new: filters as activity, not dialog

This makes it possible to replace certain filters by better matching
controls over time.

7 files changed, 16 insertions, 24 deletions

diff --git a/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java b/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java
index d474857..3353fe9 100644
--- a/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java
@@ -4,11 +4,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.filter.StateFilter.StateArchivedFilter;
 
 public class StateArchivedFilterTest extends CGeoTestCase {
 
-    private StateFilter.StateArchivedFilter archivedFilter;
+    private StateFilterFactory.StateArchivedFilter archivedFilter;
     private Geocache archivedCache;
 
     @Override
@@ -16,7 +15,7 @@ public class StateArchivedFilterTest extends CGeoTestCase {
         super.setUp();
 
         // members can only be setup here, after application is initialized
-        archivedFilter = new StateArchivedFilter();
+        archivedFilter = new StateFilterFactory.StateArchivedFilter();
         archivedCache = new Geocache();
         archivedCache.setArchived(true);
     }
diff --git a/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java b/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java
index 71a1134..eff3a67 100644
--- a/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java
@@ -4,18 +4,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.filter.StateFilter.StateDisabledFilter;
 
 public class StateDisabledFilterTest extends CGeoTestCase {
 
-    private StateFilter.StateDisabledFilter disabledFilter;
+    private StateFilterFactory.StateDisabledFilter disabledFilter;
     private Geocache disabledCache;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        disabledFilter = new StateDisabledFilter();
+        disabledFilter = new StateFilterFactory.StateDisabledFilter();
         disabledCache = new Geocache();
         disabledCache.setDisabled(true);
     }
diff --git a/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java b/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java
index e763881..beedd51 100644
--- a/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java
@@ -4,18 +4,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.filter.StateFilter.StateFoundFilter;
 
 public class StateFoundFilterTest extends CGeoTestCase {
 
-    private StateFilter.StateFoundFilter foundFilter;
+    private StateFilterFactory.StateFoundFilter foundFilter;
     private Geocache foundCache;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        foundFilter = new StateFoundFilter();
+        foundFilter = new StateFilterFactory.StateFoundFilter();
         foundCache = new Geocache();
         foundCache.setFound(true);
     }
diff --git a/tests/src/cgeo/geocaching/filter/StateNonPremiumFilterTest.java b/tests/src/cgeo/geocaching/filter/StateNonPremiumFilterTest.java
index c698e8b..87a8909 100644
--- a/tests/src/cgeo/geocaching/filter/StateNonPremiumFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateNonPremiumFilterTest.java
@@ -4,18 +4,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.filter.StateFilter.StateNonPremiumFilter;
 
 public class StateNonPremiumFilterTest extends CGeoTestCase {
 
-    private StateFilter.StateNonPremiumFilter nonPremiumFilter;
+    private StateFilterFactory.StateNonPremiumFilter nonPremiumFilter;
     private Geocache premiumCache;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        nonPremiumFilter = new StateNonPremiumFilter();
+        nonPremiumFilter = new StateFilterFactory.StateNonPremiumFilter();
         premiumCache = new Geocache();
         premiumCache.setPremiumMembersOnly(true);
     }
diff --git a/tests/src/cgeo/geocaching/filter/StateNotFoundFilterTest.java b/tests/src/cgeo/geocaching/filter/StateNotFoundFilterTest.java
index 2bf9d94..bb5098c 100644
--- a/tests/src/cgeo/geocaching/filter/StateNotFoundFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateNotFoundFilterTest.java
@@ -4,18 +4,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.filter.StateFilter.StateNotFoundFilter;
 
 public class StateNotFoundFilterTest extends CGeoTestCase {
 
-    private StateFilter.StateNotFoundFilter notFoundFilter;
+    private StateFilterFactory.StateNotFoundFilter notFoundFilter;
     private Geocache foundCache;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        notFoundFilter = new StateNotFoundFilter();
+        notFoundFilter = new StateFilterFactory.StateNotFoundFilter();
         foundCache = new Geocache();
         foundCache.setFound(true);
     }
diff --git a/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java b/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java
index ac8682b..c06a4fe 100644
--- a/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java
@@ -4,18 +4,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.filter.StateFilter.StatePremiumFilter;
 
 public class StatePremiumFilterTest extends CGeoTestCase {
 
-    private StateFilter.StatePremiumFilter premiumFilter;
+    private StateFilterFactory.StatePremiumFilter premiumFilter;
     private Geocache premiumCache;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        premiumFilter = new StatePremiumFilter();
+        premiumFilter = new StateFilterFactory.StatePremiumFilter();
         premiumCache = new Geocache();
         premiumCache.setPremiumMembersOnly(true);
     }
diff --git a/tests/src/cgeo/geocaching/filter/StateStoredFilterTest.java b/tests/src/cgeo/geocaching/filter/StateStoredFilterTest.java
index d110921..5d1eecc 100644
--- a/tests/src/cgeo/geocaching/filter/StateStoredFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateStoredFilterTest.java
@@ -4,20 +4,18 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.filter.StateFilter.StateNotStoredFilter;
-import cgeo.geocaching.filter.StateFilter.StateStoredFilter;
 
 public class StateStoredFilterTest extends CGeoTestCase {
 
-    private StateFilter.StateStoredFilter storedFilter;
-    private StateFilter.StateNotStoredFilter notStoredFilter;
+    private StateFilterFactory.StateStoredFilter storedFilter;
+    private StateFilterFactory.StateNotStoredFilter notStoredFilter;
     private Geocache cache;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        storedFilter = new StateStoredFilter();
-        notStoredFilter = new StateNotStoredFilter();
+        storedFilter = new StateFilterFactory.StateStoredFilter();
+        notStoredFilter = new StateFilterFactory.StateNotStoredFilter();
         cache = new Geocache();
     }