Changeset 15827 in josm

Timestamp:

2020-02-08T16:46:49+01:00 (5 years ago)

Author:

Don-vip

Message:

fix EDT violation

File:

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

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

@@ -41 +41 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
@@ -292 +293 @@
      */
     Collection<DownloadTask> askWhichTasksToLoad(final Collection<DownloadTask> tasks) {
-        final JList<DownloadTask> list = new JList<>(tasks.toArray(new DownloadTask[0]));
-        list.addSelectionInterval(0, tasks.size() - 1);
-        final ExtendedDialog dialog = new WhichTasksToPerformDialog(list);
-        dialog.showDialog();
-        return dialog.getValue() == 1 ? list.getSelectedValuesList() : Collections.<DownloadTask>emptyList();
+        return GuiHelper.runInEDTAndWaitAndReturn(() -> {
+            final JList<DownloadTask> list = new JList<>(tasks.toArray(new DownloadTask[0]));
+            list.addSelectionInterval(0, tasks.size() - 1);
+            final ExtendedDialog dialog = new WhichTasksToPerformDialog(list);
+            dialog.showDialog();
+            return dialog.getValue() == 1 ? list.getSelectedValuesList() : Collections.<DownloadTask>emptyList();
+        });
     }