refactoring: remove duplicated getter

7 files changed, 12 insertions, 16 deletions

diff --git a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
index d1dda2a..15072d1 100644
--- a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
@@ -120,8 +120,8 @@ public abstract class AbstractLocusApp extends AbstractApp {
         pg.premiumOnly = cache.isMembers();
         pg.name = cache.getName();
         pg.placedBy = cache.getOwner();
-        if (cache.getHidden() != null) {
-            pg.hidden = ISO8601DATE.format(cache.getHidden().getTime());
+        if (cache.getHiddenDate() != null) {
+            pg.hidden = ISO8601DATE.format(cache.getHiddenDate().getTime());
         }
         int locusId = toLocusId(cache.getCacheType());
         if (locusId != NO_LOCUS_ID) {
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 1b55d48..8cab9c3 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -1015,7 +1015,7 @@ public class cgBase {
                 if (StringUtils.isNotBlank(hiddenString)) {
                     cache.setHidden(parseGcCustomDate(hiddenString));
                 }
-                if (cache.getHidden() == null) {
+                if (cache.getHiddenDate() == null) {
                     // event date
                     hiddenString = BaseUtils.getMatch(tableInside, GCConstants.PATTERN_HIDDENEVENT, true, null);
                     if (StringUtils.isNotBlank(hiddenString)) {
@@ -1448,7 +1448,7 @@ public class cgBase {
         if (StringUtils.isBlank(cache.getOwnerReal())) {
             Log.e(Settings.tag, "owner real not parsed correctly");
         }
-        if (cache.getHidden() == null) {
+        if (cache.getHiddenDate() == null) {
             Log.e(Settings.tag, "hidden not parsed correctly");
         }
         if (cache.getFavouriteCnt() == null) {
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 146dfcb..cc608ca 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -645,10 +645,6 @@ public class cgCache implements ICache {
         this.nameSp = nameSp;
     }
 
-    public Date getHidden() {
-        return hidden;
-    }
-
     public void setHidden(Date hidden) {
         this.hidden = hidden;
     }
diff --git a/main/src/cgeo/geocaching/cgCacheListAdapter.java b/main/src/cgeo/geocaching/cgCacheListAdapter.java
index 0e2320d..6ec256d 100644
--- a/main/src/cgeo/geocaching/cgCacheListAdapter.java
+++ b/main/src/cgeo/geocaching/cgCacheListAdapter.java
@@ -578,7 +578,7 @@ public class cgCacheListAdapter extends ArrayAdapter<cgCache> {
                 if (cacheInfo.length() > 0) {
                     cacheInfo.append(SEPARATOR);
                 }
-                cacheInfo.append(cgBase.formatShortDate(cache.getHidden().getTime()));
+                cacheInfo.append(cgBase.formatShortDate(cache.getHiddenDate().getTime()));
             }
             if (cache.isMembers()) {
                 if (cacheInfo.length() > 0) {
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index bea910c..2620a1f 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -1238,10 +1238,10 @@ public class cgData {
         values.put("own", cache.isOwn() ? 1 : 0);
         values.put("owner", cache.getOwner());
         values.put("owner_real", cache.getOwnerReal());
-        if (cache.getHidden() == null) {
+        if (cache.getHiddenDate() == null) {
             values.put("hidden", 0);
         } else {
-            values.put("hidden", cache.getHidden().getTime());
+            values.put("hidden", cache.getHiddenDate().getTime());
         }
         values.put("hint", cache.getHint());
         values.put("size", cache.getSize() == null ? "" : cache.getSize().id);
diff --git a/main/src/cgeo/geocaching/cgeodetail.java b/main/src/cgeo/geocaching/cgeodetail.java
index cbe25d8..978fe72 100644
--- a/main/src/cgeo/geocaching/cgeodetail.java
+++ b/main/src/cgeo/geocaching/cgeodetail.java
@@ -822,8 +822,8 @@ public class cgeodetail extends AbstractActivity {
             }
 
             // cache hidden
-            if (cache.getHidden() != null && cache.getHidden().getTime() > 0) {
-                addCacheDetail(cache.isEventCache() ? R.string.cache_event : R.string.cache_hidden, cgBase.formatFullDate(cache.getHidden().getTime()));
+            if (cache.getHiddenDate() != null && cache.getHiddenDate().getTime() > 0) {
+                addCacheDetail(cache.isEventCache() ? R.string.cache_event : R.string.cache_hidden, cgBase.formatFullDate(cache.getHiddenDate().getTime()));
             }
 
             // cache location
@@ -1514,7 +1514,7 @@ public class cgeodetail extends AbstractActivity {
             final Integer[] keys = calendars.keySet().toArray(new Integer[calendars.size()]);
             final Integer calId = keys[index];
 
-            final Date eventDate = cache.getHidden();
+            final Date eventDate = cache.getHiddenDate();
             eventDate.setHours(0);
             eventDate.setMinutes(0);
             eventDate.setSeconds(0);
diff --git a/main/src/cgeo/geocaching/sorting/DateComparator.java b/main/src/cgeo/geocaching/sorting/DateComparator.java
index 7c8f7ed..92ada91 100644
--- a/main/src/cgeo/geocaching/sorting/DateComparator.java
+++ b/main/src/cgeo/geocaching/sorting/DateComparator.java
@@ -19,8 +19,8 @@ public class DateComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        Date date1 = cache1.getHidden();
-        Date date2 = cache2.getHidden();
+        Date date1 = cache1.getHiddenDate();
+        Date date2 = cache2.getHiddenDate();
         if (date1 != null && date2 != null) {
             return date1.compareTo(date2);
         }