refactoring: remove duplication in logging manager

5 files changed, 27 insertions, 34 deletions

diff --git a/main/src/cgeo/geocaching/connector/AbstractLoggingManager.java b/main/src/cgeo/geocaching/connector/AbstractLoggingManager.java
new file mode 100644
index 0000000..9e702c4
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/AbstractLoggingManager.java
@@ -0,0 +1,20 @@
+package cgeo.geocaching.connector;
+
+import cgeo.geocaching.TrackableLog;
+
+import java.util.Collections;
+import java.util.List;
+
+public abstract class AbstractLoggingManager implements ILoggingManager {
+
+    @Override
+    public boolean hasLoaderError() {
+        return false;
+    }
+
+    @Override
+    public List<TrackableLog> getTrackables() {
+        return Collections.emptyList();
+    }
+
+}
diff --git a/main/src/cgeo/geocaching/connector/NoLoggingManager.java b/main/src/cgeo/geocaching/connector/NoLoggingManager.java
index 04a73c1..e2e5d4c 100644
--- a/main/src/cgeo/geocaching/connector/NoLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/NoLoggingManager.java
@@ -11,7 +11,7 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 
-public class NoLoggingManager implements ILoggingManager {
+public class NoLoggingManager extends AbstractLoggingManager {
 
     @Override
     public void init() {
@@ -34,11 +34,6 @@ public class NoLoggingManager implements ILoggingManager {
     }
 
     @Override
-    public List<TrackableLog> getTrackables() {
-        return Collections.emptyList();
-    }
-
-    @Override
     public List<LogType> getPossibleLogTypes() {
         return Collections.emptyList();
     }
diff --git a/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java b/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java
index c736fe3..ded2d71 100644
--- a/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java
@@ -3,7 +3,7 @@ package cgeo.geocaching.connector.ec;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.connector.ILoggingManager;
+import cgeo.geocaching.connector.AbstractLoggingManager;
 import cgeo.geocaching.connector.ImageResult;
 import cgeo.geocaching.connector.LogResult;
 import cgeo.geocaching.enumerations.LogType;
@@ -11,10 +11,9 @@ import cgeo.geocaching.enumerations.LogType;
 import android.net.Uri;
 
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.List;
 
-public class ECLoggingManager implements ILoggingManager {
+public class ECLoggingManager extends AbstractLoggingManager {
 
     private final ECConnector connector;
     private final Geocache cache;
@@ -42,16 +41,6 @@ public class ECLoggingManager implements ILoggingManager {
     }
 
     @Override
-    public final boolean hasLoaderError() {
-        return false;
-    }
-
-    @Override
-    public final List<TrackableLog> getTrackables() {
-        return Collections.emptyList();
-    }
-
-    @Override
     public List<LogType> getPossibleLogTypes() {
         return connector.getPossibleLogTypes(cache);
     }
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
index c618110..06d6411 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
@@ -5,7 +5,7 @@ import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.R;
 import cgeo.geocaching.TrackableLog;
 import cgeo.geocaching.activity.ActivityMixin;
-import cgeo.geocaching.connector.ILoggingManager;
+import cgeo.geocaching.connector.AbstractLoggingManager;
 import cgeo.geocaching.connector.ImageResult;
 import cgeo.geocaching.connector.LogResult;
 import cgeo.geocaching.enumerations.LogType;
@@ -28,7 +28,7 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 
-public class GCLoggingManager implements ILoggingManager, LoaderManager.LoaderCallbacks<String> {
+public class GCLoggingManager extends AbstractLoggingManager implements LoaderManager.LoaderCallbacks<String> {
 
     private final LogCacheActivity activity;
     private final Geocache cache;
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
index c6be3cb..6836e6f 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
@@ -3,7 +3,7 @@ package cgeo.geocaching.connector.oc;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.connector.ILoggingManager;
+import cgeo.geocaching.connector.AbstractLoggingManager;
 import cgeo.geocaching.connector.ImageResult;
 import cgeo.geocaching.connector.LogResult;
 import cgeo.geocaching.enumerations.LogType;
@@ -12,10 +12,9 @@ import cgeo.geocaching.enumerations.StatusCode;
 import android.net.Uri;
 
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.List;
 
-public class OkapiLoggingManager implements ILoggingManager {
+public class OkapiLoggingManager extends AbstractLoggingManager {
 
     private final OCApiLiveConnector connector;
     private final Geocache cache;
@@ -45,16 +44,6 @@ public class OkapiLoggingManager implements ILoggingManager {
     }
 
     @Override
-    public final boolean hasLoaderError() {
-        return false;
-    }
-
-    @Override
-    public final List<TrackableLog> getTrackables() {
-        return Collections.emptyList();
-    }
-
-    @Override
     public List<LogType> getPossibleLogTypes() {
         return connector.getPossibleLogTypes(cache);
     }