Changeset 17347 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

Timestamp:

2020-11-24T07:00:30+01:00 (5 years ago)

Author:

GerdP

Message:

fix #17196: Undo/Redo may change data in inactive layer

• use separate stacks for each edit layer
• show empty undo/redo stack when active layer isn't an edit layer

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) (4 diffs)

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

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -63 +65 @@
  * @since 94
  */
-public class CommandStackDialog extends ToggleDialog implements CommandQueuePreciseListener {
+public class CommandStackDialog extends ToggleDialog implements CommandQueuePreciseListener, ActiveLayerChangeListener {
 
     private final DefaultTreeModel undoTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
@@ -145 +147 @@
         InputMapUtils.addEnterAction(undoTree, selectAndZoomAction);
         InputMapUtils.addEnterAction(redoTree, selectAndZoomAction);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
     }
 
@@ -553 +556 @@
         }
     }
+
+    @Override
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        hideNotify();
+        showNotify();
+    }
 }