yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

cleanup: unused code has been removed

Browse source
This commit is contained in:
Nikolay Pultsin 2010-11-06 04:36:04 +00:00
parent 7defe26255
commit ee7fcb6413
5 changed files with 7 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java
View file

@ -30,7 +30,7 @@ public class OptionsDialog {
private ZLOptionsDialog myDialog; private ZLOptionsDialog myDialog;
public OptionsDialog(FBReaderApp fbreader) { public OptionsDialog(FBReaderApp fbreader) {
myDialog = ZLDialogManager.Instance().createOptionsDialog("OptionsDialog", null, new OptionsApplyRunnable(fbreader), true); myDialog = ZLDialogManager.Instance().createOptionsDialog("OptionsDialog");
new FormatOptionsPage(myDialog.createTab("Format")); new FormatOptionsPage(myDialog.createTab("Format"));
@ -55,19 +55,6 @@ public class OptionsDialog {
return myDialog; 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 static class StateOptionEntry extends ZLToggleBooleanOptionEntry {
private boolean myState; private boolean myState;

2
src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java
View file

@ -41,7 +41,7 @@ public abstract class ZLDialogManager {
return ourInstance; 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); public abstract void wait(String key, Runnable runnable);

12
src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java
View file

@ -26,20 +26,13 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
public abstract class ZLOptionsDialog { public abstract class ZLOptionsDialog {
private final ZLResource myResource; private final ZLResource myResource;
protected final ArrayList<ZLDialogContent> myTabs = new ArrayList<ZLDialogContent>(); 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; myResource = resource;
myExitAction = exitAction;
myApplyAction = applyAction;
} }
protected void acceptTab(ZLDialogContent tab) { protected void acceptTab(ZLDialogContent tab) {
tab.accept(); tab.accept();
if (myApplyAction != null) {
myApplyAction.run();
}
} }
protected void resetTab(ZLDialogContent tab) { protected void resetTab(ZLDialogContent tab) {
@ -51,9 +44,6 @@ public abstract class ZLOptionsDialog {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
myTabs.get(i).accept(); myTabs.get(i).accept();
} }
if (myApplyAction != null) {
myApplyAction.run();
}
} }
protected final String getCaption() { protected final String getCaption() {

4
src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
View file

@ -38,8 +38,8 @@ public class ZLAndroidDialogManager extends ZLDialogManager {
myActivity = activity; myActivity = activity;
} }
public ZLOptionsDialog createOptionsDialog(String key, Runnable exitAction, Runnable applyAction, boolean showApplyButton) { public ZLOptionsDialog createOptionsDialog(String key) {
return new ZLAndroidOptionsDialog(myActivity, getResource().getResource(key), exitAction, applyAction); return new ZLAndroidOptionsDialog(myActivity, getResource().getResource(key));
} }
public void wait(String key, Runnable action) { public void wait(String key, Runnable action) {

4
src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
View file

@ -34,8 +34,8 @@ class ZLAndroidOptionsDialog extends ZLOptionsDialog {
private final String myCaption; private final String myCaption;
private final Activity myMainActivity; private final Activity myMainActivity;
ZLAndroidOptionsDialog(Activity activity, ZLResource resource, Runnable exitAction, Runnable applyAction) { ZLAndroidOptionsDialog(Activity activity, ZLResource resource) {
super(resource, exitAction, applyAction); super(resource);
myCaption = resource.getResource("title").getValue(); myCaption = resource.getResource("title").getValue();
myMainActivity = activity; myMainActivity = activity;
} }