synchronization with library-service branch

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

@@ -188,7 +188,7 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem
 	}
 
 	private void createBookContextMenu(ContextMenu menu, Book book) {
-		final ZLResource resource = LibraryUtil.resource();
+		final ZLResource resource = Library.resource();
 		menu.setHeaderTitle(book.getTitle());
 		menu.add(0, OPEN_BOOK_ITEM_ID, 0, resource.getResource("openBook").getValue());
 		menu.add(0, SHOW_BOOK_INFO_ITEM_ID, 0, resource.getResource("showBookInfo").getValue());
@@ -261,7 +261,7 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem
 	}
 
 	private MenuItem addMenuItem(Menu menu, int index, String resourceKey, int iconId) {
-		final String label = LibraryUtil.resource().getResource("menu").getResource(resourceKey).getValue();
+		final String label = Library.resource().getResource("menu").getResource(resourceKey).getValue();
 		final MenuItem item = menu.add(0, index, Menu.NONE, label);
 		item.setOnMenuItemClickListener(this);
 		item.setIcon(iconId);

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

@@ -38,7 +38,7 @@ public class AuthorTree extends LibraryTree {
 		return
 			Author != null ?
 				Author.DisplayName :
-				LibraryUtil.resource().getResource("unknownAuthor").getValue();
+				Library.resource().getResource("unknownAuthor").getValue();
 	}
 
 	@Override

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

@@ -190,7 +190,7 @@ public class Book {
 		}
 		final String demoPathPrefix = Paths.mainBookDirectory() + "/Demos/";
 		if (File.getPath().startsWith(demoPathPrefix)) {
-			final String demoTag = LibraryUtil.resource().getResource("demo").getValue();
+			final String demoTag = Library.resource().getResource("demo").getValue();
 			setTitle(getTitle() + " (" + demoTag + ")");
 			addTag(demoTag);
 		}

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

@@ -35,7 +35,7 @@ public class FileFirstLevelTree extends FirstLevelTree {
 	private void addChild(String path, String resourceKey) {
 		final ZLFile file = ZLFile.createFileByPath(path);
 		if (file != null) {
-			final ZLResource resource = LibraryUtil.resource().getResource(resourceKey);
+			final ZLResource resource = Library.resource().getResource(resourceKey);
 			new FileTree(
 				this,
 				file,

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

@@ -28,13 +28,13 @@ public class FirstLevelTree extends LibraryTree {
 	FirstLevelTree(RootTree root, int position, String id) {
 		super(root, position);
 		myId = id;
-		myResource = LibraryUtil.resource().getResource(myId);
+		myResource = Library.resource().getResource(myId);
 	}
 
 	FirstLevelTree(RootTree root, String id) {
 		super(root);
 		myId = id;
-		myResource = LibraryUtil.resource().getResource(myId);
+		myResource = Library.resource().getResource(myId);
 	}
 
 	@Override

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

@@ -23,6 +23,7 @@ import java.io.File;
 import java.util.*;
 
 import org.geometerplus.zlibrary.core.filesystem.*;
+import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 import org.geometerplus.fbreader.Paths;
 import org.geometerplus.fbreader.book.*;
@@ -30,6 +31,10 @@ import org.geometerplus.fbreader.bookmodel.BookReadingException;
 import org.geometerplus.fbreader.tree.FBTree;
 
 public final class Library extends AbstractLibrary {
+	public static ZLResource resource() {
+		return ZLResource.resource("library");
+	}
+
 	public static final String ROOT_FOUND = "found";
 	public static final String ROOT_FAVORITES = "favorites";
 	public static final String ROOT_RECENT = "recent";

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

@@ -21,16 +21,11 @@ package org.geometerplus.fbreader.library;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.image.ZLImage;
-import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 import org.geometerplus.fbreader.formats.FormatPlugin;
 import org.geometerplus.fbreader.bookmodel.BookReadingException;
 
 public abstract class LibraryUtil {
-	public static ZLResource resource() {
-		return ZLResource.resource("library");
-	}
-
 	public static ZLImage getCover(Book book) {
 		return book != null ? book.getCover() : null;
 	}

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

@@ -25,7 +25,7 @@ class RootTree extends LibraryTree {
 
 	@Override
 	public String getName() {
-		return LibraryUtil.resource().getValue();
+		return Library.resource().getValue();
 	}
 
 	@Override

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

@@ -36,7 +36,7 @@ public final class TagTree extends LibraryTree {
 	@Override
 	public String getName() {
 		return Tag != null
-			? Tag.Name : LibraryUtil.resource().getResource("booksWithNoTags").getValue();
+			? Tag.Name : Library.resource().getResource("booksWithNoTags").getValue();
 	}
 
 	@Override