Changeset 3388 in josm

Timestamp:

Jul 27, 2010 8:06:29 PM (3 years ago)

Author:

jttt

Message:

Add tagging preset search dialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (3 diffs)
• tagging/TaggingPreset.java (modified) (11 diffs)
• tagging/TaggingPresetSearchAction.java (added)
• tagging/TaggingPresetSearchDialog.java (added)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -85 +85 @@
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
 import org.openstreetmap.josm.tools.Shortcut;
 /**
@@ -183 +184 @@
     public final JumpToAction jumpToAct = new JumpToAction();
 
+    public final TaggingPresetSearchAction presetSearchAction = new TaggingPresetSearchAction();
+
 
     /**
@@ -289 +292 @@
         }
 
+        add(presetsMenu, presetSearchAction);
+
         add(toolsMenu, splitWay);
         add(toolsMenu, combineWay);

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
@@ -21 +20 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -70 +70 @@
  */
 public class TaggingPreset extends AbstractAction implements MapView.LayerChangeListener {
+
+    public enum PresetType {
+        NODE("Mf_node"), WAY("Mf_way"), RELATION("Mf_relation"), CLOSEDWAY("Mf_closedway");
+
+        private final String iconName;
+
+        PresetType(String iconName) {
+            this.iconName = iconName;
+        }
+
+        public String getIconName() {
+            return iconName;
+        }
+
+        public String getName() {
+            return name().toLowerCase();
+        }
+
+    }
 
     public TaggingPresetMenu group = null;
@@ -487 +506 @@
 
     public static class Role {
-        public List<String> types;
+        public EnumSet<PresetType> types;
         public String key;
         public String text;
@@ -545 +564 @@
             if(types != null){
                 JPanel pp = new JPanel();
-                for(String t : types) {
-                    pp.add(new JLabel(ImageProvider.get("Mf_" + t)));
+                for(PresetType t : types) {
+                    pp.add(new JLabel(ImageProvider.get(t.getIconName())));
                 }
                 p.add(pp, GBC.eol());
@@ -607 +626 @@
      * The types as preparsed collection.
      */
-    public List<String> types;
+    public EnumSet<PresetType> types;
     public List<Item> data = new LinkedList<Item>();
     private static HashMap<String,String> lastValue = new HashMap<String,String>();
@@ -669 +688 @@
      * Called from the XML parser to set the types this preset affects
      */
-    private static Collection<String> allowedtypes = Arrays.asList(new String[]
-                                                                              {marktr("way"), marktr("node"), marktr("relation"), marktr("closedway")});
-
-    static public List<String> getType(String types) throws SAXException {
-        List<String> t = Arrays.asList(types.split(","));
-        for (String type : t) {
-            if(!allowedtypes.contains(type))
+
+    static public EnumSet<PresetType> getType(String types) throws SAXException {
+        EnumSet<PresetType> result = EnumSet.noneOf(PresetType.class);
+        for (String type : Arrays.asList(types.split(","))) {
+            try {
+                PresetType presetType = PresetType.valueOf(type.toUpperCase());
+                result.add(presetType);
+            } catch (IllegalArgumentException e) {
                 throw new SAXException(tr("Unknown type: {0}", type));
-        }
-        return t;
+            }
+        }
+        return result;
     }
 
@@ -833 +854 @@
         if(types != null){
             JPanel pp = new JPanel();
-            for(String t : types){
-                JLabel la = new JLabel(ImageProvider.get("Mf_" + t));
-                la.setToolTipText(tr("Elements of type {0} are supported.", tr(t)));
+            for(PresetType t : types){
+                JLabel la = new JLabel(ImageProvider.get(t.getIconName()));
+                la.setToolTipText(tr("Elements of type {0} are supported.", tr(t.getName())));
                 pp.add(la);
             }
@@ -953 +974 @@
                 if(osm instanceof Relation)
                 {
-                    if(!types.contains("relation")) {
+                    if(!types.contains(PresetType.RELATION)) {
                         continue;
                     }
@@ -959 +980 @@
                 else if(osm instanceof Node)
                 {
-                    if(!types.contains("node")) {
+                    if(!types.contains(PresetType.NODE)) {
                         continue;
                     }
@@ -965 +986 @@
                 else if(osm instanceof Way)
                 {
-                    if(!types.contains("way") &&
-                            !(types.contains("closedway") && ((Way)osm).isClosed())) {
+                    if(!types.contains(PresetType.WAY) &&
+                            !(types.contains(PresetType.CLOSEDWAY) && ((Way)osm).isClosed())) {
                         continue;
                     }