From d3b6c30fd8aadcc02e2f78a03bc1ff77205bde4a Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 21 Oct 2010 20:31:15 +0100 Subject: [PATCH] refactoring: FBReader -> FBReaderApp, FBReaderActivity -> FBReader --- AndroidManifest.xml | 2 +- AndroidManifest.xml.pattern | 2 +- .../geometerplus/android/fbreader/BookInfoAction.java | 4 ++-- .../android/fbreader/BookmarkSearchActivity.java | 4 ++-- .../android/fbreader/BookmarksActivity.java | 10 +++++----- .../fbreader/{FBReaderActivity.java => FBReader.java} | 11 +++++------ .../android/fbreader/LibraryTabActivity.java | 2 +- .../android/fbreader/PreferencesAction.java | 4 ++-- .../android/fbreader/RunActivityAction.java | 6 +++--- .../{ShowBookmarks.java => ShowBookmarksAction.java} | 4 ++-- .../android/fbreader/ShowLibraryAction.java | 6 +++--- .../android/fbreader/ShowNavigationAction.java | 6 +++--- .../android/fbreader/ShowNetworkLibraryAction.java | 4 ++-- .../geometerplus/android/fbreader/ShowTOCAction.java | 4 ++-- .../geometerplus/android/fbreader/TOCActivity.java | 6 +++--- .../android/fbreader/TextSearchActivity.java | 10 +++++----- .../fbreader/network/BookDownloaderService.java | 4 ++-- .../android/fbreader/network/NetworkBookActions.java | 4 ++-- .../fbreader/preferences/BookInfoActivity.java | 6 +++--- .../fbreader/preferences/PreferenceActivity.java | 8 ++++---- .../geometerplus/fbreader/fbreader/CancelAction.java | 2 +- .../fbreader/fbreader/ChangeFontSizeAction.java | 2 +- .../fbreader/fbreader/ClearFindResultsAction.java | 2 +- src/org/geometerplus/fbreader/fbreader/FBAction.java | 4 ++-- .../fbreader/{FBReader.java => FBReaderApp.java} | 4 ++-- src/org/geometerplus/fbreader/fbreader/FBView.java | 6 +++--- .../fbreader/fbreader/FindNextAction.java | 2 +- .../fbreader/fbreader/FindPreviousAction.java | 2 +- .../fbreader/fbreader/FollowHyperlinkAction.java | 2 +- .../geometerplus/fbreader/fbreader/QuitAction.java | 2 +- .../geometerplus/fbreader/fbreader/RotateAction.java | 2 +- .../geometerplus/fbreader/fbreader/SearchAction.java | 2 +- .../fbreader/fbreader/SwitchProfileAction.java | 2 +- .../fbreader/fbreader/TrackballScrollingAction.java | 2 +- .../fbreader/fbreader/VolumeKeyScrollingAction.java | 2 +- .../fbreader/optionsDialog/OptionsDialog.java | 6 +++--- 36 files changed, 75 insertions(+), 76 deletions(-) rename src/org/geometerplus/android/fbreader/{FBReaderActivity.java => FBReader.java} (96%) rename src/org/geometerplus/android/fbreader/{ShowBookmarks.java => ShowBookmarksAction.java} (88%) rename src/org/geometerplus/fbreader/fbreader/{FBReader.java => FBReaderApp.java} (98%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1e2dd110a..36162ddd1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,7 +8,7 @@ - + diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern index f22ddaa0f..5ea22f591 100644 --- a/AndroidManifest.xml.pattern +++ b/AndroidManifest.xml.pattern @@ -8,7 +8,7 @@ - + diff --git a/src/org/geometerplus/android/fbreader/BookInfoAction.java b/src/org/geometerplus/android/fbreader/BookInfoAction.java index 312046cb0..5b8804d1e 100644 --- a/src/org/geometerplus/android/fbreader/BookInfoAction.java +++ b/src/org/geometerplus/android/fbreader/BookInfoAction.java @@ -19,12 +19,12 @@ package org.geometerplus.android.fbreader; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.android.fbreader.preferences.BookInfoActivity; class BookInfoAction extends RunActivityAction { - BookInfoAction(FBReaderActivity baseActivity, FBReader fbreader) { + BookInfoAction(FBReader baseActivity, FBReaderApp fbreader) { super(baseActivity, fbreader, BookInfoActivity.class); } diff --git a/src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java b/src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java index 37bdfb953..f829be2fc 100644 --- a/src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java +++ b/src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java @@ -24,7 +24,7 @@ import java.util.LinkedList; import android.app.Activity; import org.geometerplus.zlibrary.core.util.ZLMiscUtil; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.library.*; public class BookmarkSearchActivity extends SearchActivity { @@ -51,7 +51,7 @@ public class BookmarkSearchActivity extends SearchActivity { @Override boolean runSearch(String pattern) { - final FBReader fbreader = (FBReader)FBReader.Instance(); + final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance(); fbreader.BookmarkSearchPatternOption.setValue(pattern); pattern = pattern.toLowerCase(); myBookmarks.clear(); diff --git a/src/org/geometerplus/android/fbreader/BookmarksActivity.java b/src/org/geometerplus/android/fbreader/BookmarksActivity.java index 7d84861ce..cb6bee010 100644 --- a/src/org/geometerplus/android/fbreader/BookmarksActivity.java +++ b/src/org/geometerplus/android/fbreader/BookmarksActivity.java @@ -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); diff --git a/src/org/geometerplus/android/fbreader/FBReaderActivity.java b/src/org/geometerplus/android/fbreader/FBReader.java similarity index 96% rename from src/org/geometerplus/android/fbreader/FBReaderActivity.java rename to src/org/geometerplus/android/fbreader/FBReader.java index 394711de5..71b6386e7 100644 --- a/src/org/geometerplus/android/fbreader/FBReaderActivity.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -43,12 +43,12 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication; import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.fbreader.bookmodel.BookModel; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.fbreader.ActionCode; import org.geometerplus.fbreader.library.Library; -public final class FBReaderActivity extends ZLAndroidActivity { - static FBReaderActivity Instance; +public final class FBReader extends ZLAndroidActivity { + static FBReader Instance; private int myFullScreenFlag; @@ -184,7 +184,7 @@ public final class FBReaderActivity extends ZLAndroidActivity { new SQLiteBooksDatabase(); final String[] args = (fileName != null) ? new String[] { fileName } : new String[0]; - final FBReader fbReader = new FBReader(args); + final FBReaderApp fbReader = new FBReaderApp(args); fbReader.addAction(ActionCode.SHOW_LIBRARY, new ShowLibraryAction(this, fbReader)); fbReader.addAction(ActionCode.SHOW_PREFERENCES, new PreferencesAction(this, fbReader)); @@ -210,8 +210,7 @@ public final class FBReaderActivity extends ZLAndroidActivity { manager.setOnCancelListener(null); } }); - final org.geometerplus.fbreader.fbreader.FBReader fbreader = - (org.geometerplus.fbreader.fbreader.FBReader)ZLApplication.Instance(); + final FBReaderApp fbreader = (FBReaderApp)ZLApplication.Instance(); startSearch(fbreader.TextSearchPatternOption.getValue(), true, null, false); return true; } diff --git a/src/org/geometerplus/android/fbreader/LibraryTabActivity.java b/src/org/geometerplus/android/fbreader/LibraryTabActivity.java index 4d54ebca3..2461f591c 100644 --- a/src/org/geometerplus/android/fbreader/LibraryTabActivity.java +++ b/src/org/geometerplus/android/fbreader/LibraryTabActivity.java @@ -258,7 +258,7 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt } private Intent getFBReaderIntent(final File file) { - final Intent intent = new Intent(getApplicationContext(), FBReaderActivity.class); + final Intent intent = new Intent(getApplicationContext(), FBReader.class); intent.setAction(Intent.ACTION_VIEW); if (file != null) { intent.setData(Uri.fromFile(file)); diff --git a/src/org/geometerplus/android/fbreader/PreferencesAction.java b/src/org/geometerplus/android/fbreader/PreferencesAction.java index 96c85a7f5..73d9da2e9 100644 --- a/src/org/geometerplus/android/fbreader/PreferencesAction.java +++ b/src/org/geometerplus/android/fbreader/PreferencesAction.java @@ -19,12 +19,12 @@ package org.geometerplus.android.fbreader; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.android.fbreader.preferences.PreferenceActivity; class PreferencesAction extends RunActivityAction { - PreferencesAction(FBReaderActivity baseActivity, FBReader fbreader) { + PreferencesAction(FBReader baseActivity, FBReaderApp fbreader) { super(baseActivity, fbreader, PreferenceActivity.class); } } diff --git a/src/org/geometerplus/android/fbreader/RunActivityAction.java b/src/org/geometerplus/android/fbreader/RunActivityAction.java index dd3f771b9..919773f26 100644 --- a/src/org/geometerplus/android/fbreader/RunActivityAction.java +++ b/src/org/geometerplus/android/fbreader/RunActivityAction.java @@ -22,13 +22,13 @@ package org.geometerplus.android.fbreader; import android.content.Intent; import org.geometerplus.fbreader.fbreader.FBAction; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; abstract class RunActivityAction extends FBAction { - private final FBReaderActivity myBaseActivity; + private final FBReader myBaseActivity; private final Class myActivityClass; - RunActivityAction(FBReaderActivity baseActivity, FBReader fbreader, Class activityClass) { + RunActivityAction(FBReader baseActivity, FBReaderApp fbreader, Class activityClass) { super(fbreader); myBaseActivity = baseActivity; myActivityClass = activityClass; diff --git a/src/org/geometerplus/android/fbreader/ShowBookmarks.java b/src/org/geometerplus/android/fbreader/ShowBookmarksAction.java similarity index 88% rename from src/org/geometerplus/android/fbreader/ShowBookmarks.java rename to src/org/geometerplus/android/fbreader/ShowBookmarksAction.java index 5c6a77bcc..3983450ff 100644 --- a/src/org/geometerplus/android/fbreader/ShowBookmarks.java +++ b/src/org/geometerplus/android/fbreader/ShowBookmarksAction.java @@ -19,10 +19,10 @@ package org.geometerplus.android.fbreader; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; class ShowBookmarksAction extends RunActivityAction { - ShowBookmarksAction(FBReaderActivity baseActivity, FBReader fbreader) { + ShowBookmarksAction(FBReader baseActivity, FBReaderApp fbreader) { super(baseActivity, fbreader, BookmarksActivity.class); } } diff --git a/src/org/geometerplus/android/fbreader/ShowLibraryAction.java b/src/org/geometerplus/android/fbreader/ShowLibraryAction.java index 112ea8088..f7abb2f53 100644 --- a/src/org/geometerplus/android/fbreader/ShowLibraryAction.java +++ b/src/org/geometerplus/android/fbreader/ShowLibraryAction.java @@ -24,15 +24,15 @@ import java.util.HashMap; import android.content.Intent; import org.geometerplus.fbreader.fbreader.FBAction; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; class ShowLibraryAction extends FBAction { - private final FBReaderActivity myBaseActivity; + private final FBReader myBaseActivity; - ShowLibraryAction(FBReaderActivity baseActivity, FBReader fbreader) { + ShowLibraryAction(FBReader baseActivity, FBReaderApp fbreader) { super(fbreader); myBaseActivity = baseActivity; } diff --git a/src/org/geometerplus/android/fbreader/ShowNavigationAction.java b/src/org/geometerplus/android/fbreader/ShowNavigationAction.java index c28c63601..0f8f232bf 100644 --- a/src/org/geometerplus/android/fbreader/ShowNavigationAction.java +++ b/src/org/geometerplus/android/fbreader/ShowNavigationAction.java @@ -23,12 +23,12 @@ import org.geometerplus.zlibrary.text.model.ZLTextModel; import org.geometerplus.zlibrary.text.view.ZLTextView; import org.geometerplus.fbreader.fbreader.FBAction; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; class ShowNavigationAction extends FBAction { - private final FBReaderActivity myActivity; + private final FBReader myActivity; - ShowNavigationAction(FBReaderActivity activity, FBReader fbreader) { + ShowNavigationAction(FBReader activity, FBReaderApp fbreader) { super(fbreader); myActivity = activity; } diff --git a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java b/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java index ca8e0822b..bb9fa3b6a 100644 --- a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java +++ b/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java @@ -19,12 +19,12 @@ package org.geometerplus.android.fbreader; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.android.fbreader.network.NetworkLibraryActivity; class ShowNetworkLibraryAction extends RunActivityAction { - ShowNetworkLibraryAction(FBReaderActivity baseActivity, FBReader fbreader) { + ShowNetworkLibraryAction(FBReader baseActivity, FBReaderApp fbreader) { super(baseActivity, fbreader, NetworkLibraryActivity.class); } } diff --git a/src/org/geometerplus/android/fbreader/ShowTOCAction.java b/src/org/geometerplus/android/fbreader/ShowTOCAction.java index bf6632421..65082e44d 100644 --- a/src/org/geometerplus/android/fbreader/ShowTOCAction.java +++ b/src/org/geometerplus/android/fbreader/ShowTOCAction.java @@ -19,10 +19,10 @@ package org.geometerplus.android.fbreader; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; class ShowTOCAction extends RunActivityAction { - ShowTOCAction(FBReaderActivity baseActivity, FBReader fbreader) { + ShowTOCAction(FBReader baseActivity, FBReaderApp fbreader) { super(baseActivity, fbreader, TOCActivity.class); } diff --git a/src/org/geometerplus/android/fbreader/TOCActivity.java b/src/org/geometerplus/android/fbreader/TOCActivity.java index 0c96ab83a..62b356673 100644 --- a/src/org/geometerplus/android/fbreader/TOCActivity.java +++ b/src/org/geometerplus/android/fbreader/TOCActivity.java @@ -32,7 +32,7 @@ import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.text.view.ZLTextWordCursor; import org.geometerplus.fbreader.bookmodel.TOCTree; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; public class TOCActivity extends ListActivity { private TOCAdapter myAdapter; @@ -46,7 +46,7 @@ public class TOCActivity extends ListActivity { requestWindowFeature(Window.FEATURE_NO_TITLE); - final FBReader fbreader = (FBReader)ZLApplication.Instance(); + final FBReaderApp fbreader = (FBReaderApp)ZLApplication.Instance(); final TOCTree root = fbreader.Model.TOCTree; myAdapter = new TOCAdapter(root); final ZLTextWordCursor cursor = fbreader.BookTextView.getStartCursor(); @@ -121,7 +121,7 @@ public class TOCActivity extends ListActivity { final TOCTree.Reference reference = tree.getReference(); if (reference != null) { finish(); - final FBReader fbreader = (FBReader)ZLApplication.Instance(); + final FBReaderApp fbreader = (FBReaderApp)ZLApplication.Instance(); fbreader.BookTextView.gotoPosition(reference.ParagraphIndex, 0, 0); fbreader.showBookTextView(); } diff --git a/src/org/geometerplus/android/fbreader/TextSearchActivity.java b/src/org/geometerplus/android/fbreader/TextSearchActivity.java index 40a9d8ee7..9cea1e64a 100644 --- a/src/org/geometerplus/android/fbreader/TextSearchActivity.java +++ b/src/org/geometerplus/android/fbreader/TextSearchActivity.java @@ -21,17 +21,17 @@ package org.geometerplus.android.fbreader; import android.app.Activity; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; public class TextSearchActivity extends SearchActivity { @Override void onSuccess() { - FBReaderActivity.Instance.showTextSearchControls(true); + FBReader.Instance.showTextSearchControls(true); } /*@Override void onFailure() { - FBReaderActivity.Instance.showTextSearchControls(false); + FBReader.Instance.showTextSearchControls(false); }*/ @Override @@ -46,13 +46,13 @@ public class TextSearchActivity extends SearchActivity { @Override boolean runSearch(final String pattern) { - final FBReader fbReader = (FBReader)FBReader.Instance(); + final FBReaderApp fbReader = (FBReaderApp)FBReaderApp.Instance(); fbReader.TextSearchPatternOption.setValue(pattern); return fbReader.getTextView().search(pattern, true, false, false, false) != 0; } @Override Activity getParentActivity() { - return FBReaderActivity.Instance; + return FBReader.Instance; } } diff --git a/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java b/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java index 6bc3519af..5b5f91276 100644 --- a/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java +++ b/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java @@ -42,7 +42,7 @@ import org.geometerplus.zlibrary.core.network.*; import org.geometerplus.fbreader.network.BookReference; -import org.geometerplus.android.fbreader.FBReaderActivity; +import org.geometerplus.android.fbreader.FBReader; public class BookDownloaderService extends Service { public static final String BOOK_FORMAT_KEY = "org.geometerplus.android.fbreader.network.BookFormat"; @@ -191,7 +191,7 @@ public class BookDownloaderService extends Service { } private Intent getFBReaderIntent(final File file) { - final Intent intent = new Intent(getApplicationContext(), FBReaderActivity.class); + final Intent intent = new Intent(getApplicationContext(), FBReader.class); if (file != null) { intent.setAction(Intent.ACTION_VIEW).setData(Uri.fromFile(file)); } diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java index 60113ba63..87400a6d0 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java @@ -39,7 +39,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.android.util.AndroidUtil; -import org.geometerplus.android.fbreader.FBReaderActivity; +import org.geometerplus.android.fbreader.FBReader; import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.tree.NetworkBookTree; @@ -307,7 +307,7 @@ class NetworkBookActions extends NetworkTreeActions { new Intent(Intent.ACTION_VIEW, Uri.fromFile(new File(local)), activity.getApplicationContext(), - FBReaderActivity.class + FBReader.class ).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) ); } diff --git a/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java b/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java index 6b76a64da..9bc429800 100644 --- a/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java @@ -29,7 +29,7 @@ import org.geometerplus.zlibrary.core.language.ZLLanguageList; import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; -import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.library.Book; class BookTitlePreference extends ZLStringPreference { @@ -93,7 +93,7 @@ public class BookInfoActivity extends ZLPreferenceActivity { @Override protected void init() { final Category commonCategory = createCategory(null); - myBook = ((FBReader)FBReader.Instance()).Model.Book; + myBook = ((FBReaderApp)FBReaderApp.Instance()).Model.Book; if (myBook.File.getPhysicalFile() != null) { commonCategory.addPreference(new InfoPreference( this, @@ -109,7 +109,7 @@ public class BookInfoActivity extends ZLPreferenceActivity { protected void onPause() { super.onPause(); if (myBook.save()) { - ((FBReader)FBReader.Instance()).clearTextCaches(); + ((FBReaderApp)FBReaderApp.Instance()).clearTextCaches(); ZLTextHyphenator.Instance().load(myBook.getLanguage()); } } diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java index 73642b5e4..f7087933c 100644 --- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java @@ -33,7 +33,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { } /*private static final class ColorProfilePreference extends ZLSimplePreference { - private final FBReader myFBReader; + private final FBReaderApp myFBReader; private final Screen myScreen; private final String myKey; @@ -42,7 +42,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { return r.hasValue() ? r.getValue() : resourceKey; } - ColorProfilePreference(Context context, FBReader fbreader, Screen screen, String key, String title) { + ColorProfilePreference(Context context, FBReaderApp fbreader, Screen screen, String key, String title) { super(context); myFBReader = fbreader; myScreen = screen; @@ -57,7 +57,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { @Override public void onClick() { myScreen.setSummary(getTitle()); - myFBReader.setColorProfileName(myKey); + myFBReaderApp.setColorProfileName(myKey); myScreen.close(); } }*/ @@ -74,7 +74,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { final Category lookNFeelCategory = createCategory("LookNFeel"); - final FBReader fbReader = (FBReader)FBReader.Instance(); + final FBReaderApp fbReader = (FBReaderApp)FBReaderApp.Instance(); final Screen appearanceScreen = lookNFeelCategory.createPreferenceScreen("appearanceSettings"); appearanceScreen.setSummary( appearanceScreen.Resource.getResource("summary").getValue() ); diff --git a/src/org/geometerplus/fbreader/fbreader/CancelAction.java b/src/org/geometerplus/fbreader/fbreader/CancelAction.java index 3e502d4b7..898f4387a 100644 --- a/src/org/geometerplus/fbreader/fbreader/CancelAction.java +++ b/src/org/geometerplus/fbreader/fbreader/CancelAction.java @@ -20,7 +20,7 @@ package org.geometerplus.fbreader.fbreader; class CancelAction extends FBAction { - CancelAction(FBReader fbreader) { + CancelAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java index 755c2df43..250e9c975 100644 --- a/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java @@ -25,7 +25,7 @@ import org.geometerplus.zlibrary.text.view.style.ZLTextStyleCollection; class ChangeFontSizeAction extends FBAction { private final int myDelta; - ChangeFontSizeAction(FBReader fbreader, int delta) { + ChangeFontSizeAction(FBReaderApp fbreader, int delta) { super(fbreader); myDelta = delta; } diff --git a/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java b/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java index b52b38589..ac1653fa3 100644 --- a/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java @@ -20,7 +20,7 @@ package org.geometerplus.fbreader.fbreader; class ClearFindResultsAction extends FBAction { - ClearFindResultsAction(FBReader fbreader) { + ClearFindResultsAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/FBAction.java b/src/org/geometerplus/fbreader/fbreader/FBAction.java index dd48f05d7..15ba3035d 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FBAction.java @@ -22,9 +22,9 @@ package org.geometerplus.fbreader.fbreader; import org.geometerplus.zlibrary.core.application.ZLApplication; public abstract class FBAction extends ZLApplication.ZLAction { - protected final FBReader Reader; + protected final FBReaderApp Reader; - public FBAction(FBReader fbreader) { + public FBAction(FBReaderApp fbreader) { Reader = fbreader; } } diff --git a/src/org/geometerplus/fbreader/fbreader/FBReader.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java similarity index 98% rename from src/org/geometerplus/fbreader/fbreader/FBReader.java rename to src/org/geometerplus/fbreader/fbreader/FBReaderApp.java index 69d304f5e..12011f294 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBReader.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java @@ -32,7 +32,7 @@ import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.library.Bookmark; import org.geometerplus.fbreader.optionsDialog.OptionsDialog; -public final class FBReader extends ZLApplication { +public final class FBReaderApp extends ZLApplication { public final ZLStringOption TextSearchPatternOption = new ZLStringOption("TextSearch", "Pattern", ""); public final ZLStringOption BookmarkSearchPatternOption = @@ -68,7 +68,7 @@ public final class FBReader extends ZLApplication { private final String myArg0; - public FBReader(String[] args) { + public FBReaderApp(String[] args) { myArg0 = (args.length > 0) ? args[0] : null; addAction(ActionCode.QUIT, new QuitAction(this)); diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index b368c9720..397d6bbb7 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -28,9 +28,9 @@ import org.geometerplus.zlibrary.text.view.*; import org.geometerplus.fbreader.bookmodel.FBHyperlinkType; public final class FBView extends ZLTextView { - private FBReader myReader; + private FBReaderApp myReader; - FBView(FBReader reader) { + FBView(FBReaderApp reader) { super(ZLibrary.Instance().getPaintContext()); myReader = reader; } @@ -82,7 +82,7 @@ public final class FBView extends ZLTextView { ZLibrary.Instance().openInBrowser(hyperlink.Id); break; case FBHyperlinkType.INTERNAL: - ((FBReader)ZLApplication.Instance()).tryOpenFootnote(hyperlink.Id); + ((FBReaderApp)ZLApplication.Instance()).tryOpenFootnote(hyperlink.Id); break; } } diff --git a/src/org/geometerplus/fbreader/fbreader/FindNextAction.java b/src/org/geometerplus/fbreader/fbreader/FindNextAction.java index 628241589..360cc3ae2 100644 --- a/src/org/geometerplus/fbreader/fbreader/FindNextAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FindNextAction.java @@ -20,7 +20,7 @@ package org.geometerplus.fbreader.fbreader; class FindNextAction extends FBAction { - FindNextAction(FBReader fbreader) { + FindNextAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java b/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java index fd64dd112..c70e3f014 100644 --- a/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java @@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader; import org.geometerplus.zlibrary.text.view.ZLTextView; class FindPreviousAction extends FBAction { - FindPreviousAction(FBReader fbreader) { + FindPreviousAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/FollowHyperlinkAction.java b/src/org/geometerplus/fbreader/fbreader/FollowHyperlinkAction.java index 91249a999..3fd63a39f 100644 --- a/src/org/geometerplus/fbreader/fbreader/FollowHyperlinkAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FollowHyperlinkAction.java @@ -20,7 +20,7 @@ package org.geometerplus.fbreader.fbreader; public class FollowHyperlinkAction extends FBAction { - FollowHyperlinkAction(FBReader fbreader) { + FollowHyperlinkAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/QuitAction.java b/src/org/geometerplus/fbreader/fbreader/QuitAction.java index be1cf8be4..49799ec13 100644 --- a/src/org/geometerplus/fbreader/fbreader/QuitAction.java +++ b/src/org/geometerplus/fbreader/fbreader/QuitAction.java @@ -20,7 +20,7 @@ package org.geometerplus.fbreader.fbreader; class QuitAction extends FBAction { - QuitAction(FBReader fbreader) { + QuitAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/RotateAction.java b/src/org/geometerplus/fbreader/fbreader/RotateAction.java index 6bdbd93ba..5c0a926dc 100644 --- a/src/org/geometerplus/fbreader/fbreader/RotateAction.java +++ b/src/org/geometerplus/fbreader/fbreader/RotateAction.java @@ -20,7 +20,7 @@ package org.geometerplus.fbreader.fbreader; class RotateAction extends FBAction { - RotateAction(FBReader fbreader) { + RotateAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/SearchAction.java b/src/org/geometerplus/fbreader/fbreader/SearchAction.java index 81c6a7db1..a98fade8c 100644 --- a/src/org/geometerplus/fbreader/fbreader/SearchAction.java +++ b/src/org/geometerplus/fbreader/fbreader/SearchAction.java @@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader; import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; class SearchAction extends FBAction { - SearchAction(FBReader fbreader) { + SearchAction(FBReaderApp fbreader) { super(fbreader); } diff --git a/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java b/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java index 6111876df..33801d676 100644 --- a/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java +++ b/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java @@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader; class SwitchProfileAction extends FBAction { private String myProfileName; - SwitchProfileAction(FBReader fbreader, String profileName) { + SwitchProfileAction(FBReaderApp fbreader, String profileName) { super(fbreader); myProfileName = profileName; } diff --git a/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java b/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java index 0b43b9efc..ccf3b4cb1 100644 --- a/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java +++ b/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java @@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader; class TrackballScrollingAction extends FBAction { private final boolean myForward; - TrackballScrollingAction(FBReader fbreader, boolean forward) { + TrackballScrollingAction(FBReaderApp fbreader, boolean forward) { super(fbreader); myForward = forward; } diff --git a/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java b/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java index 03fcb747c..778958aa3 100644 --- a/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java +++ b/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java @@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader; class VolumeKeyScrollingAction extends FBAction { private final boolean myForward; - VolumeKeyScrollingAction(FBReader fbreader, boolean forward) { + VolumeKeyScrollingAction(FBReaderApp fbreader, boolean forward) { super(fbreader); myForward = forward; } diff --git a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java index 7345f1a64..89c13fa59 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java @@ -30,7 +30,7 @@ import org.geometerplus.fbreader.fbreader.*; public class OptionsDialog { private ZLOptionsDialog myDialog; - public OptionsDialog(FBReader fbreader) { + public OptionsDialog(FBReaderApp fbreader) { myDialog = ZLDialogManager.Instance().createOptionsDialog("OptionsDialog", null, new OptionsApplyRunnable(fbreader), true); ZLDialogContent marginTab = myDialog.createTab("Margins"); @@ -67,9 +67,9 @@ public class OptionsDialog { } private static class OptionsApplyRunnable implements Runnable { - private final FBReader myFBReader; + private final FBReaderApp myFBReader; - public OptionsApplyRunnable(FBReader fbreader) { + public OptionsApplyRunnable(FBReaderApp fbreader) { myFBReader = fbreader; }