Changeset 14204 in josm for trunk/src

Timestamp:

2018-08-29T23:16:52+02:00 (6 years ago)

Author:

wiktorn

Message:

Move undo handler to EDT

To prevent live-locks when undo is called outside EDT and locks DataSet, and
DrawAction.selectionChanged tries to reaquire this lock in EDT thread.

Also - add synchronized keyword to redo and clean, to be symetrical with undo.

Closes: #16679

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmDataManager;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -291 +292 @@
         if (commands.isEmpty())
             return;
-        DataSet ds = OsmDataManager.getInstance().getEditDataSet();
-        if (ds != null) {
-            ds.beginUpdate();
-        }
-        try {
-            for (int i = 1; i <= num; ++i) {
-                final Command c = commands.removeLast();
-                c.undoCommand();
-                redoCommands.addFirst(c);
-                fireEvent(new CommandUndoneEvent(this, c));
-                if (commands.isEmpty()) {
-                    break;
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override
+            public void run() {
+                DataSet ds = OsmDataManager.getInstance().getEditDataSet();
+                if (ds != null) {
+                    ds.beginUpdate();
                 }
+                try {
+                    for (int i = 1; i <= num; ++i) {
+                        final Command c = commands.removeLast();
+                        c.undoCommand();
+                        redoCommands.addFirst(c);
+                        fireEvent(new CommandUndoneEvent(UndoRedoHandler.this, c));
+                        if (commands.isEmpty()) {
+                            break;
+                        }
+                    }
+                } finally {
+                    if (ds != null) {
+                        ds.endUpdate();
+                    }
+                }
+                fireCommandsChanged();
             }
-        } finally {
-            if (ds != null) {
-                ds.endUpdate();
-            }
-        }
-        fireCommandsChanged();
+
+        });
     }
 
@@ -324 +331 @@
      * @param num The number of commands to redo
      */
-    public void redo(int num) {
+    public synchronized void redo(int num) {
         if (redoCommands.isEmpty())
             return;
@@ -367 +374 @@
      * @since 12718
      */
-    public void clean(DataSet dataSet) {
+    public synchronized void clean(DataSet dataSet) {
         if (dataSet == null)
             return;