Changeset 13943 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-06-17T17:23:47+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16389 - fix wrong undo/redo behaviour in command stack dialog (regression from r13729)

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• CommandListMutableTreeNode.java (modified) (2 diffs)
• CommandStackDialog.java (modified) (4 diffs)

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

@@ -13 +13 @@
 
     protected final transient PseudoCommand cmd;
-    protected final int idx;
 
     /**
      * Constructs a new {@code CommandListMutableTreeNode}.
      * @param cmd command
-     * @param idx index
      */
-    public CommandListMutableTreeNode(PseudoCommand cmd, int idx) {
+    public CommandListMutableTreeNode(PseudoCommand cmd) {
         super(new JLabel(cmd.getDescriptionText(), cmd.getDescriptionIcon(), JLabel.HORIZONTAL));
         this.cmd = cmd;
-        this.idx = idx;
     }
 
@@ -39 +36 @@
      */
     public int getIndex() {
-        return idx;
+        return getParent().getIndex(this);
     }
 }

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

@@ -273 +273 @@
         undoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < undoCommands.size(); ++i) {
-            undoRoot.add(getNodeForCommand(undoCommands.get(i), i));
+            undoRoot.add(getNodeForCommand(undoCommands.get(i)));
         }
         undoTreeModel.setRoot(undoRoot);
@@ -282 +282 @@
         redoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < redoCommands.size(); ++i) {
-            redoRoot.add(getNodeForCommand(redoCommands.get(i), i));
+            redoRoot.add(getNodeForCommand(redoCommands.get(i)));
         }
         redoTreeModel.setRoot(redoRoot);
@@ -330 +330 @@
      * Recursively adds child commands.
      * @param c the command
-     * @param idx index
      * @return the resulting node
      */
-    protected CommandListMutableTreeNode getNodeForCommand(PseudoCommand c, int idx) {
-        CommandListMutableTreeNode node = new CommandListMutableTreeNode(c, idx);
+    protected CommandListMutableTreeNode getNodeForCommand(PseudoCommand c) {
+        CommandListMutableTreeNode node = new CommandListMutableTreeNode(c);
         if (c.getChildren() != null) {
             List<PseudoCommand> children = new ArrayList<>(c.getChildren());
             for (int i = 0; i < children.size(); ++i) {
-                node.add(getNodeForCommand(children.get(i), i));
+                node.add(getNodeForCommand(children.get(i)));
             }
         }
@@ -371 +370 @@
     public void commandAdded(CommandAddedEvent e) {
         if (isVisible()) {
-            undoRoot.add(getNodeForCommand(e.getCommand(), undoRoot.getChildCount()));
+            undoRoot.add(getNodeForCommand(e.getCommand()));
             undoTreeModel.nodeStructureChanged(undoRoot);
             ensureTreesConsistency();