Changeset 34805 in osm for applications

Timestamp:

2019-01-01T18:13:20+01:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14347

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="14256"/>
+    <property name="plugin.main.version" value="14347"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java

@@ -6 +6 @@
 import java.io.File;
 import java.io.IOException;
+import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
@@ -13 +14 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -83 +85 @@
 
         @Override
-        protected OsmDataLayer createNewLayer(String layerName) {
+        protected OsmDataLayer createNewLayer(DataSet ds, Optional<String> optLayerName) {
             File associatedFile = ((NetworkReader) reader).getReadFile();
             String filename = ((NetworkReader) reader).getReadFileName();
-            if (layerName == null || layerName.isEmpty()) {
+            String layerName = optLayerName.orElse("");
+            if (layerName.isEmpty()) {
                 if (associatedFile != null) {
                     layerName = associatedFile.getName();