Changeset 14381 in josm for trunk/src/org

Timestamp:

2018-10-28T21:04:34+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16875 - command stack dialog was not updated after fixing errors from validator dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/UndoRedoHandler.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Objects;
 
@@ -305 +306 @@
         if (cmd != null) {
             fireEvent(new CommandAddedEvent(this, cmd));
+        }
+        fireCommandsChanged();
+    }
+
+    /**
+     * Fires a commands change event after adding a list of commands.
+     * @param cmds commands added
+     * @since 14381
+     */
+    public void afterAdd(List<? extends Command> cmds) {
+        if (cmds != null) {
+            for (Command cmd : cmds) {
+                fireEvent(new CommandAddedEvent(this, cmd));
+            }
         }
         fireCommandsChanged();

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -534 +534 @@
     /**
      * Task for fixing a collection of {@link TestError}s. Can be run asynchronously.
-     *
-     *
      */
     class FixTask extends PleaseWaitRunnable {
         private final Collection<TestError> testErrors;
+        private final List<Command> fixCommands = new ArrayList<>();
         private boolean canceled;
 
@@ -561 +560 @@
                 if (fixCommand != null) {
                     SwingUtilities.invokeAndWait(() -> UndoRedoHandler.getInstance().addNoRedraw(fixCommand));
+                    fixCommands.add(fixCommand);
                 }
                 // It is wanted to ignore an error if it said fixable, even if fixCommand was null
@@ -591 +591 @@
                 monitor.subTask(tr("Updating map ..."));
                 SwingUtilities.invokeAndWait(() -> {
-                    UndoRedoHandler.getInstance().afterAdd(null);
+                    UndoRedoHandler.getInstance().afterAdd(fixCommands);
                     invalidateValidatorLayers();
                     tree.resetErrors();