code simplification

src/org/geometerplus/android/fbreader/library/BaseActivity.java

@@ -127,11 +127,11 @@ abstract class BaseActivity extends ListActivity {
 		final FBTreeInfo info = myInfoMap.get(tree);
 		if (info != null && info.CoverResourceId != -1) {
 			return info.CoverResourceId;
+		} else if (((LibraryTree)tree).getBook() != null) {
+			return R.drawable.ic_list_library_book;
 		} else if (tree instanceof FileTree) {
 			final FileTree fileTree = (FileTree)tree;
-			if (fileTree.getBook() != null) {
+			if (fileTree.getFile().isDirectory()) {
-				return R.drawable.ic_list_library_book;
-			} else if (fileTree.getFile().isDirectory()) {
 				if (fileTree.getFile().isReadable()) {
 					return R.drawable.ic_list_library_folder;
 				} else {
@@ -146,8 +146,6 @@ abstract class BaseActivity extends ListActivity {
 			return R.drawable.ic_list_library_author;
 		} else if (tree instanceof TagTree) {
 			return R.drawable.ic_list_library_tag;
-		} else if (tree instanceof BookTree) {
-			return R.drawable.ic_list_library_book;
 		} else {
 			return R.drawable.ic_list_library_books;
 		}
@@ -155,14 +153,13 @@ abstract class BaseActivity extends ListActivity {
 
 	@Override
 	protected void onListItemClick(ListView listView, View view, int position, long rowId) {
-		final FBTree tree = getListAdapter().getItem(position);
+		final LibraryTree tree = (LibraryTree)getListAdapter().getItem(position);
-		if (tree instanceof FileTree) {
+		final Book book = tree.getBook();
-			final FileTree fileTree = (FileTree)tree;
-			final ZLFile file = fileTree.getFile();
-			final Book book = fileTree.getBook();
 		if (book != null) {
 			showBookInfo(book);
-			} else if (!file.isReadable()) {
+		} else if (tree instanceof FileTree) {
+			final ZLFile file = ((FileTree)tree).getFile();
+			if (!file.isReadable()) {
 				UIUtil.showErrorMessage(this, "permissionDenied");
 			} else if (file.isDirectory() || file.isArchive()) {
 				startActivityForResult(
@@ -172,8 +169,6 @@ abstract class BaseActivity extends ListActivity {
 					CHILD_LIST_REQUEST
 				);
 			}
-		} else if (tree instanceof BookTree) {
-			showBookInfo(((BookTree)tree).Book);
 		} else {
 			final FBTreeInfo info = myInfoMap.get(tree);
 			if (info != null && info.Action != null) {
@@ -189,8 +184,9 @@ abstract class BaseActivity extends ListActivity {
 			return false;
 		}
 
-		if (tree instanceof BookTree) {
+		final Book book = ((LibraryTree)tree).getBook();
-			return mySelectedBook.equals(((BookTree)tree).Book);
+		if (book != null) {
+			return mySelectedBook.equals(book);
 		} else if (tree instanceof AuthorTree) {
 			return mySelectedBook.authors().contains(((AuthorTree)tree).Author);
 		} else if (tree instanceof TitleTree) {
@@ -215,12 +211,7 @@ abstract class BaseActivity extends ListActivity {
 				return false;
 			}
 			final ZLFile file = fileTree.getFile();
-			final String path = file.getPath();
+			String prefix = file.getPath();
-			if (mySelectedBookPath.equals(path)) {
-				return true;
-			}
-        
-			String prefix = path;
 			if (file.isDirectory()) {
 				if (!prefix.endsWith("/")) {
 					prefix += '/';
@@ -303,15 +294,10 @@ abstract class BaseActivity extends ListActivity {
 	@Override
 	public boolean onContextItemSelected(MenuItem item) {
 		final int position = ((AdapterView.AdapterContextMenuInfo)item.getMenuInfo()).position;
-		final FBTree tree = getListAdapter().getItem(position);
+		final Book book = ((LibraryTree)getListAdapter().getItem(position)).getBook();
-		if (tree instanceof BookTree) {
-			return onContextItemSelected(item.getItemId(), ((BookTree)tree).Book);
-		} else if (tree instanceof FileTree) {
-			final Book book = ((FileTree)tree).getBook(); 
 		if (book != null) {
 			return onContextItemSelected(item.getItemId(), book);
 		}
-		}
 		return super.onContextItemSelected(item);
 	}
 

src/org/geometerplus/fbreader/library/BookTree.java

@@ -36,6 +36,11 @@ public class BookTree extends LibraryTree {
 		return Book.getTitle();
 	}
 
+	@Override
+	public Book getBook() {
+		return Book;
+	}
+
 	@Override
 	protected String getStringId() {
 		return getName();

src/org/geometerplus/fbreader/library/FileTree.java

@@ -104,6 +104,7 @@ public class FileTree extends LibraryTree {
 		return myFile;
 	}
 
+	@Override
 	public Book getBook() {
 		return Book.getByFile(myFile);
 	}

src/org/geometerplus/fbreader/library/LibraryTree.java

@@ -36,6 +36,10 @@ public abstract class LibraryTree extends FBTree {
 		return getName();
 	}
 
+	public Book getBook() {
+		return null;
+	}
+
 	TagTree createTagSubTree(Tag tag) {
 		return new TagTree(this, tag);
 	}