Changeset 13932 in josm

Timestamp:

2018-06-14T19:38:30+02:00 (6 years ago)

Author:

Don-vip

Message:

see #11000 - restore old (deprecated) method signatures to avoid plugins breakage

File:

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

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

@@ -77 +77 @@
     }
 
+    /**
+     * Asynchronously launches the download task for a given bounding box.
+     * @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 downloadArea the area to download
+     * @param progressMonitor the progressMonitor
+     * @return the future representing the asynchronous task
+     * @deprecated Use {@link #download(DownloadParams, Bounds, ProgressMonitor)}
+     */
+    @Deprecated
+    public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        return download(new BoundingBoxDownloader(downloadArea),
+                new DownloadParams().withNewLayer(newLayer), downloadArea, progressMonitor);
+    }
+
     @Override
     public Future<?> download(DownloadParams settings, Bounds downloadArea, ProgressMonitor progressMonitor) {
         return download(new BoundingBoxDownloader(downloadArea), settings, downloadArea, progressMonitor);
+    }
+
+    /**
+     * Asynchronously launches the download task for a given bounding box.
+     *
+     * @param reader the reader used to parse OSM data (see {@link OsmServerReader#parseOsm})
+     * @param newLayer 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 downloadArea the area to download
+     * @param progressMonitor the progressMonitor
+     * @return the future representing the asynchronous task
+     * @deprecated Use {@link #download(OsmServerReader, DownloadParams, Bounds, ProgressMonitor)}
+     */
+    @Deprecated
+    public Future<?> download(OsmServerReader reader, boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        return download(new DownloadTask(new DownloadParams().withNewLayer(newLayer), reader, progressMonitor, zoomAfterDownload),
+                downloadArea);
     }
 
@@ -117 +150 @@
      * @param progressMonitor the progressMonitor
      * @return the future representing the asynchronous task
+     * @since 13927
      */
     public Future<?> download(OsmServerReader reader, DownloadParams settings, Bounds downloadArea, ProgressMonitor progressMonitor) {