diff --git a/VadereGui/src/org/vadere/gui/topographycreator/control/ActionRedo.java b/VadereGui/src/org/vadere/gui/topographycreator/control/ActionRedo.java index e839748bceaa092c366b272236f35e991510f6fb..c9ba6c31544bc5562bafedeaaf3d6b2a2b7d8c58 100644 --- a/VadereGui/src/org/vadere/gui/topographycreator/control/ActionRedo.java +++ b/VadereGui/src/org/vadere/gui/topographycreator/control/ActionRedo.java @@ -1,9 +1,14 @@ package org.vadere.gui.topographycreator.control; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.apache.log4j.Priority; + +import java.awt.*; import java.awt.event.ActionEvent; -import javax.swing.AbstractAction; -import javax.swing.ImageIcon; +import javax.swing.*; +import javax.swing.undo.CannotRedoException; import javax.swing.undo.UndoManager; /** @@ -15,6 +20,7 @@ public class ActionRedo extends AbstractAction { private static final long serialVersionUID = 4975524648404524891L; private final UndoManager undoManager; private final TopographyAction action; + private static Logger logger = LogManager.getLogger(ActionRedo.class); public ActionRedo(final String name, final ImageIcon icon, final UndoManager undoManager, final TopographyAction action) { @@ -25,7 +31,12 @@ public class ActionRedo extends AbstractAction { @Override public void actionPerformed(ActionEvent arg0) { - undoManager.redo(); + try { + undoManager.redo(); + } catch (CannotRedoException e) { + logger.log(Priority.DEBUG, "Cannot redo! List of edits is empty!"); + Toolkit.getDefaultToolkit().beep(); + } action.actionPerformed(arg0); } } diff --git a/VadereGui/src/org/vadere/gui/topographycreator/control/ActionUndo.java b/VadereGui/src/org/vadere/gui/topographycreator/control/ActionUndo.java index 7c5eb456c67b2754e0310eb91f5151bd464449eb..0d5ca9c1594e074ab338eb785446ad65f8901a61 100644 --- a/VadereGui/src/org/vadere/gui/topographycreator/control/ActionUndo.java +++ b/VadereGui/src/org/vadere/gui/topographycreator/control/ActionUndo.java @@ -1,9 +1,14 @@ package org.vadere.gui.topographycreator.control; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.apache.log4j.Priority; + +import java.awt.*; import java.awt.event.ActionEvent; -import javax.swing.AbstractAction; -import javax.swing.ImageIcon; +import javax.swing.*; +import javax.swing.undo.CannotUndoException; import javax.swing.undo.UndoManager; /** @@ -16,6 +21,7 @@ public class ActionUndo extends AbstractAction { private static final long serialVersionUID = 6022031098257929748L; private final UndoManager undoManager; private final TopographyAction action; + private static Logger logger = LogManager.getLogger(ActionUndo.class); public ActionUndo(final String name, final ImageIcon icon, UndoManager undoManager, final TopographyAction action) { super(name, icon); @@ -25,7 +31,13 @@ public class ActionUndo extends AbstractAction { @Override public void actionPerformed(ActionEvent arg0) { - undoManager.undo(); + try { + undoManager.undo(); + } catch (CannotUndoException e) { + logger.log(Priority.DEBUG, "Cannot undo! List of edits is empty!"); + Toolkit.getDefaultToolkit().beep(); + } + action.actionPerformed(arg0); }