Changeset 11995 in josm

Timestamp:

2017-04-24T21:16:45+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14690 - Loading commandline file blocks JOSM (regression from r11986)

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/MainTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -830 +830 @@
      * Handle command line instructions after GUI has been initialized.
      * @param args program arguments
-     */
-    protected static void postConstructorProcessCmdLine(ProgramArguments args) {
+     * @return the list of submitted tasks
+     */
+    protected static List<Future<?>> postConstructorProcessCmdLine(ProgramArguments args) {
         List<Future<?>> tasks = new ArrayList<>();
         List<File> fileList = new ArrayList<>();
@@ -843 +844 @@
             tasks.addAll(DownloadParamType.paramType(s).downloadGps(s));
         }
-        // Make sure all download tasks complete before handling selection arguments
-        for (Future<?> task : tasks) {
-            try {
-                task.get();
-            } catch (InterruptedException | ExecutionException e) {
-                error(e);
-            }
-        }
-        for (String s : args.get(Option.SELECTION)) {
-            SearchAction.search(s, SearchAction.SearchMode.add);
-        }
+        final Collection<String> selectionArguments = args.get(Option.SELECTION);
+        if (!selectionArguments.isEmpty()) {
+            tasks.add(Main.worker.submit(() -> {
+                for (String s : selectionArguments) {
+                    SearchAction.search(s, SearchAction.SearchMode.add);
+                }
+            }));
+        }
+        return tasks;
     }
 

trunk/test/unit/org/openstreetmap/josm/MainTest.java

@@ -12 +12 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import javax.swing.UIManager;
@@ -100 +102 @@
     private static void doTestPostConstructorProcessCmdLine(String download, String downloadGps, boolean gpx) {
         assertNull(Main.getLayerManager().getEditDataSet());
-        Main.postConstructorProcessCmdLine(new ProgramArguments(new String[]{
+        for (Future<?> f : Main.postConstructorProcessCmdLine(new ProgramArguments(new String[]{
                 "--download=" + download,
                 "--downloadgps=" + downloadGps,
-                "--selection=type: node"}));
+                "--selection=type: node"}))) {
+            try {
+                f.get();
+            } catch (InterruptedException | ExecutionException e) {
+                Main.error(e);
+            }
+        }
         DataSet ds = Main.getLayerManager().getEditDataSet();
         assertNotNull(ds);