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

refactoring: FBReader -> FBReaderApp, FBReaderActivity -> FBReader

Browse source
This commit is contained in:
Nikolay Pultsin 2010-10-21 20:31:15 +01:00
parent 05ec6c3861
commit d3b6c30fd8
36 changed files with 75 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.fbreader.FBReader;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.library.*;
public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuItemClickListener {
@ -73,7 +73,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
AllBooksBookmarks = Bookmark.bookmarks();
Collections.sort(AllBooksBookmarks, new Bookmark.ByTimeComparator());
final FBReader fbreader = (FBReader)FBReader.Instance();
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
if (fbreader.Model != null) {
final long bookId = fbreader.Model.Book.getId();
@ -129,7 +129,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
@Override
public boolean onSearchRequested() {
final FBReader fbreader = (FBReader)FBReader.Instance();
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
startSearch(fbreader.BookmarkSearchPatternOption.getValue(), true, null, false);
return true;
}
@ -279,7 +279,7 @@ mainLoop:
}
private void addBookmark() {
final FBReader fbreader = (FBReader)FBReader.Instance();
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
final ZLTextView textView = fbreader.getTextView();
final ZLTextWordCursor cursor = textView.getStartCursor();
@ -302,7 +302,7 @@ mainLoop:
private void gotoBookmark(Bookmark bookmark) {
bookmark.onOpen();
final FBReader fbreader = (FBReader)FBReader.Instance();
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
final long bookId = bookmark.getBookId();
if ((fbreader.Model == null) || (fbreader.Model.Book.getId() != bookId)) {
final Book book = Book.getById(bookId);