Changeset 125 in josm

Timestamp:

2006-07-24T20:45:40+02:00 (18 years ago)

Author:

imi

Message:

added type="type1,type2" for specifying more than one type in annotation preset items

File:

• src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java

@@ -136 +136 @@
                 List<Item> current;
                 String currentName;
-                Class<?> currentType;
+                Collection<Class<?>> currentTypes;
                 private static int unknownCounter = 1;
 
@@ -149 +149 @@
                                 if (a.getValue("type") != null) {
                                         String s = a.getValue("type");
-                                        s = Character.toUpperCase(s.charAt(0))+s.substring(1);
                                         try {
-                                                currentType = Class.forName("org.openstreetmap.josm.data.osm."+s);
+                                                for (String type : s.split(",")) {
+                                                        type = Character.toUpperCase(type.charAt(0))+type.substring(1);
+                                                        if (currentTypes == null)
+                                                                currentTypes = new LinkedList<Class<?>>();
+                                                        currentTypes.add(Class.forName("org.openstreetmap.josm.data.osm."+type));
+                                                }
                                         } catch (ClassNotFoundException e) {
                                                 e.printStackTrace();
@@ -188 +192 @@
 
                 @Override public void endElement(String ns, String lname, String qname) {
-                        if (qname.equals("item"))
-                                data.add(new AnnotationPreset(current, currentName, currentType));
+                        if (qname.equals("item")) {
+                                data.add(new AnnotationPreset(current, currentName, currentTypes));
+                                current = null;
+                                currentName = null;
+                                currentTypes = null;
+                        }
                 }
         }
 
         private List<Item> data;
-        String name;
-        private Class<?> type;
-
-        public AnnotationPreset(List<Item> data, String name, Class<?> currentType) {
+        public final String name;
+        private Collection<Class<?>> types;
+
+        public AnnotationPreset(List<Item> data, String name, Collection<Class<?>> currentTypes) {
                 this.data = data;
                 this.name = name;
-                this.type = currentType;
+                this.types = currentTypes;
         }
 
@@ -234 +242 @@
         }
 
-        @Override public String toString() {
-                return name;
-        }
-
         public Command createCommand(Collection<OsmPrimitive> participants) {
                 Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
                 for (OsmPrimitive osm : participants)
-                        if (osm.getClass() == type)
+                        if (types == null || types.contains(osm.getClass()))
                                 sel.add(osm);
                 if (sel.isEmpty())