Changeset 11033 in josm for trunk

Timestamp:

2016-09-20T12:28:48+02:00 (8 years ago)

Author:

simon04

Message:

fix #13663 - Two data layers with the same name

Counting starts from 1 again in an saved session file.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (modified) (2 diffs)

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

@@ -31 +31 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
@@ -98 +99 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.io.OsmImporter;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
@@ -198 +200 @@
 
     /** the global counter for created data layers */
-    private static int dataLayerCounter;
+    private static final AtomicInteger dataLayerCounter = new AtomicInteger();
 
     /**
@@ -206 +208 @@
      */
     public static String createNewName() {
-        dataLayerCounter++;
-        return tr("Data Layer {0}", dataLayerCounter);
+        return createLayerName(dataLayerCounter.incrementAndGet());
+    }
+
+    static String createLayerName(Object arg) {
+        return tr("Data Layer {0}", arg);
     }
 
@@ -352 +357 @@
         data.addDataSetListener(MultipolygonCache.getInstance());
         DataSet.addSelectionListener(this);
+        if (name != null && name.startsWith(createLayerName(""))) {
+            while (AlphanumComparator.getInstance().compare(createLayerName(dataLayerCounter), name) < 0) {
+                dataLayerCounter.incrementAndGet();
+            }
+        }
     }
 

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

@@ -10 +10 @@
 import java.io.File;
 
+import org.fest.assertions.Assertions;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -254 +255 @@
         assertTrue(layer.checkSaveConditions());
     }
+
+    @Test
+    public void testLayerNameIncreases() throws Exception {
+        final OsmDataLayer layer1 = new OsmDataLayer(new DataSet(), OsmDataLayer.createLayerName(147), null);
+        final OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
+        assertEquals("Data Layer 147", layer1.getName());
+        assertEquals("Data Layer 148", layer2.getName());
+    }
 }