mirror of
https://github.com/geometer/FBReaderJ.git
synced 2025-10-06 03:50:19 +02:00
Merge branch 'master' into library-service
Conflicts: src/org/geometerplus/android/fbreader/libraryService/LibraryService.java src/org/geometerplus/fbreader/library/AbstractLibrary.java src/org/geometerplus/fbreader/library/Library.java
This commit is contained in:
commit
6bf29e3bd3
1 changed files with 14 additions and 14 deletions
|
@ -32,6 +32,20 @@ public final class Library {
|
|||
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";
|
||||
public static final String ROOT_BY_AUTHOR = "byAuthor";
|
||||
public static final String ROOT_BY_TITLE = "byTitle";
|
||||
public static final String ROOT_BY_SERIES = "bySeries";
|
||||
public static final String ROOT_BY_TAG = "byTag";
|
||||
public static final String ROOT_FILE_TREE = "fileTree";
|
||||
|
||||
public static final int REMOVE_DONT_REMOVE = 0x00;
|
||||
public static final int REMOVE_FROM_LIBRARY = 0x01;
|
||||
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 List<ChangeListener> myListeners = Collections.synchronizedList(new LinkedList<ChangeListener>());
|
||||
|
||||
public interface ChangeListener {
|
||||
|
@ -62,20 +76,6 @@ public final class Library {
|
|||
}
|
||||
}
|
||||
|
||||
public static final String ROOT_FOUND = "found";
|
||||
public static final String ROOT_FAVORITES = "favorites";
|
||||
public static final String ROOT_RECENT = "recent";
|
||||
public static final String ROOT_BY_AUTHOR = "byAuthor";
|
||||
public static final String ROOT_BY_TITLE = "byTitle";
|
||||
public static final String ROOT_BY_SERIES = "bySeries";
|
||||
public static final String ROOT_BY_TAG = "byTag";
|
||||
public static final String ROOT_FILE_TREE = "fileTree";
|
||||
|
||||
public static final int REMOVE_DONT_REMOVE = 0x00;
|
||||
public static final int REMOVE_FROM_LIBRARY = 0x01;
|
||||
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 IBookCollection myCollection;
|
||||
|
||||
private final RootTree myRootTree = new RootTree();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue