Changeset 13928 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-06-13T22:55:57+02:00 (6 years ago)

Author:

Don-vip

Message:

see #11000 - support layer_name in the general case

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -11 +11 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Future;
@@ -186 +187 @@
     public abstract static class AbstractInternalTask extends PleaseWaitRunnable {
 
-        protected final boolean newLayer;
+        protected final DownloadParams settings;
         protected final boolean zoomAfterDownload;
         protected DataSet dataSet;
@@ -201 +202 @@
         public AbstractInternalTask(DownloadParams settings, String title, boolean ignoreException, boolean zoomAfterDownload) {
             super(title, ignoreException);
-            this.newLayer = settings.isNewLayer();
+            this.settings = Objects.requireNonNull(settings);
             this.zoomAfterDownload = zoomAfterDownload;
         }
@@ -218 +219 @@
                 boolean zoomAfterDownload) {
             super(title, progressMonitor, ignoreException);
-            this.newLayer = settings.isNewLayer();
+            this.settings = Objects.requireNonNull(settings);
             this.zoomAfterDownload = zoomAfterDownload;
         }
@@ -260 +261 @@
 
         protected OsmDataLayer createNewLayer(String layerName) {
+            if (layerName == null || layerName.isEmpty()) {
+                layerName = settings.getLayerName();
+            }
             if (layerName == null || layerName.isEmpty()) {
                 layerName = OsmDataLayer.createNewName();
@@ -282 +286 @@
         protected OsmDataLayer addNewLayerIfRequired(String newLayerName) {
             long numDataLayers = getNumModifiableDataLayers();
-            if (newLayer || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
+            if (settings.isNewLayer() || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
                 // the user explicitly wants a new layer, we don't have any layer at all
                 // or it is not clear which layer to merge to