refactoring: reduce class coupling

8 files changed, 23 insertions, 28 deletions

diff --git a/main/src/cgeo/geocaching/filter/AbstractFilter.java b/main/src/cgeo/geocaching/filter/AbstractFilter.java
index dff8b4b..20575a6 100644
--- a/main/src/cgeo/geocaching/filter/AbstractFilter.java
+++ b/main/src/cgeo/geocaching/filter/AbstractFilter.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.filter;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 
 import org.eclipse.jdt.annotation.NonNull;
@@ -11,10 +12,15 @@ abstract class AbstractFilter implements IFilter {
     @NonNull
     private final String name;
 
+    protected AbstractFilter(final int nameResourceId) {
+        this(CgeoApplication.getInstance().getString(nameResourceId));
+    }
+
     protected AbstractFilter(@NonNull final String name) {
         this.name = name;
     }
 
+
     @Override
     public void filter(@NonNull final List<Geocache> list) {
         final List<Geocache> itemsToRemove = new ArrayList<>();
diff --git a/main/src/cgeo/geocaching/filter/ModifiedFilter.java b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
index c224cb4..9b5c856 100644
--- a/main/src/cgeo/geocaching/filter/ModifiedFilter.java
+++ b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 
@@ -12,7 +11,7 @@ import java.util.List;
 class ModifiedFilter extends AbstractFilter implements IFilterFactory {
 
     public ModifiedFilter() {
-        super(CgeoApplication.getInstance().getString(R.string.caches_filter_modified));
+        super(R.string.caches_filter_modified);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/filter/OfflineLogFilter.java b/main/src/cgeo/geocaching/filter/OfflineLogFilter.java
index e0c79c7..0ed9618 100644
--- a/main/src/cgeo/geocaching/filter/OfflineLogFilter.java
+++ b/main/src/cgeo/geocaching/filter/OfflineLogFilter.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 
@@ -9,7 +8,7 @@ import org.eclipse.jdt.annotation.NonNull;
 public class OfflineLogFilter extends AbstractFilter {
 
     protected OfflineLogFilter() {
-        super(CgeoApplication.getInstance().getString(R.string.caches_filter_offline_log));
+        super(R.string.caches_filter_offline_log);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/filter/OwnRatingFilter.java b/main/src/cgeo/geocaching/filter/OwnRatingFilter.java
index 0c468a9..1b86bab 100644
--- a/main/src/cgeo/geocaching/filter/OwnRatingFilter.java
+++ b/main/src/cgeo/geocaching/filter/OwnRatingFilter.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.gcvote.GCVote;
@@ -18,7 +17,7 @@ import java.util.List;
 public class OwnRatingFilter extends AbstractFilter implements IFilterFactory {
 
     protected OwnRatingFilter() {
-        super(CgeoApplication.getInstance().getString(R.string.caches_filter_own_rating));
+        super(R.string.caches_filter_own_rating);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/filter/PersonalNoteFilter.java b/main/src/cgeo/geocaching/filter/PersonalNoteFilter.java
index 978ad6b..11c623e 100644
--- a/main/src/cgeo/geocaching/filter/PersonalNoteFilter.java
+++ b/main/src/cgeo/geocaching/filter/PersonalNoteFilter.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 
@@ -16,7 +15,7 @@ import java.util.List;
 public class PersonalNoteFilter extends AbstractFilter implements IFilterFactory {
 
     protected PersonalNoteFilter() {
-        super(CgeoApplication.getInstance().getString(R.string.caches_filter_personal_note));
+        super(R.string.caches_filter_personal_note);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/filter/RatingFilter.java b/main/src/cgeo/geocaching/filter/RatingFilter.java
index 3edfcb6..63e9c0b 100644
--- a/main/src/cgeo/geocaching/filter/RatingFilter.java
+++ b/main/src/cgeo/geocaching/filter/RatingFilter.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.gcvote.GCVote;
@@ -18,7 +17,7 @@ import java.util.List;
 public class RatingFilter extends AbstractFilter implements IFilterFactory {
 
     protected RatingFilter() {
-        super(CgeoApplication.getInstance().getString(R.string.caches_filter_rating));
+        super(R.string.caches_filter_rating);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/filter/StateFilter.java b/main/src/cgeo/geocaching/filter/StateFilter.java
index 8d6893e..289f656 100644
--- a/main/src/cgeo/geocaching/filter/StateFilter.java
+++ b/main/src/cgeo/geocaching/filter/StateFilter.java
@@ -1,13 +1,10 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 
 import org.eclipse.jdt.annotation.NonNull;
 
-import android.content.res.Resources;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -15,16 +12,14 @@ import java.util.List;
 
 abstract class StateFilter extends AbstractFilter {
 
-    static final Resources res = CgeoApplication.getInstance().getResources();
-
-    protected StateFilter(@NonNull final String name) {
-        super(name);
+    protected StateFilter(final int nameResourceId) {
+        super(nameResourceId);
     }
 
     static class StateFoundFilter extends StateFilter {
 
         public StateFoundFilter() {
-            super(res.getString(R.string.cache_status_found));
+            super(R.string.cache_status_found);
         }
 
         @Override
@@ -37,7 +32,7 @@ abstract class StateFilter extends AbstractFilter {
     static class StateNotFoundFilter extends StateFilter {
 
         public StateNotFoundFilter() {
-            super(res.getString(R.string.cache_not_status_found));
+            super(R.string.cache_not_status_found);
         }
 
         @Override
@@ -49,7 +44,7 @@ abstract class StateFilter extends AbstractFilter {
 
     static class StateArchivedFilter extends StateFilter {
         public StateArchivedFilter() {
-            super(res.getString(R.string.cache_status_archived));
+            super(R.string.cache_status_archived);
         }
 
         @Override
@@ -60,7 +55,7 @@ abstract class StateFilter extends AbstractFilter {
 
     static class StateDisabledFilter extends StateFilter {
         public StateDisabledFilter() {
-            super(res.getString(R.string.cache_status_disabled));
+            super(R.string.cache_status_disabled);
         }
 
         @Override
@@ -71,7 +66,7 @@ abstract class StateFilter extends AbstractFilter {
 
     static class StatePremiumFilter extends StateFilter {
         public StatePremiumFilter() {
-            super(res.getString(R.string.cache_status_premium));
+            super(R.string.cache_status_premium);
         }
 
         @Override
@@ -82,7 +77,7 @@ abstract class StateFilter extends AbstractFilter {
 
     static class StateNonPremiumFilter extends StateFilter {
         public StateNonPremiumFilter() {
-            super(res.getString(R.string.cache_status_not_premium));
+            super(R.string.cache_status_not_premium);
         }
 
         @Override
@@ -93,7 +88,7 @@ abstract class StateFilter extends AbstractFilter {
 
     private static class StateOfflineLogFilter extends StateFilter {
         public StateOfflineLogFilter() {
-            super(res.getString(R.string.cache_status_offline_log));
+            super(R.string.cache_status_offline_log);
         }
 
         @Override
@@ -104,7 +99,7 @@ abstract class StateFilter extends AbstractFilter {
 
     static class StateStoredFilter extends StateFilter {
         public StateStoredFilter() {
-            super(res.getString(R.string.cache_status_stored));
+            super(R.string.cache_status_stored);
         }
 
         @Override
@@ -115,7 +110,7 @@ abstract class StateFilter extends AbstractFilter {
 
     static class StateNotStoredFilter extends StateFilter {
         public StateNotStoredFilter() {
-            super(res.getString(R.string.cache_status_not_stored));
+            super(R.string.cache_status_not_stored);
         }
 
         @Override
diff --git a/main/src/cgeo/geocaching/filter/TrackablesFilter.java b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
index 7ad06a1..bdf91f7 100644
--- a/main/src/cgeo/geocaching/filter/TrackablesFilter.java
+++ b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 
@@ -11,7 +10,7 @@ import java.util.List;
 
 class TrackablesFilter extends AbstractFilter implements IFilterFactory {
     public TrackablesFilter() {
-        super(CgeoApplication.getInstance().getString(R.string.caches_filter_track));
+        super(R.string.caches_filter_track);
     }
 
     @Override