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

Timestamp:

2020-03-14T20:37:18+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18770 - fix ProgressException with concurrent download tasks

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenLocationAction.java (modified) (1 diff)
• gui/PleaseWaitRunnable.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -273 +273 @@
         }
 
-        PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
-
         List<Future<?>> result = new ArrayList<>();
         for (final DownloadTask task : tasks) {
             try {
                 task.setZoomAfterDownload(zoomToData);
-                result.add(MainApplication.worker.submit(new PostDownloadHandler(task, task.loadUrl(settings, url, monitor))));
+                result.add(MainApplication.worker.submit(new PostDownloadHandler(task, task.loadUrl(settings, url,
+                        new PleaseWaitProgressMonitor(tr("Download data"))))));
             } catch (IllegalArgumentException e) {
                 Logging.error(e);

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

@@ -138 +138 @@
     public final void run() {
         if (EventQueue.isDispatchThread()) {
-            new Thread((Runnable) this::doRealRun, getClass().getName()).start();
+            new Thread(this::doRealRun, getClass().getName()).start();
         } else {
             doRealRun();