Changeset 4796 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2012-01-15T21:28:46+01:00 (12 years ago)

Author:

simon04

Message:

fix #6425 - remotecontrol: make download objects available (e.g., /load_object?objects=n1,w2,r3[&new_layer=false&relation_members=true])

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java

@@ -92 +92 @@
         
         public boolean readOsmIds() {
-            String value  = getComponent().getText();
+            String value = getComponent().getText();
             char c;
-            if (value == null || value.trim().length() == 0) return false;
-            try {
-                ids.clear();
-                StringTokenizer st = new StringTokenizer(value,",.+/ \t\n");
-                String s;
-                while (st.hasMoreTokens()) {
-                    s = st.nextToken();
-                    // convert tokens to int skipping v-words (version v2 etc)
-                    c = s.charAt(0);
-                    if (c=='v') {
-                        continue;
-                    }
-                    else if (c=='n') {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s.substring(1)), OsmPrimitiveType.NODE));
-                    } else if (c=='w') {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s.substring(1)), OsmPrimitiveType.WAY));
-                    } else if (c=='r') { 
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s.substring(1)), OsmPrimitiveType.RELATION));
-                    } else if (type==OsmPrimitiveType.NODE) {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.NODE));
-                    } else if (type==OsmPrimitiveType.WAY) {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.WAY));
-                    } else if (type==OsmPrimitiveType.RELATION) {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.RELATION));
+            if (value == null || value.trim().length() == 0) {
+                return false;
+            }
+            ids.clear();
+            StringTokenizer st = new StringTokenizer(value, ",.+/ \t\n");
+            String s;
+            while (st.hasMoreTokens()) {
+                s = st.nextToken();
+                // convert tokens to int skipping v-words (version v2 etc)
+                c = s.charAt(0);
+                if (c == 'v') {
+                    continue;
+                } else {
+                    try {
+                        ids.add(SimplePrimitiveId.fromString(s));
+                    } catch (IllegalArgumentException ex) {
+                        if (type == OsmPrimitiveType.NODE) {
+                            ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.NODE));
+                        } else if (type == OsmPrimitiveType.WAY) {
+                            ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.WAY));
+                        } else if (type == OsmPrimitiveType.RELATION) {
+                            ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.RELATION));
+                        } else {
+                            return false;
+                        }
                     }
                 }
-                return true;
-            } catch(NumberFormatException e) {
-                return false;
             }
+            return true;
         }
     }