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

Timestamp:

2011-01-23T17:45:01+01:00 (14 years ago)

Author:

jttt

Message:

Fix #5862 on startup neither redo nor undo button are greyed out

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• RedoAction.java (modified) (2 diffs)
• UndoAction.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -37 +37 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null);
+        setEnabled(Main.main != null && !Main.main.undoRedo.redoCommands.isEmpty());
     }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -37 +37 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null);
+        setEnabled(Main.main != null && !Main.main.undoRedo.commands.isEmpty());
     }
+
 }