Changeset 14562 in josm for trunk

Timestamp:

2018-12-15T17:19:00+01:00 (5 years ago)

Author:

GerdP

Message:

fix #16911 regression from r13729 : make sure that redo tree is cleared when a command is added after one or more undos

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java (modified) (1 diff)

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

@@ -362 +362 @@
     }
 
+    protected boolean redoTreeIsEmpty() {
+        return redoTree.getRowCount() == 0;
+    }
+
     @Override
     public void cleaned(CommandQueueCleanedEvent e) {
@@ -374 +378 @@
             undoRoot.add(getNodeForCommand(e.getCommand()));
             undoTreeModel.nodeStructureChanged(undoRoot);
+            // fix 16911: make sure that redo tree is rebuild with empty list
+            if (!redoTreeIsEmpty())
+                buildRedoTree();
             ensureTreesConsistency();
         }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java

@@ -73 +73 @@
         }
     }
+
+    /**
+     * Unit test of {@link CommandStackDialog} class - undo followed by addCommand should empty redo tree.
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/16911">Bug #16911</a>.
+     */
+    @Test
+    public void testCommandStackDialogUndoAddCommand() {
+        DataSet ds = new DataSet();
+        OsmDataLayer layer = new OsmDataLayer(ds, "", null);
+        MainApplication.getLayerManager().addLayer(layer);
+        try {
+            Command cmd1 = TestUtils.newCommand(ds);
+            Command cmd2 = TestUtils.newCommand(ds);
+            Command cmd3 = TestUtils.newCommand(ds);
+            MapFrame map = MainApplication.getMap();
+            CommandStackDialog dlg = new CommandStackDialog();
+            map.addToggleDialog(dlg);
+            dlg.unfurlDialog();
+            assertTrue(dlg.isVisible());
+            assertTrue(dlg.redoTreeIsEmpty());
+            UndoRedoHandler.getInstance().add(cmd1);
+            assertTrue(dlg.redoTreeIsEmpty());
+            UndoRedoHandler.getInstance().add(cmd2);
+            assertTrue(dlg.redoTreeIsEmpty());
+            UndoRedoHandler.getInstance().undo(1);
+            assertFalse(dlg.redoTreeIsEmpty());
+            UndoRedoHandler.getInstance().add(cmd3);
+            assertTrue(dlg.redoTreeIsEmpty());
+
+            assertTrue(UndoRedoHandler.getInstance().hasUndoCommands());
+            assertFalse(UndoRedoHandler.getInstance().hasRedoCommands());
+
+            map.removeToggleDialog(dlg);
+            dlg.hideDialog();
+            assertFalse(dlg.isVisible());
+        } finally {
+            UndoRedoHandler.getInstance().clean();
+            MainApplication.getLayerManager().removeLayer(layer);
+        }
+    }
 }