1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00

Code cleanup

This commit is contained in:
Vasiliy Bout 2010-10-19 12:21:41 +04:00
parent c365690633
commit 40b8c2db3f
9 changed files with 5 additions and 11 deletions

View file

@ -1,4 +1,4 @@
** убрать Warning-и DONE убрать Warning-и
** убрать класс AuthenticationStatus --> вместо этого: возвращаемое значение int (ZLBoolean3) + throws ZLNetworkException ** убрать класс AuthenticationStatus --> вместо этого: возвращаемое значение int (ZLBoolean3) + throws ZLNetworkException
** сделать общий блок catch (ZLNetworkException e) вместо раздельных там, где возможно ** сделать общий блок catch (ZLNetworkException e) вместо раздельных там, где возможно
** сделать константы для строк при вызове new ZLNetworkException ** сделать константы для строк при вызове new ZLNetworkException

View file

@ -19,8 +19,6 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
import org.geometerplus.android.fbreader.preferences.BookInfoActivity;
import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager;
abstract class RunActivityAction extends FBAction { abstract class RunActivityAction extends FBAction {

View file

@ -21,7 +21,6 @@ package org.geometerplus.fbreader.fbreader;
import java.util.HashMap; import java.util.HashMap;
import org.geometerplus.fbreader.library.Library;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.android.fbreader.LibraryTabActivity; import org.geometerplus.android.fbreader.LibraryTabActivity;

View file

@ -22,6 +22,8 @@ package org.geometerplus.fbreader.network;
import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkException;
public abstract class NetworkException extends 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_INTERNAL = "internalError";
public static final String ERROR_PURCHASE_NOT_ENOUGH_MONEY = "purchaseNotEnoughMoney"; public static final String ERROR_PURCHASE_NOT_ENOUGH_MONEY = "purchaseNotEnoughMoney";
public static final String ERROR_PURCHASE_MISSING_BOOK = "purchaseMissingBook"; public static final String ERROR_PURCHASE_MISSING_BOOK = "purchaseMissingBook";

View file

@ -19,8 +19,6 @@
package org.geometerplus.zlibrary.core.dialogs; 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; import org.geometerplus.zlibrary.core.resources.ZLResource;
public abstract class ZLDialogManager { public abstract class ZLDialogManager {

View file

@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.core.dialogs;
import java.util.*; import java.util.*;
import org.geometerplus.zlibrary.core.options.*;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
public abstract class ZLOptionsDialog { public abstract class ZLOptionsDialog {

View file

@ -22,6 +22,8 @@ package org.geometerplus.zlibrary.core.network;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
public class ZLNetworkException extends Exception { public class ZLNetworkException extends Exception {
private static final long serialVersionUID = 4272384299121648643L;
// Messages with no parameters: // Messages with no parameters:
public static final String ERROR_UNKNOWN_ERROR = "unknownErrorMessage"; public static final String ERROR_UNKNOWN_ERROR = "unknownErrorMessage";
public static final String ERROR_TIMEOUT = "operationTimedOutMessage"; public static final String ERROR_TIMEOUT = "operationTimedOutMessage";

View file

@ -23,10 +23,8 @@ import java.util.*;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.os.*;
import org.geometerplus.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.AndroidUtil;

View file

@ -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.view.ZLAndroidWidget;
import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; 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.BookDownloader;
import org.geometerplus.android.fbreader.network.BookDownloaderService; import org.geometerplus.android.fbreader.network.BookDownloaderService;