refactoring: checkstyle cleanups in filters

11 files changed, 48 insertions, 40 deletions

diff --git a/main/src/cgeo/geocaching/filter/AbstractFilter.java b/main/src/cgeo/geocaching/filter/AbstractFilter.java
index bc99959..6bd8587 100644
--- a/main/src/cgeo/geocaching/filter/AbstractFilter.java
+++ b/main/src/cgeo/geocaching/filter/AbstractFilter.java
@@ -8,12 +8,12 @@ import java.util.List;
 abstract class AbstractFilter implements IFilter {
     private final String name;
 
-    protected AbstractFilter(String name) {
+    protected AbstractFilter(final String name) {
         this.name = name;
     }
 
     @Override
-    public void filter(List<Geocache> list) {
+    public void filter(final List<Geocache> list) {
         final List<Geocache> itemsToRemove = new ArrayList<Geocache>();
         for (Geocache item : list) {
             if (!accepts(item)) {
@@ -30,7 +30,7 @@ abstract class AbstractFilter implements IFilter {
 
     /*
      * show name in array adapter
-     * 
+     *
      * @see java.lang.Object#toString()
      */
     @Override
diff --git a/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java b/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java
index e84174a..96d256a 100644
--- a/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java
+++ b/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java
@@ -8,7 +8,7 @@ abstract class AbstractRangeFilter extends AbstractFilter {
     protected final float rangeMin;
     protected final float rangeMax;
 
-    protected AbstractRangeFilter(int ressourceId, int range) {
+    protected AbstractRangeFilter(final int ressourceId, final int range) {
         super(cgeoapplication.getInstance().getResources().getString(ressourceId) + ' ' + (range == 5 ? '5' : range + " + " + String.format("%.1f", range + 0.5)));
         this.rangeMin = range;
         rangeMax = rangeMin + 1f;
diff --git a/main/src/cgeo/geocaching/filter/DifficultyFilter.java b/main/src/cgeo/geocaching/filter/DifficultyFilter.java
index 8099a51..438c25a 100644
--- a/main/src/cgeo/geocaching/filter/DifficultyFilter.java
+++ b/main/src/cgeo/geocaching/filter/DifficultyFilter.java
@@ -8,21 +8,25 @@ import java.util.List;
 
 class DifficultyFilter extends AbstractRangeFilter {
 
-    public DifficultyFilter(int difficulty) {
+    public DifficultyFilter(final int difficulty) {
         super(R.string.cache_difficulty, difficulty);
     }
 
     @Override
-    public boolean accepts(Geocache cache) {
-        return rangeMin <= cache.getDifficulty() && cache.getDifficulty() < rangeMax;
+    public boolean accepts(final Geocache cache) {
+        final float difficulty = cache.getDifficulty();
+        return rangeMin <= difficulty && difficulty < rangeMax;
     }
 
     public static class Factory implements IFilterFactory {
 
+        private static final int DIFFICULTY_MIN = 1;
+        private static final int DIFFICULTY_MAX = 5;
+
         @Override
         public List<IFilter> getFilters() {
-            final ArrayList<IFilter> filters = new ArrayList<IFilter>(5);
-            for (int difficulty = 1; difficulty <= 5; difficulty++) {
+            final ArrayList<IFilter> filters = new ArrayList<IFilter>(DIFFICULTY_MAX);
+            for (int difficulty = DIFFICULTY_MIN; difficulty <= DIFFICULTY_MAX; difficulty++) {
                 filters.add(new DifficultyFilter(difficulty));
             }
             return filters;
diff --git a/main/src/cgeo/geocaching/filter/FilterUserInterface.java b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
index 6c9c045..3556eef 100644
--- a/main/src/cgeo/geocaching/filter/FilterUserInterface.java
+++ b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.filter;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.CacheType;
+import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.RunnableWithArgument;
 
@@ -60,7 +60,7 @@ public final class FilterUserInterface {
         Collections.sort(registry, new Comparator<FactoryEntry>() {
 
             @Override
-            public int compare(FactoryEntry lhs, FactoryEntry rhs) {
+            public int compare(final FactoryEntry lhs, final FactoryEntry rhs) {
                 return lhs.name.compareToIgnoreCase(rhs.name);
             }
         });
@@ -69,7 +69,7 @@ public final class FilterUserInterface {
         register(R.string.caches_filter_clear, null);
     }
 
-    private void register(int resourceId, Class<? extends IFilterFactory> factoryClass) {
+    private void register(final int resourceId, final Class<? extends IFilterFactory> factoryClass) {
         registry.add(new FactoryEntry(res.getString(resourceId), factoryClass));
     }
 
@@ -81,7 +81,7 @@ public final class FilterUserInterface {
 
         builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
             @Override
-            public void onClick(DialogInterface dialog, int itemIndex) {
+            public void onClick(final DialogInterface dialog, final int itemIndex) {
                 FactoryEntry entry = adapter.getItem(itemIndex);
                 // reset?
                 if (entry.filterFactory == null) {
@@ -114,7 +114,7 @@ public final class FilterUserInterface {
         final ArrayAdapter<IFilter> adapter = new ArrayAdapter<IFilter>(activity, android.R.layout.select_dialog_item, filters);
         builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
             @Override
-            public void onClick(DialogInterface dialog, int item) {
+            public void onClick(final DialogInterface dialog, final int item) {
                 runAfterwards.run(filters.get(item));
             }
         });
diff --git a/main/src/cgeo/geocaching/filter/IFilter.java b/main/src/cgeo/geocaching/filter/IFilter.java
index 4a428f8..4fafe6f 100644
--- a/main/src/cgeo/geocaching/filter/IFilter.java
+++ b/main/src/cgeo/geocaching/filter/IFilter.java
@@ -6,13 +6,13 @@ import java.util.List;
 
 public interface IFilter {
 
-    public abstract String getName();
+    String getName();
 
     /**
      * @param cache
      * @return true if the filter accepts the cache, false otherwise
      */
-    public abstract boolean accepts(final Geocache cache);
+    boolean accepts(final Geocache cache);
 
-    public void filter(final List<Geocache> list);
+    void filter(final List<Geocache> list);
 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/filter/IFilterFactory.java b/main/src/cgeo/geocaching/filter/IFilterFactory.java
index e750639..afc99af 100644
--- a/main/src/cgeo/geocaching/filter/IFilterFactory.java
+++ b/main/src/cgeo/geocaching/filter/IFilterFactory.java
@@ -3,5 +3,5 @@ package cgeo.geocaching.filter;
 import java.util.List;
 
 interface IFilterFactory {
-    public List<? extends IFilter> getFilters();
+    List<? extends IFilter> getFilters();
 }
diff --git a/main/src/cgeo/geocaching/filter/OriginFilter.java b/main/src/cgeo/geocaching/filter/OriginFilter.java
index bd4e41e..8c54a4c 100644
--- a/main/src/cgeo/geocaching/filter/OriginFilter.java
+++ b/main/src/cgeo/geocaching/filter/OriginFilter.java
@@ -13,13 +13,13 @@ public class OriginFilter extends AbstractFilter {
 
     private final IConnector connector;
 
-    public OriginFilter(IConnector connector) {
+    public OriginFilter(final IConnector connector) {
         super(connector.getName());
         this.connector = connector;
     }
 
     @Override
-    public boolean accepts(Geocache cache) {
+    public final boolean accepts(final Geocache cache) {
         return ConnectorFactory.getConnector(cache) == connector;
     }
 
@@ -36,7 +36,7 @@ public class OriginFilter extends AbstractFilter {
             Collections.sort(filters, new Comparator<OriginFilter>() {
 
                 @Override
-                public int compare(OriginFilter lhs, OriginFilter rhs) {
+                public int compare(final OriginFilter lhs, final OriginFilter rhs) {
                     return lhs.getName().compareToIgnoreCase(rhs.getName());
                 }
             });
diff --git a/main/src/cgeo/geocaching/filter/SizeFilter.java b/main/src/cgeo/geocaching/filter/SizeFilter.java
index 8ddc475..13c1d87 100644
--- a/main/src/cgeo/geocaching/filter/SizeFilter.java
+++ b/main/src/cgeo/geocaching/filter/SizeFilter.java
@@ -9,13 +9,13 @@ import java.util.List;
 class SizeFilter extends AbstractFilter {
     private final CacheSize cacheSize;
 
-    public SizeFilter(CacheSize cacheSize) {
+    public SizeFilter(final CacheSize cacheSize) {
         super(cacheSize.id);
         this.cacheSize = cacheSize;
     }
 
     @Override
-    public boolean accepts(Geocache cache) {
+    public boolean accepts(final Geocache cache) {
         return cacheSize == cache.getSize();
     }
 
diff --git a/main/src/cgeo/geocaching/filter/StateFilter.java b/main/src/cgeo/geocaching/filter/StateFilter.java
index e18128d..98589ab 100644
--- a/main/src/cgeo/geocaching/filter/StateFilter.java
+++ b/main/src/cgeo/geocaching/filter/StateFilter.java
@@ -13,9 +13,9 @@ import java.util.List;
 
 abstract class StateFilter extends AbstractFilter {
 
-    final static Resources res = cgeoapplication.getInstance().getResources();
+    static final Resources res = cgeoapplication.getInstance().getResources();
 
-    protected StateFilter(String name) {
+    protected StateFilter(final String name) {
         super(name);
     }
 
@@ -26,7 +26,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return cache.isFound();
         }
 
@@ -38,7 +38,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return cache.isArchived();
         }
     }
@@ -49,7 +49,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return cache.isDisabled();
         }
     }
@@ -60,7 +60,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return cache.isPremiumMembersOnly();
         }
     }
@@ -71,7 +71,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return !cache.isPremiumMembersOnly();
         }
     }
@@ -82,7 +82,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return cache.isLogOffline();
         }
     }
@@ -93,7 +93,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return cache.isOffline();
         }
     }
@@ -104,7 +104,7 @@ abstract class StateFilter extends AbstractFilter {
         }
 
         @Override
-        public boolean accepts(Geocache cache) {
+        public boolean accepts(final Geocache cache) {
             return !cache.isOffline();
         }
     }
@@ -126,7 +126,7 @@ abstract class StateFilter extends AbstractFilter {
             Collections.sort(filters, new Comparator<StateFilter>() {
 
                 @Override
-                public int compare(StateFilter filter1, StateFilter filter2) {
+                public int compare(final StateFilter filter1, final StateFilter filter2) {
                     return filter1.getName().compareToIgnoreCase(filter2.getName());
                 }
             });
diff --git a/main/src/cgeo/geocaching/filter/TerrainFilter.java b/main/src/cgeo/geocaching/filter/TerrainFilter.java
index 87372c6..d74f954 100644
--- a/main/src/cgeo/geocaching/filter/TerrainFilter.java
+++ b/main/src/cgeo/geocaching/filter/TerrainFilter.java
@@ -8,20 +8,24 @@ import java.util.List;
 
 class TerrainFilter extends AbstractRangeFilter {
 
-    public TerrainFilter(int terrain) {
+    public TerrainFilter(final int terrain) {
         super(R.string.cache_terrain, terrain);
     }
 
     @Override
-    public boolean accepts(Geocache cache) {
-        return rangeMin <= cache.getTerrain() && cache.getTerrain() < rangeMax;
+    public boolean accepts(final Geocache cache) {
+        final float terrain = cache.getTerrain();
+        return rangeMin <= terrain && terrain < rangeMax;
     }
 
     public static class Factory implements IFilterFactory {
+        private static final int TERRAIN_MIN = 1;
+        private static final int TERRAIN_MAX = 5;
+
         @Override
         public List<IFilter> getFilters() {
-            final ArrayList<IFilter> filters = new ArrayList<IFilter>(5);
-            for (int terrain = 1; terrain <= 5; terrain++) {
+            final ArrayList<IFilter> filters = new ArrayList<IFilter>(TERRAIN_MAX);
+            for (int terrain = TERRAIN_MIN; terrain <= TERRAIN_MAX; terrain++) {
                 filters.add(new TerrainFilter(terrain));
             }
             return filters;
diff --git a/main/src/cgeo/geocaching/filter/TrackablesFilter.java b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
index 5eff8a7..74f43be 100644
--- a/main/src/cgeo/geocaching/filter/TrackablesFilter.java
+++ b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
@@ -13,7 +13,7 @@ class TrackablesFilter extends AbstractFilter implements IFilterFactory {
     }
 
     @Override
-    public boolean accepts(Geocache cache) {
+    public boolean accepts(final Geocache cache) {
         return cache.hasTrackables();
     }