From 9d919fb7a9621a25e9707ec74bede3de346b92f8 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 15 Oct 2010 22:53:14 +0100 Subject: [PATCH] code cleanup: unused methods have been removed --- .../core/dialogs/ZLDialogManager.java | 18 ------- .../dialogs/ZLAndroidDialogManager.java | 48 ------------------- 2 files changed, 66 deletions(-) diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java index 14cf8593b..b8f722796 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java @@ -43,24 +43,6 @@ public abstract class ZLDialogManager { return ourInstance; } - public abstract void showInformationBox(String key, String message); - - public final void showInformationBox(String key) { - showInformationBox(key, getDialogMessage(key)); - } - - public abstract void showErrorBox(String key, String message, Runnable action); - - public final void showErrorBox(String key, Runnable action) { - showErrorBox(key, getDialogMessage(key), action); - } - - public abstract void showQuestionBox(String key, String message, String button0, Runnable action0, String button1, Runnable action1, String button2, Runnable action2); - - public final void showQuestionBox(String key, String button0, Runnable action0, String button1, Runnable action1, String button2, Runnable action2) { - showQuestionBox(key, getDialogMessage(key), button0, action0, button1, action1, button2, action2); - } - public abstract ZLApplicationWindow createApplicationWindow(ZLApplication application); public abstract ZLOptionsDialog createOptionsDialog(String key, Runnable exitAction, Runnable applyAction, boolean showApplyButton); diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java index 3e8a5bbc0..91780b3dc 100644 --- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java +++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java @@ -62,10 +62,6 @@ public class ZLAndroidDialogManager extends ZLDialogManager { runActivity(activityClass, Collections.emptyMap()); } - public void showInformationBox(String key, String message) { - showAlert(0, key, message); - } - private class MyAlertDialog extends AlertDialog { MyAlertDialog(Context context, boolean cancelable, OnCancelListener listener) { super(context, cancelable, listener); @@ -82,30 +78,6 @@ public class ZLAndroidDialogManager extends ZLDialogManager { //AlertDialog.show(myActivity, null, iconId, message, getButtonText(OK_BUTTON).replaceAll("&", ""), null, true, null); } - public void showErrorBox(String key, String message, final Runnable action) { - final AlertDialog dialog = new MyAlertDialog(myActivity, true, null); - dialog.setTitle(getDialogTitle(key)); - dialog.setMessage(message); - dialog.setIcon(0); - dialog.setButton(getButtonText(OK_BUTTON).replaceAll("&", ""), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - action.run(); - } - } - ); - dialog.show(); - /* - AlertDialog.show(myActivity, null, 0, message, getButtonText(OK_BUTTON).replaceAll("&", ""), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - action.run(); - } - }, - true, null); - */ - } - private static class AlertListener implements DialogInterface.OnClickListener { private final Runnable myAction0, myAction1, myAction2; @@ -135,26 +107,6 @@ public class ZLAndroidDialogManager extends ZLDialogManager { } } - public void showQuestionBox(String key, String message, String button0, Runnable action0, String button1, Runnable action1, String button2, Runnable action2) { - final AlertListener al = new AlertListener(action0, action1, action2); - - final AlertDialog dialog = new MyAlertDialog(myActivity, true, null); - dialog.setTitle(getDialogTitle(key)); - dialog.setMessage(message); - dialog.setIcon(0); - if (button0 != null) { - dialog.setButton(button0.replaceAll("&", ""), al); - } - if (button1 != null) { - dialog.setButton2(button1.replaceAll("&", ""), al); - } - if (button2 != null) { - dialog.setButton3(button2.replaceAll("&", ""), al); - } - dialog.show(); - //AlertDialog.show(myActivity, null, 0, message, button0, al, button1, al, button2, al, true, null); - } - public ZLAndroidApplicationWindow createApplicationWindow(ZLApplication application) { // TODO: implement //myApplicationWindow = new ZLAndroidApplicationWindow(activity);