navigaion code has been simplified

src/org/geometerplus/android/fbreader/FBReader.java

@@ -47,7 +47,7 @@ import org.geometerplus.fbreader.fbreader.ActionCode;
 import org.geometerplus.fbreader.library.Library;
 
 public final class FBReader extends ZLAndroidActivity {
-	static FBReader Instance;
+	public static FBReader Instance;
 
 	private int myFullScreenFlag;
 
@@ -203,31 +203,13 @@ public final class FBReader extends ZLAndroidActivity {
 		return true;
 	}
 
-
 	public void navigate() {
-		final ZLTextView textView = (ZLTextView) ZLApplication.Instance().getCurrentView();
+		final ZLTextView textView = (ZLTextView)ZLApplication.Instance().getCurrentView();
 		myNavigatePanel.NavigateDragging = false;
 		myNavigatePanel.StartPosition = new ZLTextFixedPosition(textView.getStartCursor());
 		myNavigatePanel.show(true);
 	}
 
-
-
-	public final boolean canNavigate() {
-		final org.geometerplus.fbreader.fbreader.FBReader fbreader =
-			(org.geometerplus.fbreader.fbreader.FBReader)ZLApplication.Instance();
-		final ZLView view = fbreader.getCurrentView();
-		if (!(view instanceof ZLTextView)) {
-			return false;
-		}
-		final ZLTextModel textModel = ((ZLTextView) view).getModel();
-		if (textModel == null || textModel.getParagraphsNumber() == 0) {
-			return false;
-		}
-		final BookModel bookModel = fbreader.Model;
-		return bookModel != null && bookModel.Book != null;
-	}
-
 	private final void createNavigation(View layout) {
 		final SeekBar slider = (SeekBar) layout.findViewById(R.id.book_position_slider);
 		final TextView text = (TextView) layout.findViewById(R.id.book_position_text);

src/org/geometerplus/fbreader/fbreader/ShowNavigationAction.java

@@ -19,6 +19,9 @@
 
 package org.geometerplus.fbreader.fbreader;
 
+import org.geometerplus.zlibrary.text.model.ZLTextModel;
+import org.geometerplus.zlibrary.text.view.ZLTextView;
+
 class ShowNavigationAction extends FBAction {
 	ShowNavigationAction(FBReader fbreader) {
 		super(fbreader);
@@ -26,10 +29,12 @@ class ShowNavigationAction extends FBAction {
 
 	@Override
 	public boolean isVisible() {
-		return Reader.canNavigate();
+		final ZLTextView view = (ZLTextView)Reader.getCurrentView();
+		final ZLTextModel textModel = view.getModel();
+		return textModel != null && textModel.getParagraphsNumber() != 0;
 	}
 
 	public void run() {
-		Reader.navigate();
+		org.geometerplus.android.fbreader.FBReader.Instance.navigate();
 	}
 }

src/org/geometerplus/zlibrary/core/application/ZLApplication.java

@@ -144,19 +144,6 @@ public abstract class ZLApplication {
 		return false;
 	}
 
-	public void navigate() {
-		if (myWindow != null) {
-			myWindow.navigate();
-		}
-	}
-
-	public boolean canNavigate() {
-		if (myWindow != null) {
-			return myWindow.canNavigate();
-		}
-		return false;
-	}
-
 	public void rotateScreen() {
 		if (myWindow != null) {
 			myWindow.rotate();

src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java

@@ -44,8 +44,6 @@ abstract public class ZLApplicationWindow {
 
 	abstract protected void rotate();
 	abstract protected boolean canRotate();
-	abstract protected void navigate();
-	abstract protected boolean canNavigate();
 
 	abstract protected void close();
 }

src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java

@@ -125,14 +125,6 @@ public final class ZLAndroidApplicationWindow extends ZLApplicationWindow {
 		return !ZLAndroidApplication.Instance().AutoOrientationOption.getValue();
 	}
 
-	public void navigate() {
-		((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).navigate();
-	}
-
-	public boolean canNavigate() {
-		return ((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).canNavigate();
-	}
-
 	public void close() {
 		((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).finish();
 	}

src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java

@@ -255,7 +255,4 @@ public abstract class ZLAndroidActivity extends Activity {
 			myChangeCounter = 0;
 		}
 	}
-
-	abstract protected void navigate();
-	abstract protected boolean canNavigate();
 }

src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java

@@ -59,19 +59,6 @@ public final class ZLAndroidLibrary extends ZLibrary {
 		}
 	}
 
-	public void navigate() {
-		if (myActivity != null)	{
-			myActivity.navigate();
-		}
-	}
-
-	public boolean canNavigate() {
-		if (myActivity != null)	{
-			return myActivity.canNavigate();
-		}
-		return false;
-	}
-
 	public void finish() {
 		if ((myActivity != null) && !myActivity.isFinishing()) {
 			myActivity.finish();