Changeset 5509 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

2012-09-13T10:53:21+02:00 (12 years ago)

Author:

stoecker

Message:

see #8059 - fix preset loading for tr

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -94 +94 @@
 
     public enum PresetType {
-        NODE(/* ICON */"Mf_node"), WAY(/* ICON */"Mf_way"), RELATION(/* ICON */"Mf_relation"), CLOSEDWAY(/* ICON */"Mf_closedway");
+        NODE(/* ICON */"Mf_node", "node"),
+        WAY(/* ICON */"Mf_way", "way"),
+        RELATION(/* ICON */"Mf_relation", "relation"),
+        CLOSEDWAY(/* ICON */"Mf_closedway", "closedway");
 
         private final String iconName;
-
-        PresetType(String iconName) {
+        private final String name;
+
+        PresetType(String iconName, String name) {
             this.iconName = iconName;
+            this.name = name;
         }
 
@@ -107 +112 @@
 
         public String getName() {
-            return name().toLowerCase();
+            return name;
         }
 
@@ -128 +133 @@
                 throw new IllegalArgumentException("Unexpected primitive type: " + type);
             }
+        }
+
+        public static PresetType fromString(String type) {
+            for (PresetType t : PresetType.values()) {
+                if (t.getName().equals(type))
+                    return t;
+            }
+            return null;
         }
     }
@@ -1298 +1311 @@
         for (String type : Arrays.asList(types.split(","))) {
             try {
-                PresetType presetType = PresetType.valueOf(type.toUpperCase());
+                PresetType presetType = PresetType.fromString(type);
                 result.add(presetType);
             } catch (IllegalArgumentException e) {