diff options
| author | Marco Jacob <mjacob@union06.de> | 2012-05-16 22:00:31 +0200 |
|---|---|---|
| committer | Marco Jacob <mjacob@union06.de> | 2012-05-16 22:00:31 +0200 |
| commit | 1fb54eca9e977c443b30ae49fd3622fa467d2c8b (patch) | |
| tree | 99140bf61db7b52264f9242b974cce139a77ab68 | |
| parent | faf78fc0e3f6442c6f6bf29b783ad3384c6f6565 (diff) | |
| download | cgeo-1fb54eca9e977c443b30ae49fd3622fa467d2c8b.zip cgeo-1fb54eca9e977c443b30ae49fd3622fa467d2c8b.tar.gz cgeo-1fb54eca9e977c443b30ae49fd3622fa467d2c8b.tar.bz2 | |
Fixed wrong refactoring at static maps nav apps
3 files changed, 30 insertions, 15 deletions
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java index d6e82ec..a46ae2c 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java @@ -67,21 +67,6 @@ abstract class AbstractStaticMapsApp extends AbstractNavigationApp { return true; } - @Override - public boolean isEnabled(cgCache cache) { - if (cache == null) { - return false; - } - return !hasStaticMap(cache); - } - - @Override - public boolean isEnabled(cgWaypoint waypoint) { - if (waypoint == null) { - return false; - } - return !hasStaticMap(waypoint); - } @Override public boolean isEnabled(Geopoint geopoint) { diff --git a/main/src/cgeo/geocaching/apps/cache/navi/DownloadStaticMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/DownloadStaticMapsApp.java index d9434f8..1625ef7 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/DownloadStaticMapsApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/DownloadStaticMapsApp.java @@ -18,4 +18,19 @@ class DownloadStaticMapsApp extends AbstractStaticMapsApp { return invoke(activity, cache, waypoint, true); } + @Override + public boolean isEnabled(cgCache cache) { + if (cache == null) { + return false; + } + return !hasStaticMap(cache); + } + + @Override + public boolean isEnabled(cgWaypoint waypoint) { + if (waypoint == null) { + return false; + } + return !hasStaticMap(waypoint); + } } diff --git a/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java b/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java index 4680778..d805656 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java @@ -18,4 +18,19 @@ class StaticMapApp extends AbstractStaticMapsApp { return invoke(activity, cache, waypoint, false); } + @Override + public boolean isEnabled(cgCache cache) { + if (cache == null) { + return false; + } + return hasStaticMap(cache); + } + + @Override + public boolean isEnabled(cgWaypoint waypoint) { + if (waypoint == null) { + return false; + } + return hasStaticMap(waypoint); + } } |