Changeset 34801 in osm for applications/editors/josm/plugins/cadastre-fr/src

Timestamp:

2019-01-01T14:44:20+01:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14347

File:

• applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java (modified) (2 diffs)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -111 +112 @@
 
         @Override
-        protected CadastreDataLayer createNewLayer(String layerName) {
-            String realLayerName = layerName != null ? layerName : url.substring(url.lastIndexOf('/')+1);
+        protected CadastreDataLayer createNewLayer(DataSet dataset, Optional<String> layerName) {
+            String realLayerName = layerName.isPresent() ? layerName.get() : url.substring(url.lastIndexOf('/')+1);
             if (realLayerName == null || realLayerName.isEmpty()) {
                 realLayerName = settings.getLayerName();