Changeset 4081 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java

Timestamp:

2011-05-15T16:12:43+02:00 (13 years ago)

Author:

bastiK

Message:

applied #6251 (patch by akks) - Download multiple objects on Ctrl-Shift-O

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java (modified) (6 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
 import javax.swing.JTextField;
 import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 
 /**
@@ -18 +26 @@
     }
 
-    public int getOsmId() {
+    public void setType(OsmPrimitiveType type) {
+        validator.type = type;
+    }
+
+    public long getOsmId() {
         return validator.getOsmId();
     }
+
+    /**
+     * Get entered ID list - supports "1,2,3" "1 2   ,3" or even "1 2 3 v2 6 v8"
+     * @return list of id's
+     */
+    public List<PrimitiveId> getIds() {
+        return validator.ids;
+    }
+
+    public boolean readOsmIds() {
+        return validator.readOsmIds();
+    }
+
 
     /**
@@ -32 +57 @@
         }
 
+        private List<PrimitiveId> ids = new ArrayList<PrimitiveId>();
+        private OsmPrimitiveType type;
+
         public OsmIdValidator(JTextComponent tc) {
             super(tc, false);
@@ -38 +66 @@
         @Override
         public boolean isValid() {
-            return getOsmId() > 0;
+            return getOsmId() > 0 || readOsmIds() != false;
         }
 
@@ -50 +78 @@
         }
 
-        public int getOsmId() {
+        public long getOsmId() {
             String value  = getComponent().getText();
             if (value == null || value.trim().length() == 0) return 0;
             try {
-                int osmId = Integer.parseInt(value.trim());
-                if (osmId > 0) return osmId;
+                long osmId = Long.parseLong(value.trim());
+                if (osmId > 0) 
+                    return osmId;
                 return 0;
             } catch(NumberFormatException e) {
@@ -61 +90 @@
             }
         }
+        
+        public boolean readOsmIds() {
+            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));
+                    }
+                }
+                return true;
+            } catch(NumberFormatException e) {
+                return false;
+            }
+        }
     }
 }