Changeset 6965 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-04-09T23:03:16+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8047 - fix EDT violation in save/upload dialog

File:

• trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.progress.SwingRenderingProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -53 +54 @@
 public class SaveLayersDialog extends JDialog implements TableModelListener {
     public static enum UserAction {
-        /**
-         * save/upload layers was successful, proceed with operation
-         */
+        /** save/upload layers was successful, proceed with operation */
         PROCEED,
-        /**
-         * save/upload of layers was not successful or user canceled operation
-         */
+        /** save/upload of layers was not successful or user canceled operation */
         CANCEL
     }
@@ -286 +283 @@
     }
 
+    /**
+     * Closes this dialog and frees all native screen resources.
+     */
     public void closeDialog() {
         setVisible(false);
@@ -556 +556 @@
         @Override
         public void run() {
-            model.setMode(SaveLayersModel.Mode.UPLOADING_AND_SAVING);
-            List<SaveLayerInfo> toUpload = model.getLayersToUpload();
-            if (!toUpload.isEmpty()) {
-                uploadLayers(toUpload);
-            }
-            List<SaveLayerInfo> toSave = model.getLayersToSave();
-            if (!toSave.isEmpty()) {
-                saveLayers(toSave);
-            }
-            model.setMode(SaveLayersModel.Mode.EDITING_DATA);
-            if (model.hasUnsavedData()) {
-                warnBecauseOfUnsavedData();
-                model.setMode(Mode.EDITING_DATA);
-                if (canceled) {
-                    setUserAction(UserAction.CANCEL);
-                    closeDialog();
-                }
-            } else {
-                setUserAction(UserAction.PROCEED);
-                closeDialog();
-            }
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    model.setMode(SaveLayersModel.Mode.UPLOADING_AND_SAVING);
+                    List<SaveLayerInfo> toUpload = model.getLayersToUpload();
+                    if (!toUpload.isEmpty()) {
+                        uploadLayers(toUpload);
+                    }
+                    List<SaveLayerInfo> toSave = model.getLayersToSave();
+                    if (!toSave.isEmpty()) {
+                        saveLayers(toSave);
+                    }
+                    model.setMode(SaveLayersModel.Mode.EDITING_DATA);
+                    if (model.hasUnsavedData()) {
+                        warnBecauseOfUnsavedData();
+                        model.setMode(Mode.EDITING_DATA);
+                        if (canceled) {
+                            setUserAction(UserAction.CANCEL);
+                            closeDialog();
+                        }
+                    } else {
+                        setUserAction(UserAction.PROCEED);
+                        closeDialog();
+                    }
+                }
+            });
         }