reduce visibility

All changes done with UCDetector. This can help in seeing which packages
are not yet self contained (e.g. all the remaining public constants in
GCConstants).

15 files changed, 29 insertions, 29 deletions

diff --git a/main/src/cgeo/geocaching/sorting/AbstractCacheComparator.java b/main/src/cgeo/geocaching/sorting/AbstractCacheComparator.java
index 968dce5..a0c5a9f 100644
--- a/main/src/cgeo/geocaching/sorting/AbstractCacheComparator.java
+++ b/main/src/cgeo/geocaching/sorting/AbstractCacheComparator.java
@@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils;
  * abstract super implementation for all cache comparators
  *
  */
-public abstract class AbstractCacheComparator implements CacheComparator {
+abstract class AbstractCacheComparator implements CacheComparator {
 
     @Override
     public final int compare(final Geocache cache1, final Geocache cache2) {
diff --git a/main/src/cgeo/geocaching/sorting/DateComparator.java b/main/src/cgeo/geocaching/sorting/DateComparator.java
index 7913941..6d294db 100644
--- a/main/src/cgeo/geocaching/sorting/DateComparator.java
+++ b/main/src/cgeo/geocaching/sorting/DateComparator.java
@@ -9,10 +9,10 @@ import java.util.Date;
 /**
  * compares caches by date
  */
-public class DateComparator extends AbstractCacheComparator {
+class DateComparator extends AbstractCacheComparator {
 
     @Override
-    protected int compareCaches(Geocache cache1, Geocache cache2) {
+    protected int compareCaches(final Geocache cache1, final Geocache cache2) {
         final Date date1 = cache1.getHiddenDate();
         final Date date2 = cache2.getHiddenDate();
         if (date1 != null && date2 != null) {
diff --git a/main/src/cgeo/geocaching/sorting/DifficultyComparator.java b/main/src/cgeo/geocaching/sorting/DifficultyComparator.java
index 459f38d..10463c8 100644
--- a/main/src/cgeo/geocaching/sorting/DifficultyComparator.java
+++ b/main/src/cgeo/geocaching/sorting/DifficultyComparator.java
@@ -6,10 +6,10 @@ import cgeo.geocaching.Geocache;
  * sorts caches by difficulty
  *
  */
-public class DifficultyComparator extends AbstractCacheComparator {
+class DifficultyComparator extends AbstractCacheComparator {
 
     @Override
-    protected boolean canCompare(Geocache cache) {
+    protected boolean canCompare(final Geocache cache) {
         return cache.getDifficulty() != 0.0;
     }
 
diff --git a/main/src/cgeo/geocaching/sorting/FindsComparator.java b/main/src/cgeo/geocaching/sorting/FindsComparator.java
index 7f2ef50..a4c0686 100644
--- a/main/src/cgeo/geocaching/sorting/FindsComparator.java
+++ b/main/src/cgeo/geocaching/sorting/FindsComparator.java
@@ -2,17 +2,17 @@ package cgeo.geocaching.sorting;
 
 import cgeo.geocaching.Geocache;
 
-public class FindsComparator extends AbstractCacheComparator {
+class FindsComparator extends AbstractCacheComparator {
 
     @Override
-    protected boolean canCompare(Geocache cache) {
+    protected boolean canCompare(final Geocache cache) {
         return cache.getLogCounts() != null;
     }
 
     @Override
-    protected int compareCaches(Geocache cache1, Geocache cache2) {
-        int finds1 = cache1.getFindsCount();
-        int finds2 = cache2.getFindsCount();
+    protected int compareCaches(final Geocache cache1, final Geocache cache2) {
+        final int finds1 = cache1.getFindsCount();
+        final int finds2 = cache2.getFindsCount();
         return finds2 - finds1;
     }
 
diff --git a/main/src/cgeo/geocaching/sorting/GeocodeComparator.java b/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
index e700f13..30a2fc8 100644
--- a/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
+++ b/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
@@ -6,7 +6,7 @@ import cgeo.geocaching.Geocache;
  * sorts caches by geo code, therefore effectively sorting by cache age
  *
  */
-public class GeocodeComparator extends AbstractCacheComparator {
+class GeocodeComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(final Geocache cache) {
diff --git a/main/src/cgeo/geocaching/sorting/InventoryComparator.java b/main/src/cgeo/geocaching/sorting/InventoryComparator.java
index 9d19b64..13eadcc 100644
--- a/main/src/cgeo/geocaching/sorting/InventoryComparator.java
+++ b/main/src/cgeo/geocaching/sorting/InventoryComparator.java
@@ -5,7 +5,7 @@ import cgeo.geocaching.Geocache;
 /**
  * sorts caches by number of items in inventory
  */
-public class InventoryComparator extends AbstractCacheComparator {
+class InventoryComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(final Geocache cache1, final Geocache cache2) {
diff --git a/main/src/cgeo/geocaching/sorting/NameComparator.java b/main/src/cgeo/geocaching/sorting/NameComparator.java
index 2941b1c..376c8b9 100644
--- a/main/src/cgeo/geocaching/sorting/NameComparator.java
+++ b/main/src/cgeo/geocaching/sorting/NameComparator.java
@@ -8,15 +8,15 @@ import org.apache.commons.lang3.StringUtils;
  * sorts caches by name
  *
  */
-public class NameComparator extends AbstractCacheComparator {
+class NameComparator extends AbstractCacheComparator {
 
     @Override
-    protected boolean canCompare(Geocache cache) {
+    protected boolean canCompare(final Geocache cache) {
         return StringUtils.isNotBlank(cache.getName());
     }
 
     @Override
-    protected int compareCaches(Geocache cache1, Geocache cache2) {
+    protected int compareCaches(final Geocache cache1, final Geocache cache2) {
         return cache1.getNameForSorting().compareToIgnoreCase(cache2.getNameForSorting());
     }
 }
diff --git a/main/src/cgeo/geocaching/sorting/PopularityComparator.java b/main/src/cgeo/geocaching/sorting/PopularityComparator.java
index 2dbee68..58b3b4c 100644
--- a/main/src/cgeo/geocaching/sorting/PopularityComparator.java
+++ b/main/src/cgeo/geocaching/sorting/PopularityComparator.java
@@ -6,7 +6,7 @@ import cgeo.geocaching.Geocache;
  * sorts caches by popularity (favorite count)
  *
  */
-public class PopularityComparator extends AbstractCacheComparator {
+class PopularityComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(final Geocache cache1, final Geocache cache2) {
diff --git a/main/src/cgeo/geocaching/sorting/PopularityRatioComparator.java b/main/src/cgeo/geocaching/sorting/PopularityRatioComparator.java
index a2da6ee..4c2d914 100644
--- a/main/src/cgeo/geocaching/sorting/PopularityRatioComparator.java
+++ b/main/src/cgeo/geocaching/sorting/PopularityRatioComparator.java
@@ -8,12 +8,12 @@ import cgeo.geocaching.Geocache;
 /**
  * sorts caches by popularity ratio (favorites per find in %).
  */
-public class PopularityRatioComparator extends AbstractCacheComparator {
+class PopularityRatioComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(final Geocache cache1, final Geocache cache2) {
-        int finds1 = cache1.getFindsCount();
-        int finds2 = cache2.getFindsCount();
+        final int finds1 = cache1.getFindsCount();
+        final int finds2 = cache2.getFindsCount();
 
         float ratio1 = 0.0f;
         if (finds1 != 0) {
diff --git a/main/src/cgeo/geocaching/sorting/RatingComparator.java b/main/src/cgeo/geocaching/sorting/RatingComparator.java
index 6f2c615..62854fe 100644
--- a/main/src/cgeo/geocaching/sorting/RatingComparator.java
+++ b/main/src/cgeo/geocaching/sorting/RatingComparator.java
@@ -6,7 +6,7 @@ import cgeo.geocaching.Geocache;
  * sorts caches by gcvote.com rating
  *
  */
-public class RatingComparator extends AbstractCacheComparator {
+class RatingComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(final Geocache cache1, final Geocache cache2) {
diff --git a/main/src/cgeo/geocaching/sorting/SizeComparator.java b/main/src/cgeo/geocaching/sorting/SizeComparator.java
index c8de586..9e911f5 100644
--- a/main/src/cgeo/geocaching/sorting/SizeComparator.java
+++ b/main/src/cgeo/geocaching/sorting/SizeComparator.java
@@ -6,15 +6,15 @@ import cgeo.geocaching.Geocache;
  * sorts caches by size
  *
  */
-public class SizeComparator extends AbstractCacheComparator {
+class SizeComparator extends AbstractCacheComparator {
 
     @Override
-    protected boolean canCompare(Geocache cache) {
+    protected boolean canCompare(final Geocache cache) {
         return cache.getSize() != null;
     }
 
     @Override
-    protected int compareCaches(Geocache cache1, Geocache cache2) {
+    protected int compareCaches(final Geocache cache1, final Geocache cache2) {
         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 9488bd9..e4403f8 100644
--- a/main/src/cgeo/geocaching/sorting/StateComparator.java
+++ b/main/src/cgeo/geocaching/sorting/StateComparator.java
@@ -6,7 +6,7 @@ import cgeo.geocaching.Geocache;
  * sort caches by state (normal, disabled, archived)
  *
  */
-public class StateComparator extends AbstractCacheComparator {
+class StateComparator extends AbstractCacheComparator {
 
     @Override
     protected int compareCaches(final Geocache cache1, final Geocache cache2) {
diff --git a/main/src/cgeo/geocaching/sorting/StorageTimeComparator.java b/main/src/cgeo/geocaching/sorting/StorageTimeComparator.java
index b718d3b..fbe3226 100644
--- a/main/src/cgeo/geocaching/sorting/StorageTimeComparator.java
+++ b/main/src/cgeo/geocaching/sorting/StorageTimeComparator.java
@@ -2,10 +2,10 @@ package cgeo.geocaching.sorting;
 
 import cgeo.geocaching.Geocache;
 
-public class StorageTimeComparator extends AbstractCacheComparator {
+class StorageTimeComparator extends AbstractCacheComparator {
 
     @Override
-    protected int compareCaches(Geocache cache1, Geocache cache2) {
+    protected int compareCaches(final Geocache cache1, final Geocache cache2) {
         if (cache1.getUpdated() < cache2.getUpdated()) {
             return -1;
         }
diff --git a/main/src/cgeo/geocaching/sorting/TerrainComparator.java b/main/src/cgeo/geocaching/sorting/TerrainComparator.java
index 9bbb5f7..e882025 100644
--- a/main/src/cgeo/geocaching/sorting/TerrainComparator.java
+++ b/main/src/cgeo/geocaching/sorting/TerrainComparator.java
@@ -6,7 +6,7 @@ import cgeo.geocaching.Geocache;
  * sorts caches by terrain rating
  *
  */
-public class TerrainComparator extends AbstractCacheComparator {
+class TerrainComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(final Geocache cache) {
diff --git a/main/src/cgeo/geocaching/sorting/VoteComparator.java b/main/src/cgeo/geocaching/sorting/VoteComparator.java
index cd4ad7e..5cf39d7 100644
--- a/main/src/cgeo/geocaching/sorting/VoteComparator.java
+++ b/main/src/cgeo/geocaching/sorting/VoteComparator.java
@@ -5,10 +5,10 @@ import cgeo.geocaching.Geocache;
 /**
  * sorts caches by the users own voting (if available at all)
  */
-public class VoteComparator extends AbstractCacheComparator {
+class VoteComparator extends AbstractCacheComparator {
 
     @Override
-    protected int compareCaches(Geocache cache1, Geocache cache2) {
+    protected int compareCaches(final Geocache cache1, final Geocache cache2) {
         // if there is no vote available, put that cache at the end of the list
         return Float.compare(cache2.getMyVote(), cache1.getMyVote());
     }