platform-independent code (top-level file tree items) moved to library package

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

@@ -24,11 +24,6 @@ import java.util.ArrayList;
 import android.content.Intent;
 import android.os.Bundle;
 
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-import org.geometerplus.zlibrary.core.filesystem.ZLFile;
-
-import org.geometerplus.fbreader.Paths;
-import org.geometerplus.fbreader.library.Library;
 import org.geometerplus.fbreader.library.FileTree;
 import org.geometerplus.fbreader.library.Book;
 import org.geometerplus.fbreader.tree.FBTree;
@@ -43,9 +38,7 @@ public final class FileManager extends BaseActivity {
 		if (myCurrentTree instanceof FileTree) {
 			startUpdate();
 		} else {
-			addItem(Paths.BooksDirectoryOption().getValue(), "fileTreeLibrary");
+			adapter.addAll(myCurrentTree.subTrees());
-			addItem("/", "fileTreeRoot");
-			addItem(Paths.cardDirectory(), "fileTreeCard");
 		}
 
 		getListView().setTextFilterEnabled(true);
@@ -85,14 +78,4 @@ public final class FileManager extends BaseActivity {
 		getListAdapter().remove(new FileTree((FileTree)myCurrentTree, book.File));
 		getListView().invalidateViews();
 	}
-
-	private void addItem(String path, String resourceKey) {
-		final ZLResource resource = Library.resource().getResource(resourceKey);
-		getListAdapter().add(new FileTree(
-			myCurrentTree,
-			ZLFile.createFileByPath(path),
-			resource.getValue(),
-			resource.getResource("summary").getValue()
-		));
-	}
 }

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2009-2011 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+package org.geometerplus.fbreader.library;
+
+import org.geometerplus.zlibrary.core.resources.ZLResource;
+import org.geometerplus.zlibrary.core.filesystem.ZLFile;
+
+import org.geometerplus.fbreader.Paths;
+
+public class FileRootTree extends RootTree {
+	FileRootTree(String id) {
+		super(id);
+		addChild(Paths.BooksDirectoryOption().getValue(), "fileTreeLibrary");
+		addChild("/", "fileTreeRoot");
+		addChild(Paths.cardDirectory(), "fileTreeCard");
+	}
+
+	private void addChild(String path, String resourceKey) {
+		final ZLResource resource = Library.resource().getResource(resourceKey);
+		new FileTree(
+			this,
+			ZLFile.createFileByPath(path),
+			resource.getValue(),
+			resource.getResource("summary").getValue()
+		);
+	}
+
+	@Override
+	public String getTreeTitle() {
+		return getName();
+	}
+}

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

@@ -56,6 +56,7 @@ public final class Library {
 	private volatile boolean myInterrupted = false;
 
 	public Library() {
+		myRootTrees.put(ROOT_FILE_TREE, new FileRootTree(ROOT_FILE_TREE));
 	}
 
 	public RootTree getRootTree(String id) {