No direct access to fields

14 files changed, 45 insertions, 45 deletions

diff --git a/main/src/cgeo/geocaching/sorting/DateComparator.java b/main/src/cgeo/geocaching/sorting/DateComparator.java
index b59e84e..7c8f7ed 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.hidden;
-        Date date2 = cache2.hidden;
+        Date date1 = cache1.getHidden();
+        Date date2 = cache2.getHidden();
         if (date1 != null && date2 != null) {
             return date1.compareTo(date2);
         }
diff --git a/main/src/cgeo/geocaching/sorting/DifficultyComparator.java b/main/src/cgeo/geocaching/sorting/DifficultyComparator.java
index 846417c..c044598 100644
--- a/main/src/cgeo/geocaching/sorting/DifficultyComparator.java
+++ b/main/src/cgeo/geocaching/sorting/DifficultyComparator.java
@@ -10,14 +10,14 @@ public class DifficultyComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return cache1.difficulty != null && cache2.difficulty != null;
+        return cache1.getDifficulty() != null && cache2.getDifficulty() != null;
     }
 
     @Override
     protected int compareCaches(final cgCache cache1, final cgCache cache2) {
-        if (cache1.difficulty > cache2.difficulty) {
+        if (cache1.getDifficulty() > cache2.getDifficulty()) {
             return 1;
-        } else if (cache2.difficulty > cache1.difficulty) {
+        } else if (cache2.getDifficulty() > cache1.getDifficulty()) {
             return -1;
         }
         return 0;
diff --git a/main/src/cgeo/geocaching/sorting/DistanceComparator.java b/main/src/cgeo/geocaching/sorting/DistanceComparator.java
index 7051718..920d965 100644
--- a/main/src/cgeo/geocaching/sorting/DistanceComparator.java
+++ b/main/src/cgeo/geocaching/sorting/DistanceComparator.java
@@ -21,19 +21,19 @@ public class DistanceComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(final cgCache cache1, final cgCache cache2) {
-        if ((cache1.coords == null || cache2.coords == null)
-                && cache1.distance != null && cache2.distance != null) {
-            return Double.compare(cache1.distance, cache2.distance);
+        if ((cache1.getCoords() == null || cache2.getCoords() == null)
+                && cache1.getDistance() != null && cache2.getDistance() != null) {
+            return Double.compare(cache1.getDistance(), cache2.getDistance());
         } else {
-            if (cache1.coords == null) {
+            if (cache1.getCoords() == null) {
                 return 1;
             }
-            if (cache2.coords == null) {
+            if (cache2.getCoords() == null) {
                 return -1;
             }
 
-            return Float.compare(coords.distanceTo(cache1.coords),
-                    coords.distanceTo(cache2.coords));
+            return Float.compare(coords.distanceTo(cache1.getCoords()),
+                    coords.distanceTo(cache2.getCoords()));
         }
     }
 
diff --git a/main/src/cgeo/geocaching/sorting/FindsComparator.java b/main/src/cgeo/geocaching/sorting/FindsComparator.java
index efde22d..2591102 100644
--- a/main/src/cgeo/geocaching/sorting/FindsComparator.java
+++ b/main/src/cgeo/geocaching/sorting/FindsComparator.java
@@ -15,7 +15,7 @@ public class FindsComparator extends AbstractCacheComparator implements
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return cache1.logCounts != null && cache2.logCounts != null;
+        return cache1.getLogCounts() != null && cache2.getLogCounts() != null;
     }
 
     @Override
@@ -27,10 +27,10 @@ public class FindsComparator extends AbstractCacheComparator implements
 
     private int getFindsCount(cgCache cache) {
         int finds = 0;
-        if (cache.logCounts.isEmpty()) {
-            cache.logCounts = app.loadLogCounts(cache.geocode);
+        if (cache.getLogCounts().isEmpty()) {
+            cache.setLogCounts(app.loadLogCounts(cache.getGeocode()));
         }
-        Integer logged = cache.logCounts.get(cgBase.LOG_FOUND_IT);
+        Integer logged = cache.getLogCounts().get(cgBase.LOG_FOUND_IT);
         if (logged != null) {
             finds = logged;
         }
diff --git a/main/src/cgeo/geocaching/sorting/GeocodeComparator.java b/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
index 136d7f5..1377cce 100644
--- a/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
+++ b/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
@@ -12,17 +12,17 @@ public class GeocodeComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return StringUtils.isNotBlank(cache1.geocode)
-                && StringUtils.isNotBlank(cache2.geocode);
+        return StringUtils.isNotBlank(cache1.getGeocode())
+                && StringUtils.isNotBlank(cache2.getGeocode());
     }
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        if (cache1.geocode.length() > cache2.geocode.length()) {
+        if (cache1.getGeocode().length() > cache2.getGeocode().length()) {
             return 1;
-        } else if (cache2.geocode.length() > cache1.geocode.length()) {
+        } else if (cache2.getGeocode().length() > cache1.getGeocode().length()) {
             return -1;
         }
-        return cache1.geocode.compareToIgnoreCase(cache2.geocode);
+        return cache1.getGeocode().compareToIgnoreCase(cache2.getGeocode());
     }
 }
diff --git a/main/src/cgeo/geocaching/sorting/InventoryComparator.java b/main/src/cgeo/geocaching/sorting/InventoryComparator.java
index 0833094..b1842d7 100644
--- a/main/src/cgeo/geocaching/sorting/InventoryComparator.java
+++ b/main/src/cgeo/geocaching/sorting/InventoryComparator.java
@@ -17,8 +17,8 @@ public class InventoryComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        int itemCount1 = cache1.inventoryItems;
-        int itemCount2 = cache2.inventoryItems;
+        int itemCount1 = cache1.getInventoryItems();
+        int itemCount2 = cache2.getInventoryItems();
         if (itemCount1 < itemCount2) {
             return 1;
         } else if (itemCount2 < itemCount1) {
diff --git a/main/src/cgeo/geocaching/sorting/NameComparator.java b/main/src/cgeo/geocaching/sorting/NameComparator.java
index bfc05c0..c32bc48 100644
--- a/main/src/cgeo/geocaching/sorting/NameComparator.java
+++ b/main/src/cgeo/geocaching/sorting/NameComparator.java
@@ -12,7 +12,7 @@ public class NameComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return StringUtils.isNotBlank(cache1.name) && StringUtils.isNotBlank(cache2.name);
+        return StringUtils.isNotBlank(cache1.getName()) && StringUtils.isNotBlank(cache2.getName());
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/sorting/PopularityComparator.java b/main/src/cgeo/geocaching/sorting/PopularityComparator.java
index dbc418a..5d3507c 100644
--- a/main/src/cgeo/geocaching/sorting/PopularityComparator.java
+++ b/main/src/cgeo/geocaching/sorting/PopularityComparator.java
@@ -10,14 +10,14 @@ public class PopularityComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return cache1.favouriteCnt != null && cache2.favouriteCnt != null;
+        return cache1.getFavouriteCnt() != null && cache2.getFavouriteCnt() != null;
     }
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        if (cache1.favouriteCnt < cache2.favouriteCnt) {
+        if (cache1.getFavouriteCnt() < cache2.getFavouriteCnt()) {
             return 1;
-        } else if (cache2.favouriteCnt < cache1.favouriteCnt) {
+        } else if (cache2.getFavouriteCnt() < cache1.getFavouriteCnt()) {
             return -1;
         }
         return 0;
diff --git a/main/src/cgeo/geocaching/sorting/RatingComparator.java b/main/src/cgeo/geocaching/sorting/RatingComparator.java
index b7140c6..3c0fc02 100644
--- a/main/src/cgeo/geocaching/sorting/RatingComparator.java
+++ b/main/src/cgeo/geocaching/sorting/RatingComparator.java
@@ -10,13 +10,13 @@ public class RatingComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return cache1.rating != null && cache2.rating != null;
+        return cache1.getRating() != null && cache2.getRating() != null;
     }
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        Float rating1 = cache1.rating;
-        Float rating2 = cache2.rating;
+        Float rating1 = cache1.getRating();
+        Float rating2 = cache2.getRating();
 
         // voting can be disabled for caches, then assume an average rating instead
         if (rating1 == 0.0) {
diff --git a/main/src/cgeo/geocaching/sorting/SizeComparator.java b/main/src/cgeo/geocaching/sorting/SizeComparator.java
index a633a06..f946522 100644
--- a/main/src/cgeo/geocaching/sorting/SizeComparator.java
+++ b/main/src/cgeo/geocaching/sorting/SizeComparator.java
@@ -10,11 +10,11 @@ public class SizeComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return cache1.size != null && cache2.size != null;
+        return cache1.getSize() != null && cache2.getSize() != null;
     }
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        return cache2.size.comparable - cache1.size.comparable;
+        return cache2.getSize().comparable - cache1.getSize().comparable;
     }
 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/sorting/StateComparator.java b/main/src/cgeo/geocaching/sorting/StateComparator.java
index f56d3fe..30d385c 100644
--- a/main/src/cgeo/geocaching/sorting/StateComparator.java
+++ b/main/src/cgeo/geocaching/sorting/StateComparator.java
@@ -20,10 +20,10 @@ public class StateComparator extends AbstractCacheComparator implements
     }
 
     private static int getState(final cgCache cache) {
-        if (cache.disabled) {
+        if (cache.isDisabled()) {
             return 1;
         }
-        if (cache.archived) {
+        if (cache.isArchived()) {
             return 2;
         }
         return 0;
diff --git a/main/src/cgeo/geocaching/sorting/TerrainComparator.java b/main/src/cgeo/geocaching/sorting/TerrainComparator.java
index 88c75e4..2da5971 100644
--- a/main/src/cgeo/geocaching/sorting/TerrainComparator.java
+++ b/main/src/cgeo/geocaching/sorting/TerrainComparator.java
@@ -10,14 +10,14 @@ public class TerrainComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return cache1.terrain != null && cache2.terrain != null;
+        return cache1.getTerrain() != null && cache2.getTerrain() != null;
     }
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        if (cache1.terrain > cache2.terrain) {
+        if (cache1.getTerrain() > cache2.getTerrain()) {
             return 1;
-        } else if (cache2.terrain > cache1.terrain) {
+        } else if (cache2.getTerrain() > cache1.getTerrain()) {
             return -1;
         }
         return 0;
diff --git a/main/src/cgeo/geocaching/sorting/VisitComparator.java b/main/src/cgeo/geocaching/sorting/VisitComparator.java
index 597efb5..ba5e07f 100644
--- a/main/src/cgeo/geocaching/sorting/VisitComparator.java
+++ b/main/src/cgeo/geocaching/sorting/VisitComparator.java
@@ -10,15 +10,15 @@ public class VisitComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(cgCache cache1, cgCache cache2) {
-        return cache1.visitedDate != null && cache1.visitedDate > 0
-                && cache2.visitedDate != null && cache2.visitedDate > 0;
+        return cache1.getVisitedDate() != null && cache1.getVisitedDate() > 0
+                && cache2.getVisitedDate() != null && cache2.getVisitedDate() > 0;
     }
 
     @Override
     protected int compareCaches(cgCache cache1, cgCache cache2) {
-        if (cache1.visitedDate > cache2.visitedDate) {
+        if (cache1.getVisitedDate() > cache2.getVisitedDate()) {
             return -1;
-        } else if (cache1.visitedDate < cache2.visitedDate) {
+        } else if (cache1.getVisitedDate() < cache2.getVisitedDate()) {
             return 1;
         }
         return 0;
diff --git a/main/src/cgeo/geocaching/sorting/VoteComparator.java b/main/src/cgeo/geocaching/sorting/VoteComparator.java
index 2a4b4ac..2145361 100644
--- a/main/src/cgeo/geocaching/sorting/VoteComparator.java
+++ b/main/src/cgeo/geocaching/sorting/VoteComparator.java
@@ -19,13 +19,13 @@ public class VoteComparator extends AbstractCacheComparator {
     protected int compareCaches(cgCache cache1, cgCache cache2) {
         // if there is no vote available, put that cache at the end of the list
         float vote1 = 0;
-        if (cache1.myVote != null) {
-            vote1 = cache1.myVote;
+        if (cache1.getMyVote() != null) {
+            vote1 = cache1.getMyVote();
         }
 
         float vote2 = 0;
-        if (cache2.myVote != null) {
-            vote2 = cache2.myVote;
+        if (cache2.getMyVote() != null) {
+            vote2 = cache2.getMyVote();
         }
 
         // compare