diff --git a/src/org/amse/ys/zip/ZipInputStream.java b/src/org/amse/ys/zip/ZipInputStream.java index 2fe7ab778..bbb05c536 100644 --- a/src/org/amse/ys/zip/ZipInputStream.java +++ b/src/org/amse/ys/zip/ZipInputStream.java @@ -1,9 +1,6 @@ package org.amse.ys.zip; import java.io.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; class ZipInputStream extends InputStream { private final ZipFile myParent; diff --git a/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java b/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java index e29ab9f8e..91a510430 100644 --- a/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java +++ b/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java @@ -25,7 +25,6 @@ import android.view.*; import android.widget.*; import android.content.Context; -import org.geometerplus.zlibrary.ui.android.R; class SimpleContainer extends ViewGroup { private final View myEditText; diff --git a/src/org/geometerplus/android/fbreader/BookmarksActivity.java b/src/org/geometerplus/android/fbreader/BookmarksActivity.java index 8d5cbc8bc..7d84861ce 100644 --- a/src/org/geometerplus/android/fbreader/BookmarksActivity.java +++ b/src/org/geometerplus/android/fbreader/BookmarksActivity.java @@ -26,14 +26,12 @@ import android.view.*; import android.widget.*; import android.content.*; import android.app.TabActivity; -import android.graphics.drawable.Drawable; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.text.view.*; import org.geometerplus.zlibrary.ui.android.R; -import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.library.*; @@ -45,8 +43,8 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte private static final int DELETE_ITEM_ID = 2; List AllBooksBookmarks; - private final List myThisBookBookmarks = new LinkedList(); - private final List mySearchResults = new LinkedList(); + private final List myThisBookBookmarks = new LinkedList(); + private final List mySearchResults = new LinkedList(); private ListView myThisBookView; private ListView myAllBooksView; @@ -396,7 +394,7 @@ mainLoop: return myCurrentBook ? myBookmarks.size() + 1 : myBookmarks.size(); } - public final void onItemClick(AdapterView parent, View view, int position, long id) { + public final void onItemClick(AdapterView parent, View view, int position, long id) { final Bookmark bookmark = getItem(position); if (bookmark != null) { gotoBookmark(bookmark); diff --git a/src/org/geometerplus/android/fbreader/LibraryTabActivity.java b/src/org/geometerplus/android/fbreader/LibraryTabActivity.java index cc0661018..5174c5b27 100644 --- a/src/org/geometerplus/android/fbreader/LibraryTabActivity.java +++ b/src/org/geometerplus/android/fbreader/LibraryTabActivity.java @@ -27,7 +27,6 @@ import android.content.DialogInterface; import org.geometerplus.zlibrary.ui.android.R; -import org.geometerplus.zlibrary.core.filesystem.*; import org.geometerplus.zlibrary.core.tree.ZLTree; import org.geometerplus.zlibrary.core.options.ZLStringOption; import org.geometerplus.zlibrary.core.resources.ZLResource; @@ -180,7 +179,7 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt } } - private ZLTree findFirstSelectedItem() { + private ZLTree findFirstSelectedItem() { if (myCurrentBook == null) { return null; } @@ -228,7 +227,8 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt return view; } - protected boolean runTreeItem(ZLTree tree) { + @Override + protected boolean runTreeItem(ZLTree tree) { if (super.runTreeItem(tree)) { return true; } diff --git a/src/org/geometerplus/android/fbreader/SearchActivity.java b/src/org/geometerplus/android/fbreader/SearchActivity.java index 097dccbd6..783208221 100644 --- a/src/org/geometerplus/android/fbreader/SearchActivity.java +++ b/src/org/geometerplus/android/fbreader/SearchActivity.java @@ -25,7 +25,6 @@ import android.content.Intent; import android.widget.Toast; import org.geometerplus.zlibrary.core.resources.ZLResource; -import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; diff --git a/src/org/geometerplus/android/fbreader/TOCActivity.java b/src/org/geometerplus/android/fbreader/TOCActivity.java index f31550b1e..0c96ab83a 100644 --- a/src/org/geometerplus/android/fbreader/TOCActivity.java +++ b/src/org/geometerplus/android/fbreader/TOCActivity.java @@ -22,10 +22,7 @@ package org.geometerplus.android.fbreader; import android.os.Bundle; import android.view.*; import android.widget.*; -import android.content.Context; import android.app.ListActivity; -import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.resources.ZLResource; @@ -39,7 +36,7 @@ import org.geometerplus.fbreader.fbreader.FBReader; public class TOCActivity extends ListActivity { private TOCAdapter myAdapter; - private ZLTree mySelectedItem; + private ZLTree mySelectedItem; @Override public void onCreate(Bundle bundle) { @@ -92,11 +89,9 @@ public class TOCActivity extends ListActivity { } private final class TOCAdapter extends ZLTreeAdapter { - private final TOCTree myRoot; TOCAdapter(TOCTree root) { super(getListView(), root); - myRoot = root; } @Override @@ -133,7 +128,7 @@ public class TOCActivity extends ListActivity { } @Override - protected boolean runTreeItem(ZLTree tree) { + protected boolean runTreeItem(ZLTree tree) { if (super.runTreeItem(tree)) { return true; } diff --git a/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java b/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java index 56d80066b..4c80986c7 100644 --- a/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java +++ b/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java @@ -21,10 +21,8 @@ package org.geometerplus.android.fbreader; import java.util.HashSet; -import android.content.Context; import android.view.*; import android.widget.*; -import android.graphics.Bitmap; import org.geometerplus.zlibrary.core.tree.ZLTree; @@ -32,11 +30,11 @@ import org.geometerplus.zlibrary.ui.android.R; abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemClickListener, View.OnCreateContextMenuListener { private final ListView myParent; - private ZLTree myTree; - private ZLTree[] myItems; - private final HashSet myOpenItems = new HashSet(); + private ZLTree myTree; + private ZLTree[] myItems; + private final HashSet> myOpenItems = new HashSet>(); - protected ZLTreeAdapter(ListView parent, ZLTree tree) { + protected ZLTreeAdapter(ListView parent, ZLTree tree) { myParent = parent; myTree = tree; myItems = new ZLTree[tree.getSize() - 1]; @@ -47,7 +45,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl parent.setOnCreateContextMenuListener(this); } - protected final void openTree(ZLTree tree) { + protected final void openTree(ZLTree tree) { if (tree == null) { return; } @@ -57,7 +55,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl } } - public final void expandOrCollapseTree(ZLTree tree) { + public final void expandOrCollapseTree(ZLTree tree) { if (!tree.hasChildren()) { return; } @@ -71,11 +69,11 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl notifyDataSetChanged(); } - public final boolean isOpen(ZLTree tree) { + public final boolean isOpen(ZLTree tree) { return myOpenItems.contains(tree); } - public final void selectItem(ZLTree tree) { + public final void selectItem(ZLTree tree) { if (tree == null) { return; } @@ -86,7 +84,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl if (parent == null) { break; } - for (ZLTree sibling : parent.subTrees()) { + for (ZLTree sibling : parent.subTrees()) { if (sibling == tree) { break; } @@ -103,7 +101,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl private int getCount(ZLTree tree) { int count = 1; if (isOpen(tree)) { - for (ZLTree subtree : tree.subTrees()) { + for (ZLTree subtree : tree.subTrees()) { count += getCount(subtree); } } @@ -120,7 +118,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl } --position; int index = 1; - for (ZLTree subtree : tree.subTrees()) { + for (ZLTree subtree : tree.subTrees()) { int count = getCount(subtree); if (count <= position) { position -= count; @@ -132,9 +130,9 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl throw new RuntimeException("That's impossible!!!"); } - public final ZLTree getItem(int position) { + public final ZLTree getItem(int position) { final int index = indexByPosition(position + 1, myTree) - 1; - ZLTree item = myItems[index]; + ZLTree item = myItems[index]; if (item == null) { item = myTree.getTreeByParagraphNumber(index + 1); myItems[index] = item; @@ -154,7 +152,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl return indexByPosition(position + 1, myTree); } - protected boolean runTreeItem(ZLTree tree) { + protected boolean runTreeItem(ZLTree tree) { if (!tree.hasChildren()) { return false; } @@ -162,7 +160,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl return true; } - protected void resetTree(ZLTree tree) { + protected void resetTree(ZLTree tree) { myTree = tree; myItems = new ZLTree[tree.getSize() - 1]; myOpenItems.clear(); @@ -179,7 +177,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl notifyDataSetChanged(); } - public final void onItemClick(AdapterView parent, View view, int position, long id) { + public final void onItemClick(AdapterView parent, View view, int position, long id) { runTreeItem(getItem(position)); } @@ -188,7 +186,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl public abstract View getView(int position, View convertView, ViewGroup parent); - protected final void setIcon(ImageView imageView, ZLTree tree) { + protected final void setIcon(ImageView imageView, ZLTree tree) { if (tree.hasChildren()) { if (isOpen(tree)) { imageView.setImageResource(R.drawable.ic_list_group_open); diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java index 3a7998244..779446f1b 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java @@ -209,7 +209,7 @@ abstract class NetworkBaseActivity extends ListActivity return; } if (confirm != null) { - final ZLResource resource = myResource.getResource("confirmQuestions"); + //final ZLResource resource = myResource.getResource("confirmQuestions"); final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button"); new AlertDialog.Builder(this) .setTitle(networkTree.getName()) diff --git a/src/org/geometerplus/android/fbreader/network/RefillAccountActions.java b/src/org/geometerplus/android/fbreader/network/RefillAccountActions.java index 4cee652b9..bba8818d1 100644 --- a/src/org/geometerplus/android/fbreader/network/RefillAccountActions.java +++ b/src/org/geometerplus/android/fbreader/network/RefillAccountActions.java @@ -40,7 +40,6 @@ class RefillAccountActions extends NetworkTreeActions { @Override public void buildContextMenu(NetworkBaseActivity activity, ContextMenu menu, NetworkTree tree) { - final RefillAccountTree refillTree = (RefillAccountTree) tree; menu.setHeaderTitle(getTitleValue("refillTitle")); addMenuItem(menu, REFILL_ITEM_ID, "refillTitle"); diff --git a/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java b/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java index 969f6b6b4..94aee7e79 100644 --- a/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java +++ b/src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java @@ -165,8 +165,6 @@ class RegisterUserDialog extends NetworkDialog { } public void prepareDialog(Dialog dialog) { - final NetworkAuthenticationManager mgr = myLink.authenticationManager(); - ((TextView) dialog.findViewById(R.id.network_register_login)).setText((myLogin != null) ? myLogin : ""); ((TextView) dialog.findViewById(R.id.network_register_password)).setText((myPassword != null) ? myPassword : ""); ((TextView) dialog.findViewById(R.id.network_register_confirm_password)).setText((myPassword != null) ? myPassword : ""); diff --git a/src/org/geometerplus/android/fbreader/network/SearchItemActions.java b/src/org/geometerplus/android/fbreader/network/SearchItemActions.java index 6e7dc33d2..ec4b101ee 100644 --- a/src/org/geometerplus/android/fbreader/network/SearchItemActions.java +++ b/src/org/geometerplus/android/fbreader/network/SearchItemActions.java @@ -48,8 +48,6 @@ class SearchItemActions extends NetworkTreeActions { @Override public void buildContextMenu(NetworkBaseActivity activity, ContextMenu menu, NetworkTree tree) { - final SearchItemTree searchTree = (SearchItemTree) tree; - final SearchResult result = searchTree.getSearchResult(); menu.setHeaderTitle(tree.getName()); final boolean isLoading = NetworkView.Instance().containsItemsLoadingRunnable(NetworkSearchActivity.SEARCH_RUNNABLE_KEY); diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java index aba9bd48c..8973eaef2 100644 --- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader.preferences; -import java.util.List; - import android.content.Context; import org.geometerplus.zlibrary.core.resources.ZLResource; @@ -35,7 +33,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { super("Preferences"); } - private static final class ColorProfilePreference extends ZLSimplePreference { + /*private static final class ColorProfilePreference extends ZLSimplePreference { private final FBReader myFBReader; private final Screen myScreen; private final String myKey; @@ -63,7 +61,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { myFBReader.setColorProfileName(myKey); myScreen.close(); } - } + }*/ @Override protected void init() { diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java index 03962a913..53ccdf24e 100644 --- a/src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader.preferences; -import org.geometerplus.zlibrary.core.resources.ZLResource; - import android.content.Context; import android.preference.Preference; diff --git a/src/org/geometerplus/fbreader/bookmodel/BookModel.java b/src/org/geometerplus/fbreader/bookmodel/BookModel.java index 2b5831f94..e0d35262f 100644 --- a/src/org/geometerplus/fbreader/bookmodel/BookModel.java +++ b/src/org/geometerplus/fbreader/bookmodel/BookModel.java @@ -20,9 +20,7 @@ package org.geometerplus.fbreader.bookmodel; import java.util.*; -//import java.io.*; -import org.geometerplus.zlibrary.core.util.*; -import org.geometerplus.zlibrary.core.filesystem.ZLFile; + import org.geometerplus.zlibrary.core.image.*; import org.geometerplus.zlibrary.text.model.*; diff --git a/src/org/geometerplus/fbreader/bookmodel/BookReader.java b/src/org/geometerplus/fbreader/bookmodel/BookReader.java index d71c7913d..b0c204bbe 100644 --- a/src/org/geometerplus/fbreader/bookmodel/BookReader.java +++ b/src/org/geometerplus/fbreader/bookmodel/BookReader.java @@ -19,7 +19,6 @@ package org.geometerplus.fbreader.bookmodel; -import java.util.*; import org.geometerplus.zlibrary.core.util.*; import java.nio.ByteBuffer; diff --git a/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java b/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java index 577b60cad..b52b38589 100644 --- a/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.fbreader; -import org.geometerplus.zlibrary.text.view.ZLTextView; - class ClearFindResultsAction extends FBAction { ClearFindResultsAction(FBReader fbreader) { super(fbreader); diff --git a/src/org/geometerplus/fbreader/fbreader/FBReader.java b/src/org/geometerplus/fbreader/fbreader/FBReader.java index 54f62ae07..ed55acac3 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBReader.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReader.java @@ -19,14 +19,9 @@ package org.geometerplus.fbreader.fbreader; -import java.io.*; -import java.util.*; -import org.geometerplus.zlibrary.core.util.*; - import org.geometerplus.zlibrary.core.filesystem.*; import org.geometerplus.zlibrary.core.application.*; import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index 779cbb076..8271069be 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -25,7 +25,6 @@ import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.text.model.ZLTextModel; import org.geometerplus.zlibrary.text.view.*; -import org.geometerplus.fbreader.bookmodel.FBTextKind; import org.geometerplus.fbreader.bookmodel.FBHyperlinkType; public final class FBView extends ZLTextView { diff --git a/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java b/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java index 1fdf8280c..6111876df 100644 --- a/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java +++ b/src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.fbreader; -import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; - class SwitchProfileAction extends FBAction { private String myProfileName; diff --git a/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java b/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java index ee5bf2dea..0b43b9efc 100644 --- a/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java +++ b/src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.fbreader; -import org.geometerplus.zlibrary.text.view.ZLTextView; - class TrackballScrollingAction extends FBAction { private final boolean myForward; diff --git a/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java b/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java index 2b0dbe92c..f4ef65178 100644 --- a/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java +++ b/src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.fbreader; -import org.geometerplus.zlibrary.text.view.ZLTextView; - class VolumeKeyScrollingAction extends FBAction { private final boolean myForward; diff --git a/src/org/geometerplus/fbreader/formats/FormatPlugin.java b/src/org/geometerplus/fbreader/formats/FormatPlugin.java index 5c67b7d13..05e76cd5d 100644 --- a/src/org/geometerplus/fbreader/formats/FormatPlugin.java +++ b/src/org/geometerplus/fbreader/formats/FormatPlugin.java @@ -19,14 +19,9 @@ package org.geometerplus.fbreader.formats; -import java.io.*; -import java.util.*; - import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.library.Book; -import org.geometerplus.zlibrary.core.dialogs.ZLOptionsDialog; import org.geometerplus.zlibrary.core.filesystem.ZLFile; -import org.geometerplus.zlibrary.core.language.ZLLanguageDetector; public abstract class FormatPlugin { public abstract boolean acceptsFile(ZLFile file); diff --git a/src/org/geometerplus/fbreader/formats/PluginCollection.java b/src/org/geometerplus/fbreader/formats/PluginCollection.java index 4595294f8..c1592a502 100644 --- a/src/org/geometerplus/fbreader/formats/PluginCollection.java +++ b/src/org/geometerplus/fbreader/formats/PluginCollection.java @@ -25,7 +25,6 @@ import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.fbreader.formats.fb2.FB2Plugin; -import org.geometerplus.fbreader.formats.html.HtmlPlugin; import org.geometerplus.fbreader.formats.oeb.OEBPlugin; import org.geometerplus.fbreader.formats.pdb.MobipocketPlugin; diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java index 7bd341988..7a5dc9df8 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java @@ -22,7 +22,6 @@ package org.geometerplus.fbreader.formats.fb2; import java.util.*; import org.geometerplus.zlibrary.core.library.ZLibrary; -import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.fbreader.bookmodel.*; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.zlibrary.core.util.*; diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java index 417ff6728..51123f2a5 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java @@ -20,7 +20,6 @@ package org.geometerplus.fbreader.formats.fb2; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; final class FB2Tag { public static final byte UNKNOWN = 0; @@ -59,9 +58,9 @@ final class FB2Tag { public static final byte LAST_NAME = 32; public static final byte SEQUENCE = 33; public static final byte GENRE = 34; - - - private static final HashMap ourTagByName = new HashMap(256, 0.2f); + + + private static final HashMap ourTagByName = new HashMap(256, 0.2f); private static final Byte ourUnknownTag; static { @@ -105,8 +104,8 @@ final class FB2Tag { } public static byte getTagByName(String name) { - final HashMap tagByName = ourTagByName; - Byte num = (Byte)tagByName.get(name); + final HashMap tagByName = ourTagByName; + Byte num = tagByName.get(name); if (num == null) { final String upperCaseName = name.toLowerCase().intern(); num = (Byte)tagByName.get(upperCaseName); diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java b/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java index c6197d8fb..212b93972 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java @@ -20,9 +20,7 @@ package org.geometerplus.fbreader.formats.fb2; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; import org.geometerplus.zlibrary.core.xml.*; diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java b/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java index 882149846..a289cf7df 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java @@ -27,7 +27,6 @@ import org.geometerplus.fbreader.formats.FormatPlugin; import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class HtmlPlugin extends FormatPlugin { - private final static String AUTO = "auto"; @Override public boolean acceptsFile(ZLFile file) { diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlReader.java b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java index c18879a96..acd029563 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlReader.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java @@ -26,9 +26,7 @@ import java.nio.charset.*; import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookReader; import org.geometerplus.fbreader.bookmodel.FBTextKind; -import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.html.*; -import org.geometerplus.zlibrary.core.image.ZLFileImage; import org.geometerplus.zlibrary.core.util.ZLArrayUtils; import org.geometerplus.zlibrary.text.model.ZLTextParagraph; @@ -64,10 +62,8 @@ public class HtmlReader extends BookReader implements ZLHtmlReader { private byte myHyperlinkType; private final char[] SPACE = { ' ' }; private String myHrefAttribute = "href"; - private String mySrcAttribute = "src"; - private boolean myAdditionalParagraphExists = false; private boolean myOrderedListIsStarted = false; - private boolean myUnorderedListIsStarted = false; + //private boolean myUnorderedListIsStarted = false; private int myOLCounter = 0; private byte[] myControls = new byte[10]; private byte myControlsNumber = 0; @@ -75,7 +71,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader { public HtmlReader(BookModel model) throws UnsupportedEncodingException { super(model); try { - String encoding = model.Book.getEncoding(); + //String encoding = model.Book.getEncoding(); myAttributeDecoder = createDecoder(); setByteDecoder(createDecoder()); } catch (UnsupportedCharsetException e) { @@ -225,7 +221,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader { break; case HtmlTag.UL: - myUnorderedListIsStarted = false; + //myUnorderedListIsStarted = false; break; default: @@ -318,7 +314,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader { break; case HtmlTag.UL: - myUnorderedListIsStarted = true; + //myUnorderedListIsStarted = true; break; case HtmlTag.LI: diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlTag.java b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java index e7ea6634c..e16ac3118 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlTag.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java @@ -20,7 +20,6 @@ package org.geometerplus.fbreader.formats.html; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; public final class HtmlTag { public static final byte UNKNOWN = 0; @@ -67,7 +66,7 @@ public final class HtmlTag { public static final byte TAG_NUMBER = 37; - private static final HashMap ourTagByName = new HashMap(256, 0.2f); + private static final HashMap ourTagByName = new HashMap(256, 0.2f); private static final Byte ourUnknownTag; static { @@ -111,8 +110,8 @@ public final class HtmlTag { } public static byte getTagByName(String name) { - final HashMap tagByName = ourTagByName; - Byte num = (Byte)tagByName.get(name); + final HashMap tagByName = ourTagByName; + Byte num = tagByName.get(name); if (num == null) { final String lowerCaseName = name.toLowerCase().intern(); num = (Byte)tagByName.get(lowerCaseName); diff --git a/src/org/geometerplus/fbreader/formats/oeb/NCXReader.java b/src/org/geometerplus/fbreader/formats/oeb/NCXReader.java index 4d985772e..c7b74c011 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/NCXReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/NCXReader.java @@ -40,7 +40,6 @@ class NCXReader extends ZLXMLReaderAdapter { } } - private final BookReader myModelReader; private final TreeMap myNavigationMap = new TreeMap(); private final ArrayList myPointStack = new ArrayList(); @@ -55,7 +54,6 @@ class NCXReader extends ZLXMLReaderAdapter { private String myLocalPathPrefix; NCXReader(BookReader modelReader) { - myModelReader = modelReader; } boolean readFile(String filePath) { diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java b/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java index 5f0369c87..ef76a18f9 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java @@ -61,7 +61,6 @@ class OEBBookReader extends ZLXMLReaderAdapter implements XMLNamespace { private TreeMap myTOCLabels = new TreeMap(); boolean readBook(ZLFile file) { - long start = System.currentTimeMillis(); myFilePrefix = MiscUtil.htmlDirectoryPrefix(file); myIdToHref.clear(); diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java index 15ba9a220..01fa646ce 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.formats.oeb; -import java.util.ArrayList; - import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.formats.FormatPlugin; diff --git a/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java b/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java index 156b73b51..af488ef5f 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java @@ -35,8 +35,6 @@ public abstract class PdbPlugin extends FormatPlugin { } protected static String fileType(final ZLFile file) { - ZLFile baseFile = file.getPhysicalFile(); - // TODO: use database instead of option (?) ZLStringOption palmTypeOption = new ZLStringOption(file.getPath(), "PalmType", ""); String palmType = palmTypeOption.getValue(); diff --git a/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java b/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java index a99ee4ea6..cd9c28af3 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java +++ b/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java @@ -24,7 +24,6 @@ import java.io.InputStream; import org.geometerplus.fbreader.formats.pdb.DocDecompressor; import org.geometerplus.zlibrary.core.image.ZLSingleImage; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class DocCompressedFileImage extends ZLSingleImage { diff --git a/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java index 6b1438387..732886499 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java @@ -24,7 +24,6 @@ import java.io.IOException; import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.formats.pdb.PdbPlugin; -import org.geometerplus.fbreader.formats.pdb.PdbStream; import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class PluckerPlugin extends PdbPlugin { diff --git a/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java b/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java index 677478a10..2f995dbd4 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java +++ b/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java @@ -26,7 +26,6 @@ import java.util.zip.DataFormatException; import java.util.zip.Inflater; import org.geometerplus.zlibrary.core.image.ZLSingleImage; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class ZCompressedFileImage extends ZLSingleImage { @@ -48,7 +47,7 @@ public class ZCompressedFileImage extends ZLSingleImage { return new byte[0]; } - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList(); byte[] buffer; int sizeOfBufferData; diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java index 7bf824c6e..f25be088d 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java @@ -20,9 +20,7 @@ package org.geometerplus.fbreader.formats.xhtml; import java.util.*; -import java.io.InputStream; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.zlibrary.core.filesystem.ZLFile; @@ -30,7 +28,7 @@ import org.geometerplus.fbreader.bookmodel.*; import org.geometerplus.fbreader.formats.util.MiscUtil; public class XHTMLReader extends ZLXMLReaderAdapter { - private static final HashMap ourTagActions = new HashMap(); + private static final HashMap ourTagActions = new HashMap(); public static XHTMLTagAction addAction(String tag, XHTMLTagAction action) { XHTMLTagAction old = (XHTMLTagAction)ourTagActions.get(tag); diff --git a/src/org/geometerplus/fbreader/library/Author.java b/src/org/geometerplus/fbreader/library/Author.java index 3b9df3b4e..396025901 100644 --- a/src/org/geometerplus/fbreader/library/Author.java +++ b/src/org/geometerplus/fbreader/library/Author.java @@ -19,9 +19,6 @@ package org.geometerplus.fbreader.library; -import java.util.*; -import org.geometerplus.zlibrary.core.util.*; - public final class Author { public final String DisplayName; public final String SortKey; diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java index 3a3e11ef3..f6a842e64 100644 --- a/src/org/geometerplus/fbreader/library/Library.java +++ b/src/org/geometerplus/fbreader/library/Library.java @@ -23,7 +23,6 @@ import java.io.File; import java.util.*; import org.geometerplus.zlibrary.core.filesystem.*; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.fbreader.Paths; public final class Library { @@ -121,7 +120,7 @@ public final class Library { } private void collectBooks() { - final long start = System.currentTimeMillis(); + //final long start = System.currentTimeMillis(); //android.os.Debug.startMethodTracing("/sdcard/ll0"); final List physicalFilesList = collectPhysicalFiles(); //android.os.Debug.stopMethodTracing(); diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItem.java b/src/org/geometerplus/fbreader/network/NetworkBookItem.java index 6254d42ee..3e36734c8 100644 --- a/src/org/geometerplus/fbreader/network/NetworkBookItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkBookItem.java @@ -107,7 +107,7 @@ public final class NetworkBookItem extends NetworkLibraryItem { Tags = new LinkedList(tags); SeriesTitle = seriesTitle; IndexInSeries = indexInSeries; - myReferences = new LinkedList(references); + myReferences = new LinkedList(references); } public BookReference reference(int type) { diff --git a/src/org/geometerplus/fbreader/network/NetworkImage.java b/src/org/geometerplus/fbreader/network/NetworkImage.java index 8369d81e0..b72f67a4d 100644 --- a/src/org/geometerplus/fbreader/network/NetworkImage.java +++ b/src/org/geometerplus/fbreader/network/NetworkImage.java @@ -23,7 +23,6 @@ import java.io.*; import java.net.*; import org.geometerplus.zlibrary.core.image.ZLSingleImage; -import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; import org.geometerplus.zlibrary.core.network.*; import org.geometerplus.fbreader.Paths; diff --git a/src/org/geometerplus/fbreader/network/NetworkLink.java b/src/org/geometerplus/fbreader/network/NetworkLink.java index 10b668c83..bfa2e81a1 100644 --- a/src/org/geometerplus/fbreader/network/NetworkLink.java +++ b/src/org/geometerplus/fbreader/network/NetworkLink.java @@ -60,7 +60,7 @@ abstract public class NetworkLink { Summary = summary; Icon = icon; OnOption = new ZLBooleanOption(SiteName, "on", true); - Links = new TreeMap(links); + Links = new TreeMap(links); } public abstract ZLNetworkRequest simpleSearchRequest(String pattern, NetworkOperationData data); diff --git a/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java b/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java index 3ec88f4c0..0289cf4e4 100644 --- a/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java +++ b/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java @@ -20,7 +20,6 @@ package org.geometerplus.fbreader.network.authentication; import org.geometerplus.zlibrary.core.options.ZLStringOption; -import org.geometerplus.zlibrary.core.options.ZLBooleanOption; import org.geometerplus.fbreader.network.*; diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java index 376ff9feb..c7d107616 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java @@ -19,14 +19,13 @@ package org.geometerplus.fbreader.network.authentication.litres; -import java.util.LinkedList; +/*import java.util.LinkedList; import java.util.HashMap; class LitResGenreMap { private static LitResGenreMap ourInstance; - private boolean myInitialized; LinkedList myGenresTree; HashMap myGenresMap; HashMap myGenresTitles; @@ -41,3 +40,4 @@ class LitResGenreMap { private LitResGenreMap() { } } +*/ \ No newline at end of file diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java index c8fbbdace..a78dd7c33 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java @@ -36,8 +36,8 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { private String myBookId; private String myTitle; - private String myLanguage; - private String myDate; + //private String myLanguage; + //private String myDate; private String mySeriesTitle; private int myIndexInSeries; @@ -233,7 +233,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { myReferences )); - myBookId = myTitle = myLanguage = myDate = mySeriesTitle = mySummary = myCover = null; + myBookId = myTitle = /*myLanguage = myDate = */mySeriesTitle = mySummary = myCover = null; myIndexInSeries = 0; myAuthors.clear(); myTags.clear(); @@ -329,13 +329,13 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { break; case DATE: if (TAG_DATE == tag) { - myDate = bufferContent; + //myDate = bufferContent; myState = TITLE_INFO; } break; case LANGUAGE: if (TAG_LANGUAGE == tag) { - myLanguage = bufferContent; + //myLanguage = bufferContent; myState = TITLE_INFO; } break; diff --git a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java index 457d53f0d..459ecc12c 100644 --- a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java +++ b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java @@ -149,12 +149,12 @@ class NetworkOPDSFeedReader implements OPDSFeedReader { private NetworkLibraryItem readBookItem(OPDSEntry entry) { final OPDSLink opdsLink = (OPDSLink) myData.Link; - final String date; + /*final String date; if (entry.DCIssued != null) { date = entry.DCIssued.getDateTime(true); } else { date = null; - } + }*/ final LinkedList tags = new LinkedList(); for (ATOMCategory category: entry.Categories) { diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSLink.java index 346e7de89..a0d9d77c2 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLink.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLink.java @@ -51,7 +51,7 @@ class OPDSLink extends NetworkLink { final void setRelationAliases(Map relationAliases) { if (relationAliases != null && relationAliases.size() > 0) { - myRelationAliases = new TreeMap(relationAliases); + myRelationAliases = new TreeMap(relationAliases); } else { myRelationAliases = null; } @@ -59,7 +59,7 @@ class OPDSLink extends NetworkLink { final void setUrlConditions(Map conditions) { if (conditions != null && conditions.size() > 0) { - myUrlConditions = new TreeMap(conditions); + myUrlConditions = new TreeMap(conditions); } else { myUrlConditions = null; } @@ -67,7 +67,7 @@ class OPDSLink extends NetworkLink { final void setUrlRewritingRules(List rules) { if (rules != null && rules.size() > 0) { - myUrlRewritingRules = new LinkedList(rules); + myUrlRewritingRules = new LinkedList(rules); } else { myUrlRewritingRules = null; } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java index 57ee917b8..e713b06b1 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java @@ -41,7 +41,7 @@ public class OPDSLinkReader extends ZLXMLReaderAdapter { private HashMap myRelationAliases = new HashMap(); - private String mySearchType; + //private String mySearchType; private final HashMap mySearchFields = new HashMap(); private final HashMap myUrlConditions = new HashMap(); @@ -88,7 +88,7 @@ public class OPDSLinkReader extends ZLXMLReaderAdapter { } public NetworkLink readDocument(ZLFile file) { - mySiteName = myTitle = mySummary = myIcon = mySearchType = myAuthenticationType = mySSLCertificate = null; + mySiteName = myTitle = mySummary = myIcon = /*mySearchType = */myAuthenticationType = mySSLCertificate = null; myLinks.clear(); mySearchFields.clear(); myUrlConditions.clear(); @@ -168,7 +168,7 @@ public class OPDSLinkReader extends ZLXMLReaderAdapter { } else if (TAG_SEARCH_DESCRIPTION == tag) { String searchType = attributes.getValue("style"); if (searchType != null) { - mySearchType = searchType; + //mySearchType = searchType; myState = READ_SEARCH_DESCRIPTION; } } else if (myState == READ_SEARCH_DESCRIPTION && TAG_FIELD == tag) { diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java index 1953b68ba..863c892c5 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java @@ -19,11 +19,8 @@ package org.geometerplus.fbreader.network.tree; -import java.util.*; - import org.geometerplus.zlibrary.core.image.ZLImage; -import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.network.*; diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java index a803c860f..548332c46 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.network.tree; -import java.util.*; - import org.geometerplus.fbreader.network.*; public class NetworkCatalogRootTree extends NetworkCatalogTree { diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java b/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java index f39543a56..0c20315f4 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java @@ -19,11 +19,8 @@ package org.geometerplus.fbreader.network.tree; -import java.util.*; - import org.geometerplus.zlibrary.core.util.ZLBoolean3; -import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.network.*; public class NetworkTreeFactory { diff --git a/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java b/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java index 513ea34b0..485c08abf 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java +++ b/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java @@ -20,10 +20,8 @@ package org.geometerplus.fbreader.optionsDialog; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; -import java.util.Map; import java.util.Map.Entry; import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; @@ -31,7 +29,7 @@ import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; class ComboOptionEntry extends ZLComboOptionEntry { protected final OptionsPage myPage; - protected final ArrayList /**/ myValues = new ArrayList(); + protected final ArrayList myValues = new ArrayList(); protected String myInitialValue; public ComboOptionEntry(final OptionsPage myPage, String myInitialValue) { @@ -39,7 +37,7 @@ class ComboOptionEntry extends ZLComboOptionEntry { this.myInitialValue = myInitialValue; } - public ArrayList getValues() { + public ArrayList getValues() { return myValues; } @@ -49,13 +47,15 @@ class ComboOptionEntry extends ZLComboOptionEntry { public void onAccept(String value) {} + @Override public void onReset() { onValueSelected(0); } + @Override public void onValueSelected(int index) { final Object selectedValue = myValues.get(index); - final LinkedHashMap /**/ entries = myPage.getEntries(); + final LinkedHashMap entries = myPage.getEntries(); /* for (Iterator it = entries.keySet().iterator(); it.hasNext(); ) { ZLOptionEntry entry = (ZLOptionEntry) it.next(); entry.setVisible(selectedValue != null && selectedValue.equals(entries.get(entry))); @@ -63,12 +63,12 @@ class ComboOptionEntry extends ZLComboOptionEntry { System.out.println(entry.getKind()+" "+entry.hashCode()); } */ - for (Iterator it = entries.entrySet().iterator(); it.hasNext(); ) { - Entry entry = (Entry) it.next(); - ((ZLOptionEntry) entry.getKey()).setVisible(selectedValue != null && selectedValue.equals(entry.getValue())); + for (Iterator> it = entries.entrySet().iterator(); it.hasNext(); ) { + Entry entry = it.next(); + entry.getKey().setVisible(selectedValue != null && selectedValue.equals(entry.getValue())); } } - + public void addValue(final String value) { myValues.add(value); } diff --git a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java index eb11a7f17..7345f1a64 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java @@ -22,12 +22,10 @@ package org.geometerplus.fbreader.optionsDialog; import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.optionEntries.*; -import org.geometerplus.zlibrary.core.options.*; +//import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.resources.ZLResource; -import org.geometerplus.zlibrary.text.view.style.*; import org.geometerplus.fbreader.fbreader.*; -import org.geometerplus.fbreader.formats.PluginCollection; public class OptionsDialog { private ZLOptionsDialog myDialog; @@ -81,7 +79,7 @@ public class OptionsDialog { } } - private static class StateOptionEntry extends ZLToggleBooleanOptionEntry { + /*private static class StateOptionEntry extends ZLToggleBooleanOptionEntry { private boolean myState; public StateOptionEntry(ZLBooleanOption option) { @@ -111,5 +109,5 @@ public class OptionsDialog { (mySecond.isVisible() && mySecond.myState) ); } - } + }*/ } diff --git a/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java index 362268bcd..2292420fa 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java @@ -24,9 +24,9 @@ import java.util.*; import org.geometerplus.zlibrary.core.dialogs.*; class OptionsPage { - private final LinkedHashMap /**/ myEntries = new LinkedHashMap(); + private final LinkedHashMap myEntries = new LinkedHashMap(); protected ComboOptionEntry myComboEntry; - + protected OptionsPage() { } @@ -51,7 +51,7 @@ class OptionsPage { tab.addOptions(entry0Key, entry0, entry1Key, entry1); } - LinkedHashMap getEntries() { + LinkedHashMap getEntries() { return myEntries; } } diff --git a/src/org/geometerplus/zlibrary/core/application/ZLApplication.java b/src/org/geometerplus/zlibrary/core/application/ZLApplication.java index d64c9bf33..658402232 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLApplication.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLApplication.java @@ -20,12 +20,8 @@ package org.geometerplus.zlibrary.core.application; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.filesystem.*; -import org.geometerplus.zlibrary.core.library.ZLibrary; -import org.geometerplus.zlibrary.core.options.ZLBooleanOption; -import org.geometerplus.zlibrary.core.options.ZLIntegerOption; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.view.ZLView; @@ -39,8 +35,8 @@ public abstract class ZLApplication { private static ZLApplication ourInstance; - private static final String MouseScrollUpKey = ""; - private static final String MouseScrollDownKey = ""; + //private static final String MouseScrollUpKey = ""; + //private static final String MouseScrollDownKey = ""; public static final String NoAction = "none"; public final ZLIntegerRangeOption KeyDelayOption = @@ -218,7 +214,7 @@ public abstract class ZLApplication { public interface Item { } - private final ArrayList myItems = new ArrayList(); + private final ArrayList myItems = new ArrayList(); private final ZLResource myResource; Menu(ZLResource resource) { @@ -317,17 +313,19 @@ public abstract class ZLApplication { private static final String ITEM = "item"; private static final String SUBMENU = "submenu"; - private final ArrayList mySubmenuStack = new ArrayList(); + private final ArrayList mySubmenuStack = new ArrayList(); + @Override public boolean dontCacheAttributeValues() { return true; } + @Override public boolean startElementHandler(String tag, ZLStringMap attributes) { if (myMenubar == null) { myMenubar = new Menubar(); } - final ArrayList stack = mySubmenuStack; + final ArrayList stack = mySubmenuStack; final Menu menu = stack.isEmpty() ? myMenubar : (Menu)stack.get(stack.size() - 1); if (ITEM == tag) { final String id = attributes.getValue("id"); @@ -343,9 +341,10 @@ public abstract class ZLApplication { return false; } + @Override public boolean endElementHandler(String tag) { if (SUBMENU == tag) { - final ArrayList stack = mySubmenuStack; + final ArrayList stack = mySubmenuStack; if (!stack.isEmpty()) { stack.remove(stack.size() - 1); } diff --git a/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java index 7c85e9bea..5eb74023c 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java @@ -19,9 +19,6 @@ package org.geometerplus.zlibrary.core.application; -import java.util.*; -import org.geometerplus.zlibrary.core.util.*; - abstract public class ZLApplicationWindow { private ZLApplication myApplication; diff --git a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java index df19344e8..6e65e959e 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java @@ -20,11 +20,7 @@ package org.geometerplus.zlibrary.core.application; import java.util.*; -import java.util.Map.Entry; -import org.geometerplus.zlibrary.core.util.*; - -import org.geometerplus.zlibrary.core.options.ZLIntegerOption; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.options.ZLStringOption; @@ -34,7 +30,7 @@ public final class ZLKeyBindings { private static final String BINDED_ACTION = "Action"; private final String myName; - private final HashMap myBindingsMap = new HashMap(); + private final HashMap myBindingsMap = new HashMap(); private boolean myIsChanged; public ZLKeyBindings(String name) { @@ -78,15 +74,15 @@ public final class ZLKeyBindings { if (!myIsChanged) { return; } - - final HashMap keymap = new HashMap(); + + final HashMap keymap = new HashMap(); new ZLKeyBindingsReader(keymap).readBindings(); - + int counter = 0; - for (Iterator it = myBindingsMap.keySet().iterator(); it.hasNext(); ) { - final String key = (String)it.next(); - final String originalValue = (String)keymap.get(key); - final String value = (String)myBindingsMap.get(key); + for (Iterator it = myBindingsMap.keySet().iterator(); it.hasNext(); ) { + final String key = it.next(); + final String originalValue = keymap.get(key); + final String value = myBindingsMap.get(key); if (!value.equals(originalValue)) { new ZLStringOption(myName, BINDED_KEY + counter, "").setValue(key); new ZLStringOption(myName, BINDED_ACTION + counter, "").setValue(value); diff --git a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java index 7ddb6d622..a7452d80d 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java @@ -20,22 +20,24 @@ package org.geometerplus.zlibrary.core.application; import java.util.*; + import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; class ZLKeyBindingsReader extends ZLXMLReaderAdapter { - private final HashMap myKeymap; - + private final HashMap myKeymap; + + @Override public boolean dontCacheAttributeValues() { return true; } - public ZLKeyBindingsReader(HashMap keymap) { + public ZLKeyBindingsReader(HashMap keymap) { myKeymap = keymap; } - + + @Override public boolean startElementHandler(String tag, ZLStringMap attributes) { if ("binding".equals(tag)) { final String key = attributes.getValue("key"); diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java index e03ee59ed..1ccbb3f72 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java @@ -20,46 +20,45 @@ package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; public abstract class ZLComboOptionEntry extends ZLOptionEntry { private final boolean myEditable; - + protected ZLComboOptionEntry() { myEditable = false; } - + protected ZLComboOptionEntry(boolean editable) { myEditable = editable; } - + public int getKind() { return ZLOptionKind.COMBO; } - + public void onValueSelected(int index) {} - + public final void onStringValueSelected(String value) { int index = getValues().indexOf(value); if (index != -1) { onValueSelected(index); } } - + public boolean useOnValueEdited() { return false; } - + public void onValueEdited(String value) {} - + public final boolean isEditable() { return myEditable; } - + public abstract String initialValue(); - - public abstract ArrayList/**/ getValues(); - + + public abstract ArrayList getValues(); + public abstract void onAccept(String value); public void onReset() { diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java index baefb2994..7d811071f 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java @@ -21,8 +21,6 @@ package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; - import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry; import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry; @@ -31,8 +29,8 @@ import org.geometerplus.zlibrary.core.options.*; public abstract class ZLDialogContent { private final ZLResource myResource; - protected final ArrayList Views = new ArrayList(); - + protected final ArrayList Views = new ArrayList(); + private static ZLOptionEntry createEntryByOption(ZLSimpleOption option) { switch (option.getType()) { case ZLSimpleOption.Type.BOOLEAN: @@ -91,14 +89,14 @@ public abstract class ZLDialogContent { protected final void accept() { final int size = Views.size(); for (int i = 0; i < size; i++) { - ((ZLOptionView)Views.get(i)).onAccept(); + Views.get(i).onAccept(); } } final void reset() { final int size = Views.size(); for (int i = 0; i < size; i++) { - ((ZLOptionView)Views.get(i)).reset(); + Views.get(i).reset(); } } diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java index b1225f823..81013ea9f 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java @@ -20,10 +20,9 @@ package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; public abstract class ZLKeyOptionEntry extends ZLOptionEntry { - private final ArrayList/**/ myActionNames = new ArrayList(); + private final ArrayList myActionNames = new ArrayList(); public ZLKeyOptionEntry() {} @@ -35,7 +34,7 @@ public abstract class ZLKeyOptionEntry extends ZLOptionEntry { myActionNames.add(actionName); } - public final ArrayList getActionNames() { + public final ArrayList getActionNames() { return myActionNames; } diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java index 6a3cd8ec4..4ed2105bd 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java @@ -20,14 +20,13 @@ package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class ZLOptionsDialog { private final ZLResource myResource; - protected final ArrayList /*ZLDialogContent*/ myTabs = new ArrayList(); + protected final ArrayList myTabs = new ArrayList(); protected Runnable myExitAction; protected Runnable myApplyAction; protected ZLStringOption myTabOption; @@ -53,7 +52,7 @@ public abstract class ZLOptionsDialog { protected void accept() { final int size = myTabs.size(); for (int i = 0; i < size; i++) { - ((ZLDialogContent)myTabs.get(i)).accept(); + myTabs.get(i).accept(); } if (myApplyAction != null) { myApplyAction.run(); diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java index 6397e8c42..fd4a1b1a8 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java @@ -19,8 +19,7 @@ package org.geometerplus.zlibrary.core.dialogs; -import java.util.*; -import org.geometerplus.zlibrary.core.util.*; +/*import java.util.*; public abstract class ZLOrderOptionEntry extends ZLOptionEntry { private final ArrayList myValues = new ArrayList(); @@ -36,3 +35,4 @@ public abstract class ZLOrderOptionEntry extends ZLOptionEntry { return myValues; } } +*/ \ No newline at end of file diff --git a/src/org/geometerplus/zlibrary/core/encoding/ZLEncodingCollection.java b/src/org/geometerplus/zlibrary/core/encoding/ZLEncodingCollection.java index 9671d3b23..b235a161b 100644 --- a/src/org/geometerplus/zlibrary/core/encoding/ZLEncodingCollection.java +++ b/src/org/geometerplus/zlibrary/core/encoding/ZLEncodingCollection.java @@ -22,7 +22,6 @@ package org.geometerplus.zlibrary.core.encoding; import java.util.HashMap; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java index 1e2d97434..b743e1ac1 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java @@ -22,8 +22,6 @@ package org.geometerplus.zlibrary.core.filesystem; import java.util.*; import java.io.*; -import org.geometerplus.zlibrary.core.library.ZLibrary; - public final class ZLPhysicalFile extends ZLFile { private final File myFile; diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java index 9993d3968..34aafb0a6 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.core.filesystem; -import java.io.*; - import org.geometerplus.zlibrary.core.library.ZLibrary; public abstract class ZLResourceFile extends ZLFile { diff --git a/src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java b/src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java index 704edbfd8..1e21e672f 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java @@ -24,11 +24,11 @@ import java.io.IOException; class ZLTarInputStream extends InputStream { private final InputStream myBase; - private final String myFileName; + //private final String myFileName; ZLTarInputStream(InputStream base, String fileName) throws IOException { myBase = base; - myFileName = fileName; + //myFileName = fileName; ZLTarHeader header = new ZLTarHeader(); while (header.read(myBase)) { @@ -51,18 +51,22 @@ class ZLTarInputStream extends InputStream { return myBase.read(); } + @Override public int read(byte b[]) throws IOException { return myBase.read(b); } + @Override public int read(byte b[], int off, int len) throws IOException { return myBase.read(b, off, len); } + @Override public long skip(long n) throws IOException { return myBase.skip(n); } + @Override public int available() throws IOException { return myBase.available(); } diff --git a/src/org/geometerplus/zlibrary/core/html/ZLHtmlAttributeMap.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlAttributeMap.java index 2d649d795..6333ffded 100644 --- a/src/org/geometerplus/zlibrary/core/html/ZLHtmlAttributeMap.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlAttributeMap.java @@ -21,8 +21,6 @@ package org.geometerplus.zlibrary.core.html; import java.nio.charset.CharsetDecoder; -import org.geometerplus.zlibrary.core.util.ZLArrayUtils; - // optimized partially implemented map ZLByteBuffer -> ZLByteBuffer // there is no remove() in this implementation // put with the same key does not remove old entry diff --git a/src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java index 3bdfb1847..a22ebfdfb 100644 --- a/src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java @@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.core.html; import java.io.*; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.ZLArrayUtils; import org.geometerplus.zlibrary.core.html.ZLHtmlReader; @@ -31,8 +30,8 @@ final class ZLHtmlParser { private static final byte START_TAG = 1; private static final byte END_TAG = 2; private static final byte TEXT = 3; - private static final byte IGNORABLE_WHITESPACE = 4; - private static final byte PROCESSING_INSTRUCTION = 5; + //private static final byte IGNORABLE_WHITESPACE = 4; + //private static final byte PROCESSING_INSTRUCTION = 5; private static final byte COMMENT = 6; private static final byte LANGLE = 7; private static final byte WS_AFTER_START_TAG_NAME = 8; @@ -77,7 +76,7 @@ final class ZLHtmlParser { final HashMap strings = new HashMap(); final ZLHtmlAttributeMap attributes = new ZLHtmlAttributeMap(); boolean scriptOpened = false; - boolean html = false; + //boolean html = false; int bufferOffset = 0; int offset = 0; @@ -191,9 +190,9 @@ mainSwitchLabel: state = SCRIPT; break mainSwitchLabel; } - if (stringTagName.equalsToLCString("html")) { + /*if (stringTagName.equalsToLCString("html")) { html = true; - } + }*/ } startPosition = i + 1; break mainSwitchLabel; diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java b/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java index e9a220afc..5d0b0effb 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java @@ -20,9 +20,10 @@ package org.geometerplus.zlibrary.core.image; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; -public final class ZLImageMap extends HashMap { +public final class ZLImageMap extends HashMap { + private static final long serialVersionUID = -4488377408233803199L; + public ZLImage getImage(String id) { return (ZLImage)super.get(id); } diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java index 47762eeef..3d151b455 100644 --- a/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java @@ -27,8 +27,8 @@ import org.geometerplus.zlibrary.core.language.ZLLanguageMatcher.ZLWordBasedMatc import org.geometerplus.zlibrary.core.util.ZLUnicodeUtil; public class ZLLanguageDetector { - private ArrayList myUtf8Matchers = new ArrayList(); - private ArrayList myNonUtf8Matchers = new ArrayList(); + private ArrayList myUtf8Matchers = new ArrayList(); + private ArrayList myNonUtf8Matchers = new ArrayList(); //private ArrayList myChineseMatchers; // 0: no break @@ -137,8 +137,8 @@ public class ZLLanguageDetector { } String str = new String(buffer); word += str.substring(wordStart,wordStart + ptr - wordStart); - for (Iterator it = wbMatchers.iterator(); it.hasNext(); ) { - ((ZLWordBasedMatcher)it.next()).processWord(word, length2); + for (Iterator it = wbMatchers.iterator(); it.hasNext(); ) { + it.next().processWord(word, length2); } word = ""; } @@ -157,8 +157,8 @@ public class ZLLanguageDetector { LanguageInfo info = null; - for (Iterator it = wbMatchers.iterator(); it.hasNext(); ) { - ZLWordBasedMatcher itzl = (ZLWordBasedMatcher)it.next(); + for (Iterator it = wbMatchers.iterator(); it.hasNext(); ) { + ZLWordBasedMatcher itzl = it.next(); int criterion = itzl.criterion(); if (criterion > matchingCriterion) { info = itzl.info(); diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java index 8593f7511..df8cd72d7 100644 --- a/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java @@ -19,22 +19,20 @@ package org.geometerplus.zlibrary.core.language; -import java.io.File; import java.util.*; import org.geometerplus.zlibrary.core.filesystem.*; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class ZLLanguageList { - private static ArrayList ourLanguageCodes = new ArrayList(); + private static ArrayList ourLanguageCodes = new ArrayList(); private ZLLanguageList() { } public static List languageCodes() { if (ourLanguageCodes.isEmpty()) { - TreeSet codes = new TreeSet(); + TreeSet codes = new TreeSet(); for (ZLFile file : patternsFile().children()) { String name = file.getName(false); final int index = name.indexOf("_"); diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java index 5dbe7a4da..742232b55 100644 --- a/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java @@ -54,7 +54,12 @@ public abstract class ZLLanguageMatcher { }; static class ZLLanguagePatternBasedMatcher extends ZLWordBasedMatcher { - public ZLLanguagePatternBasedMatcher(ZLFile file, ZLLanguageDetector.LanguageInfo info) { + + private int myProCounter; + private int myContraCounter; + private ArrayList myDictionary = new ArrayList(); + + public ZLLanguagePatternBasedMatcher(ZLFile file, ZLLanguageDetector.LanguageInfo info) { super(info); try{ InputStream dictionaryStream = file.getInputStream(); @@ -101,9 +106,5 @@ public abstract class ZLLanguageMatcher { public int criterion() { return myProCounter * 2000 / (myProCounter + myContraCounter) - 1000; } - - private int myProCounter; - private int myContraCounter; - private ArrayList/**/ myDictionary = new ArrayList(); }; } diff --git a/src/org/geometerplus/zlibrary/core/network/ZLX509TrustManager.java b/src/org/geometerplus/zlibrary/core/network/ZLX509TrustManager.java index ac81acad4..b4a34a490 100644 --- a/src/org/geometerplus/zlibrary/core/network/ZLX509TrustManager.java +++ b/src/org/geometerplus/zlibrary/core/network/ZLX509TrustManager.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.core.network; import java.io.*; -import java.net.*; import javax.net.ssl.*; import java.security.GeneralSecurityException; import java.security.cert.*; diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java index 8663c3bfb..f9bc15266 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java @@ -62,23 +62,23 @@ public class ZLColorOptionBuilder { } public ZLColor getColor() { - Object color = myData.myCurrentColors.get(myData.myCurrentOptionName); - return (color != null) ? (ZLColor)color : initialColor(); + ZLColor color = myData.myCurrentColors.get(myData.myCurrentOptionName); + return (color != null) ? color : initialColor(); } public ZLColor initialColor() { - return ((ZLColorOption)myData.myOptions.get(myData.myCurrentOptionName)).getValue(); + return myData.myOptions.get(myData.myCurrentOptionName).getValue(); } public void onAccept(ZLColor color) { onReset(color); - final ArrayList optionNames = myData.myOptionNames; - final HashMap options = myData.myOptions; - final HashMap colors = myData.myCurrentColors; + final ArrayList optionNames = myData.myOptionNames; + final HashMap options = myData.myOptions; + final HashMap colors = myData.myCurrentColors; final int len = optionNames.size(); for (int i = 0; i < len; i++) { - Object name = optionNames.get(i); - ((ZLColorOption)options.get(name)).setValue((ZLColor)colors.get(name)); + String name = optionNames.get(i); + options.get(name).setValue(colors.get(name)); } } @@ -94,7 +94,7 @@ public class ZLColorOptionBuilder { myData = data; } - public ArrayList getValues() { + public ArrayList getValues() { return myData.myOptionNames; } @@ -109,7 +109,7 @@ public class ZLColorOptionBuilder { } public void onValueSelected(int index) { - myData.myCurrentOptionName = (String)getValues().get(index); + myData.myCurrentOptionName = getValues().get(index); myData.myColorEntry.resetView(); myData.myPreviousOptionName = myData.myCurrentOptionName; } @@ -120,8 +120,8 @@ public class ZLColorOptionBuilder { private ZLColorOptionEntry myColorEntry; private String myCurrentOptionName; private String myPreviousOptionName; - private final ArrayList/**/ myOptionNames = new ArrayList(); - private final HashMap/**/ myCurrentColors = new HashMap(); - private final HashMap/**/ myOptions = new HashMap(); + private final ArrayList myOptionNames = new ArrayList(); + private final HashMap myCurrentColors = new HashMap(); + private final HashMap myOptions = new HashMap(); } } diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java index e1aeac3dd..9bfb2f416 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java @@ -38,7 +38,7 @@ public class ZLFontFamilyOptionEntry extends ZLComboOptionEntry { } } - public ArrayList getValues() { + public ArrayList getValues() { return myContext.fontFamilies(); } diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java index bd4df89ba..c64991c91 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java @@ -21,13 +21,12 @@ package org.geometerplus.zlibrary.core.optionEntries; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; import org.geometerplus.zlibrary.core.options.ZLBooleanOption; public class ZLToggleBooleanOptionEntry extends ZLSimpleBooleanOptionEntry { - private final ArrayList myDependentEntries = new ArrayList(); - + private final ArrayList myDependentEntries = new ArrayList(); + public ZLToggleBooleanOptionEntry(ZLBooleanOption option) { super(option); } @@ -35,14 +34,16 @@ public class ZLToggleBooleanOptionEntry extends ZLSimpleBooleanOptionEntry { public void addDependentEntry(ZLOptionEntry dependent) { myDependentEntries.add(dependent); } - + + @Override public void onStateChanged(boolean state) { final int size = myDependentEntries.size(); for (int i = 0; i < size; i++) { - ((ZLOptionEntry)myDependentEntries.get(i)).setVisible(state); + myDependentEntries.get(i).setVisible(state); } } + @Override public void onReset() { onStateChanged(initialState()); } diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLResource.java index 0c4df24d5..50122c3dd 100644 --- a/src/org/geometerplus/zlibrary/core/resources/ZLResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLResource.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.core.resources; -import org.geometerplus.zlibrary.core.library.ZLibrary; - abstract public class ZLResource { public final String Name; diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java index 109f052ef..e221a5c62 100644 --- a/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java @@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.core.resources; import java.util.*; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; import org.geometerplus.zlibrary.core.filesystem.*; @@ -91,10 +90,12 @@ final class ZLTreeResource extends ZLResource { read(file); } + @Override public boolean dontCacheAttributeValues() { return true; } + @Override public boolean startElementHandler(String tag, ZLStringMap attributes) { final ArrayList stack = myStack; if (!stack.isEmpty() && (NODE.equals(tag))) { @@ -125,8 +126,9 @@ final class ZLTreeResource extends ZLResource { return false; } + @Override public boolean endElementHandler(String tag) { - final ArrayList stack = myStack; + final ArrayList stack = myStack; if (!stack.isEmpty() && (NODE.equals(tag))) { stack.remove(stack.size() - 1); } diff --git a/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java b/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java index cf873731e..1d9143459 100644 --- a/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java +++ b/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.core.sqliteconfig; import android.content.Context; -import android.database.Cursor; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteStatement; diff --git a/src/org/geometerplus/zlibrary/core/tree/ZLTree.java b/src/org/geometerplus/zlibrary/core/tree/ZLTree.java index 1ca21767d..511b3f346 100644 --- a/src/org/geometerplus/zlibrary/core/tree/ZLTree.java +++ b/src/org/geometerplus/zlibrary/core/tree/ZLTree.java @@ -21,7 +21,7 @@ package org.geometerplus.zlibrary.core.tree; import java.util.*; -public abstract class ZLTree implements Iterable { +public abstract class ZLTree> implements Iterable { private int mySize = 1; public final T Parent; public final int Level; @@ -50,7 +50,7 @@ public abstract class ZLTree implements Iterable { Parent = parent; if (parent != null) { Level = parent.Level + 1; - parent.addSubTree(this, position); + parent.addSubTree((T)this, position); } else { Level = nullLevel; } @@ -100,14 +100,14 @@ public abstract class ZLTree implements Iterable { subtree = mySubTrees.set(position++, subtree); } mySubTrees.add(subtree); - for (ZLTree parent = this; parent != null; parent = parent.Parent) { + for (ZLTree parent = this; parent != null; parent = parent.Parent) { parent.mySize += subTreeSize; } } public void removeSelf() { final int subTreeSize = getSize(); - ZLTree parent = Parent; + ZLTree parent = Parent; if (parent != null) { parent.mySubTrees.remove(this); if (parent.mySubTrees.isEmpty()) { @@ -124,7 +124,7 @@ public abstract class ZLTree implements Iterable { mySubTrees = null; mySize = 1; if (subTreesSize > 0) { - for (ZLTree parent = Parent; parent != null; parent = parent.Parent) { + for (ZLTree parent = Parent; parent != null; parent = parent.Parent) { parent.mySize -= subTreesSize; } } diff --git a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java index 6197604c9..3d0831a3f 100644 --- a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java @@ -25,7 +25,7 @@ import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.image.ZLImageData; abstract public class ZLPaintContext { - private final ArrayList myFamilies = new ArrayList(); + private final ArrayList myFamilies = new ArrayList(); public interface LineStyle { int SOLID_LINE = 0; @@ -145,13 +145,13 @@ abstract public class ZLPaintContext { abstract public void drawFilledCircle(int x, int y, int r); abstract public void drawOutline(int[] xs, int ys[]); - public ArrayList fontFamilies() { + public ArrayList fontFamilies() { if (myFamilies.isEmpty()) { fillFamiliesList(myFamilies); } return myFamilies; } - + abstract public String realFontFamilyName(String fontFamily); - abstract protected void fillFamiliesList(ArrayList families); + abstract protected void fillFamiliesList(ArrayList families); } diff --git a/src/org/geometerplus/zlibrary/core/view/ZLView.java b/src/org/geometerplus/zlibrary/core/view/ZLView.java index 307af352f..b27765b3d 100644 --- a/src/org/geometerplus/zlibrary/core/view/ZLView.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLView.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.core.view; -import org.geometerplus.zlibrary.core.application.ZLApplication; - abstract public class ZLView { public final ZLPaintContext Context; diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java b/src/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java index 1156a81ff..a16cb4dcd 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.ZLArrayUtils; @@ -41,7 +40,7 @@ final class ZLDTDParser { private static final byte VALUE = 10; private static final byte WAIT_END_OF_ENTITY = 11; - public void doIt(final InputStream stream, final HashMap entityMap) throws IOException { + public void doIt(final InputStream stream, final HashMap entityMap) throws IOException { final InputStreamReader streamReader = new InputStreamReader(stream, "us-ascii"); char[] buffer = new char[8192]; diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java index 015a32f9f..e190d9f0c 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java @@ -22,9 +22,7 @@ package org.geometerplus.zlibrary.core.xml; import java.io.*; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.filesystem.*; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.util.ZLArrayUtils; import org.geometerplus.zlibrary.core.xml.ZLStringMap; @@ -35,8 +33,8 @@ final class ZLXMLParser { private static final byte START_TAG = 1; private static final byte END_TAG = 2; private static final byte TEXT = 3; - private static final byte IGNORABLE_WHITESPACE = 4; - private static final byte PROCESSING_INSTRUCTION = 5; + //private static final byte IGNORABLE_WHITESPACE = 4; + //private static final byte PROCESSING_INSTRUCTION = 5; private static final byte COMMENT = 6; // tag of form private static final byte END_OF_COMMENT1 = 7; private static final byte END_OF_COMMENT2 = 8; @@ -172,7 +170,8 @@ final class ZLXMLParser { return value; } - private static ConcurrentHashMap,HashMap> ourDTDMaps = new ConcurrentHashMap(); // FIXME: concurrency violation + private static ConcurrentHashMap,HashMap> ourDTDMaps = + new ConcurrentHashMap,HashMap>(); // FIXME: concurrency violation static HashMap getDTDMap(List dtdList) throws IOException { HashMap entityMap = ourDTDMaps.get(dtdList); @@ -194,7 +193,8 @@ final class ZLXMLParser { return entityMap; } - private final static ConcurrentHashMap ourStringMap = new ConcurrentHashMap(); + private final static ConcurrentHashMap ourStringMap = + new ConcurrentHashMap(); void doIt() throws IOException { final ZLXMLReader xmlReader = myXMLReader; @@ -737,7 +737,7 @@ mainSwitchLabel: return false; } - private static boolean processStartTag(ZLXMLReader xmlReader, String tagName, ZLStringMap attributes, HashMap currentNamespaceMap) { + private static boolean processStartTag(ZLXMLReader xmlReader, String tagName, ZLStringMap attributes, HashMap currentNamespaceMap) { if (xmlReader.startElementHandler(tagName, attributes)) { return true; } @@ -748,7 +748,7 @@ mainSwitchLabel: return false; } - private static boolean processEndTag(ZLXMLReader xmlReader, String tagName, HashMap currentNamespaceMap) { + private static boolean processEndTag(ZLXMLReader xmlReader, String tagName, HashMap currentNamespaceMap) { if (currentNamespaceMap != null) { xmlReader.namespaceMapChangedHandler(currentNamespaceMap); } diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java index 1aff7a0df..3c7d20b3d 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java @@ -23,7 +23,6 @@ import java.util.*; import java.io.*; import org.geometerplus.zlibrary.core.filesystem.ZLFile; -import org.geometerplus.zlibrary.core.library.ZLibrary; public abstract class ZLXMLProcessor { public static Map getEntityMap(List dtdList) { diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java index 518f324e3..755f9ee83 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java @@ -19,7 +19,6 @@ package org.geometerplus.zlibrary.text.hyphenation; -import java.util.*; import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.text.view.ZLTextWord; diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java index b92c43d3e..978876707 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.text.hyphenation; -import java.util.Arrays; - public final class ZLTextTeXHyphenationPattern { int myLength; final char[] mySymbols; diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java index dffd17b19..6e8abf9d7 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java @@ -21,13 +21,13 @@ package org.geometerplus.zlibrary.text.hyphenation; import java.util.*; import org.geometerplus.zlibrary.core.util.ZLMiscUtil; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; public final class ZLTextTeXHyphenator extends ZLTextHyphenator { - private final HashMap myPatternTable = new HashMap(); + private final HashMap myPatternTable = + new HashMap(); private String myLanguage; - + public ZLTextTeXHyphenator() { } @@ -62,8 +62,8 @@ public final class ZLTextTeXHyphenator extends ZLTextHyphenator { } byte[] values = new byte[length + 1]; - - final HashMap table = myPatternTable; + + final HashMap table = myPatternTable; ZLTextTeXHyphenationPattern pattern = new ZLTextTeXHyphenationPattern(stringToHyphenate, 0, length, false); for (int offset = 0; offset < length - 1; offset++) { diff --git a/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java b/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java index b1bcb8734..0e161085d 100644 --- a/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java +++ b/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java @@ -22,9 +22,10 @@ package org.geometerplus.zlibrary.text.model; import java.lang.ref.WeakReference; import java.io.*; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; final class CachedCharStorageException extends RuntimeException { + private static final long serialVersionUID = -6373408730045821053L; + public CachedCharStorageException(String message) { super(message); } @@ -86,7 +87,7 @@ public final class CachedCharStorage implements CharStorage { blockSize = minimumLength; } char[] block = new char[blockSize]; - myArray.add(new WeakReference(block)); + myArray.add(new WeakReference(block)); return block; } diff --git a/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java b/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java index bcee3f20e..67e6072b8 100644 --- a/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java +++ b/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.text.model; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; final class SimpleCharStorage implements CharStorage { private final int myBlockSize; diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextWritableModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextWritableModel.java index d255f9e24..c3c5fc09d 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextWritableModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextWritableModel.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.text.model; -import org.geometerplus.zlibrary.core.image.ZLImageMap; - public interface ZLTextWritableModel extends ZLTextModel { void createParagraph(byte kind); diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextWritablePlainModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextWritablePlainModel.java index 81736ffba..d0f9b6077 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextWritablePlainModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextWritablePlainModel.java @@ -19,7 +19,6 @@ package org.geometerplus.zlibrary.text.model; -import java.util.*; import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.image.ZLImageMap; diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java index 18dd55b8d..2a09b4529 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java @@ -32,17 +32,15 @@ public class ZLTextAlignmentOptionEntry extends ZLComboOptionEntry { private static final String KEY_JUSTIFY = "justify"; private static final String KEY_UNCHANGED = "unchanged"; - private static final ArrayList ourValues4 = new ArrayList(); - private static final ArrayList ourValues5 = new ArrayList(); + private static final ArrayList ourValues4 = new ArrayList(); + private static final ArrayList ourValues5 = new ArrayList(); - private final ZLResource myResource; private final ZLIntegerOption myOption; private final boolean myAllowUndefined; public ZLTextAlignmentOptionEntry(ZLIntegerOption option, final ZLResource resource, boolean allowUndefined) { myAllowUndefined = allowUndefined; myOption = option; - myResource = resource; if (ourValues5.isEmpty()) { ourValues5.add(resource.getResource(KEY_UNCHANGED).getValue()); String value = resource.getResource(KEY_LEFT).getValue(); @@ -60,7 +58,7 @@ public class ZLTextAlignmentOptionEntry extends ZLComboOptionEntry { } } - public ArrayList getValues() { + public ArrayList getValues() { return myAllowUndefined ? ourValues5 : ourValues4; } diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java b/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java index 0038c184c..2a89c5b41 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java @@ -22,6 +22,8 @@ package org.geometerplus.zlibrary.text.view; import java.util.ArrayList; final class ZLTextElementAreaVector extends ArrayList { + private static final long serialVersionUID = -5045824474350948281L; + final ArrayList HyperlinkAreas = new ArrayList(); private ZLTextHyperlinkArea myCurrentHyperlinkArea; diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java index d6b4ebc1b..3af03e57e 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java @@ -27,7 +27,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.view.ZLPaintContext; public class ZLTextFontFamilyWithBaseOptionEntry extends ZLFontFamilyOptionEntry { - private static final ArrayList ourAllFamilies = new ArrayList(); + private static final ArrayList ourAllFamilies = new ArrayList(); private final ZLResource myResource; @@ -36,20 +36,23 @@ public class ZLTextFontFamilyWithBaseOptionEntry extends ZLFontFamilyOptionEntry myResource = resource; } - public ArrayList getValues() { + @Override + public ArrayList getValues() { if (ourAllFamilies.size() == 0) { - final ArrayList families = super.getValues(); + final ArrayList families = super.getValues(); ourAllFamilies.add(myResource.getResource("unchanged").getValue()); ourAllFamilies.addAll(families); } return ourAllFamilies; } + @Override public String initialValue() { final String value = super.initialValue(); - return ((value == null) || (value.length() == 0)) ? (String)(getValues().get(0)) : value; + return ((value == null) || (value.length() == 0)) ? getValues().get(0) : value; } + @Override public void onAccept(String value) { super.onAccept((value.equals(getValues().get(0))) ? "" : value); } diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java index 2f0620c1c..1ee10ca3d 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.text.view; import java.util.ArrayList; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; import org.geometerplus.zlibrary.core.options.ZLIntegerOption; @@ -29,8 +28,8 @@ import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLTextLineSpaceOptionEntry extends ZLComboOptionEntry { private static final String KEY_UNCHANGED = "unchanged"; - private static final ArrayList ourAllValues = new ArrayList(); - private static final ArrayList ourAllValuesPlusBase = new ArrayList(); + private static final ArrayList ourAllValues = new ArrayList(); + private static final ArrayList ourAllValuesPlusBase = new ArrayList(); private final ZLIntegerOption myOption; private final ZLResource myResource; @@ -48,18 +47,18 @@ public class ZLTextLineSpaceOptionEntry extends ZLComboOptionEntry { ourAllValuesPlusBase.addAll(ourAllValues); } } - - public ArrayList getValues() { + + public ArrayList getValues() { return myAllowBase ? ourAllValuesPlusBase : ourAllValues; } public String initialValue() { final int value = myOption.getValue(); if (value == -1) { - return (String) ourAllValuesPlusBase.get(0); + return ourAllValuesPlusBase.get(0); } final int index = Math.max(0, Math.min(15, (value + 5) / 10 - 5)); - return (String) ourAllValues.get(index); + return ourAllValues.get(index); } public void onAccept(String value) { diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java index 297d232a7..1d06c0003 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java @@ -96,7 +96,7 @@ public final class ZLTextParagraphCursor { private static byte[] ourBreaks = new byte[1024]; private static final int NO_SPACE = 0; private static final int SPACE = 1; - private static final int NON_BREAKABLE_SPACE = 2; + //private static final int NON_BREAKABLE_SPACE = 2; private void processTextEntry(final char[] data, final int offset, final int length) { if (length != 0) { if (ourBreaks.length < length) { diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursorCache.java b/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursorCache.java index df09792cc..e7e651daa 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursorCache.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursorCache.java @@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.text.view; import java.lang.ref.WeakReference; import java.util.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.text.model.ZLTextModel; diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextSelectionModel.java b/src/org/geometerplus/zlibrary/text/view/ZLTextSelectionModel.java index 1de686bd7..f7145c8c7 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextSelectionModel.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextSelectionModel.java @@ -100,7 +100,7 @@ final class ZLTextSelectionModel { private boolean myIsActive; private boolean myIsEmpty = true; private boolean myDoUpdate; - private boolean myTextIsUpToDate = true; + //private boolean myTextIsUpToDate = true; private int myStoredX; private int myStoredY; @@ -108,7 +108,6 @@ final class ZLTextSelectionModel { private final Bound myFirstBound = new Bound(); private final Bound mySecondBound = new Bound(); - private final HashSet myCursors = new HashSet(); private final StringBuilder myText = new StringBuilder(); ZLTextSelectionModel(ZLTextView view) { @@ -124,9 +123,8 @@ final class ZLTextSelectionModel { myIsEmpty = false; setBound(myFirstBound, x, y); mySecondBound.copyFrom(myFirstBound); - myCursors.clear(); myText.delete(0, myText.length()); - myTextIsUpToDate = true; + //myTextIsUpToDate = true; } boolean extendTo(int x, int y) { @@ -149,7 +147,7 @@ final class ZLTextSelectionModel { } if (!oldRange.Left.equalsTo(newRange.Left) || !oldRange.Right.equalsTo(newRange.Right)) { - myTextIsUpToDate = false; + //myTextIsUpToDate = false; myText.delete(0, myText.length()); return true; } @@ -163,7 +161,7 @@ final class ZLTextSelectionModel { myDoUpdate = false; setBound(mySecondBound, myStoredX, myStoredY); //myView.copySelectedTextToClipboard(ZLDialogManager::CLIPBOARD_SELECTION); - myTextIsUpToDate = false; + //myTextIsUpToDate = false; myText.delete(0, myText.length()); } } @@ -179,9 +177,8 @@ final class ZLTextSelectionModel { myIsEmpty = true; myIsActive = false; myDoUpdate = false; - myCursors.clear(); myText.delete(0, myText.length()); - myTextIsUpToDate = true; + //myTextIsUpToDate = true; } Range getRange() { diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 904bf4c84..66babdc16 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -21,8 +21,6 @@ package org.geometerplus.zlibrary.text.view; import java.util.*; -import org.geometerplus.zlibrary.core.util.ZLColor; - import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.view.ZLPaintContext; import org.geometerplus.zlibrary.text.model.*; @@ -1098,7 +1096,7 @@ public abstract class ZLTextView extends ZLTextViewBase { return myCurrentPage.TextElementMap.binarySearch(x, y); } - private static int lowerBound(int[] array, int value) { + /*private static int lowerBound(int[] array, int value) { int leftIndex = 0; int rightIndex = array.length - 1; if (array[rightIndex] <= value) { @@ -1113,8 +1111,9 @@ public abstract class ZLTextView extends ZLTextViewBase { } } return leftIndex; - } + }*/ + @Override public boolean onStylusMovePressed(int x, int y) { if (mySelectionModel.extendTo(x, y)) { ZLApplication.Instance().repaintView(); @@ -1123,6 +1122,7 @@ public abstract class ZLTextView extends ZLTextViewBase { return false; } + @Override public boolean onStylusRelease(int x, int y) { mySelectionModel.deactivate(); return false; @@ -1177,7 +1177,6 @@ public abstract class ZLTextView extends ZLTextViewBase { protected boolean moveHyperlinkPointer(boolean forward) { final ArrayList hyperlinkAreas = myCurrentPage.TextElementMap.HyperlinkAreas; - boolean hyperlinkIsChanged = false; if (!hyperlinkAreas.isEmpty()) { final int index = hyperlinkAreas.indexOf(myCurrentHyperlink); if (index == -1) { diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java index b69a2f241..f89349fa6 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java @@ -23,8 +23,6 @@ import org.geometerplus.zlibrary.text.view.ZLTextStyle; import org.geometerplus.zlibrary.text.view.ZLTextHyperlink; import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; -import org.geometerplus.zlibrary.core.util.*; - public class ZLTextFullDecoratedStyle extends ZLTextPartialDecoratedStyle { private final ZLTextFullStyleDecoration myFullDecoration; diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java index 932ca9ab2..2f422a2b9 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java @@ -20,12 +20,10 @@ package org.geometerplus.zlibrary.text.view.style; import org.geometerplus.zlibrary.core.options.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.text.view.ZLTextStyle; import org.geometerplus.zlibrary.text.view.ZLTextHyperlink; -import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; public class ZLTextFullStyleDecoration extends ZLTextStyleDecoration { public final ZLIntegerRangeOption SpaceBeforeOption; diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java index ad9a213ad..2c5634351 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java @@ -24,8 +24,6 @@ import org.geometerplus.zlibrary.core.util.ZLBoolean3; import org.geometerplus.zlibrary.text.view.ZLTextStyle; import org.geometerplus.zlibrary.text.view.ZLTextHyperlink; -import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; - class ZLTextPartialDecoratedStyle extends ZLTextDecoratedStyle { private final ZLTextStyleDecoration myDecoration; diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java index 8696ab904..49b7a8d09 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java @@ -19,11 +19,9 @@ package org.geometerplus.zlibrary.text.view.style; -import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.util.ZLBoolean3; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; -import org.geometerplus.zlibrary.text.view.ZLTextStyle; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; public class ZLTextStyleCollection { diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java index f5073a730..2cd808910 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.text.view.style; import org.geometerplus.zlibrary.core.options.*; -import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.text.view.ZLTextStyle; import org.geometerplus.zlibrary.text.view.ZLTextHyperlink; diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java index b189a028f..dcfc65ae6 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java @@ -78,16 +78,16 @@ class ZLAndroidBoolean3OptionView extends ZLAndroidOptionView { } private class ComboAdapter extends BaseAdapter implements Spinner.OnItemSelectedListener { - EditText myEditor; - public void onItemSelected(AdapterView parent, View v, int position, long id) { + public void onItemSelected(AdapterView parent, View v, int position, long id) { //final ZLBoolean3OptionEntry comboEntry = (ZLBoolean3OptionEntry)myOption; //comboEntry.onValueSelected(position); } - public void onNothingSelected(AdapterView parent) { + public void onNothingSelected(AdapterView parent) { } + @Override public View getDropDownView(int position, View convertView, ViewGroup parent) { if (convertView == null || !(convertView instanceof TextView)) { TextView textView = new TextView(parent.getContext()); @@ -137,7 +137,8 @@ class ZLAndroidBoolean3OptionView extends ZLAndroidOptionView { return position; } - public boolean stableIds() { + @Override + public boolean hasStableIds() { return true; } } diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java index 56b816332..6ed1fee0d 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; -import android.view.View; import android.widget.*; import org.geometerplus.zlibrary.core.dialogs.ZLChoiceOptionEntry; @@ -69,6 +68,7 @@ class ZLAndroidChoiceOptionView extends ZLAndroidOptionView { } } + @Override protected void _setActive(boolean active) { if (myGroup != null) { myGroup.setEnabled(active); diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java index e65e2f1f9..d84002236 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java @@ -82,14 +82,15 @@ class ZLAndroidComboOptionView extends ZLAndroidOptionView { private class ComboAdapter extends BaseAdapter implements Spinner.OnItemSelectedListener { EditText myEditor; - public void onItemSelected(AdapterView parent, View v, int position, long id) { + public void onItemSelected(AdapterView parent, View v, int position, long id) { final ZLComboOptionEntry comboEntry = (ZLComboOptionEntry)myOption; comboEntry.onValueSelected(position); } - public void onNothingSelected(AdapterView parent) { + public void onNothingSelected(AdapterView parent) { } + @Override public View getDropDownView(int position, View convertView, ViewGroup parent) { if (convertView == null) { TextView textView = new TextView(parent.getContext()); @@ -131,7 +132,8 @@ class ZLAndroidComboOptionView extends ZLAndroidOptionView { return position; } - public boolean stableIds() { + @Override + public boolean hasStableIds() { return false; } } diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java index 8aed45f54..5f2324672 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java @@ -33,7 +33,7 @@ class ZLAndroidDialogContent extends ZLDialogContent implements ZLAndroidDialogI private Context myContext; protected ListView myListView; - final ArrayList myAndroidViews = new ArrayList(); + final ArrayList myAndroidViews = new ArrayList(); private boolean[] mySelectableMarks = new boolean[10]; ZLAndroidDialogContent(Context context, ZLResource resource) { @@ -62,9 +62,9 @@ class ZLAndroidDialogContent extends ZLDialogContent implements ZLAndroidDialogI return myContext; } - private ArrayList getAndroidViews() { + private ArrayList getAndroidViews() { if (myAndroidViews.isEmpty()) { - final ArrayList views = Views; + final ArrayList views = Views; final int len = views.size(); for (int i = 0; i < len; ++i) { final ZLAndroidOptionView v = (ZLAndroidOptionView)views.get(i); @@ -165,13 +165,13 @@ class ZLAndroidDialogContent extends ZLDialogContent implements ZLAndroidDialogI return (View)getAndroidViews().get(position); } - public boolean areAllItemsSelectable() { + /*public boolean areAllItemsSelectable() { return true; } public boolean isSelectable(int position) { return mySelectableMarks[position]; - } + }*/ public int getCount() { return getAndroidViews().size(); diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java index 556d6abf6..bc6f44568 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java @@ -22,17 +22,14 @@ package org.geometerplus.zlibrary.ui.android.dialogs; import java.util.*; import android.app.*; -import android.view.View; import android.content.*; import android.os.*; import org.geometerplus.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.application.ZLApplication; -import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication; -import org.geometerplus.zlibrary.ui.android.*; public class ZLAndroidDialogManager extends ZLDialogManager { private Activity myActivity; @@ -53,7 +50,7 @@ public class ZLAndroidDialogManager extends ZLDialogManager { activity.startActivity(intent); } - public void runActivity(Class activityClass) { + public void runActivity(Class activityClass) { myActivity.startActivity(new Intent(myActivity, activityClass)); } diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java index 43a531be0..b0ffb337f 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.ui.android.dialogs; -import android.view.View; - import org.geometerplus.zlibrary.core.dialogs.ZLOptionView; import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java index 626e0b18e..9a25e2811 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.ui.android.dialogs; -import java.util.ArrayList; - import android.app.Activity; import android.content.Context; import android.view.*; @@ -94,9 +92,6 @@ class ZLAndroidOptionsDialog extends ZLOptionsDialog implements ZLAndroidDialogI public ZLDialogContent createTab(String key) { final Context context = myMainActivity; - - final int index = myTabs.size(); - final ZLDialogContent tab = new ZLAndroidDialogContent(context, getTabResource(key)); myTabs.add(tab); @@ -145,13 +140,13 @@ class ZLAndroidOptionsDialog extends ZLOptionsDialog implements ZLAndroidDialogI return textView; } - public boolean areAllItemsSelectable() { + /*public boolean areAllItemsSelectable() { return false; } public boolean isSelectable(int position) { return true; - } + }*/ public int getCount() { return myTabs.size(); @@ -166,7 +161,7 @@ class ZLAndroidOptionsDialog extends ZLOptionsDialog implements ZLAndroidDialogI } } - private static class TabButton extends Button { + /*private static class TabButton extends Button { private Runnable myAction; TabButton(Context context, String text, Runnable action) { @@ -176,9 +171,10 @@ class ZLAndroidOptionsDialog extends ZLOptionsDialog implements ZLAndroidDialogI myAction = action; } + @Override public boolean onTouchEvent(MotionEvent event) { myAction.run(); return true; } - } + }*/ } diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java index b431216b7..da814b96a 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java @@ -66,12 +66,13 @@ class ZLAndroidSpinOptionView extends ZLAndroidOptionView { layout.setOrientation(LinearLayout.HORIZONTAL); layout.setHorizontalGravity(0x05); - final ZLSpinOptionEntry spinOption = (ZLSpinOptionEntry)myOption; + /*final ZLSpinOptionEntry spinOption = (ZLSpinOptionEntry)myOption; final int min = spinOption.minValue(); final int max = spinOption.maxValue(); - final int value = spinOption.initialValue(); - + final int value = spinOption.initialValue();*/ + Button minusButton = new Button(context) { + @Override public boolean onTouchEvent(MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_DOWN) { setValue(myValue - 1); diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java index 0d5fc00ad..77bc78244 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; -import android.view.*; import android.widget.*; import org.geometerplus.zlibrary.core.dialogs.ZLStringOptionEntry; diff --git a/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java b/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java index e92982388..1db38be9a 100644 --- a/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java +++ b/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java @@ -19,9 +19,6 @@ package org.geometerplus.zlibrary.ui.android.image; -import java.util.*; -import java.lang.ref.WeakReference; - import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java index 4e98ebd16..90fac12a6 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java @@ -25,7 +25,6 @@ import android.os.Bundle; import android.view.View; import android.widget.TextView; import android.text.method.ScrollingMovementMethod; -import android.graphics.Typeface; import org.geometerplus.zlibrary.ui.android.R; diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java index d6ebf4ebf..fa010c9d0 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java @@ -30,7 +30,6 @@ import android.content.res.Configuration; import android.view.*; import org.geometerplus.zlibrary.core.application.ZLApplication; -import org.geometerplus.zlibrary.core.config.ZLConfig; import org.geometerplus.zlibrary.core.filesystem.ZLPhysicalFile; import org.geometerplus.zlibrary.ui.android.R; diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java index d42296eba..450122fee 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java @@ -47,6 +47,7 @@ public class ZLAndroidApplication extends Application { ZLAndroidApplicationWindow myMainWindow; + @Override public void onCreate() { super.onCreate(); new ZLSQLiteConfig(this); @@ -55,6 +56,7 @@ public class ZLAndroidApplication extends Application { new ZLAndroidLibrary(this); } + @Override public void onTerminate() { super.onTerminate(); } @@ -71,5 +73,5 @@ public class ZLAndroidApplication extends Application { return myData.get(key); } - private final HashMap myData = new HashMap(); + private final HashMap myData = new HashMap(); } diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index f214c6bc4..15e9a0134 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -25,12 +25,10 @@ import android.app.Application; import android.content.res.Resources; import android.content.res.AssetFileDescriptor; import android.content.Intent; -import android.content.pm.ActivityInfo; import android.net.Uri; import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; -import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.view.ZLAndroidPaintContext; diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java index c20d52889..5cfb09ba2 100644 --- a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java +++ b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java @@ -225,7 +225,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext { return "Sans"; } - protected void fillFamiliesList(ArrayList families) { + protected void fillFamiliesList(ArrayList families) { // TODO: implement families.add("Sans"); families.add("Serif"); diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java index dbeec8f38..5b733e9b0 100644 --- a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java +++ b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.ui.android.view; -import java.util.Map; - import android.content.Context; import android.graphics.*; import android.view.*; @@ -104,7 +102,7 @@ public class ZLAndroidWidget extends View { private void onDrawInScrolling(Canvas canvas) { final int w = getWidth(); final int h = getHeight(); - final ZLAndroidPaintContext context = ZLAndroidPaintContext.Instance(); + //final ZLAndroidPaintContext context = ZLAndroidPaintContext.Instance(); boolean stopScrolling = false; if (myScrollingInProgress) {