From c25f0e12fefceebdbcc87536e8bb652f22aa07cb Mon Sep 17 00:00:00 2001 From: Vasiliy Bout Date: Wed, 24 Nov 2010 01:00:27 +0300 Subject: [PATCH] Code cleanup --- src/org/geometerplus/android/fbreader/FBReader.java | 2 -- .../android/fbreader/LibraryTabActivity.java | 2 -- .../android/fbreader/ShowLibraryAction.java | 2 -- .../fbreader/network/NetworkBaseActivity.java | 1 - .../fbreader/network/NetworkLibraryActivity.java | 1 - .../BatteryLevelToTurnScreenOffPreference.java | 1 - .../fbreader/network/NetworkLibrary.java | 3 +-- .../fbreader/optionsDialog/OptionsDialog.java | 1 - .../fbreader/optionsDialog/StyleOptionsPage.java | 3 +-- .../zlibrary/core/dialogs/ZLDialogContent.java | 1 - .../geometerplus/zlibrary/core/library/ZLibrary.java | 1 - .../core/optionEntries/ZLFontFamilyOptionEntry.java | 1 - .../zlibrary/core/util/ZLTTFInfoDetector.java | 12 ++++++------ .../ui/android/dialogs/ZLAndroidDialogManager.java | 3 --- .../ui/android/dialogs/ZLAndroidOptionsDialog.java | 6 ++---- .../ui/android/library/ZLAndroidLibrary.java | 1 - .../zlibrary/ui/android/view/AndroidFontUtil.java | 1 - .../ui/android/view/ZLAndroidPaintContext.java | 2 -- 18 files changed, 10 insertions(+), 34 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java index a5d902830..fb0c780c7 100644 --- a/src/org/geometerplus/android/fbreader/FBReader.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -34,7 +34,6 @@ import android.widget.TextView; import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.view.ZLView; -import org.geometerplus.zlibrary.text.model.ZLTextModel; import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition; import org.geometerplus.zlibrary.text.view.ZLTextPosition; import org.geometerplus.zlibrary.text.view.ZLTextView; @@ -42,7 +41,6 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidActivity; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication; import org.geometerplus.zlibrary.ui.android.R; -import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.fbreader.ActionCode; import org.geometerplus.fbreader.library.Library; diff --git a/src/org/geometerplus/android/fbreader/LibraryTabActivity.java b/src/org/geometerplus/android/fbreader/LibraryTabActivity.java index a62b04a89..1a774bff2 100644 --- a/src/org/geometerplus/android/fbreader/LibraryTabActivity.java +++ b/src/org/geometerplus/android/fbreader/LibraryTabActivity.java @@ -39,8 +39,6 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.tree.FBTree; -import org.geometerplus.android.util.AndroidUtil; - public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuItemClickListener { public static final String CURRENT_BOOK_PATH_KEY = "CurrentBookPath"; diff --git a/src/org/geometerplus/android/fbreader/ShowLibraryAction.java b/src/org/geometerplus/android/fbreader/ShowLibraryAction.java index af4192c2c..93f5b9d5d 100644 --- a/src/org/geometerplus/android/fbreader/ShowLibraryAction.java +++ b/src/org/geometerplus/android/fbreader/ShowLibraryAction.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader; -import java.util.HashMap; - import android.content.Intent; import org.geometerplus.fbreader.fbreader.FBAction; diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java index ce7885610..333066bbc 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java @@ -42,7 +42,6 @@ import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary; -import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.fbreader.network.NetworkTree; import org.geometerplus.fbreader.network.NetworkImage; diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java index 4de2300e0..e1ddacedf 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java @@ -30,7 +30,6 @@ import android.widget.BaseAdapter; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.network.ZLNetworkException; -import org.geometerplus.zlibrary.core.language.ZLLanguageUtil; import org.geometerplus.zlibrary.ui.android.R; diff --git a/src/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java b/src/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java index 587cc54a5..b8a00d6a7 100644 --- a/src/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java @@ -20,7 +20,6 @@ package org.geometerplus.android.fbreader.preferences; import android.content.Context; -import android.preference.ListPreference; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java index 54841c07b..178ec16be 100644 --- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java +++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java @@ -100,7 +100,6 @@ public class NetworkLibrary { if (myIsAlreadyInitialized) { return; } - final LinksComparator comparator = new LinksComparator(); try { OPDSLinkReader.loadOPDSLinks(OPDSLinkReader.CACHE_LOAD, new OnNewLinkListener() { @@ -466,6 +465,6 @@ public class NetworkLibrary { for (INetworkLink link : myLinks) { languageSet.add(link.getLanguage()); } - return new ArrayList(languageSet); + return new ArrayList(languageSet); } } diff --git a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java index c6360d240..ecf971269 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java @@ -19,7 +19,6 @@ 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.resources.ZLResource; diff --git a/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java index d47770cd1..7adbed624 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java @@ -20,7 +20,6 @@ package org.geometerplus.fbreader.optionsDialog; import org.geometerplus.zlibrary.core.dialogs.ZLDialogContent; -import org.geometerplus.zlibrary.core.optionEntries.ZLFontFamilyOptionEntry; import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry; import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry; import org.geometerplus.zlibrary.core.resources.ZLResource; @@ -37,7 +36,7 @@ public class StyleOptionsPage extends OptionsPage implements FBTextKind { private final static String KEY_BOLD = "bold"; private final static String KEY_ITALIC = "italic"; private final static String KEY_FONTFAMILY = "fontFamily"; - private final static String KEY_FONTSIZE = "fontSize"; + //private final static String KEY_FONTSIZE = "fontSize"; private final static String KEY_FONTSIZEDIFFERENCE = "fontSizeDifference"; private final static String KEY_ALLOWHYPHENATIONS = "allowHyphenations"; diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java index 73aeb5c26..228b77fa3 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java @@ -22,7 +22,6 @@ package org.geometerplus.zlibrary.core.dialogs; import java.util.*; import org.geometerplus.zlibrary.core.resources.ZLResource; -import org.geometerplus.zlibrary.core.options.*; public abstract class ZLDialogContent { private final ZLResource myResource; diff --git a/src/org/geometerplus/zlibrary/core/library/ZLibrary.java b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java index 8821f8566..f270c858b 100644 --- a/src/org/geometerplus/zlibrary/core/library/ZLibrary.java +++ b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java @@ -20,7 +20,6 @@ package org.geometerplus.zlibrary.core.library; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; -import org.geometerplus.zlibrary.core.view.ZLPaintContext; public abstract class ZLibrary { public static ZLibrary Instance() { diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java index 07dd936e9..134e930d7 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java @@ -43,7 +43,6 @@ public class ZLFontFamilyOptionEntry extends ZLComboOptionEntry { } public String initialValue() { - final ArrayList allValues = getValues(); final String value = myOption.getValue(); for (String v : getValues()) { if (value.equals(myContext.realFontFamilyName(v))) { diff --git a/src/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java b/src/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java index 63a21a85a..0a3bd279a 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java @@ -107,20 +107,20 @@ public class ZLTTFInfoDetector { private static class TableInfo { final String Name; - final int CheckSum; + //final int CheckSum; final int Offset; final int Length; TableInfo(byte[] buffer, int off) throws IOException { Name = new String(buffer, off, 4, "ascii"); - CheckSum = getInt32(buffer, off + 4); + //CheckSum = getInt32(buffer, off + 4); Offset = getInt32(buffer, off + 8); Length = getInt32(buffer, off + 12); } - void print(PrintStream writer) { + /*void print(PrintStream writer) { writer.println(Name + " : " + Offset + " : " + Length + " : " + CheckSum); - } + }*/ } byte[] readTable(TableInfo info) throws IOException { @@ -190,7 +190,7 @@ public class ZLTTFInfoDetector { return fontInfo; } - private int readFontProperties(TableInfo fdscInfo) throws IOException { + /*private int readFontProperties(TableInfo fdscInfo) throws IOException { if (fdscInfo == null || fdscInfo.Offset < myPosition || fdscInfo.Length <= 16) { return 0; } @@ -198,5 +198,5 @@ public class ZLTTFInfoDetector { System.err.println(getInt32(buffer, 0)); System.err.println(getInt32(buffer, 4)); return 0; - } + }*/ } diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java index 4eabe1fc2..e32bf7d29 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java @@ -19,10 +19,7 @@ package org.geometerplus.zlibrary.ui.android.dialogs; -import java.util.*; - import android.app.*; -import android.content.*; import org.geometerplus.zlibrary.core.dialogs.*; diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java index 7d270167f..733f8499e 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java @@ -22,8 +22,6 @@ package org.geometerplus.zlibrary.ui.android.dialogs; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.view.*; -import android.widget.*; import org.geometerplus.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.resources.ZLResource; @@ -31,12 +29,12 @@ import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication; class ZLAndroidOptionsDialog extends ZLOptionsDialog { - private final String myCaption; + //private final String myCaption; private final Activity myMainActivity; ZLAndroidOptionsDialog(Activity activity, ZLResource resource) { super(resource); - myCaption = resource.getResource("title").getValue(); + //myCaption = resource.getResource("title").getValue(); myMainActivity = activity; } diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index dcd0f0450..5b6d5d0f0 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -23,7 +23,6 @@ import java.io.*; import java.util.*; import android.app.Application; -import android.content.res.Resources; import android.content.res.AssetFileDescriptor; import android.content.Intent; import android.net.Uri; diff --git a/src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java b/src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java index 765836a74..54f453a42 100644 --- a/src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java +++ b/src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java @@ -27,7 +27,6 @@ import java.lang.reflect.InvocationTargetException; import android.graphics.Typeface; -import org.geometerplus.zlibrary.core.util.ZLTTFInfo; import org.geometerplus.zlibrary.core.util.ZLTTFInfoDetector; import org.geometerplus.fbreader.Paths; diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java index 98e64b85e..bc4414e00 100644 --- a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java +++ b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java @@ -26,8 +26,6 @@ import android.graphics.*; import org.geometerplus.zlibrary.core.image.ZLImageData; import org.geometerplus.zlibrary.core.util.ZLColor; -import org.geometerplus.zlibrary.core.util.ZLTTFInfo; -import org.geometerplus.zlibrary.core.util.ZLTTFInfoDetector; import org.geometerplus.zlibrary.core.view.ZLPaintContext; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;