refactoring: cleanup navigation apps hierarchy

3 files changed, 7 insertions, 23 deletions

diff --git a/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java b/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java
index 1ded9ac..4811916 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java
@@ -4,13 +4,12 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.cgeonavigate;
-import cgeo.geocaching.apps.AbstractApp;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.ui.Formatter;
 
 import android.app.Activity;
 
-class CompassApp extends AbstractApp implements CacheNavigationApp, WaypointNavigationApp, GeopointNavigationApp {
+class CompassApp extends AbstractPointNavigationApp {
 
     CompassApp() {
         super(getString(R.string.compass_title), null);
@@ -33,19 +32,9 @@ class CompassApp extends AbstractApp implements CacheNavigationApp, WaypointNavi
     }
 
     @Override
-    public boolean isEnabled(Waypoint waypoint) {
-        return waypoint.getCoords() != null;
-    }
-
-    @Override
     public void navigate(Activity activity, Geocache cache) {
         cgeonavigate.startActivity(activity, cache.getGeocode(), cache.getName(), cache.getCoords(), null,
                 Formatter.formatCacheInfoShort(cache));
     }
 
-    @Override
-    public boolean isEnabled(Geocache cache) {
-        return cache.getGeocode() != null;
-    }
-
 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java b/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java
index 2990f93..cdf14f0 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java
@@ -3,14 +3,13 @@ package cgeo.geocaching.apps.cache.navi;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.apps.AbstractApp;
 import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.maps.CGeoMap;
 
 import android.app.Activity;
 
-class InternalMap extends AbstractApp implements CacheNavigationApp, WaypointNavigationApp, GeopointNavigationApp {
+class InternalMap extends AbstractPointNavigationApp {
 
     InternalMap() {
         super(getString(R.string.cache_menu_map), null);
@@ -32,17 +31,8 @@ class InternalMap extends AbstractApp implements CacheNavigationApp, WaypointNav
     }
 
     @Override
-    public boolean isEnabled(Waypoint waypoint) {
-        return waypoint.getCoords() != null;
-    }
-
-    @Override
     public void navigate(Activity activity, Geocache cache) {
         CGeoMap.startActivityGeoCode(activity, cache.getGeocode());
     }
 
-    @Override
-    public boolean isEnabled(Geocache cache) {
-        return cache.getCoords() != null;
-    }
 }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java b/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java
index 2d7702d..8b64ac8 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java
@@ -15,6 +15,11 @@ class LocusApp extends AbstractLocusApp implements CacheNavigationApp, WaypointN
         return waypoint.getCoords() != null;
     }
 
+    @Override
+    public boolean isEnabled(Geocache cache) {
+        return cache.getCoords() != null;
+    }
+
     /**
      * Show a single cache with waypoints or a single waypoint in Locus.
      * This method constructs a list of cache and waypoints only.