2 files changed, 34 insertions, 48 deletions
diff --git a/main/src/cgeo/geocaching/IBasicCache.java b/main/src/cgeo/geocaching/IBasicCache.java
deleted file mode 100644
index 7e9ef11..0000000
--- a/main/src/cgeo/geocaching/IBasicCache.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *
- */
-package cgeo.geocaching;
-
-import cgeo.geocaching.enumerations.CacheSize;
-import cgeo.geocaching.enumerations.CacheType;
-
-public interface IBasicCache extends ILogable, ICoordinates {
-
-    public abstract String getGuid();
-
-    /**
-     * @return Tradi, multi etc.
-     */
-    public abstract CacheType getType();
-
-    /**
-     * @return Micro, small etc.
-     */
-    public abstract CacheSize getSize();
-
-    /**
-     * @return true if the user already found the cache
-     *
-     */
-    public abstract boolean isFound();
-
-    /**
-     * @return true if the cache is disabled, false else
-     */
-    public abstract boolean isDisabled();
-
-    /**
-     * @return Difficulty assessment
-     */
-    public abstract float getDifficulty();
-
-    /**
-     * @return Terrain assessment
-     */
-    public abstract float getTerrain();
-
-
-
-}
diff --git a/main/src/cgeo/geocaching/ICache.java b/main/src/cgeo/geocaching/ICache.java
index a11f53d..b99d877 100644
--- a/main/src/cgeo/geocaching/ICache.java
+++ b/main/src/cgeo/geocaching/ICache.java
@@ -3,6 +3,8 @@
  */
 package cgeo.geocaching;
 
+import cgeo.geocaching.enumerations.CacheSize;
+import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LogType;
 
 import java.util.Date;
@@ -12,7 +14,7 @@ import java.util.Map;
 /**
  * Basic interface for caches
  */
-public interface ICache extends IBasicCache {
+public interface ICache extends ILogable, ICoordinates {
 
     /**
      * @return Displayed owner, might differ from the real owner
@@ -63,7 +65,6 @@ public interface ICache extends IBasicCache {
     /**
      * @return Guid
      */
-    @Override
     public String getGuid();
 
     /**
@@ -129,4 +130,35 @@ public interface ICache extends IBasicCache {
      * @return normalized, cached name which sort also correct for numerical parts in the name
      */
     public String getNameForSorting();
+
+    /**
+     * @return Tradi, multi etc.
+     */
+    CacheType getType();
+
+    /**
+     * @return Micro, small etc.
+     */
+    CacheSize getSize();
+
+    /**
+     * @return true if the user already found the cache
+     *
+     */
+    boolean isFound();
+
+    /**
+     * @return true if the cache is disabled, false else
+     */
+    boolean isDisabled();
+
+    /**
+     * @return Difficulty assessment
+     */
+    float getDifficulty();
+
+    /**
+     * @return Terrain assessment
+     */
+    float getTerrain();
 }