Changeset 33684 in osm for applications/editors/josm

Timestamp:

2017-09-30T00:24:47+02:00 (7 years ago)

Author:

donvip

Message:

Edigeo: use file name for data layer name when downloading remote tar.bz2 file

File:

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

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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -23 +24 @@
     @Override
     public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
-        downloadTask = new DownloadTask(newLayer, new CadastreServerReader(url), progressMonitor);
+        downloadTask = new InternalDownloadTask(newLayer, url, progressMonitor);
         currentBounds = null;
         return MainApplication.worker.submit(downloadTask);
@@ -37 +38 @@
         return tr("Download cadastre data");
     }
+
+    class InternalDownloadTask extends DownloadTask {
+
+        private final String url;
+
+        InternalDownloadTask(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+            super(newLayer, new CadastreServerReader(url), progressMonitor);
+            this.url = url;
+        }
+
+        @Override
+        protected OsmDataLayer createNewLayer(String layerName) {
+            return super.createNewLayer(layerName != null ? layerName : url.substring(url.lastIndexOf('/')+1));
+        }
+    }
 }