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

Timestamp:

08.02.2012 22:31:29 (4 months ago)

Author:

simon04

Message:

fix #7327 - show hint in undo-menu which action will be undone (from event stack)

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/JosmAction.java (modified) (2 diffs)
• actions/RedoAction.java (modified) (3 diffs)
• actions/UndoAction.java (modified) (3 diffs)
• command/Command.java (modified) (1 diff)
• data/UndoRedoHandler.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (1 diff)
• gui/dialogs/CommandStackDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -268 +268 @@
         menu = new MainMenu();
 
-        undoRedo.listenerCommands.add(redoUndoListener);
+        undoRedo.addCommandQueueListener(redoUndoListener);
 
         // creating toolbar

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -74 +74 @@
             Main.registerActionShortcut(this, sc);
         }
-        putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
+        setTooltip(tooltip);
         if (getValue("toolbar") == null) {
             putValue("toolbar", toolbarId == null ? iconName : toolbarId);
@@ -119 +119 @@
         }
         putValue("help", helpId);
+    }
+
+    public void setTooltip(String tooltip) {
+        putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
     }
 

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -16 +17 @@
  * @author imi
  */
-public class RedoAction extends JosmAction {
+public class RedoAction extends JosmAction implements OsmDataLayer.CommandQueueListener {
 
     /**
@@ -39 +40 @@
         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"));
+            setTooltip(tr("Redo the last undone action."));
+        } else {
+            putValue(NAME, tr("Redo ..."));
+            setTooltip(tr("Redo {0}",
+                    Main.main.undoRedo.redoCommands.getFirst().getDescrpitionText()));
+        }
+    }
 }

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -16 +17 @@
  * @author imi
  */
-public class UndoAction extends JosmAction {
+public class UndoAction extends JosmAction implements OsmDataLayer.CommandQueueListener {
 
     /**
@@ -40 +41 @@
     }
 
+    @Override
+    public void commandChanged(int queueSize, int redoSize) {
+        if (Main.main.undoRedo.commands.isEmpty()) {
+            putValue(NAME, tr("Undo"));
+            setTooltip(tr("Undo the last action."));
+        } else {
+            putValue(NAME, tr("Undo ..."));
+            setTooltip(tr("Undo {0}",
+                    Main.main.undoRedo.commands.getFirst().getDescrpitionText()));
+        }
+    }
 }

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

@@ -160 +160 @@
     @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
         return cloneMap.keySet();
+    }
+
+    public String getDescrpitionText() {
+        Object o = getDescription();
+        if (o instanceof JLabel) {
+            return ((JLabel) o).getText();
+        } else {
+            return o.toString();
+        }
     }
 

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

@@ -24 +24 @@
     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() {
@@ -163 +163 @@
     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);
+    }
 }

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

@@ -401 +401 @@
 
         add(editMenu, undo);
+        Main.main.undoRedo.addCommandQueueListener(undo);
         add(editMenu, redo);
+        Main.main.undoRedo.addCommandQueueListener(redo);
         editMenu.addSeparator();
         add(editMenu, copy);

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

@@ -203 +203 @@
             listener.updateEnabledState();
         }
-        Main.main.undoRedo.listenerCommands.add(this);
+        Main.main.undoRedo.addCommandQueueListener(this);
     }
 
@@ -219 +219 @@
         undoTreeModel.setRoot(new DefaultMutableTreeNode());
         redoTreeModel.setRoot(new DefaultMutableTreeNode());
-        Main.main.undoRedo.listenerCommands.remove(this);
+        Main.main.undoRedo.removeCommandQueueListener(this);
     }