Changeset 11286 in josm for trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

Timestamp:

2016-11-19T14:43:38+01:00 (7 years ago)

Author:

michael2402

Message:

Fix #14008: Do not break loop.

File:

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

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

@@ -199 +199 @@
      * Open the given URL. This class checks the {@link #USE_NEW_LAYER} preference to check if a new layer should be used.
      * @param url The URL to open
-     * @return <code>true</code> if loading the task was started successfully.
+     * @return <code>true</code> if at least one task was started successfully.
+     * @since 11279
      */
     public boolean openUrl(String url) {
@@ -217 +218 @@
         PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
 
+        boolean hadAnySuccess = false;
         for (final DownloadTask task : tasks) {
             try {
                 Future<?> future = task.loadUrl(newLayer, url, monitor);
                 Main.worker.submit(new PostDownloadHandler(task, future));
-                return true;
+                hadAnySuccess = true;
             } catch (IllegalArgumentException e) {
                 Main.error(e);
             }
         }
-        return false;
+        return hadAnySuccess;
     }