Ticket #7327: 7327.patch

src/org/openstreetmap/josm/Main.java

@@ -266 +266 @@
         panel.add(gettingStarted, BorderLayout.CENTER);
         menu = new MainMenu();
 
-        undoRedo.listenerCommands.add(redoUndoListener);
+        undoRedo.addCommandQueueListener(redoUndoListener);
 
         // creating toolbar
         contentPanePrivate.add(toolbar.control, BorderLayout.NORTH);

src/org/openstreetmap/josm/actions/RedoAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -15 +16 @@
  *
  * @author imi
  */
-public class RedoAction extends JosmAction {
+public class RedoAction extends JosmAction implements OsmDataLayer.CommandQueueListener {
 
     /**
      * Construct the action with "Redo" as label.
@@ -38 +39 @@
     protected void updateEnabledState() {
         setEnabled(Main.main != null && !Main.main.undoRedo.redoCommands.isEmpty());
     }
+
+    @Override
+    public void commandChanged(int queueSize, int redoSize) {
+        if (Main.main.undoRedo.redoCommands.isEmpty()) {
+            putValue(NAME, tr("Redo"));
+        } else {
+            putValue(NAME, tr("Redo {0}", Main.main.undoRedo.redoCommands.getFirst().getDescrpitionText()));
+        }
+    }
 }

src/org/openstreetmap/josm/actions/UndoAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -15 +16 @@
  *
  * @author imi
  */
-public class UndoAction extends JosmAction {
+public class UndoAction extends JosmAction implements OsmDataLayer.CommandQueueListener {
 
     /**
      * Construct the action with "Undo" as label.
@@ -39 +40 @@
         setEnabled(Main.main != null && !Main.main.undoRedo.commands.isEmpty());
     }
 
+    @Override
+    public void commandChanged(int queueSize, int redoSize) {
+        if (Main.main.undoRedo.commands.isEmpty()) {
+            putValue(NAME, tr("Undo"));
+        } else {
+            putValue(NAME, tr("Undo {0}", Main.main.undoRedo.commands.getFirst().getDescrpitionText()));
+        }
+    }
 }

src/org/openstreetmap/josm/command/Command.java

@@ -170 +170 @@
         return ((DefaultMutableTreeNode) description()).getUserObject();
     }
 
+    public String getDescrpitionText() {
+        Object o = getDescription();
+        if (o instanceof JLabel) {
+            return ((JLabel) o).getText();
+        } else {
+            return o.toString();
+        }
+    }
+
     /**
      * @deprecated use getDescription() and getChildren() instead
      */

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

@@ -23 +23 @@
      */
     public final LinkedList<Command> redoCommands = new LinkedList<Command>();
 
-    public final LinkedList<CommandQueueListener> listenerCommands = new LinkedList<CommandQueueListener>();
+    private final LinkedList<CommandQueueListener> listenerCommands = new LinkedList<CommandQueueListener>();
 
     public UndoRedoHandler() {
         MapView.addLayerChangeListener(this);
@@ -162 +162 @@
 
     public void layerAdded(Layer newLayer) {}
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
+
+    public void removeCommandQueueListener(CommandQueueListener l) {
+        listenerCommands.remove(l);
+    }
+
+    public boolean addCommandQueueListener(CommandQueueListener l) {
+        return listenerCommands.add(l);
+    }
 }

src/org/openstreetmap/josm/gui/MainMenu.java

@@ -400 +400 @@
         add(fileMenu, exit);
 
         add(editMenu, undo);
+        Main.main.undoRedo.addCommandQueueListener(undo);
         add(editMenu, redo);
+        Main.main.undoRedo.addCommandQueueListener(redo);
         editMenu.addSeparator();
         add(editMenu, copy);
         add(editMenu, copyCoordinates, true);

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

@@ -202 +202 @@
         for (IEnabledStateUpdating listener : showNotifyListener) {
             listener.updateEnabledState();
         }
-        Main.main.undoRedo.listenerCommands.add(this);
+        Main.main.undoRedo.addCommandQueueListener(this);
     }
 
     /**
@@ -218 +218 @@
     public void hideNotify() {
         undoTreeModel.setRoot(new DefaultMutableTreeNode());
         redoTreeModel.setRoot(new DefaultMutableTreeNode());
-        Main.main.undoRedo.listenerCommands.remove(this);
+        Main.main.undoRedo.removeCommandQueueListener(this);
     }
 
     /**