diff --git a/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java b/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java index 31e9c2c63..2b7327336 100644 --- a/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java +++ b/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java @@ -56,6 +56,14 @@ public class BookCollectionShadow implements IBookCollection, ServiceConnection } } + public void addListener(Listener listener) { + // TODO: implement + } + + public void removeListener(Listener listener) { + // TODO: implement + } + public synchronized int size() { if (myInterface == null) { return 0; diff --git a/src/org/geometerplus/fbreader/library/BookCollection.java b/src/org/geometerplus/fbreader/library/BookCollection.java index e6e4f78aa..3e6c6f0af 100644 --- a/src/org/geometerplus/fbreader/library/BookCollection.java +++ b/src/org/geometerplus/fbreader/library/BookCollection.java @@ -31,25 +31,6 @@ import org.geometerplus.fbreader.bookmodel.BookReadingException; public class BookCollection implements IBookCollection { private final List myListeners = Collections.synchronizedList(new LinkedList()); - public interface Listener { - public enum BookEvent { - Added, - Updated, - Removed - } - - public enum BuildEvent { - Started, - NotStarted, - Succeeded, - Failed, - Completed - } - - void onBookEvent(BookEvent event, Book book); - void onBuildEvent(BuildEvent event); - } - public void addListener(Listener listener) { myListeners.add(listener); } diff --git a/src/org/geometerplus/fbreader/library/IBookCollection.java b/src/org/geometerplus/fbreader/library/IBookCollection.java index 613a9f239..59fd7ae22 100644 --- a/src/org/geometerplus/fbreader/library/IBookCollection.java +++ b/src/org/geometerplus/fbreader/library/IBookCollection.java @@ -22,6 +22,28 @@ package org.geometerplus.fbreader.library; import java.util.List; public interface IBookCollection { + public interface Listener { + public enum BookEvent { + Added, + Updated, + Removed + } + + public enum BuildEvent { + Started, + NotStarted, + Succeeded, + Failed, + Completed + } + + void onBookEvent(BookEvent event, Book book); + void onBuildEvent(BuildEvent event); + } + + public void addListener(Listener listener); + public void removeListener(Listener listener); + int size(); List books(String pattern); List recentBooks(); diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java index b0a8975a1..ef655756f 100644 --- a/src/org/geometerplus/fbreader/library/Library.java +++ b/src/org/geometerplus/fbreader/library/Library.java @@ -70,7 +70,7 @@ public final class Library { public static final int REMOVE_FROM_DISK = 0x02; public static final int REMOVE_FROM_LIBRARY_AND_DISK = REMOVE_FROM_LIBRARY | REMOVE_FROM_DISK; - private final BookCollection myCollection; + private final IBookCollection myCollection; private final RootTree myRootTree = new RootTree(); private boolean myDoGroupTitlesByFirstLetter;