diff options
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/LogType.java | 6 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/enumerations/LogTypeTest.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java index 8506182..a63ef4e 100644 --- a/main/src/cgeo/geocaching/enumerations/LogType.java +++ b/main/src/cgeo/geocaching/enumerations/LogType.java @@ -41,7 +41,7 @@ public enum LogType { MOVE_INVENTORY(70, "70", "unused_inventory", "", R.string.log_moveinventory), RETRACT(25, "25", "retract listing", "", R.string.log_retractlisting), MARKED_MISSING(16, "16", "marked missing", "", R.string.log_marked_missing, R.drawable.mark_red), - OC_TEAM_COMMENT(83, "", "X1", "OC Team comment", R.string.log_oc_team_comment), + OC_TEAM_COMMENT(83, null, "X1", "OC Team comment", R.string.log_oc_team_comment), UNKNOWN(0, "unknown", "", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet public final int id; @@ -70,7 +70,9 @@ public enum LogType { final HashMap<String, LogType> mappingPattern = new HashMap<String, LogType>(); final HashMap<String, LogType> mappingType = new HashMap<String, LogType>(); for (LogType lt : values()) { - mappingPattern.put(lt.iconName, lt); + if (lt.iconName != null) { + mappingPattern.put(lt.iconName, lt); + } mappingType.put(lt.type, lt); } FIND_BY_ICONNAME = Collections.unmodifiableMap(mappingPattern); diff --git a/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java b/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java index 81ca33b..47879a0 100644 --- a/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java +++ b/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java @@ -17,8 +17,7 @@ public class LogTypeTest extends AndroidTestCase { } public static void testGetByType() { - assertEquals(LogType.UNKNOWN, LogType.getByIconName("")); - assertEquals(LogType.UNKNOWN, LogType.getByIconName(null)); + assertEquals(LogType.UNKNOWN, LogType.getByType("obviously unknown type")); assertEquals(LogType.GRABBED_IT, LogType.getByType("grabbed it")); assertEquals(LogType.GRABBED_IT, LogType.getByType(" gRAbbed IT ")); } |