Changeset 13927 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

2018-06-13T22:17:23+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11000 - Remote control: allow to specify layer_name for import

File:

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

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

@@ -77 +77 @@
 
     @Override
-    public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
-        return download(new BoundingBoxDownloader(downloadArea), newLayer, downloadArea, progressMonitor);
+    public Future<?> download(DownloadParams settings, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        return download(new BoundingBoxDownloader(downloadArea), settings, downloadArea, progressMonitor);
     }
 
@@ -112 +112 @@
      * </pre>
      * @param reader the reader used to parse OSM data (see {@link OsmServerReader#parseOsm})
-     * @param newLayer true, if the data is to be downloaded into a new layer. If false, the task
-     *                 selects one of the existing layers as download layer, preferably the active layer.
+     * @param settings download settings
      * @param downloadArea the area to download
      * @param progressMonitor the progressMonitor
      * @return the future representing the asynchronous task
      */
-    public Future<?> download(OsmServerReader reader, boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
-        return download(new DownloadTask(newLayer, reader, progressMonitor, zoomAfterDownload), downloadArea);
+    public Future<?> download(OsmServerReader reader, DownloadParams settings, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        return download(new DownloadTask(settings, reader, progressMonitor, zoomAfterDownload), downloadArea);
     }
 
@@ -141 +140 @@
     /**
      * Loads a given URL from the OSM Server
-     * @param newLayer True if the data should be saved to a new layer
+     * @param settings download settings
      * @param url The URL as String
      */
     @Override
-    public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+    public Future<?> loadUrl(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
         String newUrl = modifyUrlBeforeLoad(url);
-        downloadTask = new DownloadTask(newLayer,
+        downloadTask = new DownloadTask(settings,
                 new OsmServerLocationReader(newUrl),
                 progressMonitor);
         currentBounds = null;
         // Extract .osm filename from URL to set the new layer name
-        extractOsmFilename("https?://.*/(.*\\.osm)", newUrl);
+        extractOsmFilename(settings, "https?://.*/(.*\\.osm)", newUrl);
         return MainApplication.worker.submit(downloadTask);
     }
 
-    protected final void extractOsmFilename(String pattern, String url) {
-        Matcher matcher = Pattern.compile(pattern).matcher(url);
-        newLayerName = matcher.matches() ? matcher.group(1) : null;
+    protected final void extractOsmFilename(DownloadParams settings, String pattern, String url) {
+        newLayerName = settings.getLayerName();
+        if (newLayerName == null || newLayerName.isEmpty()) {
+            Matcher matcher = Pattern.compile(pattern).matcher(url);
+            newLayerName = matcher.matches() ? matcher.group(1) : null;
+        }
     }
 
@@ -190 +192 @@
         /**
          * Constructs a new {@code AbstractInternalTask}.
-         * @param newLayer if {@code true}, force download to a new layer
+         * @param settings download settings
          * @param title message for the user
          * @param ignoreException If true, exception will be propagated to calling code. If false then
@@ -197 +199 @@
          * @param zoomAfterDownload If true, the map view will zoom to download area after download
          */
-        public AbstractInternalTask(boolean newLayer, String title, boolean ignoreException, boolean zoomAfterDownload) {
+        public AbstractInternalTask(DownloadParams settings, String title, boolean ignoreException, boolean zoomAfterDownload) {
             super(title, ignoreException);
-            this.newLayer = newLayer;
+            this.newLayer = settings.isNewLayer();
             this.zoomAfterDownload = zoomAfterDownload;
         }
@@ -205 +207 @@
         /**
          * Constructs a new {@code AbstractInternalTask}.
-         * @param newLayer if {@code true}, force download to a new layer
+         * @param settings download settings
          * @param title message for the user
          * @param progressMonitor progress monitor
@@ -213 +215 @@
          * @param zoomAfterDownload If true, the map view will zoom to download area after download
          */
-        public AbstractInternalTask(boolean newLayer, String title, ProgressMonitor progressMonitor, boolean ignoreException,
+        public AbstractInternalTask(DownloadParams settings, String title, ProgressMonitor progressMonitor, boolean ignoreException,
                 boolean zoomAfterDownload) {
             super(title, progressMonitor, ignoreException);
-            this.newLayer = newLayer;
+            this.newLayer = settings.isNewLayer();
             this.zoomAfterDownload = zoomAfterDownload;
         }
@@ -348 +350 @@
         /**
          * Constructs a new {@code DownloadTask}.
-         * @param newLayer if {@code true}, force download to a new layer
+         * @param settings download settings
          * @param reader OSM data reader
          * @param progressMonitor progress monitor
-         */
-        public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
-            this(newLayer, reader, progressMonitor, true);
+         * @since 13927
+         */
+        public DownloadTask(DownloadParams settings, OsmServerReader reader, ProgressMonitor progressMonitor) {
+            this(settings, reader, progressMonitor, true);
         }
 
         /**
          * Constructs a new {@code DownloadTask}.
-         * @param newLayer if {@code true}, force download to a new layer
+         * @param settings download settings
          * @param reader OSM data reader
          * @param progressMonitor progress monitor
          * @param zoomAfterDownload If true, the map view will zoom to download area after download
-         * @since 8942
-         */
-        public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor, boolean zoomAfterDownload) {
-            super(newLayer, tr("Downloading data"), progressMonitor, false, zoomAfterDownload);
+         * @since 13927
+         */
+        public DownloadTask(DownloadParams settings, OsmServerReader reader, ProgressMonitor progressMonitor, boolean zoomAfterDownload) {
+            super(settings, tr("Downloading data"), progressMonitor, false, zoomAfterDownload);
             this.reader = reader;
         }