Author: bobtarling
Date: 2007-09-03 17:17:23-0700
New Revision: 13486
Modified:
trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java
trunk/src_new/org/argouml/cognitive/ui/ActionNewToDoItem.java
trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
trunk/src_new/org/argouml/cognitive/ui/ToDoItemAction.java
trunk/src_new/org/argouml/kernel/ProjectManager.java
trunk/src_new/org/argouml/kernel/UndoManager.java
Log:
Begin replacing UndoableAction
Modified: trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java?view=diff&rev=13486&p1=trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java&p2=trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java&r1=13485&r2=13486
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java 2007-09-03 17:17:23-0700
@@ -33,7 +33,7 @@
import org.argouml.cognitive.ToDoItem;
import org.argouml.i18n.Translator;
import org.argouml.ui.ProjectBrowser;
-import org.tigris.gef.undo.UndoableAction;
+import org.argouml.ui.UndoableAction;
/**
* Action to display the todo pane.
Modified: trunk/src_new/org/argouml/cognitive/ui/ActionNewToDoItem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/ActionNewToDoItem.java?view=diff&rev=13486&p1=trunk/src_new/org/argouml/cognitive/ui/ActionNewToDoItem.java&p2=trunk/src_new/org/argouml/cognitive/ui/ActionNewToDoItem.java&r1=13485&r2=13486
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/ActionNewToDoItem.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/ActionNewToDoItem.java 2007-09-03 17:17:23-0700
@@ -30,10 +30,8 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
+import org.argouml.ui.UndoableAction;
import org.argouml.uml.ui.UMLListCellRenderer2;
-import org.tigris.gef.undo.UndoableAction;
-
-
/**
* The action to create a new todo item.
Modified: trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/TabToDo.java?view=diff&rev=13486&p1=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=13485&r2=13486
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/TabToDo.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/TabToDo.java 2007-09-03 17:17:23-0700
@@ -28,6 +28,7 @@
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
+import javax.swing.Action;
import javax.swing.JPanel;
import javax.swing.JToolBar;
import javax.swing.SwingConstants;
@@ -56,7 +57,7 @@
// static variables
private static int numHushes;
- private static UndoableAction actionNewToDoItem = new ActionNewToDoItem();
+ private static Action actionNewToDoItem = new ActionNewToDoItem();
private static ToDoItemAction actionResolve = new ActionResolve();
private static ToDoItemAction actionSnooze = new ActionSnooze();
Modified: trunk/src_new/org/argouml/cognitive/ui/ToDoItemAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/ToDoItemAction.java?view=diff&rev=13486&p1=trunk/src_new/org/argouml/cognitive/ui/ToDoItemAction.java&p2=trunk/src_new/org/argouml/cognitive/ui/ToDoItemAction.java&r1=13485&r2=13486
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/ToDoItemAction.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/ToDoItemAction.java 2007-09-03 17:17:23-0700
@@ -29,9 +29,7 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.cognitive.ToDoItem;
import org.argouml.i18n.Translator;
-import org.tigris.gef.undo.UndoableAction;
-
-
+import org.argouml.ui.UndoableAction;
/**
* A base class for Actions related to ToDoItems.
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=13486&p1=trunk/src_new/org/argouml/kernel/ProjectManager.java&p2=trunk/src_new/org/argouml/kernel/ProjectManager.java&r1=13485&r2=13486
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectManager.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectManager.java 2007-09-03 17:17:23-0700
@@ -353,14 +353,9 @@
public void execute() {
modelMemento.execute();
}
- public void dispose() {
- modelMemento.dispose();
- }
-
public String toString() {
return modelMemento.toString();
}
-
};
getCurrentProject().getUndoManager().addCommand(wrappedMemento);
}
Modified: trunk/src_new/org/argouml/kernel/UndoManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/UndoManager.java?view=diff&rev=13486&p1=trunk/src_new/org/argouml/kernel/UndoManager.java&p2=trunk/src_new/org/argouml/kernel/UndoManager.java&r1=13485&r2=13486
==============================================================================
--- trunk/src_new/org/argouml/kernel/UndoManager.java (original)
+++ trunk/src_new/org/argouml/kernel/UndoManager.java 2007-09-03 17:17:23-0700
@@ -81,8 +81,7 @@
redoStack.clear();
newChain = false;
if (undoStack.size() > undoMax) {
- // TODO The undo stack is full, dispose
- // of the oldest item.
+ undoStack.remove(0);
}
macroCommand = new MacroCommand();
undoStack.push(macroCommand);
@@ -101,7 +100,8 @@
}
/**
- * Undo the most recent chain of mementos received by the undo stack
+ * Undo the top MacroCommand on the undo stack and move
+ * it to the redo stack
*/
public void undo() {
final MacroCommand command = undoStack.pop();
@@ -110,7 +110,8 @@
}
/**
- * Redo the most recent MacroCommand received by the redo stack
+ * Redo the top MacroCommand on the undo stack and move
+ * it to the undo stack
*/
public void redo() {
final MacroCommand command = redoStack.pop();
@@ -135,18 +136,6 @@
newChain = true;
}
- /**
- * Empty a list stack disposing of all mementos.
- * @param list the list of mementos
- */
- private void emptyStack(List<MacroCommand> list) {
- // Lets only introduce dispose if we find it's required
- // for (int i = 0; i < list.size(); ++i) {
- // list.get(i).dispose();
- // }
- list.clear();
- }
-
public void addPropertyChangeListener(PropertyChangeListener listener) {
listeners.add(listener);
}
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.