Merge branch 'constants-for-cache-size' into upstream

1 files changed, 17 insertions, 12 deletions

diff --git a/src/cgeo/geocaching/enumerations/CacheSize.java b/src/cgeo/geocaching/enumerations/CacheSize.java
index ee202ad..44d6377 100644
--- a/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.enumerations;
 
+import cgeo.geocaching.R;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -10,28 +12,31 @@ import java.util.Map;
  * @author koem
  */
 public enum CacheSize {
-    MICRO("micro", 1),
-    SMALL("small", 2),
-    REGULAR("regular", 3),
-    LARGE("large", 4),
-    NOT_CHOSEN("not chosen", 0),
-    OTHER("other", 0);
+    MICRO("micro", 1, R.string.caches_filter_size_micro),
+    SMALL("small", 2, R.string.caches_filter_size_small),
+    REGULAR("regular", 3, R.string.caches_filter_size_regular),
+    LARGE("large", 4, R.string.caches_filter_size_large),
+    VIRTUAL("virtual", 0, R.string.caches_filter_size_virtual),
+    NOT_CHOSEN("not chosen", 0, R.string.caches_filter_size_notchosen),
+    OTHER("other", 0, R.string.caches_filter_size_other);
 
-    public final String cgeoId;
+    public final String id;
     public final int comparable;
+    public final int stringId;
 
-    private CacheSize(String cgeoId, int comparable) {
-        this.cgeoId = cgeoId;
+    private CacheSize(String id, int comparable, int stringId) {
+        this.id = id;
         this.comparable = comparable;
+        this.stringId = stringId;
     }
 
-    final public static Map<String, CacheSize> FIND_BY_CGEOID;
+    final public static Map<String, CacheSize> FIND_BY_ID;
     static {
         final HashMap<String, CacheSize> mapping = new HashMap<String, CacheSize>();
         for (CacheSize cs : values()) {
-            mapping.put(cs.cgeoId, cs);
+            mapping.put(cs.id, cs);
         }
-        FIND_BY_CGEOID = Collections.unmodifiableMap(mapping);
+        FIND_BY_ID = Collections.unmodifiableMap(mapping);
     }
 
 }