Changeset 5196 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2012-04-16T22:53:07+02:00 (13 years ago)

Author:

simon04

Message:

tagging presets: fix customized matching for combo elements (broken due to r5172), remove duplicated/inconsistent parsing/interpreting of preset values

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• RelationChecker.java (modified) (1 diff)
• TagChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -46 +46 @@
 
     @Override
-    public void initialize() throws Exception {
+    public void initialize() {
         initializePresets();
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -155 +155 @@
 
     @Override
-    public void initialize() throws Exception {
+    public void initialize() throws IOException {
         initializeData();
         initializePresets();
@@ -286 +286 @@
      * Reads the presets data.
      *
-     * @throws Exception
      */
-    public static void initializePresets() throws Exception {
+    public static void initializePresets() {
 
         if (!Main.pref.getBoolean(PREF_CHECK_VALUES, true))
@@ -308 +307 @@
             }
             for (TaggingPreset p : presets) {
-                for(TaggingPreset.Item i : p.data) {
-                    if (i instanceof TaggingPreset.Combo) {
-                        TaggingPreset.Combo combo = (TaggingPreset.Combo) i;
-                        if (combo.values != null) {
-                            for(String value : combo.values.split(",")) {
-                                presetsValueData.put(combo.key, value);
-                            }
-                        }
-                    } else if (i instanceof TaggingPreset.Key) {
-                        TaggingPreset.Key k = (TaggingPreset.Key) i;
-                        presetsValueData.put(k.key, k.value);
-                    } else if (i instanceof TaggingPreset.Text) {
-                        TaggingPreset.Text k = (TaggingPreset.Text) i;
-                        presetsValueData.putVoid(k.key);
-                    } else if (i instanceof TaggingPreset.Check) {
-                        TaggingPreset.Check k = (TaggingPreset.Check) i;
-                        presetsValueData.put(k.key, "yes");
-                        presetsValueData.put(k.key, "no");
+                for (TaggingPreset.Item i : p.data) {
+                    if (i instanceof TaggingPreset.KeyedItem) {
+                        TaggingPreset.KeyedItem ky = (TaggingPreset.KeyedItem) i;
+                        presetsValueData.putAll(ky.key, ky.getValues());
                     }
                 }