Changeset 5297 in josm for trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

Timestamp:

2012-06-24T19:14:38+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750: conflict dialog, nodes and members tab: allow selection via double-click, allow zoom via contexual menu, plus various fix in EDT violations

File:

• trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -7 +7 @@
 import java.awt.Container;
 import java.awt.Image;
+import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.Icon;
@@ -43 +44 @@
         }
     }
+
+    public static void runInEDTAndWait(Runnable task) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            task.run();
+        } else {
+            try {
+                SwingUtilities.invokeAndWait(task);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
+    }
     
     /**