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

Timestamp:

2017-04-23T19:14:12+02:00 (7 years ago)

Author:

Don-vip

Message:

add unit test for Main.postConstructorProcessCmdLine

File:

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

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

@@ -57 +57 @@
      */
     private static final BooleanProperty USE_NEW_LAYER = new BooleanProperty("download.newlayer", false);
+    /**
+     * the list of download tasks
+     */
     protected final transient List<Class<? extends DownloadTask>> downloadTasks;
 
@@ -200 +203 @@
      * @param newLayer true if the URL needs to be opened in a new layer, false otherwise
      * @param url The URL to open
-     */
-    public void openUrl(boolean newLayer, String url) {
-        realOpenUrl(newLayer, url);
+     * @return the list of tasks that have been started successfully (can be empty).
+     * @since 11986 (return type)
+     */
+    public List<Future<?>> openUrl(boolean newLayer, String url) {
+        return realOpenUrl(newLayer, url);
     }
 
@@ -208 +213 @@
      * 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 at least one task was started successfully.
-     * @since 11279
-     */
-    public boolean openUrl(String url) {
+     * @return the list of tasks that have been started successfully (can be empty).
+     * @since 11986 (return type)
+     */
+    public List<Future<?>> openUrl(String url) {
         return realOpenUrl(USE_NEW_LAYER.get(), url);
     }
 
-    private boolean realOpenUrl(boolean newLayer, String url) {
+    private List<Future<?>> realOpenUrl(boolean newLayer, String url) {
         Collection<DownloadTask> tasks = findDownloadTasks(url, false);
 
@@ -222 +227 @@
         } else if (tasks.isEmpty()) {
             warnNoSuitableTasks(url);
-            return false;
+            return Collections.emptyList();
         }
 
         PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
 
-        boolean hadAnySuccess = false;
+        List<Future<?>> result = new ArrayList<>();
         for (final DownloadTask task : tasks) {
             try {
-                Future<?> future = task.loadUrl(newLayer, url, monitor);
-                Main.worker.submit(new PostDownloadHandler(task, future));
-                hadAnySuccess = true;
+                result.add(Main.worker.submit(new PostDownloadHandler(task, task.loadUrl(newLayer, url, monitor))));
             } catch (IllegalArgumentException e) {
                 Main.error(e);
             }
         }
-        return hadAnySuccess;
+        return result;
     }