Changeset 6674 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-01-12T10:41:20+01:00 (10 years ago)

Author:

simon04

Message:

Make strings like foo relation/123 and way/345 but also node/789 paste-able in "Download object", some refactoring of related code

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -746 +747 @@
     }
 
-    // TODO: change how we handle this
     private static class ExactType extends Match {
-        private final Class<?> type;
+        private final OsmPrimitiveType type;
         public ExactType(String type) throws ParseError {
-            if ("node".equals(type)) {
-                this.type = Node.class;
-            } else if ("way".equals(type)) {
-                this.type = Way.class;
-            } else if ("relation".equals(type)) {
-                this.type = Relation.class;
-            } else
+            this.type = OsmPrimitiveType.from(type);
+            if (this.type == null)
                 throw new ParseError(tr("Unknown primitive type: {0}. Allowed values are node, way or relation",
                         type));
         }
         @Override public boolean match(OsmPrimitive osm) {
-            return osm.getClass() == type;
+            return type.equals(osm.getType());
         }
         @Override public String toString() {return "type="+type;}