Changeset 5452 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2012-08-18T19:21:29+02:00 (12 years ago)

Author:

Don-vip

Message:

Code refactorisation on EDT calls

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (3 diffs)
• ValidateAction.java (modified) (4 diffs)

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

@@ -20 +20 @@
 
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -36 +35 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -224 +224 @@
                 }
             };
-            if (SwingUtilities.isEventDispatchThread()) {
-                guiTask.run();
-            } else {
-                SwingUtilities.invokeLater(guiTask);
-            }
+            GuiHelper.runInEDT(guiTask);
         }
     }

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

@@ -11 +11 @@
 import java.util.List;
 
-import javax.swing.SwingUtilities;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -21 +19 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -138 +137 @@
             // update GUI on Swing EDT
             //
-            Runnable r = new Runnable()  {
+            GuiHelper.runInEDT(new Runnable()  {
                 @Override
                 public void run() {
@@ -145 +144 @@
                     Main.main.getCurrentDataSet().fireSelectionChanged();
                 }
-            };
-            if (SwingUtilities.isEventDispatchThread()) {
-                r.run();
-            } else {
-                SwingUtilities.invokeLater(r);
-            }
+            });
         }