From ee7fcb641346692116af4c557b7ec41b997981d7 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 6 Nov 2010 04:36:04 +0000
Subject: [PATCH] cleanup: unused code has been removed

---
 .../fbreader/optionsDialog/OptionsDialog.java     | 15 +--------------
 .../zlibrary/core/dialogs/ZLDialogManager.java    |  2 +-
 .../zlibrary/core/dialogs/ZLOptionsDialog.java    | 12 +-----------
 .../android/dialogs/ZLAndroidDialogManager.java   |  4 ++--
 .../android/dialogs/ZLAndroidOptionsDialog.java   |  4 ++--
 5 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java
index 89ac7173c..01afc89e8 100644
--- a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java
+++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java
@@ -30,7 +30,7 @@ public class OptionsDialog {
 	private ZLOptionsDialog myDialog;
 	
 	public OptionsDialog(FBReaderApp fbreader) {
-		myDialog = ZLDialogManager.Instance().createOptionsDialog("OptionsDialog", null, new OptionsApplyRunnable(fbreader), true);
+		myDialog = ZLDialogManager.Instance().createOptionsDialog("OptionsDialog");
 
 		new FormatOptionsPage(myDialog.createTab("Format"));
 			
@@ -55,19 +55,6 @@ public class OptionsDialog {
 		return myDialog;
 	}
 	
-	private static class OptionsApplyRunnable implements Runnable {
-		private final FBReaderApp myFBReader;
-		
-		public OptionsApplyRunnable(FBReaderApp fbreader) {
-			myFBReader = fbreader;
-		}
-		
-		public void run() {
-			myFBReader.clearTextCaches();
-			myFBReader.repaintView();
-		}
-	}
-	
 	/*private static class StateOptionEntry extends ZLToggleBooleanOptionEntry {
 		private boolean myState;
 		
diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java
index 277d8f3de..d61229652 100644
--- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java
+++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java
@@ -41,7 +41,7 @@ public abstract class ZLDialogManager {
 		return ourInstance;
 	} 
 	
-	public abstract ZLOptionsDialog createOptionsDialog(String key, Runnable exitAction, Runnable applyAction, boolean showApplyButton);
+	public abstract ZLOptionsDialog createOptionsDialog(String key);
 	
 	public abstract void wait(String key, Runnable runnable);
 
diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java
index d453f89f5..7112c5487 100644
--- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java
+++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java
@@ -26,20 +26,13 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 public abstract class ZLOptionsDialog {
 	private final ZLResource myResource;
 	protected final ArrayList<ZLDialogContent> myTabs = new ArrayList<ZLDialogContent>();
-	protected Runnable myExitAction;
-	protected Runnable myApplyAction;
 	
-	protected ZLOptionsDialog(ZLResource resource, Runnable exitAction, Runnable applyAction) {
+	protected ZLOptionsDialog(ZLResource resource) {
 		myResource = resource;
-		myExitAction = exitAction;
-		myApplyAction = applyAction;
 	}
 	
 	protected void acceptTab(ZLDialogContent tab) {
 		tab.accept();
-		if (myApplyAction != null) {
-			myApplyAction.run();
-		}
 	}
 
 	protected void resetTab(ZLDialogContent tab) {
@@ -51,9 +44,6 @@ public abstract class ZLOptionsDialog {
 		for (int i = 0; i < size; i++) {
 			myTabs.get(i).accept();
 		}
-		if (myApplyAction != null) {
-			myApplyAction.run();
-		}
 	}
 	
 	protected final String getCaption() {
diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
index 846d3c707..4eabe1fc2 100644
--- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
+++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
@@ -38,8 +38,8 @@ public class ZLAndroidDialogManager extends ZLDialogManager {
 		myActivity = activity;
 	}
 	
-	public ZLOptionsDialog createOptionsDialog(String key, Runnable exitAction, Runnable applyAction, boolean showApplyButton) {
-		return new ZLAndroidOptionsDialog(myActivity, getResource().getResource(key), exitAction, applyAction);
+	public ZLOptionsDialog createOptionsDialog(String key) {
+		return new ZLAndroidOptionsDialog(myActivity, getResource().getResource(key));
 	}
 
 	public void wait(String key, Runnable action) {
diff --git a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
index 728c2cd9e..7d270167f 100644
--- a/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
+++ b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
@@ -34,8 +34,8 @@ class ZLAndroidOptionsDialog extends ZLOptionsDialog {
 	private final String myCaption;
 	private final Activity myMainActivity;
 
-	ZLAndroidOptionsDialog(Activity activity, ZLResource resource, Runnable exitAction, Runnable applyAction) {
-		super(resource, exitAction, applyAction);
+	ZLAndroidOptionsDialog(Activity activity, ZLResource resource) {
+		super(resource);
 		myCaption = resource.getResource("title").getValue();
 		myMainActivity = activity;
 	}