Changeset 5561 in josm

Timestamp:

2012-11-04T00:57:22+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8145 - Forbids negative values in object id field of download object dialog

File:

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

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -104 +103 @@
                     } catch (IllegalArgumentException ex) {
                         try {
-                            if (type == OsmPrimitiveType.NODE) {
-                                ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.NODE));
+                            long id = Long.parseLong(s);
+                            if (id <= 0) {
+                                return false;
+                            } else if (type == OsmPrimitiveType.NODE) {
+                                ids.add(new SimplePrimitiveId(id, OsmPrimitiveType.NODE));
                             } else if (type == OsmPrimitiveType.WAY) {
-                                ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.WAY));
+                                ids.add(new SimplePrimitiveId(id, OsmPrimitiveType.WAY));
                             } else if (type == OsmPrimitiveType.RELATION) {
-                                ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.RELATION));
+                                ids.add(new SimplePrimitiveId(id, OsmPrimitiveType.RELATION));
                             } else {
                                 return false;