diff --git a/src/org/geometerplus/android/fbreader/RunActivityAction.java b/src/org/geometerplus/android/fbreader/RunActivityAction.java deleted file mode 100644 index 7d75cd09f..000000000 --- a/src/org/geometerplus/android/fbreader/RunActivityAction.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2007-2013 Geometer Plus - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -package org.geometerplus.android.fbreader; - -import android.content.Intent; - -import org.geometerplus.fbreader.fbreader.FBReaderApp; - -abstract class RunActivityAction extends FBAndroidAction { - private final Class myActivityClass; - - RunActivityAction(FBReader baseActivity, FBReaderApp fbreader, Class activityClass) { - super(baseActivity, fbreader); - myActivityClass = activityClass; - } - - @Override - protected void run(Object ... params) { - OrientationUtil.startActivity( - BaseActivity, new Intent(BaseActivity.getApplicationContext(), myActivityClass) - ); - } -} diff --git a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java b/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java index 952914136..cca421a41 100644 --- a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java +++ b/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java @@ -19,12 +19,24 @@ package org.geometerplus.android.fbreader; +import android.content.Intent; + import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.android.fbreader.network.NetworkLibraryPrimaryActivity; -class ShowNetworkLibraryAction extends RunActivityAction { +class ShowNetworkLibraryAction extends FBAndroidAction { ShowNetworkLibraryAction(FBReader baseActivity, FBReaderApp fbreader) { - super(baseActivity, fbreader, NetworkLibraryPrimaryActivity.class); + super(baseActivity, fbreader); + } + + @Override + protected void run(Object ... params) { + OrientationUtil.startActivity( + BaseActivity, new Intent( + BaseActivity.getApplicationContext(), + NetworkLibraryPrimaryActivity.class + ) + ); } } diff --git a/src/org/geometerplus/android/fbreader/ShowTOCAction.java b/src/org/geometerplus/android/fbreader/ShowTOCAction.java index 29695b752..50a7d39ba 100644 --- a/src/org/geometerplus/android/fbreader/ShowTOCAction.java +++ b/src/org/geometerplus/android/fbreader/ShowTOCAction.java @@ -19,14 +19,23 @@ package org.geometerplus.android.fbreader; +import android.content.Intent; + import org.geometerplus.fbreader.fbreader.FBReaderApp; -class ShowTOCAction extends RunActivityAction { +class ShowTOCAction extends FBAndroidAction { ShowTOCAction(FBReader baseActivity, FBReaderApp fbreader) { - super(baseActivity, fbreader, TOCActivity.class); + super(baseActivity, fbreader); } public boolean isVisible() { return Reader.Model != null && Reader.Model.TOCTree.hasChildren(); } + + @Override + protected void run(Object ... params) { + OrientationUtil.startActivity( + BaseActivity, new Intent(BaseActivity.getApplicationContext(), TOCActivity.class) + ); + } }