Changeset 13969 in josm for trunk

Timestamp:

2018-06-23T11:59:58+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16417 - Downloading primitive with id "0" causes IllegalArgumentException

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java

@@ -133 +133 @@
             }
             for (long i = Long.parseLong(firstId); i <= lastIdParsed; i++) {
+                if (i > 0) {
+                    ids.add(new SimplePrimitiveId(i, type));
+                }
+            }
+        } else {
+            long i = Long.parseLong(firstId);
+            if (i > 0) {
                 ids.add(new SimplePrimitiveId(i, type));
             }
-        } else {
-            ids.add(new SimplePrimitiveId(Long.parseLong(firstId), type));
         }
         return ids;

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

@@ -129 +129 @@
                 }
             }
-            return true;
+            return !ids.isEmpty();
         }
     }

trunk/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.java

@@ -63 +63 @@
         assertEquals("[relation 123, relation 124, way 345, way 346, node 789]",
                 SimplePrimitiveId.fuzzyParse("foo relation/123-24 and way/345-346 but also node/789").toString());
+        assertEquals("[]",
+                SimplePrimitiveId.fuzzyParse("foo relation/0 bar").toString());
     }
 
@@ -93 +95 @@
         assertEquals("[node 234, node 235]", SimplePrimitiveId.multipleFromString("node/234-235").toString());
         assertEquals("[node 998, node 999, node 1000, node 1001]", SimplePrimitiveId.multipleFromString("node/998-1001").toString());
+        assertEquals("[]", SimplePrimitiveId.multipleFromString("node/0").toString());
     }