refactoring: use lists instead of arrays for filter collections

Using arrays makes the surrounding code very constrained. Most of the
time, filter collections were built in lists and converted into arrays.
Using lists in the filter factory signature makes it more natural to
manipulate those collections.

15 files changed, 53 insertions, 38 deletions

diff --git a/main/src/cgeo/geocaching/filter/AttributeFilter.java b/main/src/cgeo/geocaching/filter/AttributeFilter.java
index f3e8eb3..cadcf49 100644
--- a/main/src/cgeo/geocaching/filter/AttributeFilter.java
+++ b/main/src/cgeo/geocaching/filter/AttributeFilter.java
@@ -9,6 +9,8 @@ import cgeo.geocaching.enumerations.LoadFlags.LoadFlag;
 import android.content.res.Resources;
 
 import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
 
 class AttributeFilter extends AbstractFilter {
 
@@ -37,14 +39,13 @@ class AttributeFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final String packageName = cgeoapplication.getInstance().getBaseContext().getPackageName();
             final Resources res = cgeoapplication.getInstance().getResources();
 
-            final String[] ids = res.getStringArray(R.array.attribute_ids);
-            final IFilter[] filters = new IFilter[ids.length];
-            for (int i = 0; i < ids.length; i++) {
-                filters[i] = new AttributeFilter(getName("attribute_" + ids[i], res, packageName), ids[i]);
+            final List<IFilter> filters = new LinkedList<IFilter>();
+            for (final String id: res.getStringArray(R.array.attribute_ids)) {
+                filters.add(new AttributeFilter(getName("attribute_" + id, res, packageName), id));
             }
             return filters;
         }
diff --git a/main/src/cgeo/geocaching/filter/DifficultyFilter.java b/main/src/cgeo/geocaching/filter/DifficultyFilter.java
index c0ec61a..8099a51 100644
--- a/main/src/cgeo/geocaching/filter/DifficultyFilter.java
+++ b/main/src/cgeo/geocaching/filter/DifficultyFilter.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 
 import java.util.ArrayList;
+import java.util.List;
 
 class DifficultyFilter extends AbstractRangeFilter {
 
@@ -19,12 +20,12 @@ class DifficultyFilter extends AbstractRangeFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final ArrayList<IFilter> filters = new ArrayList<IFilter>(5);
             for (int difficulty = 1; difficulty <= 5; difficulty++) {
                 filters.add(new DifficultyFilter(difficulty));
             }
-            return filters.toArray(new IFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/FilterUserInterface.java b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
index be63a08..a1d42cc 100644
--- a/main/src/cgeo/geocaching/filter/FilterUserInterface.java
+++ b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
@@ -16,6 +16,7 @@ import android.widget.ArrayAdapter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 public final class FilterUserInterface {
 
@@ -101,9 +102,9 @@ public final class FilterUserInterface {
     }
 
     private void selectFromFactory(final IFilterFactory factory, final String menuTitle, final RunnableWithArgument<IFilter> runAfterwards) {
-        final IFilter[] filters = factory.getFilters();
-        if (filters.length == 1) {
-            runAfterwards.run(filters[0]);
+        final List<IFilter> filters = Collections.unmodifiableList(factory.getFilters());
+        if (filters.size() == 1) {
+            runAfterwards.run(filters.get(0));
             return;
         }
 
@@ -114,7 +115,7 @@ public final class FilterUserInterface {
         builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int item) {
-                runAfterwards.run(filters[item]);
+                runAfterwards.run(filters.get(item));
             }
         });
 
diff --git a/main/src/cgeo/geocaching/filter/IFilterFactory.java b/main/src/cgeo/geocaching/filter/IFilterFactory.java
index 3491fd7..e750639 100644
--- a/main/src/cgeo/geocaching/filter/IFilterFactory.java
+++ b/main/src/cgeo/geocaching/filter/IFilterFactory.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.filter;
 
+import java.util.List;
+
 interface IFilterFactory {
-    public IFilter[] getFilters();
+    public List<? extends IFilter> getFilters();
 }
diff --git a/main/src/cgeo/geocaching/filter/ModifiedFilter.java b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
index f3e57de..74befda 100644
--- a/main/src/cgeo/geocaching/filter/ModifiedFilter.java
+++ b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
@@ -4,6 +4,9 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.cgeoapplication;
 
+import java.util.Collections;
+import java.util.List;
+
 class ModifiedFilter extends AbstractFilter implements IFilterFactory {
 
     public ModifiedFilter() {
@@ -17,7 +20,7 @@ class ModifiedFilter extends AbstractFilter implements IFilterFactory {
     }
 
     @Override
-    public IFilter[] getFilters() {
-        return new IFilter[] { this };
+    public List<ModifiedFilter> getFilters() {
+        return Collections.singletonList(this);
     }
 }
diff --git a/main/src/cgeo/geocaching/filter/OriginFilter.java b/main/src/cgeo/geocaching/filter/OriginFilter.java
index a880092..bd4e41e 100644
--- a/main/src/cgeo/geocaching/filter/OriginFilter.java
+++ b/main/src/cgeo/geocaching/filter/OriginFilter.java
@@ -7,6 +7,7 @@ import cgeo.geocaching.connector.IConnector;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 public class OriginFilter extends AbstractFilter {
 
@@ -25,7 +26,7 @@ public class OriginFilter extends AbstractFilter {
     public static final class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<OriginFilter> getFilters() {
             final ArrayList<OriginFilter> filters = new ArrayList<OriginFilter>();
             for (IConnector connector : ConnectorFactory.getConnectors()) {
                 filters.add(new OriginFilter(connector));
@@ -40,7 +41,7 @@ public class OriginFilter extends AbstractFilter {
                 }
             });
 
-            return filters.toArray(new OriginFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/SizeFilter.java b/main/src/cgeo/geocaching/filter/SizeFilter.java
index 7a34c83..8ddc475 100644
--- a/main/src/cgeo/geocaching/filter/SizeFilter.java
+++ b/main/src/cgeo/geocaching/filter/SizeFilter.java
@@ -3,7 +3,8 @@ package cgeo.geocaching.filter;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.enumerations.CacheSize;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 class SizeFilter extends AbstractFilter {
     private final CacheSize cacheSize;
@@ -26,15 +27,15 @@ class SizeFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final CacheSize[] cacheSizes = CacheSize.values();
-            final ArrayList<SizeFilter> filters = new ArrayList<SizeFilter>();
+            final List<IFilter> filters = new LinkedList<IFilter>();
             for (CacheSize cacheSize : cacheSizes) {
                 if (cacheSize != CacheSize.UNKNOWN) {
                     filters.add(new SizeFilter(cacheSize));
                 }
             }
-            return filters.toArray(new SizeFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/StateFilter.java b/main/src/cgeo/geocaching/filter/StateFilter.java
index 0df47c1..ae3fac2 100644
--- a/main/src/cgeo/geocaching/filter/StateFilter.java
+++ b/main/src/cgeo/geocaching/filter/StateFilter.java
@@ -9,6 +9,7 @@ import android.content.res.Resources;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 abstract class StateFilter extends AbstractFilter {
 
@@ -89,8 +90,8 @@ abstract class StateFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
-            final ArrayList<StateFilter> filters = new ArrayList<StateFilter>();
+        public List<StateFilter> getFilters() {
+            final List<StateFilter> filters = new ArrayList<StateFilter>(6);
             filters.add(new StateFoundFilter());
             filters.add(new StateArchivedFilter());
             filters.add(new StateDisabledFilter());
@@ -106,7 +107,7 @@ abstract class StateFilter extends AbstractFilter {
                 }
             });
 
-            return filters.toArray(new StateFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/main/src/cgeo/geocaching/filter/TerrainFilter.java b/main/src/cgeo/geocaching/filter/TerrainFilter.java
index f7703d5..87372c6 100644
--- a/main/src/cgeo/geocaching/filter/TerrainFilter.java
+++ b/main/src/cgeo/geocaching/filter/TerrainFilter.java
@@ -1,10 +1,10 @@
 package cgeo.geocaching.filter;
 
-
-import cgeo.geocaching.R;
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.R;
 
 import java.util.ArrayList;
+import java.util.List;
 
 class TerrainFilter extends AbstractRangeFilter {
 
@@ -19,12 +19,12 @@ class TerrainFilter extends AbstractRangeFilter {
 
     public static class Factory implements IFilterFactory {
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final ArrayList<IFilter> filters = new ArrayList<IFilter>(5);
             for (int terrain = 1; terrain <= 5; terrain++) {
                 filters.add(new TerrainFilter(terrain));
             }
-            return filters.toArray(new IFilter[filters.size()]);
+            return filters;
         }
     }
 
diff --git a/main/src/cgeo/geocaching/filter/TrackablesFilter.java b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
index 3225daa..5eff8a7 100644
--- a/main/src/cgeo/geocaching/filter/TrackablesFilter.java
+++ b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
@@ -1,9 +1,12 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.R;
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.R;
 import cgeo.geocaching.cgeoapplication;
 
+import java.util.Collections;
+import java.util.List;
+
 class TrackablesFilter extends AbstractFilter implements IFilterFactory {
     public TrackablesFilter() {
         super(cgeoapplication.getInstance().getString(R.string.caches_filter_track));
@@ -15,8 +18,8 @@ class TrackablesFilter extends AbstractFilter implements IFilterFactory {
     }
 
     @Override
-    public IFilter[] getFilters() {
-        return new IFilter[] { this };
+    public List<TrackablesFilter> getFilters() {
+        return Collections.singletonList(this);
     }
 
 }
diff --git a/main/src/cgeo/geocaching/filter/TypeFilter.java b/main/src/cgeo/geocaching/filter/TypeFilter.java
index eeab552..ea0ccff 100644
--- a/main/src/cgeo/geocaching/filter/TypeFilter.java
+++ b/main/src/cgeo/geocaching/filter/TypeFilter.java
@@ -3,7 +3,8 @@ package cgeo.geocaching.filter;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.enumerations.CacheType;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 class TypeFilter extends AbstractFilter {
     private final CacheType cacheType;
@@ -26,15 +27,15 @@ class TypeFilter extends AbstractFilter {
     public static class Factory implements IFilterFactory {
 
         @Override
-        public IFilter[] getFilters() {
+        public List<IFilter> getFilters() {
             final CacheType[] types = CacheType.values();
-            final ArrayList<IFilter> filters = new ArrayList<IFilter>(types.length);
+            final List<IFilter> filters = new LinkedList<IFilter>();
             for (CacheType cacheType : types) {
                 if (cacheType != CacheType.ALL) {
                     filters.add(new TypeFilter(cacheType));
                 }
             }
-            return filters.toArray(new IFilter[filters.size()]);
+            return filters;
         }
 
     }
diff --git a/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java b/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java
index b3ff056..ebe4cf6 100644
--- a/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java
@@ -19,6 +19,6 @@ public class DifficultyFilterTest extends CGeoTestCase {
     }
 
     public static void testAllFilters() {
-        assertTrue(new DifficultyFilter.Factory().getFilters().length == 5); // difficulty ranges from 1 to 5
+        assertTrue(new DifficultyFilter.Factory().getFilters().size() == 5); // difficulty ranges from 1 to 5
     }
 }
diff --git a/tests/src/cgeo/geocaching/filter/SizeFilterTest.java b/tests/src/cgeo/geocaching/filter/SizeFilterTest.java
index 2c6552b..8b909f3 100644
--- a/tests/src/cgeo/geocaching/filter/SizeFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/SizeFilterTest.java
@@ -33,7 +33,7 @@ public class SizeFilterTest extends CGeoTestCase {
 
     public static void testGetAllFilters() {
         final int expectedSizes = CacheSize.values().length - 1; // hide "UNKNOWN"
-        assertEquals(expectedSizes, new SizeFilter.Factory().getFilters().length);
+        assertEquals(expectedSizes, new SizeFilter.Factory().getFilters().size());
     }
 
     public void testFilter() {
diff --git a/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java b/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java
index d64f4d9..234af7e 100644
--- a/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java
@@ -19,6 +19,6 @@ public class TerrainFilterTest extends CGeoTestCase {
     }
 
     public static void testAllFilters() {
-        assertTrue(new TerrainFilter.Factory().getFilters().length == 5); // terrain ranges from 1 to 5
+        assertTrue(new TerrainFilter.Factory().getFilters().size() == 5); // terrain ranges from 1 to 5
     }
 }
diff --git a/tests/src/cgeo/geocaching/filter/TypeFilterTest.java b/tests/src/cgeo/geocaching/filter/TypeFilterTest.java
index 3a43b33..e813052 100644
--- a/tests/src/cgeo/geocaching/filter/TypeFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/TypeFilterTest.java
@@ -46,7 +46,7 @@ public class TypeFilterTest extends CGeoTestCase {
 
     public static void testGetAllFilters() {
         final int expectedEntries = CacheType.values().length - 1; // hide "all"
-        assertEquals(expectedEntries, new TypeFilter.Factory().getFilters().length);
+        assertEquals(expectedEntries, new TypeFilter.Factory().getFilters().size());
     }
 
 }