Changeset 5211 in josm

Timestamp:

May 4, 2012 7:15:59 PM (13 months ago)

Author:

simon04

Message:

fix #7666 - Download object exception with invalid value

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadPrimitiveAction.java (modified) (3 diffs)
• gui/widgets/OsmIdTextField.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java

@@ -10 +10 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.awt.event.KeyEvent;
 import java.lang.reflect.InvocationTargetException;
@@ -139 +140 @@
         );
 
-        cbType.addActionListener(new ActionListener() {
+        cbType.addItemListener(new ItemListener() {
 
             @Override
-            public void actionPerformed(ActionEvent ae) {
+            public void itemStateChanged(ItemEvent e) {
+                tfId.setType(cbType.getType());
+                tfId.performValidation();
                 referrers.setText(cbType.getType() == OsmPrimitiveType.NODE
                         ? tr("Download referrers (parent relations and ways)")
@@ -186 +189 @@
 
         tfId.setType(cbType.getType());
-        if(tfId.readOsmIds()==false) {
+        if(!tfId.readOsmIds()) {
             JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("Invalid ID list specified\n"
-                    + " Cannot download object."),
+                    + "Cannot download object."),
                     tr("Information"),
                     JOptionPane.INFORMATION_MESSAGE

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

@@ -30 +30 @@
     }
 
-    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"
@@ -46 +42 @@
     }
 
+    public void performValidation() {
+        validator.validate();
+    }
 
     /**
@@ -66 +65 @@
         @Override
         public boolean isValid() {
-            return getOsmId() > 0 || readOsmIds() != false;
+            return readOsmIds();
         }
 
@@ -78 +77 @@
         }
 
-        public long getOsmId() {
-            String value  = getComponent().getText();
-            if (value == null || value.trim().length() == 0) return 0;
-            try {
-                long osmId = Long.parseLong(value.trim());
-                if (osmId > 0) 
-                    return osmId;
-                return 0;
-            } catch(NumberFormatException e) {
-                return 0;
-            }
-        }
-        
         public boolean readOsmIds() {
             String value = getComponent().getText();
@@ -110 +96 @@
                         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 {
+                        try {
+                            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;
+                            }
+                        } catch (IllegalArgumentException ex2) {
                             return false;
                         }