Changeset 31594 in osm for applications/editors/josm/plugins/reverter

Timestamp:

2015-10-04T22:32:21+02:00 (9 years ago)

Author:

simon04

Message:

JOSM/reverter: Fix EDT violation - fixes #josm11857

File:

• applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java (modified) (3 diffs)

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java

@@ -4 +4 @@
 
 import java.util.List;
+import java.util.concurrent.Callable;
 
 import javax.swing.JOptionPane;
@@ -16 +17 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmTransferException;
-
 import reverter.ChangesetReverter.RevertType;
 
@@ -46 +46 @@
         if (!rev.hasMissingObjects()) return true;
         if (!downloadConfirmed) {
-            downloadConfirmed = JOptionPane.showConfirmDialog(Main.parent,
-                    tr("This changeset has objects that are not present in current dataset.\n" +
-                            "It is needed to download them before reverting. Do you want to continue?"),
-                    tr("Confirm"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
+            final Integer selectedOption = GuiHelper.runInEDTAndWaitAndReturn(new Callable<Integer>() {
+                @Override
+                public Integer call() throws Exception {
+                    return JOptionPane.showConfirmDialog(Main.parent,
+                            tr("This changeset has objects that are not present in current dataset.\n" +
+                                    "It is needed to download them before reverting. Do you want to continue?"),
+                            tr("Confirm"), JOptionPane.YES_NO_OPTION);
+                }
+            });
+            downloadConfirmed = selectedOption != null && selectedOption == JOptionPane.YES_OPTION;
             if (!downloadConfirmed) return false;
         }