5 files changed, 6 insertions, 8 deletions
diff --git a/main/proguard-project.txt b/main/proguard-project.txt
index cf4ed33..d4991f6 100644
--- a/main/proguard-project.txt
+++ b/main/proguard-project.txt
@@ -3,6 +3,8 @@
 # Suppress notes about classes from the general config, which we don't use at all. 
 -dontnote **.ILicensingService
 
+-printusage usage.txt
+
 -optimizationpasses 2
 -dontobfuscate
 -allowaccessmodification
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index e6db8d5..3c69197 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -788,11 +788,6 @@ public class Geocache implements ICache, IWaypoint {
     }
 
     @Override
-    public boolean isWatchlist() {
-        return onWatchlist;
-    }
-
-    @Override
     public Date getHiddenDate() {
         return hidden;
     }
@@ -979,6 +974,7 @@ public class Geocache implements ICache, IWaypoint {
         this.inventoryItems = inventoryItems;
     }
 
+    @Override
     public boolean isOnWatchlist() {
         return onWatchlist;
     }
diff --git a/main/src/cgeo/geocaching/ICache.java b/main/src/cgeo/geocaching/ICache.java
index 6d0d89a..a11f53d 100644
--- a/main/src/cgeo/geocaching/ICache.java
+++ b/main/src/cgeo/geocaching/ICache.java
@@ -93,7 +93,7 @@ public interface ICache extends IBasicCache {
      * @return true if the cache is on the watchlist of the user
      *
      */
-    public boolean isWatchlist();
+    public boolean isOnWatchlist();
 
     /**
      * @return The date the cache has been hidden
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index 0085a18..d1252ce 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -129,7 +129,7 @@ public abstract class MockedCache implements ICache {
     }
 
     @Override
-    public boolean isWatchlist() {
+    public boolean isOnWatchlist() {
         return false;
     }
 
diff --git a/tests/src/cgeo/test/Compare.java b/tests/src/cgeo/test/Compare.java
index 3b3ff5a..e4e7aac 100644
--- a/tests/src/cgeo/test/Compare.java
+++ b/tests/src/cgeo/test/Compare.java
@@ -38,7 +38,7 @@ public abstract class Compare {
             assertEquals(expected.getLocation(), actual.getLocation());
             assertEquals(expected.isFound(), actual.isFound());
             assertEquals(expected.isFavorite(), actual.isFavorite());
-            assertEquals(expected.isWatchlist(), actual.isWatchlist());
+            assertEquals(expected.isOnWatchlist(), actual.isOnWatchlist());
 
             for (String attribute : expected.getAttributes()) {
                 assertTrue("Expected attribute '" + attribute + "' not found in " + actual.getGeocode(), actual.getAttributes().contains(attribute));