Changeset 5155 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.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/dialogs/properties/PresetListPanel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
@@ -24 +23 @@
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Check;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Combo;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Text;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -82 +78 @@
     }
 
-    public void updatePresets(int nodes, int ways, int relations, int closedways, Map<String, Map<String, Integer>> valueCount, PresetHandler presetHandler)  {
+    public void updatePresets(final Collection<PresetType> types, final Map<String, String> tags, PresetHandler presetHandler) {
 
         removeAll();
-        int total = nodes+ways+relations+closedways;
-        if(total == 0) {
+        if (types.isEmpty()) {
             setVisible(false);
             return;
         }
 
-        for(TaggingPreset t : TaggingPresetPreference.taggingPresets) {
-            if(
-                    (       t.types == null
-                            || (relations > 0 && t.types.contains(PresetType.RELATION))
-                            || (nodes > 0 && t.types.contains(PresetType.NODE))
-                            || (ways+closedways > 0 && t.types.contains(PresetType.WAY))
-                            || (closedways > 0 && t.types.contains(PresetType.CLOSEDWAY))
-                    )
-                    && t.isShowable())
-            {
-                int found = 0;
-                for(TaggingPreset.Item i : t.data) {
-                    if(i instanceof TaggingPreset.Key) {
-                        String val = ((TaggingPreset.Key)i).value;
-                        String key = ((TaggingPreset.Key)i).key;
-                        // we subtract 100 if not found and add 1 if found
-                        found -= 100;
-                        if(key == null || !valueCount.containsKey(key)) {
-                            continue;
-                        }
+        for (TaggingPreset t : TaggingPresetPreference.taggingPresets) {
+            if (!t.matches(types, tags)) {
+                continue;
+            }
 
-                        Map<String, Integer> v = valueCount.get(key);
-                        if(v.size() == 1 && val != null && v.containsKey(val) && v.get(val) == total) {
-                            found += 101;
-                        }
-                    } else {
-                        String key = null;
-                        if ((i instanceof Text) && ((Text)i).required) {
-                            key = ((Text)i).key;
-                        } else if ((i instanceof Combo) && ((Combo)i).required) {
-                            key = ((Combo)i).key;
-                        } else if ((i instanceof Check) && ((Check)i).required) {
-                            key = ((Check)i).key;
-                        }
-                        if (key != null) {
-                            if (valueCount.get(key) != null) {
-                                found += 1;
-                            } else {
-                                found -= 100;
-                            }
-                        }
-                    }
-                }
-
-                if(found <= 0) {
-                    continue;
-                }
-
-                JLabel lbl = new JLabel(t.getName() + " …");
-                lbl.setIcon((Icon) t.getValue(Action.SMALL_ICON));
-                lbl.addMouseListener(new PresetLabelML(lbl, t, presetHandler));
-                add(lbl, GBC.eol().fill(GBC.HORIZONTAL));
-            }
+            JLabel lbl = new JLabel(t.getName() + " …");
+            lbl.setIcon((Icon) t.getValue(Action.SMALL_ICON));
+            lbl.addMouseListener(new PresetLabelML(lbl, t, presetHandler));
+            add(lbl, GBC.eol().fill(GBC.HORIZONTAL));
         }
 
-        if(getComponentCount() > 0) {
+        if (getComponentCount() > 0) {
             setVisible(true);
             // This ensures the presets are exactly as high as needed.
@@ -157 +108 @@
         }
     }
-
 }