diff --git a/src/org/amse/ys/zip/ZipFile.java b/src/org/amse/ys/zip/ZipFile.java index f59b56f46..9283037b6 100644 --- a/src/org/amse/ys/zip/ZipFile.java +++ b/src/org/amse/ys/zip/ZipFile.java @@ -22,6 +22,8 @@ public final class ZipFile { private final InputStreamHolder myStreamHolder; private final LinkedHashMap myFileHeaders = new LinkedHashMap() { + private static final long serialVersionUID = -4412796553514902113L; + @Override public LocalFileHeader get(Object key) { return super.get(((String)key).toLowerCase()); diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java index 581df632f..0e3c0206d 100644 --- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java +++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader.network; -import java.util.HashMap; - import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java index b6b76dd82..bf845730a 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader.network; -import java.net.*; - import android.app.*; import android.os.Bundle; import android.view.*; diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java index e00401557..e853ec59c 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java @@ -302,10 +302,6 @@ class NetworkCatalogActions extends NetworkTreeActions { myResumeNotLoad = resumeNotLoad; } - public String getResourceKey() { - return "downloadingCatalogs"; - } - @Override public void doBefore() throws ZLNetworkException { final INetworkLink link = myTree.Item.Link; diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActivity.java index f80b3df32..924ab9605 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActivity.java @@ -19,7 +19,6 @@ package org.geometerplus.android.fbreader.network; -import android.app.Activity; import android.os.Bundle; import android.view.*; import android.widget.BaseAdapter; @@ -29,12 +28,10 @@ import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; -import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkManager; import org.geometerplus.zlibrary.core.options.ZLStringOption; import org.geometerplus.fbreader.network.*; -import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; import org.geometerplus.fbreader.network.tree.*; import org.geometerplus.fbreader.tree.FBTree; diff --git a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java index 13445aa56..1b246df16 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java @@ -64,10 +64,6 @@ public class NetworkSearchActivity extends Activity { myPattern = pattern; } - public String getResourceKey() { - return "searchingNetwork"; - } - @Override public void doBefore() { } diff --git a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java index bbd5f514f..430c7cfe6 100644 --- a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java +++ b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader.network; -import java.util.HashMap; - import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; diff --git a/src/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java b/src/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java index 05ec11039..ccf52b8b8 100644 --- a/src/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java @@ -129,7 +129,7 @@ class AnimationSpeedPreference extends DialogPreference implements ZLPreference final int max = mySlider.getMax(); if (progress >= max / 3) { final String text = myResource.getResource("slow").getValue(); - final float textWidth = myOutlinePaint.measureText(text); + //final float textWidth = myOutlinePaint.measureText(text); final float x = 6; canvas.drawText(text, x, y, myOutlinePaint); canvas.drawText(text, x, y, myPaint); diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java index a0a63718f..5e9e82fd3 100644 --- a/src/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java @@ -32,7 +32,7 @@ class ZLEnumPreference> extends ZLStringListPreference { myOption = option; final T initialValue = option.getValue(); - final Enum[] allValues = initialValue.getClass().getEnumConstants(); + final T[] allValues = initialValue.getDeclaringClass().getEnumConstants(); final String[] stringValues = new String[allValues.length]; for (int i = 0; i < stringValues.length; ++i) { stringValues[i] = allValues[i].toString(); @@ -42,6 +42,6 @@ class ZLEnumPreference> extends ZLStringListPreference { } public void onAccept() { - myOption.setValue((T)Enum.valueOf(myOption.getValue().getClass(), getValue())); + myOption.setValue(Enum.valueOf(myOption.getValue().getDeclaringClass(), getValue())); } } diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index fb4fb7c26..63f7067d2 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -21,7 +21,6 @@ package org.geometerplus.fbreader.fbreader; import java.util.*; -import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.util.ZLColor; import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.view.ZLPaintContext; @@ -505,11 +504,11 @@ public final class FBView extends ZLTextView { // TODO: remove int myGaugeWidth = 1; - public int getGaugeWidth() { + /*public int getGaugeWidth() { return myGaugeWidth; - } + }*/ - public void setProgress(int x) { + /*public void setProgress(int x) { // set progress according to tap coordinate int gaugeWidth = getGaugeWidth(); float progress = 1.0f * Math.min(x, gaugeWidth) / gaugeWidth; @@ -521,7 +520,7 @@ public final class FBView extends ZLTextView { } myReader.getViewWidget().reset(); myReader.getViewWidget().repaint(); - } + }*/ } private Footer myFooter; diff --git a/src/org/geometerplus/fbreader/fbreader/TurnPageAction.java b/src/org/geometerplus/fbreader/fbreader/TurnPageAction.java index 52c6c22cb..c316e574e 100644 --- a/src/org/geometerplus/fbreader/fbreader/TurnPageAction.java +++ b/src/org/geometerplus/fbreader/fbreader/TurnPageAction.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.fbreader; -import org.geometerplus.zlibrary.text.view.ZLTextWordCursor; - class TurnPageAction extends FBAction { private final boolean myForward; diff --git a/src/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java b/src/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java index 5d8537881..286b24a94 100755 --- a/src/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java +++ b/src/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.fbreader; -import org.geometerplus.zlibrary.text.view.ZLTextWordCursor; - class VolumeKeyTurnPageAction extends FBAction { private final boolean myForward; diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java index 471133345..b6fcae04f 100644 --- a/src/org/geometerplus/fbreader/library/Library.java +++ b/src/org/geometerplus/fbreader/library/Library.java @@ -209,7 +209,7 @@ public final class Library { } } - private final ArrayList myNullList = new ArrayList(1); + private final ArrayList myNullList = new ArrayList(1); { myNullList.add(null); } diff --git a/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java b/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java index 5b5576b64..eac75ede1 100644 --- a/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java +++ b/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java @@ -21,7 +21,6 @@ package org.geometerplus.fbreader.network; import java.util.*; -import org.geometerplus.zlibrary.core.util.ZLMiscUtil; import org.geometerplus.zlibrary.core.options.ZLStringListOption; import org.geometerplus.fbreader.network.urlInfo.*; diff --git a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java index 9a5644e7f..f9fc50f77 100644 --- a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java +++ b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.network; -import java.util.HashMap; - import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.fbreader.network.urlInfo.*; diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItem.java b/src/org/geometerplus/fbreader/network/NetworkBookItem.java index 0fdd31f8f..c43f1a9f6 100644 --- a/src/org/geometerplus/fbreader/network/NetworkBookItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkBookItem.java @@ -97,7 +97,7 @@ public class NetworkBookItem extends NetworkItem { public NetworkBookItem(INetworkLink link, String id, int index, CharSequence title, CharSequence summary, /*String language, String date,*/ List authors, List tags, String seriesTitle, float indexInSeries, - UrlInfoCollection urls) { + UrlInfoCollection urls) { super(link, title, summary, urls); Index = index; Id = id; diff --git a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java index e1a488c16..e00c4248f 100644 --- a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java @@ -64,7 +64,7 @@ public abstract class NetworkCatalogItem extends NetworkItem { * in the network library view. * @param flags describes how to show book items inside this catalog */ - public NetworkCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { + public NetworkCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { super(link, title, summary, urls); myAccessibility = accessibility; Flags = flags; diff --git a/src/org/geometerplus/fbreader/network/NetworkDatabase.java b/src/org/geometerplus/fbreader/network/NetworkDatabase.java index e9ca94aaa..6b61346b2 100644 --- a/src/org/geometerplus/fbreader/network/NetworkDatabase.java +++ b/src/org/geometerplus/fbreader/network/NetworkDatabase.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.network; -import java.util.Map; - import org.geometerplus.fbreader.network.urlInfo.*; public abstract class NetworkDatabase { diff --git a/src/org/geometerplus/fbreader/network/NetworkItem.java b/src/org/geometerplus/fbreader/network/NetworkItem.java index 3f427fe1b..a7a2a04a6 100644 --- a/src/org/geometerplus/fbreader/network/NetworkItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkItem.java @@ -29,7 +29,7 @@ public abstract class NetworkItem { public final CharSequence Title; private CharSequence mySummary; - private final UrlInfoCollection myURLs; + private final UrlInfoCollection myURLs; /** * Creates new NetworkItem instance. @@ -39,12 +39,12 @@ public abstract class NetworkItem { * @param summary description of this library item. Can be null. * @param urls collection of item-related urls (like icon link, opds catalog link, etc. Can be null. */ - protected NetworkItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls) { + protected NetworkItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls) { Link = link; Title = title != null ? title : ""; setSummary(summary); if (urls != null && !urls.isEmpty()) { - myURLs = new UrlInfoCollection(urls); + myURLs = new UrlInfoCollection(urls); } else { myURLs = null; } @@ -58,7 +58,7 @@ public abstract class NetworkItem { return mySummary; } - protected void addUrls(UrlInfoCollection urls) { + protected void addUrls(UrlInfoCollection urls) { myURLs.upgrade(urls); } diff --git a/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java b/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java index 36f0b57e7..f6844abea 100644 --- a/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java @@ -35,7 +35,7 @@ public abstract class NetworkURLCatalogItem extends NetworkCatalogItem { * @param summary description of this library item. Can be null. * @param urls collection of item-related URLs. Can be null. */ - public NetworkURLCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls) { + public NetworkURLCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls) { this(link, title, summary, urls, Accessibility.ALWAYS, FLAGS_DEFAULT); } @@ -50,7 +50,7 @@ public abstract class NetworkURLCatalogItem extends NetworkCatalogItem { * in the network library view. * @param flags value defines how to show book items in this catalog. */ - public NetworkURLCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { + public NetworkURLCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { super(link, title, summary, urls, accessibility, flags); } diff --git a/src/org/geometerplus/fbreader/network/TopUpItem.java b/src/org/geometerplus/fbreader/network/TopUpItem.java index 09c3cb0e1..9b4c9015e 100644 --- a/src/org/geometerplus/fbreader/network/TopUpItem.java +++ b/src/org/geometerplus/fbreader/network/TopUpItem.java @@ -24,7 +24,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection; public class TopUpItem extends NetworkItem { - public TopUpItem(INetworkLink link, UrlInfoCollection urls) { + public TopUpItem(INetworkLink link, UrlInfoCollection urls) { super( link, ZLResource.resource("networkView").getResource("topupTitle").getValue(), diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java b/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java index 1e6cb6d99..9a4f2cf19 100644 --- a/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java +++ b/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java @@ -26,7 +26,7 @@ import org.geometerplus.zlibrary.core.util.MimeType; import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; -public class ATOMXMLReader extends ZLXMLReaderAdapter { +public abstract class ATOMXMLReader extends ZLXMLReaderAdapter { public static String intern(String str) { if (str == null || str.length() == 0) { return null; @@ -34,10 +34,10 @@ public class ATOMXMLReader extends ZLXMLReaderAdapter { return str.intern(); } - private final ATOMFeedHandler myFeedHandler; + private final ATOMFeedHandler myFeedHandler; - private ATOMFeedMetadata myFeed; - private ATOMEntry myEntry; + private T1 myFeed; + private T2 myEntry; private ATOMAuthor myAuthor; private ATOMId myId; private ATOMLink myLink; @@ -99,20 +99,20 @@ public class ATOMXMLReader extends ZLXMLReaderAdapter { protected final FormattedBuffer myFormattedBuffer = new FormattedBuffer(); protected boolean myFeedMetadataProcessed; - public ATOMXMLReader(ATOMFeedHandler handler, boolean readEntryNotFeed) { + public ATOMXMLReader(ATOMFeedHandler handler, boolean readEntryNotFeed) { myFeedHandler = handler; myState = readEntryNotFeed ? FEED : START; } - protected final ATOMFeedHandler getATOMFeedHandler() { + protected final ATOMFeedHandler getATOMFeedHandler() { return myFeedHandler; } - protected final ATOMFeedMetadata getATOMFeed() { + protected final T1 getATOMFeed() { return myFeed; } - protected final ATOMEntry getATOMEntry() { + protected final T2 getATOMEntry() { return myEntry; } @@ -175,17 +175,13 @@ public class ATOMXMLReader extends ZLXMLReaderAdapter { return new String(bufferContentArray); } - protected ATOMFeedMetadata createFeed(ZLStringMap attributes) { - return new ATOMFeedMetadata(attributes); - } + protected abstract T1 createFeed(ZLStringMap attributes); + protected abstract T2 createEntry(ZLStringMap attributes); protected ATOMLink createLink(ZLStringMap attributes) { return new ATOMLink(attributes); } - protected ATOMEntry createEntry(ZLStringMap attributes) { - return new ATOMEntry(attributes); - } public boolean startElementHandler( final String ns, final String tag, diff --git a/src/org/geometerplus/fbreader/network/atom/FormattedBuffer.java b/src/org/geometerplus/fbreader/network/atom/FormattedBuffer.java index cfdb34d53..f3ccf22e8 100644 --- a/src/org/geometerplus/fbreader/network/atom/FormattedBuffer.java +++ b/src/org/geometerplus/fbreader/network/atom/FormattedBuffer.java @@ -21,10 +21,7 @@ package org.geometerplus.fbreader.network.atom; import org.geometerplus.zlibrary.core.xml.ZLStringMap; -import org.geometerplus.fbreader.formats.xhtml.XHTMLReader; -import org.geometerplus.fbreader.network.NetworkLibrary; import org.geometerplus.fbreader.network.HtmlUtil; -import org.geometerplus.fbreader.network.atom.ATOMConstants; public class FormattedBuffer { public static enum Type { diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java index 7af1f3208..319bd4ad2 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java @@ -161,7 +161,7 @@ class BySeriesCatalogItem extends SortedCatalogItem { public class LitResBookshelfItem extends NetworkURLCatalogItem { private boolean myForceReload; - public LitResBookshelfItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility) { + public LitResBookshelfItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility) { super(link, title, summary, urls, accessibility, FLAGS_DEFAULT); } diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java index 071845ef5..bd1ed305e 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.network.authentication.litres; -import java.util.*; - import java.io.InputStream; import java.io.IOException; diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java index 90d365d9e..aeb3a46a8 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java @@ -27,7 +27,7 @@ import org.geometerplus.fbreader.network.opds.OPDSNetworkLink; import org.geometerplus.fbreader.network.urlInfo.*; public class LitResRecommendationsItem extends OPDSCatalogItem { - public LitResRecommendationsItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility) { + public LitResRecommendationsItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility) { super(link, title, summary, urls, accessibility, FLAGS_DEFAULT & ~FLAGS_GROUP); } diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java index 8f9ccde34..066a470ef 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java @@ -21,7 +21,6 @@ package org.geometerplus.fbreader.network.authentication.litres; import java.util.*; -import org.geometerplus.zlibrary.core.util.MimeType; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.fbreader.network.*; @@ -43,7 +42,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { private CharSequence mySummary; - private final UrlInfoCollection myUrls = new UrlInfoCollection(); + private final UrlInfoCollection myUrls = new UrlInfoCollection(); private String myAuthorFirstName; private String myAuthorMiddleName; diff --git a/src/org/geometerplus/fbreader/network/opds/BasketItem.java b/src/org/geometerplus/fbreader/network/opds/BasketItem.java index a49de7c6a..16279d028 100644 --- a/src/org/geometerplus/fbreader/network/opds/BasketItem.java +++ b/src/org/geometerplus/fbreader/network/opds/BasketItem.java @@ -25,7 +25,7 @@ import org.geometerplus.fbreader.network.urlInfo.UrlInfo; import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection; public class BasketItem extends OPDSCatalogItem { - BasketItem(OPDSNetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) { + BasketItem(OPDSNetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) { super(link, title, summary, urls, accessibility, FLAGS_DEFAULT & ~FLAGS_GROUP); link.setSupportsBasket(); } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java b/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java index 07ba738f5..9a27f07de 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java @@ -88,8 +88,8 @@ public class OPDSBookItem extends NetworkBookItem implements OPDSConstants { return tags; } - private static UrlInfoCollection getUrls(OPDSNetworkLink networkLink, OPDSEntry entry, String baseUrl) { - final UrlInfoCollection urls = new UrlInfoCollection(); + private static UrlInfoCollection getUrls(OPDSNetworkLink networkLink, OPDSEntry entry, String baseUrl) { + final UrlInfoCollection urls = new UrlInfoCollection(); for (ATOMLink link: entry.Links) { final String href = ZLNetworkUtil.url(baseUrl, link.getHref()); final MimeType type = MimeType.get(link.getType()); @@ -166,7 +166,7 @@ public class OPDSBookItem extends NetworkBookItem implements OPDSConstants { } private static void collectReferences( - UrlInfoCollection urls, + UrlInfoCollection urls, OPDSLink opdsLink, String href, UrlInfo.Type type, diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java index ace6aeef4..64aa2c87a 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java @@ -39,18 +39,18 @@ public class OPDSCatalogItem extends NetworkURLCatalogItem { private State myLoadingState; private final Map myExtraData; - OPDSCatalogItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Map extraData) { + OPDSCatalogItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Map extraData) { super(link, title, summary, urls); myExtraData = extraData; } - protected OPDSCatalogItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { + protected OPDSCatalogItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { super(link, title, summary, urls, accessibility, flags); myExtraData = null; } - private static UrlInfoCollection createSimpleCollection(String url) { - final UrlInfoCollection collection = new UrlInfoCollection(); + private static UrlInfoCollection createSimpleCollection(String url) { + final UrlInfoCollection collection = new UrlInfoCollection(); collection.addInfo(new UrlInfo(UrlInfo.Type.Catalog, url)); return collection; } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java b/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java index 6e9b20d7e..98c46199c 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.network.opds; -import java.util.*; - import org.geometerplus.zlibrary.core.util.MimeType; import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; @@ -188,7 +186,7 @@ class OPDSFeedHandler implements ATOMFeedHandler, OP private NetworkItem readCatalogItem(OPDSEntry entry) { final OPDSNetworkLink opdsLink = (OPDSNetworkLink)myData.Link; - final UrlInfoCollection urlMap = new UrlInfoCollection(); + final UrlInfoCollection urlMap = new UrlInfoCollection(); boolean urlIsAlternate = false; String litresRel = null; diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java index 929c13bd3..4b201feb6 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java @@ -24,7 +24,6 @@ import java.util.*; import org.geometerplus.zlibrary.core.constants.XMLNamespaces; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; import org.geometerplus.zlibrary.core.util.MimeType; -import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.fbreader.network.*; diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java index 065bfd138..820a2fcd1 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java @@ -26,7 +26,6 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import org.geometerplus.zlibrary.core.util.MimeType; -import org.geometerplus.zlibrary.core.util.ZLMiscUtil; import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkRequest; @@ -134,7 +133,7 @@ public class OPDSNetworkLink extends AbstractNetworkLink { } public NetworkCatalogItem libraryItem() { - final UrlInfoCollection urlMap = new UrlInfoCollection(); + final UrlInfoCollection urlMap = new UrlInfoCollection(); urlMap.addInfo(getUrlInfo(UrlInfo.Type.Catalog)); urlMap.addInfo(getUrlInfo(UrlInfo.Type.Image)); urlMap.addInfo(getUrlInfo(UrlInfo.Type.Thumbnail)); diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java index bf9e74e11..0435796ce 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java @@ -19,14 +19,12 @@ package org.geometerplus.fbreader.network.opds; -import java.util.*; - import org.geometerplus.zlibrary.core.constants.XMLNamespaces; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.fbreader.network.atom.*; -public class OPDSXMLReader extends ATOMXMLReader { +public class OPDSXMLReader extends ATOMXMLReader { public static final String KEY_PRICE = "price"; private DCDate myDCIssued; @@ -37,11 +35,11 @@ public class OPDSXMLReader extends ATOMXMLReader { } protected final OPDSFeedMetadata getOPDSFeed() { - return (OPDSFeedMetadata)getATOMFeed(); + return getATOMFeed(); } protected final OPDSEntry getOPDSEntry() { - return (OPDSEntry)getATOMEntry(); + return getATOMEntry(); } protected final OPDSLink getOPDSLink() { diff --git a/src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java b/src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java index c3cbb3ffc..afd9a627b 100644 --- a/src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java +++ b/src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java @@ -20,6 +20,8 @@ package org.geometerplus.fbreader.network.urlInfo; public class BookBuyUrlInfo extends BookUrlInfo { + private static final long serialVersionUID = 7877935250896069650L; + public final String Price; public BookBuyUrlInfo(Type type, int format, String url, String price) { diff --git a/src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java b/src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java index 2e853d8d5..2e2017b79 100644 --- a/src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java +++ b/src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java @@ -20,6 +20,8 @@ package org.geometerplus.fbreader.network.urlInfo; public class DecoratedBookUrlInfo extends BookUrlInfo { + private static final long serialVersionUID = 8558634525845586904L; + private final String myCleanUrl; public DecoratedBookUrlInfo(BookUrlInfo base, String url) { diff --git a/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java index 3440b7fe4..6040c68cd 100644 --- a/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java +++ b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java @@ -30,11 +30,11 @@ public class UrlInfoCollection implements Serializable { public UrlInfoCollection() { } - public UrlInfoCollection(UrlInfoCollection other) { + public UrlInfoCollection(UrlInfoCollection other) { myInfos.addAll(other.myInfos); } - public void upgrade(UrlInfoCollection other) { + public void upgrade(UrlInfoCollection other) { myInfos.removeAll(other.myInfos); myInfos.addAll(other.myInfos); } diff --git a/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java index 1015a3013..a998e624e 100644 --- a/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java +++ b/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java @@ -20,7 +20,6 @@ package org.geometerplus.fbreader.network.urlInfo; import java.util.Date; -import java.io.Serializable; import org.geometerplus.zlibrary.core.util.ZLMiscUtil; diff --git a/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java index 04495bec5..059d51972 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java @@ -19,7 +19,6 @@ package org.geometerplus.zlibrary.core.application; -import org.geometerplus.zlibrary.core.view.ZLView; import org.geometerplus.zlibrary.core.view.ZLViewWidget; abstract public class ZLApplicationWindow { diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java b/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java index 0d975a240..52c7b4f43 100644 --- a/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java +++ b/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java @@ -23,13 +23,11 @@ import java.util.*; import java.util.zip.GZIPInputStream; import java.io.*; import java.net.*; -import javax.net.ssl.*; import org.apache.http.*; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; import org.apache.http.client.CookieStore; -import org.apache.http.client.CredentialsProvider; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.*; import org.apache.http.client.protocol.ClientContext; @@ -42,7 +40,6 @@ import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.BasicHttpContext; import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; -import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; public class ZLNetworkManager { private static ZLNetworkManager ourManager; @@ -124,10 +121,10 @@ public class ZLNetworkManager { myHttpContext.setAttribute(ClientContext.COOKIE_STORE, myCookieStore); } - private void setCommonHTTPOptions(HttpMessage request) throws ZLNetworkException { - //httpConnection.setInstanceFollowRedirects(true); - //httpConnection.setAllowUserInteraction(true); - } + /*private void setCommonHTTPOptions(HttpMessage request) throws ZLNetworkException { + httpConnection.setInstanceFollowRedirects(true); + httpConnection.setAllowUserInteraction(true); + }*/ public void setCredentialsCreator(CredentialsCreator creator) { myCredentialsCreator = creator; diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java b/src/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java index 5db48fb66..af8347b8d 100644 --- a/src/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java +++ b/src/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.HashMap; import java.io.InputStream; import java.io.IOException; -import java.net.URLConnection; public abstract class ZLNetworkRequest { String URL; diff --git a/src/org/geometerplus/zlibrary/core/options/ZLEnumOption.java b/src/org/geometerplus/zlibrary/core/options/ZLEnumOption.java index b3181e5a5..38605caca 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLEnumOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLEnumOption.java @@ -34,7 +34,7 @@ public final class ZLEnumOption> extends ZLOption { final String value = getConfigValue(null); if (value != null) { try { - myValue = (T)T.valueOf(myDefaultValue.getClass(), value); + myValue = T.valueOf(myDefaultValue.getDeclaringClass(), value); } catch (Throwable t) { } } diff --git a/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java b/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java index afab231b8..f6ffddf31 100644 --- a/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java +++ b/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java @@ -27,10 +27,8 @@ import android.view.MenuItem; import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplicationWindow; import org.geometerplus.zlibrary.core.resources.ZLResource; -import org.geometerplus.zlibrary.core.view.ZLView; import org.geometerplus.zlibrary.core.view.ZLViewWidget; -import org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication; diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java index 1e878b5c8..23336826e 100644 --- a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java +++ b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java @@ -80,8 +80,8 @@ public class ZLAndroidWidget extends View implements ZLViewWidget, View.OnLongCl } super.onDraw(canvas); - final int w = getWidth(); - final int h = getMainAreaHeight(); +// final int w = getWidth(); +// final int h = getMainAreaHeight(); if (getAnimationProvider().inProgress()) { onDrawInScrolling(canvas); @@ -118,8 +118,8 @@ public class ZLAndroidWidget extends View implements ZLViewWidget, View.OnLongCl private void onDrawInScrolling(Canvas canvas) { final ZLView view = ZLApplication.Instance().getCurrentView(); - final int w = getWidth(); - final int h = getMainAreaHeight(); +// final int w = getWidth(); +// final int h = getMainAreaHeight(); final AnimationProvider animator = getAnimationProvider(); final AnimationProvider.Mode oldMode = animator.getMode();