diff --git a/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java b/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java index 9fcb62223..58c08a7a0 100644 --- a/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java +++ b/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java @@ -23,7 +23,6 @@ import java.util.*; import android.app.Activity; import android.content.Intent; -import android.net.Uri; import android.os.Bundle; import android.view.View; import android.widget.TextView; diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java index 9e7cbe2c3..74090a18d 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java @@ -49,7 +49,6 @@ import org.geometerplus.fbreader.network.tree.NetworkBookTree; import org.geometerplus.fbreader.network.urlInfo.*; import org.geometerplus.fbreader.network.opds.OPDSBookItem; -import org.geometerplus.android.fbreader.network.action.ActionCode; import org.geometerplus.android.fbreader.network.action.OpenCatalogAction; import org.geometerplus.android.fbreader.network.action.NetworkBookActions; @@ -319,7 +318,6 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary. } private final void setupButtons() { - final ZLResource resource = NetworkLibrary.resource(); final int buttons[] = new int[] { R.id.network_book_button0, R.id.network_book_button1, diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java index d91220385..2003533b9 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java @@ -34,12 +34,8 @@ import org.geometerplus.zlibrary.ui.android.network.SQLiteCookieDatabase; import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.tree.*; -import org.geometerplus.fbreader.network.urlInfo.UrlInfo; -import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; import org.geometerplus.android.fbreader.tree.BaseActivity; -import org.geometerplus.android.fbreader.api.PluginApi; - import org.geometerplus.android.fbreader.network.action.*; public class NetworkLibraryActivity extends BaseActivity implements NetworkLibrary.ChangeListener { @@ -250,7 +246,6 @@ public class NetworkLibraryActivity extends BaseActivity implements NetworkLibra } final NetworkTree tree = (NetworkTree)getListAdapter().getItem(position); - Action defaultAction = null; for (Action a : myListClickActions) { if (a.isVisible(tree) && a.isEnabled(tree)) { a.checkAndRun(tree); @@ -284,7 +279,7 @@ public class NetworkLibraryActivity extends BaseActivity implements NetworkLibra fillOptionsMenuList(); } - final NetworkTree tree = (NetworkTree)getCurrentTree(); +// final NetworkTree tree = (NetworkTree)getCurrentTree(); for (Action a : myOptionsMenuActions) { final MenuItem item = menu.add(0, a.Code, Menu.NONE, ""); if (a.IconId != -1) { diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/src/org/geometerplus/android/fbreader/network/Util.java index 48fddc59a..7040fe383 100644 --- a/src/org/geometerplus/android/fbreader/network/Util.java +++ b/src/org/geometerplus/android/fbreader/network/Util.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader.network; -import java.util.*; - import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -28,16 +26,13 @@ import android.content.Context; import android.net.Uri; import org.geometerplus.zlibrary.core.network.ZLNetworkException; -import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticationManager; import org.geometerplus.fbreader.network.tree.NetworkBookTree; -import org.geometerplus.fbreader.network.tree.NetworkCatalogTree; import org.geometerplus.fbreader.network.urlInfo.UrlInfo; -import org.geometerplus.android.util.UIUtil; import org.geometerplus.android.util.PackageUtil; public abstract class Util implements UserRegistrationConstants { diff --git a/src/org/geometerplus/android/fbreader/network/action/Action.java b/src/org/geometerplus/android/fbreader/network/action/Action.java index fb06dda15..7fd143aec 100644 --- a/src/org/geometerplus/android/fbreader/network/action/Action.java +++ b/src/org/geometerplus/android/fbreader/network/action/Action.java @@ -19,8 +19,6 @@ package org.geometerplus.android.fbreader.network.action; -import java.util.*; - import android.app.Activity; import org.geometerplus.zlibrary.core.util.ZLBoolean3; diff --git a/src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java b/src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java index 04a182317..0f1952220 100644 --- a/src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java +++ b/src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java @@ -27,7 +27,6 @@ import android.app.Activity; import android.net.Uri; import android.content.Intent; import android.content.DialogInterface; -import android.view.ContextMenu; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.network.ZLNetworkException; @@ -40,7 +39,6 @@ import org.geometerplus.android.fbreader.FBReader; import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.urlInfo.*; -import org.geometerplus.fbreader.network.tree.NetworkBookTree; import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; import org.geometerplus.android.fbreader.network.*; diff --git a/src/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java b/src/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java index d0fbdaebb..d79bdf464 100644 --- a/src/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java +++ b/src/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java @@ -27,7 +27,6 @@ import org.geometerplus.fbreader.network.NetworkURLCatalogItem; import org.geometerplus.fbreader.network.tree.NetworkCatalogTree; import org.geometerplus.fbreader.network.urlInfo.UrlInfo; -import org.geometerplus.android.fbreader.network.Util; import org.geometerplus.android.fbreader.network.ItemsLoadingService; public class ReloadCatalogAction extends CatalogAction { diff --git a/src/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java b/src/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java index f81bdfdd1..497102477 100644 --- a/src/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java +++ b/src/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java @@ -20,7 +20,6 @@ package org.geometerplus.android.fbreader.network.action; import android.app.Activity; -import android.content.Intent; import org.geometerplus.fbreader.network.NetworkLibrary; import org.geometerplus.fbreader.network.NetworkTree; diff --git a/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java b/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java index 2c31653d6..67757c352 100644 --- a/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java +++ b/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java @@ -19,14 +19,9 @@ package org.geometerplus.android.fbreader.network.action; -import java.util.*; - import android.app.Activity; import org.geometerplus.fbreader.network.NetworkTree; -import org.geometerplus.fbreader.network.NetworkLibrary; - -import org.geometerplus.android.fbreader.network.ItemsLoadingService; import org.geometerplus.zlibrary.ui.android.R; diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java index f5bcb6334..24e5c12c2 100644 --- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java +++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java @@ -278,17 +278,17 @@ public class NetworkLibrary { myUpdateVisibility = true; } - private static boolean linkIsChanged(INetworkLink link) { - return - link instanceof ICustomNetworkLink && - ((ICustomNetworkLink)link).hasChanges(); - } +// private static boolean linkIsChanged(INetworkLink link) { +// return +// link instanceof ICustomNetworkLink && +// ((ICustomNetworkLink)link).hasChanges(); +// } - private static void makeValid(INetworkLink link) { - if (link instanceof ICustomNetworkLink) { - ((ICustomNetworkLink)link).resetChanges(); - } - } +// private static void makeValid(INetworkLink link) { +// if (link instanceof ICustomNetworkLink) { +// ((ICustomNetworkLink)link).resetChanges(); +// } +// } private void makeUpToDate() { final SortedSet linkSet = new TreeSet(activeLinks()); diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java index a2be3fe06..973312b01 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java @@ -28,7 +28,6 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkRequest; import org.geometerplus.fbreader.Paths; import org.geometerplus.fbreader.network.*; -import org.geometerplus.fbreader.network.atom.ATOMUpdated; public class OPDSLinkReader { static final String CATALOGS_URL = "http://data.fbreader.org/catalogs/generic-1.7.xml"; diff --git a/src/org/geometerplus/zlibrary/core/money/MoneyException.java b/src/org/geometerplus/zlibrary/core/money/MoneyException.java index 234544dfc..c411be222 100644 --- a/src/org/geometerplus/zlibrary/core/money/MoneyException.java +++ b/src/org/geometerplus/zlibrary/core/money/MoneyException.java @@ -20,6 +20,8 @@ package org.geometerplus.zlibrary.core.money; public class MoneyException extends RuntimeException { + private static final long serialVersionUID = 3936494538949724968L; + public MoneyException(String message) { super(message); }