Author: bobtarling
Date: 2007-09-06 17:49:59-0700
New Revision: 13501
Added:
trunk/src_new/org/argouml/Images/Redo.gif (contents, props changed)
trunk/src_new/org/argouml/Images/Undo.gif (contents, props changed)
trunk/src_new/org/argouml/kernel/NonUndoableCommand.java (contents, props changed)
Modified:
trunk/src_new/org/argouml/kernel/DefaultUndoManager.java
trunk/src_new/org/argouml/kernel/ProjectManager.java
trunk/src_new/org/argouml/ui/ActionRedo.java
trunk/src_new/org/argouml/ui/ActionUndo.java
trunk/src_new/org/argouml/ui/ProjectActions.java
trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java
Log:
New project sends an non undoable command. Undo and Redo enable correctly
Added: trunk/src_new/org/argouml/Images/Redo.gif
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/Images/Redo.gif?view=auto&rev=13501
==============================================================================
Binary file. No diff available.
Added: trunk/src_new/org/argouml/Images/Undo.gif
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/Images/Undo.gif?view=auto&rev=13501
==============================================================================
Binary file. No diff available.
Modified: trunk/src_new/org/argouml/kernel/DefaultUndoManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/DefaultUndoManager.java?view=diff&rev=13501&p1=trunk/src_new/org/argouml/kernel/DefaultUndoManager.java&p2=trunk/src_new/org/argouml/kernel/DefaultUndoManager.java&r1=13500&r2=13501
==============================================================================
--- trunk/src_new/org/argouml/kernel/DefaultUndoManager.java (original)
+++ trunk/src_new/org/argouml/kernel/DefaultUndoManager.java 2007-09-06 17:49:59-0700
@@ -33,6 +33,7 @@
import java.util.ListIterator;
import java.util.Stack;
+import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
/**
@@ -40,7 +41,10 @@
* UndoManager is only temporarily singleton until changes are made to GEF.
* @author Bob Tarling
*/
-public class DefaultUndoManager implements UndoManager {
+class DefaultUndoManager implements UndoManager {
+
+ private static final Logger LOG =
+ Logger.getLogger(DefaultUndoManager.class);
private int undoMax = 100;
@@ -80,6 +84,11 @@
if (undoMax == 0) {
return;
}
+
+ if (!command.isUndoable()) {
+ undoStack.clear();
+ newInteraction = true;
+ }
// Flag the command as to whether it is first in a chain
final Interaction macroCommand;
if (newInteraction || undoStack.isEmpty()) {
@@ -151,7 +160,7 @@
*
* @author Bob
*/
- private class Interaction extends AbstractCommand {
+ class Interaction extends AbstractCommand {
private List<Command> commands = new ArrayList<Command>();
@@ -204,24 +213,39 @@
private String getRedoLabel() {
return "Redo " + label;
}
+
+ List<Command> getCommands() {
+ return new ArrayList<Command> (commands);
+ }
}
private abstract class InteractionStack extends Stack<Interaction> {
private String enabledProperty;
private String labelProperty;
+ private String addedProperty;
+ private String removedProperty;
+ private String sizeProperty;
public InteractionStack(
String enabledProperty,
- String labelProperty) {
+ String labelProperty,
+ String addedProperty,
+ String removedProperty,
+ String sizeProperty) {
this.enabledProperty = enabledProperty;
this.labelProperty = labelProperty;
+ this.addedProperty = addedProperty;
+ this.removedProperty = removedProperty;
+ this.sizeProperty = sizeProperty;
}
public Interaction push(Interaction item) {
super.push(item);
fireLabel();
- if (size() == 1) {
+ fire(addedProperty, item);
+ fire(sizeProperty, size());
+ if (item.isUndoable()) {
fire(enabledProperty, true);
}
return item;
@@ -230,12 +254,19 @@
public Interaction pop() {
Interaction item = super.pop();
fireLabel();
- if (size() == 0) {
+ fire(removedProperty, item);
+ fire(sizeProperty, size());
+ if (size() == 0 || !peek().isUndoable()) {
fire(enabledProperty, false);
}
return item;
}
+ public void clear() {
+ super.clear();
+ fire(sizeProperty, size());
+ }
+
private void fireLabel() {
fire(labelProperty, getLabel());
}
@@ -246,7 +277,12 @@
private class UndoStack extends InteractionStack {
public UndoStack() {
- super("undoable", "undoLabel");
+ super(
+ "undoable",
+ "undoLabel",
+ "undoAdded",
+ "undoRemoved",
+ "undoSize");
}
protected String getLabel() {
@@ -261,7 +297,12 @@
private class RedoStack extends InteractionStack {
public RedoStack() {
- super("redoable", "redoLabel");
+ super(
+ "redoable",
+ "redoLabel",
+ "redoAdded",
+ "redoRemoved",
+ "redoSize");
}
protected String getLabel() {
Added: trunk/src_new/org/argouml/kernel/NonUndoableCommand.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/NonUndoableCommand.java?view=auto&rev=13501
==============================================================================
--- (empty file)
+++ trunk/src_new/org/argouml/kernel/NonUndoableCommand.java 2007-09-06 17:49:59-0700
@@ -0,0 +1,41 @@
+// $Id$
+// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.kernel;
+
+/**
+ * The base class for any commands that can be undone by ActionUndo.
+ * @author Bob Tarling
+ */
+public abstract class NonUndoableCommand implements Command {
+
+ public abstract void execute();
+
+ public void undo() {
+ }
+
+ public boolean isUndoable() {
+ return false;
+ }
+}
Modified: trunk/src_new/org/argouml/kernel/ProjectManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectManager.java?view=diff&rev=13501&p1=trunk/src_new/org/argouml/kernel/ProjectManager.java&p2=trunk/src_new/org/argouml/kernel/ProjectManager.java&r1=13500&r2=13501
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectManager.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectManager.java 2007-09-06 17:49:59-0700
@@ -72,12 +72,14 @@
/**
* The name of the property that there is no project.
+ * @deprecated in 0.25.4 By Bob Tarling This is unused.
*/
public static final String NO_PROJECT =
"noProject";
/**
* The name of the property that defines the save state.
+ * @deprecated in 0.25.4 By Bob Tarling This is unused.
*/
public static final String SAVE_STATE_PROPERTY_NAME = "saveState";
@@ -246,25 +248,33 @@
* default diagrams (Class and Use Case)
* @return Project the newly created project
*/
- public Project makeEmptyProject(boolean addDefaultDiagrams) {
- Model.getPump().stopPumpingEvents();
-
- creatingCurrentProject = true;
- LOG.info("making empty project");
- Project oldProject = currentProject;
- currentProject = new ProjectImpl();
- if (addDefaultDiagrams) {
- createDefaultDiagrams();
- }
- firePropertyChanged(CURRENT_PROJECT_PROPERTY_NAME,
- oldProject, currentProject);
- creatingCurrentProject = false;
+ public Project makeEmptyProject(final boolean addDefaultDiagrams) {
+ final Command cmd = new NonUndoableCommand() {
- Model.getPump().startPumpingEvents();
-
- if (saveAction != null) {
- saveAction.setEnabled(false);
- }
+ @Override
+ public void execute() {
+ Model.getPump().stopPumpingEvents();
+
+ creatingCurrentProject = true;
+ LOG.info("making empty project");
+ final Project oldProject = currentProject;
+ currentProject = new ProjectImpl();
+ if (addDefaultDiagrams) {
+ createDefaultDiagrams();
+ }
+ firePropertyChanged(CURRENT_PROJECT_PROPERTY_NAME,
+ oldProject, currentProject);
+ creatingCurrentProject = false;
+
+ Model.getPump().startPumpingEvents();
+
+ if (saveAction != null) {
+ saveAction.setEnabled(false);
+ }
+ }
+ };
+ cmd.execute();
+ currentProject.getUndoManager().addCommand(cmd);
return currentProject;
}
Modified: trunk/src_new/org/argouml/ui/ActionRedo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionRedo.java?view=diff&rev=13501&p1=trunk/src_new/org/argouml/ui/ActionRedo.java&p2=trunk/src_new/org/argouml/ui/ActionRedo.java&r1=13500&r2=13501
==============================================================================
--- trunk/src_new/org/argouml/ui/ActionRedo.java (original)
+++ trunk/src_new/org/argouml/ui/ActionRedo.java 2007-09-06 17:49:59-0700
@@ -25,8 +25,6 @@
package org.argouml.ui;
import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import javax.swing.AbstractAction;
import javax.swing.Icon;
@@ -39,8 +37,7 @@
*
* @author [email protected]
*/
-public class ActionRedo extends AbstractAction
- implements PropertyChangeListener {
+public class ActionRedo extends AbstractAction {
private static final long serialVersionUID = 3921952827170089931L;
@@ -50,9 +47,6 @@
*/
public ActionRedo(String name) {
super(name);
- final Project p = ProjectManager.getManager().getCurrentProject();
- p.getUndoManager().addPropertyChangeListener(this);
- setEnabled(false);
}
/**
@@ -62,25 +56,10 @@
*/
public ActionRedo(String name, Icon icon) {
super(name, icon);
- final Project p = ProjectManager.getManager().getCurrentProject();
- p.getUndoManager().addPropertyChangeListener(this);
- setEnabled(false);
}
public void actionPerformed(ActionEvent e) {
final Project p = ProjectManager.getManager().getCurrentProject();
p.getUndoManager().redo();
}
-
- /**
- * Listens for property change events to determine when redo changes
- * availability
- * @param event the event
- * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
- if ("canRedo".equals(event.getPropertyName())) {
- setEnabled ("true".equals(event.getNewValue()));
- }
- }
}
Modified: trunk/src_new/org/argouml/ui/ActionUndo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionUndo.java?view=diff&rev=13501&p1=trunk/src_new/org/argouml/ui/ActionUndo.java&p2=trunk/src_new/org/argouml/ui/ActionUndo.java&r1=13500&r2=13501
==============================================================================
--- trunk/src_new/org/argouml/ui/ActionUndo.java (original)
+++ trunk/src_new/org/argouml/ui/ActionUndo.java 2007-09-06 17:49:59-0700
@@ -25,8 +25,6 @@
package org.argouml.ui;
import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import javax.swing.AbstractAction;
import javax.swing.Icon;
@@ -39,8 +37,7 @@
*
* @author Bob Tarling
*/
-public class ActionUndo extends AbstractAction
- implements PropertyChangeListener {
+public class ActionUndo extends AbstractAction {
private static final long serialVersionUID = 6544646406482242086L;
@@ -50,9 +47,6 @@
*/
public ActionUndo(String name) {
super(name);
- Project p = ProjectManager.getManager().getCurrentProject();
- p.getUndoManager().addPropertyChangeListener(this);
- setEnabled(false);
}
/**
@@ -62,25 +56,10 @@
*/
public ActionUndo(String name, Icon icon) {
super(name, icon);
- Project p = ProjectManager.getManager().getCurrentProject();
- p.getUndoManager().addPropertyChangeListener(this);
- setEnabled(false);
}
public void actionPerformed(ActionEvent e) {
Project p = ProjectManager.getManager().getCurrentProject();
p.getUndoManager().undo();
}
-
- /**
- * Listens for property change events to determine when undo changes
- * availability
- * @param event the event
- * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
- if ("canUndo".equals(event.getPropertyName())) {
- setEnabled ("true".equals(event.getNewValue()));
- }
- }
}
Modified: trunk/src_new/org/argouml/ui/ProjectActions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectActions.java?view=diff&rev=13501&p1=trunk/src_new/org/argouml/ui/ProjectActions.java&p2=trunk/src_new/org/argouml/ui/ProjectActions.java&r1=13500&r2=13501
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectActions.java (original)
+++ trunk/src_new/org/argouml/ui/ProjectActions.java 2007-09-06 17:49:59-0700
@@ -31,8 +31,8 @@
import javax.swing.AbstractAction;
+import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.DefaultUndoManager;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.UndoManager;
@@ -64,14 +64,20 @@
private ProjectActions() {
super();
- undoAction =
- new ActionUndo(Translator.localize("action.undo"));
+
+ undoAction = new ActionUndo(
+ Translator.localize("action.undo"),
+ ResourceLoaderWrapper.lookupIcon("Undo"));
undoAction.setEnabled(false);
- redoAction =
- new ActionRedo(Translator.localize("action.redo"));
+
+ redoAction = new ActionRedo(
+ Translator.localize("action.redo"),
+ ResourceLoaderWrapper.lookupIcon("Redo"));
redoAction.setEnabled(false);
+
TargetManager.getInstance().addTargetListener(this);
- DefaultUndoManager.getInstance().addPropertyChangeListener(this);
+ ProjectManager.getManager().getCurrentProject().getUndoManager()
+ .addPropertyChangeListener(this);
}
/**
Modified: trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&rev=13501&p1=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=13500&r2=13501
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java (original)
+++ trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java 2007-09-06 17:49:59-0700
@@ -71,7 +71,6 @@
import org.argouml.uml.ui.ActionImportFromSources;
import org.argouml.uml.ui.ActionLayout;
import org.argouml.uml.ui.ActionOpenProject;
-import org.argouml.uml.ui.ActionPaste;
import org.argouml.uml.ui.ActionRevertToSaved;
import org.argouml.uml.ui.ActionSaveAllGraphics;
import org.argouml.uml.ui.ActionSaveGraphics;
@@ -87,6 +86,7 @@
import org.tigris.gef.base.SelectInvertAction;
import org.tigris.gef.base.ZoomAction;
import org.tigris.toolbar.ToolBar;
+import org.tigris.toolbar.ToolBarFactory;
/**
* GenericArgoMenuBar defines the menubar for all operating systems which do not
@@ -394,17 +394,15 @@
initCommandStackItems(edit);
- JMenuItem undoItem = edit.add(ProjectActions.getInstance()
- .getUndoAction());
+ JMenuItem undoItem = edit.add(
+ ProjectActions.getInstance().getUndoAction());
setMnemonic(undoItem, "Undo");
ShortcutMgr.assignAccelerator(undoItem, ShortcutMgr.ACTION_UNDO);
- undoItem.setEnabled(true);
- JMenuItem redoItem = edit.add(ProjectActions.getInstance()
- .getRedoAction());
+ JMenuItem redoItem = edit.add(
+ ProjectActions.getInstance().getRedoAction());
setMnemonic(redoItem, "Redo");
ShortcutMgr.assignAccelerator(redoItem, ShortcutMgr.ACTION_REDO);
- redoItem.setEnabled(true);
edit.addSeparator();
@@ -998,15 +996,8 @@
*/
public JToolBar getEditToolbar() {
if (editToolbar == null) {
- editToolbar = new ToolBar("misc.toolbar.edit");
- // editToolbar.add(ActionCut.getInstance());
- // editToolbar.add(ActionCopy.getInstance());
- // editToolbar.add(ActionPaste.getInstance());
- editToolbar.addFocusListener(ActionPaste.getInstance());
- editToolbar.add(ProjectActions.getInstance()
- .getRemoveFromDiagramAction());
- editToolbar.add(navigateTargetBackAction);
- editToolbar.add(navigateTargetForwardAction);
+ editToolbar = ToolBarFactory.createToolBar(edit);
+ editToolbar.setName(Translator.localize("misc.toolbar.edit"));
}
return editToolbar;
}
Modified: trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java?view=diff&rev=13501&p1=trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java&p2=trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java&r1=13500&r2=13501
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java 2007-09-06 17:49:59-0700
@@ -64,7 +64,9 @@
org.argouml.kernel.UndoManager undo = p.getUndoManager();
if (startChain) {
- undo.startInteraction();
+ //TODO i18n: GEF needs to pass us back the description of what is
+ // being done.
+ undo.startInteraction("Diagram Interaction");
}
undo.addCommand(new DiagramCommand(memento));
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.