yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

no static methods in Bookmark

Browse source
This commit is contained in:
Nikolay Pultsin 2012-03-19 10:51:43 +00:00
parent 75af08e4fe
commit 31e5b3a823
6 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/BookmarksActivity.java
View file

@ -77,7 +77,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
final TabHost host = getTabHost(); final TabHost host = getTabHost();
LayoutInflater.from(this).inflate(R.layout.bookmarks, host.getTabContentView(), true); LayoutInflater.from(this).inflate(R.layout.bookmarks, host.getTabContentView(), true);
AllBooksBookmarks = Bookmark.bookmarks(); AllBooksBookmarks = Library.Instance().bookmarks();
Collections.sort(AllBooksBookmarks, new Bookmark.ByTimeComparator()); Collections.sort(AllBooksBookmarks, new Bookmark.ByTimeComparator());
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance(); final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();

14
src/org/geometerplus/android/fbreader/libraryService/LibraryShadow.java
View file

@ -19,6 +19,8 @@
package org.geometerplus.android.fbreader.libraryService; package org.geometerplus.android.fbreader.libraryService;
import java.util.*;
import android.os.RemoteException; import android.os.RemoteException;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
@ -84,4 +86,16 @@ public class LibraryShadow extends AbstractLibrary {
public void startBookSearch(final String pattern) { public void startBookSearch(final String pattern) {
// TODO: implement // TODO: implement
} }
@Override
public List<Bookmark> bookmarks() {
// TODO: implement
return Collections.emptyList();
}
@Override
public List<Bookmark> invisibleBookmarks(Book book) {
// TODO: implement
return Collections.emptyList();
}
} }

8
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -292,7 +292,7 @@ public final class FBReaderApp extends ZLApplication {
return false; return false;
} }
final List<Bookmark> bookmarks = Bookmark.invisibleBookmarks(Model.Book); final List<Bookmark> bookmarks = Library.Instance().invisibleBookmarks(Model.Book);
if (bookmarks.isEmpty()) { if (bookmarks.isEmpty()) {
return false; return false;
} }
@ -399,7 +399,7 @@ public final class FBReaderApp extends ZLApplication {
} }
if (ShowPositionsInCancelMenuOption.getValue()) { if (ShowPositionsInCancelMenuOption.getValue()) {
if (Model != null && Model.Book != null) { if (Model != null && Model.Book != null) {
for (Bookmark bookmark : Bookmark.invisibleBookmarks(Model.Book)) { for (Bookmark bookmark : Library.Instance().invisibleBookmarks(Model.Book)) {
myCancelActionsList.add(new BookmarkDescription(bookmark)); myCancelActionsList.add(new BookmarkDescription(bookmark));
} }
} }
@ -435,13 +435,13 @@ public final class FBReaderApp extends ZLApplication {
private synchronized void updateInvisibleBookmarksList(Bookmark b) { private synchronized void updateInvisibleBookmarksList(Bookmark b) {
if (Model != null && Model.Book != null && b != null) { if (Model != null && Model.Book != null && b != null) {
for (Bookmark bm : Bookmark.invisibleBookmarks(Model.Book)) { for (Bookmark bm : Library.Instance().invisibleBookmarks(Model.Book)) {
if (b.equals(bm)) { if (b.equals(bm)) {
bm.delete(); bm.delete();
} }
} }
b.save(); b.save();
final List<Bookmark> bookmarks = Bookmark.invisibleBookmarks(Model.Book); final List<Bookmark> bookmarks = Library.Instance().invisibleBookmarks(Model.Book);
for (int i = 3; i < bookmarks.size(); ++i) { for (int i = 3; i < bookmarks.size(); ++i) {
bookmarks.get(i).delete(); bookmarks.get(i).delete();
} }

3
src/org/geometerplus/fbreader/library/AbstractLibrary.java
View file

@ -70,4 +70,7 @@ public abstract class AbstractLibrary {
public abstract void removeBookFromFavorites(Book book); public abstract void removeBookFromFavorites(Book book);
public abstract void startBookSearch(final String pattern); public abstract void startBookSearch(final String pattern);
public abstract List<Bookmark> bookmarks();
public abstract List<Bookmark> invisibleBookmarks(Book book);
} }

10
src/org/geometerplus/fbreader/library/Bookmark.java
View file

@ -29,16 +29,6 @@ public final class Bookmark extends ZLTextFixedPosition {
public final static int ACCESS = 2; public final static int ACCESS = 2;
public final static int LATEST = 3; public final static int LATEST = 3;
public static List<Bookmark> bookmarks() {
return BooksDatabase.Instance().loadAllVisibleBookmarks();
}
public static List<Bookmark> invisibleBookmarks(Book book) {
final List<Bookmark> list = BooksDatabase.Instance().loadBookmarks(book.getId(), false);
Collections.sort(list, new ByTimeComparator());
return list;
}
private long myId; private long myId;
private final long myBookId; private final long myBookId;
private final String myBookTitle; private final String myBookTitle;

12
src/org/geometerplus/fbreader/library/Library.java
View file

@ -572,4 +572,16 @@ public final class Library extends AbstractLibrary {
book.File.getPhysicalFile().delete(); book.File.getPhysicalFile().delete();
} }
} }
@Override
public List<Bookmark> bookmarks() {
return BooksDatabase.Instance().loadAllVisibleBookmarks();
}
@Override
public List<Bookmark> invisibleBookmarks(Book book) {
final List<Bookmark> list = BooksDatabase.Instance().loadBookmarks(book.getId(), false);
Collections.sort(list, new Bookmark.ByTimeComparator());
return list;
}
} }