diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java index 6ada8eb98..80da59c2c 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java @@ -24,7 +24,7 @@ import java.util.*; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.filesystem.*; import org.geometerplus.zlibrary.core.application.*; -import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; +import org.geometerplus.zlibrary.core.util.ZLMainWindowUtil; import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.util.ZLColor; @@ -137,7 +137,7 @@ public final class FBReaderApp extends ZLApplication { public void initWindow() { super.initWindow(); - ZLDialogManager.Instance().wait("loadingBook", new Runnable() { + ZLMainWindowUtil.Instance().wait("loadingBook", new Runnable() { public void run() { Book book = createBookForFile(ZLFile.createFileByPath(myArg0)); if (book == null) { @@ -160,7 +160,7 @@ public final class FBReaderApp extends ZLApplication { return; } } - ZLDialogManager.Instance().wait("loadingBook", new Runnable() { + ZLMainWindowUtil.Instance().wait("loadingBook", new Runnable() { public void run() { openBookInternal(book, bookmark); } diff --git a/src/org/geometerplus/zlibrary/core/util/ZLMainWindowUtil.java b/src/org/geometerplus/zlibrary/core/util/ZLMainWindowUtil.java index b6947ab1c..590a17fb0 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLMainWindowUtil.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLMainWindowUtil.java @@ -17,18 +17,19 @@ * 02110-1301, USA. */ -package org.geometerplus.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.util; -public abstract class ZLDialogManager { - protected static ZLDialogManager ourInstance; +public abstract class ZLMainWindowUtil { + protected static ZLMainWindowUtil ourInstance; - protected ZLDialogManager() { + protected ZLMainWindowUtil() { ourInstance = this; } - public static ZLDialogManager Instance() { + public static ZLMainWindowUtil Instance() { return ourInstance; } + public abstract void setTitle(String key); public abstract void wait(String key, Runnable runnable); } diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java index 8f883f39b..f4884884c 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java @@ -27,7 +27,7 @@ import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.sqliteconfig.ZLSQLiteConfig; import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow; -import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; +import org.geometerplus.zlibrary.ui.android.util.ZLAndroidMainWindowUtil; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; public class ZLAndroidApplication extends Application { @@ -64,7 +64,7 @@ public class ZLAndroidApplication extends Application { super.onCreate(); new ZLSQLiteConfig(this); new ZLAndroidImageManager(); - new ZLAndroidDialogManager(); + new ZLAndroidMainWindowUtil(); new ZLAndroidLibrary(this); } } diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index 74e4ea198..94a15592a 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -35,7 +35,7 @@ import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget; -import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; +import org.geometerplus.zlibrary.ui.android.util.ZLAndroidMainWindowUtil; public final class ZLAndroidLibrary extends ZLibrary { private ZLAndroidActivity myActivity; @@ -48,7 +48,7 @@ public final class ZLAndroidLibrary extends ZLibrary { void setActivity(ZLAndroidActivity activity) { myActivity = activity; - ((ZLAndroidDialogManager)ZLAndroidDialogManager.Instance()).setActivity(activity); + ((ZLAndroidMainWindowUtil)ZLAndroidMainWindowUtil.Instance()).setActivity(activity); myWidget = null; } diff --git a/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidMainWindowUtil.java b/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidMainWindowUtil.java index 6c46d1b50..3565e8824 100644 --- a/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidMainWindowUtil.java +++ b/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidMainWindowUtil.java @@ -17,25 +17,37 @@ * 02110-1301, USA. */ -package org.geometerplus.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.util; import android.app.*; -import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.android.util.UIUtil; -public class ZLAndroidDialogManager extends ZLDialogManager { +public class ZLAndroidMainWindowUtil extends ZLMainWindowUtil { private Activity myActivity; - public ZLAndroidDialogManager() { + public ZLAndroidMainWindowUtil() { } public void setActivity(Activity activity) { myActivity = activity; } + @Override public void wait(String key, Runnable action) { - UIUtil.wait(key, action, myActivity); + if (myActivity != null) { + UIUtil.wait(key, action, myActivity); + } else { + action.run(); + } + } + + @Override + public void setTitle(String title) { + if (myActivity != null) { + myActivity.setTitle(title); + } } }