From 40b8c2db3fb5ec32a9d828b409bd9c5e28ffe08f Mon Sep 17 00:00:00 2001 From: Vasiliy Bout Date: Tue, 19 Oct 2010 12:21:41 +0400 Subject: [PATCH] Code cleanup --- TODO.network | 2 +- src/org/geometerplus/fbreader/fbreader/RunActivityAction.java | 2 -- src/org/geometerplus/fbreader/fbreader/ShowLibraryAction.java | 1 - src/org/geometerplus/fbreader/network/NetworkException.java | 2 ++ src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java | 2 -- src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java | 1 - .../geometerplus/zlibrary/core/network/ZLNetworkException.java | 2 ++ .../zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java | 2 -- .../zlibrary/ui/android/library/ZLAndroidLibrary.java | 2 -- 9 files changed, 5 insertions(+), 11 deletions(-) diff --git a/TODO.network b/TODO.network index 0633b4802..e22aa2ec4 100644 --- a/TODO.network +++ b/TODO.network @@ -1,4 +1,4 @@ -** убрать Warning-и +DONE убрать Warning-и ** убрать класс AuthenticationStatus --> вместо этого: возвращаемое значение int (ZLBoolean3) + throws ZLNetworkException ** сделать общий блок catch (ZLNetworkException e) вместо раздельных там, где возможно ** сделать константы для строк при вызове new ZLNetworkException diff --git a/src/org/geometerplus/fbreader/fbreader/RunActivityAction.java b/src/org/geometerplus/fbreader/fbreader/RunActivityAction.java index b43aee2fb..81e6d82d5 100644 --- a/src/org/geometerplus/fbreader/fbreader/RunActivityAction.java +++ b/src/org/geometerplus/fbreader/fbreader/RunActivityAction.java @@ -19,8 +19,6 @@ package org.geometerplus.fbreader.fbreader; -import org.geometerplus.android.fbreader.preferences.BookInfoActivity; - import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; abstract class RunActivityAction extends FBAction { diff --git a/src/org/geometerplus/fbreader/fbreader/ShowLibraryAction.java b/src/org/geometerplus/fbreader/fbreader/ShowLibraryAction.java index 40b1e0c3a..da113a4ef 100644 --- a/src/org/geometerplus/fbreader/fbreader/ShowLibraryAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowLibraryAction.java @@ -21,7 +21,6 @@ package org.geometerplus.fbreader.fbreader; import java.util.HashMap; -import org.geometerplus.fbreader.library.Library; import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.android.fbreader.LibraryTabActivity; diff --git a/src/org/geometerplus/fbreader/network/NetworkException.java b/src/org/geometerplus/fbreader/network/NetworkException.java index 016ce0146..cd01d9701 100644 --- a/src/org/geometerplus/fbreader/network/NetworkException.java +++ b/src/org/geometerplus/fbreader/network/NetworkException.java @@ -22,6 +22,8 @@ package org.geometerplus.fbreader.network; import org.geometerplus.zlibrary.core.network.ZLNetworkException; public abstract class NetworkException extends ZLNetworkException { + private static final long serialVersionUID = 8931535868304063605L; + public static final String ERROR_INTERNAL = "internalError"; public static final String ERROR_PURCHASE_NOT_ENOUGH_MONEY = "purchaseNotEnoughMoney"; public static final String ERROR_PURCHASE_MISSING_BOOK = "purchaseMissingBook"; diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java index 99a88a527..f4407c213 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java @@ -19,8 +19,6 @@ package org.geometerplus.zlibrary.core.dialogs; -import org.geometerplus.zlibrary.core.application.ZLApplication; -import org.geometerplus.zlibrary.core.application.ZLApplicationWindow; import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class ZLDialogManager { diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java index f0cf279da..e66b515dc 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java @@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class ZLOptionsDialog { diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkException.java b/src/org/geometerplus/zlibrary/core/network/ZLNetworkException.java index ccabb53fa..a617c9613 100644 --- a/src/org/geometerplus/zlibrary/core/network/ZLNetworkException.java +++ b/src/org/geometerplus/zlibrary/core/network/ZLNetworkException.java @@ -22,6 +22,8 @@ package org.geometerplus.zlibrary.core.network; import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLNetworkException extends Exception { + private static final long serialVersionUID = 4272384299121648643L; + // Messages with no parameters: public static final String ERROR_UNKNOWN_ERROR = "unknownErrorMessage"; public static final String ERROR_TIMEOUT = "operationTimedOutMessage"; diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java index 0db38f177..3d104ce18 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java @@ -23,10 +23,8 @@ import java.util.*; import android.app.*; import android.content.*; -import android.os.*; import org.geometerplus.zlibrary.core.dialogs.*; -import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.android.util.AndroidUtil; diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index e46a06c05..9b29bf29d 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -35,8 +35,6 @@ import org.geometerplus.zlibrary.ui.android.view.ZLAndroidPaintContext; import org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget; import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; -import org.geometerplus.fbreader.network.NetworkLibrary; - import org.geometerplus.android.fbreader.network.BookDownloader; import org.geometerplus.android.fbreader.network.BookDownloaderService;