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

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

Files:

• actions/downloadtasks/DownloadGpsTask.java (modified) (3 diffs)
• actions/downloadtasks/DownloadNotesTask.java (modified) (1 diff)
• gui/PleaseWaitRunnable.java (modified) (3 diffs)
• plugins/PluginDownloadTask.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

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -32 +32 @@
     /**
      * Create the runnable object with a given message for the user.
+     * @param title message for the user
      */
     public PleaseWaitRunnable(String title) {
         this(title, false);
     }
+
     /**
      * Create the runnable object with a given message for the user.
@@ -65 +67 @@
     }
 
+    /**
+     * Create the runnable object with a given message for the user
+     *
+     * @param title message for the user
+     * @param progressMonitor progress monitor
+     * @param ignoreException If true, exception will be propagated to calling code. If false then
+     * exception will be thrown directly in EDT. When this runnable is executed using executor framework
+     * then use false unless you read result of task (because exception will get lost if you don't)
+     * @throws IllegalArgumentException thrown if parent is null
+     */
     public PleaseWaitRunnable(String title, ProgressMonitor progressMonitor, boolean ignoreException) {
         this.title = title;
@@ -175 +187 @@
     protected abstract void finish();
 
+    /**
+     * Relies the progress monitor.
+     * @return the progress monitor
+     */
     public ProgressMonitor getProgressMonitor() {
         return progressMonitor;

trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

@@ -155 +155 @@
         File pluginDir = Main.pref.getPluginsDirectory();
         if (!pluginDir.exists() && !pluginDir.mkdirs()) {
-            //lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
+            /*lastException =*/ new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
             failed.addAll(toUpdate);
             return;