Ticket #17401: 17401-v4-poc.patch

src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -89 +89 @@
     private final SelectAction selectAction = new SelectAction();
     private final SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
 
+    private boolean notInSync;
+    private boolean passive;
+
     /**
      * Constructs a new {@code CommandStackDialog}.
      */
@@ -375 +378 @@
     @Override
     public void commandAdded(CommandAddedEvent e) {
         if (isVisible()) {
-            undoRoot.add(getNodeForCommand(e.getCommand()));
-            undoTreeModel.nodeStructureChanged(undoRoot);
-            // fix 16911: make sure that redo tree is rebuild with empty list
-            if (!redoTreeIsEmpty())
-                buildRedoTree();
-            ensureTreesConsistency();
+            if (passive) {
+                notInSync = true;
+            } else {
+                undoRoot.add(getNodeForCommand(e.getCommand()));
+                undoTreeModel.nodeStructureChanged(undoRoot);
+                // fix 16911: make sure that redo tree is rebuild with empty list
+                if (!redoTreeIsEmpty())
+                    buildRedoTree();
+                ensureTreesConsistency();
+            }
         }
     }
 
@@ -550 +557 @@
             add(selectAndZoomAction);
         }
     }
+
+    /**
+     * Allows to set the dialog into passive mode so that updates to the undo/redo tree are ignored
+     * @param b true: enable passive mode, false: disable passive mode and rebuild dialog
+     */
+    public void setPassive(boolean b) {
+        if (passive) {
+            if (!b) {
+                passive = false;
+                if (notInSync) {
+                    buildTrees();
+                    notInSync = false;
+                }
+            }
+        } else {
+            passive = b;
+        }
+    }
 }

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

@@ -618 +618 @@
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             ProgressMonitor monitor = getProgressMonitor();
+            CommandStackDialog cmdStackPanel = dialogsPanel.getToggleDialog(CommandStackDialog.class);
             try {
+                if (cmdStackPanel != null && testErrors.size() > 100) {
+                    cmdStackPanel.setPassive(true);
+                }
                 monitor.setTicksCount(testErrors.size());
                 final DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
                 int i = 0;
@@ -646 +650 @@
                 throw new JosmRuntimeException(e);
             } finally {
                 monitor.finishTask();
+                if (cmdStackPanel != null) {
+                    cmdStackPanel.setPassive(false);
+                }
             }
         }
     }