Changeset 4758 in josm

Timestamp:

2012-01-01T18:27:06+01:00 (12 years ago)

Author:

jttt

Message:

Fix #7212 "Update data" broken (regression)

Location:

trunk/src/org/openstreetmap/josm/gui/progress

Files:

• AbstractProgressMonitor.java (modified) (2 diffs)
• PleaseWaitProgressMonitor.java (modified) (2 diffs)
• SwingRenderingProgressMonitor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java

@@ -6 +6 @@
 import java.util.LinkedList;
 import java.util.Queue;
-
-import javax.swing.SwingUtilities;
 
 public abstract class AbstractProgressMonitor implements ProgressMonitor {
@@ -61 +59 @@
         }
         throw new ProgressException("Expected states are %s but current state is %s", Arrays.asList(expectedStates).toString(), state);
-    }
-
-    protected void doInEDT(Runnable runnable) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            runnable.run();
-        } else {
-            SwingUtilities.invokeLater(runnable);
-        }
     }
 

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -13 +13 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -48 +49 @@
     private boolean cancelable;
 
+    private void doInEDT(Runnable runnable) {
+        // This must be invoke later even if current thread is EDT because inside there is dialog.setVisible which freeze current code flow until modal dialog is closed
+        SwingUtilities.invokeLater(runnable);
+    }
+
+
     private void setDialogVisible(boolean visible) {
         if (dialog.isVisible() != visible) {

trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.progress;
+
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -25 +27 @@
         CheckParameterUtil.ensureParameterNotNull(delegate, "delegate");
         this.delegate = delegate;
+    }
+
+    private void doInEDT(Runnable runnable) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            runnable.run();
+        } else {
+            SwingUtilities.invokeLater(runnable);
+        }
     }