diff options
Diffstat (limited to 'src/cgeo/geocaching/enumerations')
| -rw-r--r-- | src/cgeo/geocaching/enumerations/CacheSize.java | 29 | ||||
| -rw-r--r-- | src/cgeo/geocaching/enumerations/CacheType.java | 42 | ||||
| -rw-r--r-- | src/cgeo/geocaching/enumerations/WaypointType.java | 30 |
3 files changed, 55 insertions, 46 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); } } diff --git a/src/cgeo/geocaching/enumerations/CacheType.java b/src/cgeo/geocaching/enumerations/CacheType.java index 0751a1f..59c774b 100644 --- a/src/cgeo/geocaching/enumerations/CacheType.java +++ b/src/cgeo/geocaching/enumerations/CacheType.java @@ -12,41 +12,41 @@ import java.util.Map; * @author koem */ public enum CacheType { - TRADITIONAL ("traditional", "traditional cache", "32bc9333-5e52-4957-b0f6-5a2c8fc7b257", R.string.traditional), - MULTI ("multi", "multi-cache", "a5f6d0ad-d2f2-4011-8c14-940a9ebf3c74", R.string.multi), - MYSTERY ("mystery", "unknown cache", "40861821-1835-4e11-b666-8d41064d03fe", R.string.mystery), - LETTERBOX ("letterbox", "letterbox hybrid", "4bdd8fb2-d7bc-453f-a9c5-968563b15d24", R.string.letterbox), - EVENT ("event", "event cache", "69eb8534-b718-4b35-ae3c-a856a55b0874", R.string.event), - MEGA_EVENT ("mega", "mega-event cache", "69eb8535-b718-4b35-ae3c-a856a55b0874", R.string.mega), - EARTH ("earth", "earthcache", "c66f5cf3-9523-4549-b8dd-759cd2f18db8", R.string.earth), - CITO ("cito", "cache in trash out event", "57150806-bc1a-42d6-9cf0-538d171a2d22", R.string.cito), - WEBCAM ("webcam", "webcam cache", "31d2ae3c-c358-4b5f-8dcd-2185bf472d3d", R.string.webcam), - VIRTUAL ("virtual", "virtual cache", "294d4360-ac86-4c83-84dd-8113ef678d7e", R.string.virtual), - WHERIGO ("wherigo", "wherigo cache", "0544fa55-772d-4e5c-96a9-36a51ebcf5c9", R.string.wherigo), - LOSTANDFOUND ("lostfound", "lost & found", "3ea6533d-bb52-42fe-b2d2-79a3424d4728", R.string.lostfound), - PROJECT_APE ("ape", "project ape cache", "2555690d-b2bc-4b55-b5ac-0cb704c0b768", R.string.ape), - GCHQ ("gchq", "groundspeak hq", "416f2494-dc17-4b6a-9bab-1a29dd292d8c", R.string.gchq), - GPS_EXHIBIT ("gps", "gps cache exhibit", "72e69af2-7986-4990-afd9-bc16cbbb4ce3", R.string.gps); + TRADITIONAL("traditional", "traditional cache", "32bc9333-5e52-4957-b0f6-5a2c8fc7b257", R.string.traditional), + MULTI("multi", "multi-cache", "a5f6d0ad-d2f2-4011-8c14-940a9ebf3c74", R.string.multi), + MYSTERY("mystery", "unknown cache", "40861821-1835-4e11-b666-8d41064d03fe", R.string.mystery), + LETTERBOX("letterbox", "letterbox hybrid", "4bdd8fb2-d7bc-453f-a9c5-968563b15d24", R.string.letterbox), + EVENT("event", "event cache", "69eb8534-b718-4b35-ae3c-a856a55b0874", R.string.event), + MEGA_EVENT("mega", "mega-event cache", "69eb8535-b718-4b35-ae3c-a856a55b0874", R.string.mega), + EARTH("earth", "earthcache", "c66f5cf3-9523-4549-b8dd-759cd2f18db8", R.string.earth), + CITO("cito", "cache in trash out event", "57150806-bc1a-42d6-9cf0-538d171a2d22", R.string.cito), + WEBCAM("webcam", "webcam cache", "31d2ae3c-c358-4b5f-8dcd-2185bf472d3d", R.string.webcam), + VIRTUAL("virtual", "virtual cache", "294d4360-ac86-4c83-84dd-8113ef678d7e", R.string.virtual), + WHERIGO("wherigo", "wherigo cache", "0544fa55-772d-4e5c-96a9-36a51ebcf5c9", R.string.wherigo), + LOSTANDFOUND("lostfound", "lost & found", "3ea6533d-bb52-42fe-b2d2-79a3424d4728", R.string.lostfound), + PROJECT_APE("ape", "project ape cache", "2555690d-b2bc-4b55-b5ac-0cb704c0b768", R.string.ape), + GCHQ("gchq", "groundspeak hq", "416f2494-dc17-4b6a-9bab-1a29dd292d8c", R.string.gchq), + GPS_EXHIBIT("gps", "gps cache exhibit", "72e69af2-7986-4990-afd9-bc16cbbb4ce3", R.string.gps); - public final String cgeoId; + public final String id; public final String pattern; public final String guid; public final int stringId; - private CacheType(String cgeoId, String pattern, String guid, int stringId) { - this.cgeoId = cgeoId; + private CacheType(String id, String pattern, String guid, int stringId) { + this.id = id; this.pattern = pattern; this.guid = guid; this.stringId = stringId; } - public final static Map<String, CacheType> FIND_BY_CGEOID; + public final static Map<String, CacheType> FIND_BY_ID; static { final HashMap<String, CacheType> mapping = new HashMap<String, CacheType>(); for (CacheType ct : values()) { - mapping.put(ct.cgeoId, ct); + mapping.put(ct.id, ct); } - FIND_BY_CGEOID = Collections.unmodifiableMap(mapping); + FIND_BY_ID = Collections.unmodifiableMap(mapping); } } diff --git a/src/cgeo/geocaching/enumerations/WaypointType.java b/src/cgeo/geocaching/enumerations/WaypointType.java index 70ef08a..2cb22a0 100644 --- a/src/cgeo/geocaching/enumerations/WaypointType.java +++ b/src/cgeo/geocaching/enumerations/WaypointType.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,27 +12,29 @@ import java.util.Map; * @author koem */ public enum WaypointType { - FLAG ("flag"), - OWN ("own"), - PKG ("pkg"), - PUZZLE ("puzzle"), - STAGE ("stage"), - TRAILHEAD ("trailhead"), - WAYPOINT ("waypoint"); + FLAG("flag", R.string.wp_final), + OWN("own", R.string.wp_stage), + PKG("pkg", R.string.wp_pkg), + PUZZLE("puzzle", R.string.wp_puzzle), + STAGE("stage", R.string.wp_stage), + TRAILHEAD("trailhead", R.string.wp_trailhead), + WAYPOINT("waypoint", R.string.wp_waypoint); - public final String cgeoId; + public final String id; + public final int stringId; - private WaypointType(String cgeoId) { - this.cgeoId = cgeoId; + private WaypointType(String id, int stringId) { + this.id = id; + this.stringId = stringId; } - public static final Map<String, WaypointType> FIND_BY_CGEOID; + public static final Map<String, WaypointType> FIND_BY_ID; static { final HashMap<String, WaypointType> mapping = new HashMap<String, WaypointType>(); for (WaypointType wt : values()) { - mapping.put(wt.cgeoId, wt); + mapping.put(wt.id, wt); } - FIND_BY_CGEOID = Collections.unmodifiableMap(mapping); + FIND_BY_ID = Collections.unmodifiableMap(mapping); } } |
