Changeset 7597 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-10-04T17:54:40+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10588 - DownloadGpsTask ignores the ProgressMonitor argument given in its constructor

Location:

trunk/src/org/openstreetmap/josm/actions/downloadtasks

Files:

• DownloadGpsTask.java (modified) (3 diffs)
• DownloadNotesTask.java (modified) (1 diff)

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

@@ -68 +68 @@
     public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
-        if (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT) || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
+        if (url.matches(PATTERN_TRACE_ID)
+         || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT)
+         || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
             downloadTask = new DownloadTask(newLayer,
                     new OsmServerLocationReader(url), progressMonitor);
@@ -101 +103 @@
 
         public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
-            super(tr("Downloading GPS data"));
+            super(tr("Downloading GPS data"), progressMonitor, false);
             this.reader = reader;
             this.newLayer = newLayer;
@@ -132 +134 @@
             String name = newLayerName != null ? newLayerName : tr("Downloaded GPX Data");
 
-            GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name, tr("Markers from {0}", name));
+            GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name,
+                    tr("Markers from {0}", name));
 
             GpxLayer gpxLayer = addOrMergeLayer(layers.getGpxLayer(), findGpxMergeLayer());

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

@@ -72 +72 @@
 
         public DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
-            super(tr("Downloading Notes"));
+            super(tr("Downloading Notes"), progressMonitor, false);
             this.reader = reader;
         }
-
 
         @Override