From 7fcbdf37a383cf7f25f45875bc056a22a041dc28 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sun, 10 Feb 2013 00:36:41 +0400
Subject: [PATCH] synchronization with library-service branch

---
 src/org/geometerplus/fbreader/library/Library.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java
index 0c9de055c..6e3b2451f 100644
--- a/src/org/geometerplus/fbreader/library/Library.java
+++ b/src/org/geometerplus/fbreader/library/Library.java
@@ -40,7 +40,7 @@ public final class Library {
 	private static Library ourInstance;
 	public static Library Instance() {
 		if (ourInstance == null) {
-			ourInstance = new Library(BooksDatabase.Instance());
+			ourInstance = new Library(new BookCollection(BooksDatabase.Instance()));
 		}
 		return ourInstance;
 	}
@@ -76,7 +76,6 @@ public final class Library {
 	}
 
 	public final IBookCollection Collection;
-	private final BooksDatabase myDatabase;
 
 	private final Map<ZLFile,Book> myBooks =
 		Collections.synchronizedMap(new HashMap<ZLFile,Book>());
@@ -96,11 +95,10 @@ public final class Library {
 		}
 	}
 
-	public Library(BooksDatabase db) {
-		myDatabase = db;
-		Collection = new BookCollection(db);
+	public Library(IBookCollection collection) {
+		Collection = collection;
 
-		myRootTree = new RootTree(Collection);
+		myRootTree = new RootTree(collection);
 
 		new FavoritesTree(myRootTree);
 		new RecentBooksTree(myRootTree);