Changeset 11261 in josm

Timestamp:

2016-11-16T13:04:17+01:00 (7 years ago)

Author:

simon04

Message:

fix #13985 - Freezes when creating a layer named "Data Layer "

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -357 +357 @@
         data.addDataSetListener(MultipolygonCache.getInstance());
         DataSet.addSelectionListener(this);
-        if (name != null && name.startsWith(createLayerName(""))) {
+        if (name != null && name.startsWith(createLayerName(""))
+                && Character.isDigit((name.substring(createLayerName("").length()) + "XX" /*avoid StringIndexOutOfBoundsException*/).charAt(1))) {
             while (AlphanumComparator.getInstance().compare(createLayerName(dataLayerCounter), name) < 0) {
-                dataLayerCounter.incrementAndGet();
+                final int i = dataLayerCounter.incrementAndGet();
+                if (i > 1_000_000) {
+                    break; // to avoid looping in unforeseen case
+                }
             }
         }

trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java

@@ -259 +259 @@
         assertEquals("Data Layer 148", layer2.getName());
     }
+
+    @Test
+    public void testLayerUnnumberedName() {
+        final OsmDataLayer layer = new OsmDataLayer(new DataSet(), "Data Layer ", null);
+        assertEquals("Data Layer ", layer.getName());
+    }
+
+    /**
+     * Non-regression test for ticket #13985
+     */
+    @Test
+    public void testLayerNameDoesFinish() {
+        final OsmDataLayer layer = new OsmDataLayer(new DataSet(), "Data Layer from GeoJSON: foo.geojson", null);
+        assertEquals("Data Layer from GeoJSON: foo.geojson", layer.getName());
+    }
 }