Changeset 10669 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-07-28T23:47:16+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13237 - Should not duplicate layer names in the changeset source

File:

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

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -30 +30 @@
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -1286 +1287 @@
      */
     public String getLayerInformationForSourceTag() {
-        final Collection<String> layerInfo = new ArrayList<>();
-        if (!getLayersOfType(GpxLayer.class).isEmpty()) {
+        final Set<String> layerInfo = new TreeSet<>();
+        if (!layerManager.getLayersOfType(GpxLayer.class).isEmpty()) {
             // no i18n for international values
             layerInfo.add("survey");
         }
-        for (final GeoImageLayer i : getLayersOfType(GeoImageLayer.class)) {
+        for (final GeoImageLayer i : layerManager.getLayersOfType(GeoImageLayer.class)) {
             if (i.isVisible()) {
                 layerInfo.add(i.getName());
             }
         }
-        for (final ImageryLayer i : getLayersOfType(ImageryLayer.class)) {
+        for (final ImageryLayer i : layerManager.getLayersOfType(ImageryLayer.class)) {
             if (i.isVisible()) {
                 layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());