Changeset 5196 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java

Timestamp:

2012-04-16T22:53:07+02:00 (12 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

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java (modified) (3 diffs)

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

@@ -45 +45 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Check;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Combo;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset.Item;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset.Key;
@@ -52 +50 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPreset.Role;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset.Roles;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Text;
 
 public class TaggingPresetSearchDialog extends ExtendedDialog implements SelectionChangedListener {
@@ -122 +119 @@
             }
             for (Item item: preset.data) {
-                if (item instanceof Check) {
-                    tags.add(((Check)item).key.toLowerCase());
-                } else if (item instanceof Combo) {
+                if (item instanceof TaggingPreset.KeyedItem) {
+                    tags.add(((TaggingPreset.KeyedItem) item).key);
                     // Should combo values also be added?
-                    tags.add(((Combo)item).key);
-                } else if (item instanceof Key) {
-                    tags.add(((Key) item).key);
-                    String value = ((Key) item).value;
-                    if (value != null) {
-                        tags.add(value);
-                    }
-                } else if (item instanceof Text) {
-                    tags.add(((Text) item).key);
+                    if (item instanceof Key && ((Key) item).value != null) {
+                        tags.add(((Key) item).value);
+                    }
                 } else if (item instanceof Roles) {
-                    for (Role role: ((Roles) item).roles) {
+                    for (Role role : ((Roles) item).roles) {
                         tags.add(role.key);
                     }