Changeset 5155 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

Timestamp:

2012-04-01T19:48:01+02:00 (12 years ago)

Author:

simon04

Message:

fix #5933 - tagging presets: allow to change the matching process (match=none|key|key!|keyvalue), remove delete_if_empty, default defaults to "", adapted comments in defaultpresets.xml, refactoring of the matching process (removes some duplicate code and some magical arithmetic)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
+import java.util.EnumSet;
 
 import javax.swing.BoxLayout;
@@ -181 +179 @@
 
     private void updatePresets() {
-        Map<String, Map<String, Integer>> valuesCount = new HashMap<String, Map<String,Integer>>();
-        for (Entry<String, String> entry: model.getTags().entrySet()) {
-            Map<String, Integer> values = new HashMap<String, Integer>();
-            values.put(entry.getValue(), 1);
-            valuesCount.put(entry.getKey(), values);
-        }
-        presetListPanel.updatePresets(0, 0, 1, 0, valuesCount, presetHandler);
+        presetListPanel.updatePresets(
+                EnumSet.of(TaggingPreset.PresetType.RELATION),
+                model.getTags(), presetHandler);
         validate();
     }