Author: bobtarling
Date: 2007-09-09 04:44:49-0700
New Revision: 13520
Modified:
trunk/src_new/org/argouml/kernel/AbstractCommand.java
trunk/src_new/org/argouml/kernel/Command.java
trunk/src_new/org/argouml/kernel/DefaultUndoManager.java
trunk/src_new/org/argouml/kernel/NonUndoableCommand.java
trunk/src_new/org/argouml/kernel/ProjectImpl.java
trunk/src_new/org/argouml/kernel/ProjectManager.java
trunk/src_new/org/argouml/kernel/UndoManager.java
trunk/src_new/org/argouml/ui/ProjectBrowser.java
trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java
trunk/src_new/org/argouml/uml/ui/ActionSaveProject.java
Log:
Change void to Object for execute return
Modified: trunk/src_new/org/argouml/kernel/AbstractCommand.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/AbstractCommand.java?view=diff&rev=13520&p1=trunk/src_new/org/argouml/kernel/AbstractCommand.java&p2=trunk/src_new/org/argouml/kernel/AbstractCommand.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/kernel/AbstractCommand.java (original)
+++ trunk/src_new/org/argouml/kernel/AbstractCommand.java 2007-09-09 04:44:49-0700
@@ -30,7 +30,7 @@
*/
public abstract class AbstractCommand implements Command {
- public abstract void execute();
+ public abstract Object execute();
public abstract void undo();
Modified: trunk/src_new/org/argouml/kernel/Command.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/Command.java?view=diff&rev=13520&p1=trunk/src_new/org/argouml/kernel/Command.java&p2=trunk/src_new/org/argouml/kernel/Command.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/kernel/Command.java (original)
+++ trunk/src_new/org/argouml/kernel/Command.java 2007-09-09 04:44:49-0700
@@ -33,8 +33,9 @@
/**
* To be implemented on the concrete memento to redo an instruction
+ * @return any resulting object created by the command
*/
- public abstract void execute();
+ public abstract Object execute();
/**
* Perform undo an an undoable command that is in an undoable state
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=13520&p1=trunk/src_new/org/argouml/kernel/DefaultUndoManager.java&p2=trunk/src_new/org/argouml/kernel/DefaultUndoManager.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/kernel/DefaultUndoManager.java (original)
+++ trunk/src_new/org/argouml/kernel/DefaultUndoManager.java 2007-09-09 04:44:49-0700
@@ -80,9 +80,9 @@
return INSTANCE;
}
- public void execute(Command command) {
- command.execute();
+ public Object execute(Command command) {
addCommand(command);
+ return command.execute();
}
public void addCommand(Command command) {
@@ -184,11 +184,12 @@
}
}
- public void execute() {
+ public Object execute() {
final Iterator<Command> it = commands.iterator();
while (it.hasNext()) {
it.next().execute();
}
+ return null;
}
public boolean isUndoable() {
Modified: 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=diff&rev=13520&p1=trunk/src_new/org/argouml/kernel/NonUndoableCommand.java&p2=trunk/src_new/org/argouml/kernel/NonUndoableCommand.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/kernel/NonUndoableCommand.java (original)
+++ trunk/src_new/org/argouml/kernel/NonUndoableCommand.java 2007-09-09 04:44:49-0700
@@ -30,7 +30,7 @@
*/
public abstract class NonUndoableCommand implements Command {
- public abstract void execute();
+ public abstract Object execute();
public void undo() {
}
Modified: trunk/src_new/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectImpl.java?view=diff&rev=13520&p1=trunk/src_new/org/argouml/kernel/ProjectImpl.java&p2=trunk/src_new/org/argouml/kernel/ProjectImpl.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectImpl.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectImpl.java 2007-09-09 04:44:49-0700
@@ -427,8 +427,9 @@
public void setAuthorname(final String s) {
final String oldAuthorName = authorname;
AbstractCommand command = new AbstractCommand() {
- public void execute() {
+ public Object execute() {
authorname = s;
+ return null;
}
public void undo() {
@@ -447,8 +448,9 @@
public void setAuthoremail(final String s) {
final String oldAuthorEmail = authoremail;
AbstractCommand command = new AbstractCommand() {
- public void execute() {
+ public Object execute() {
authoremail = s;
+ return null;
}
public void undo() {
@@ -477,8 +479,9 @@
public void setDescription(final String s) {
final String oldDescription = description;
AbstractCommand command = new AbstractCommand() {
- public void execute() {
+ public Object execute() {
description = s;
+ return null;
}
public void undo() {
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=13520&p1=trunk/src_new/org/argouml/kernel/ProjectManager.java&p2=trunk/src_new/org/argouml/kernel/ProjectManager.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectManager.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectManager.java 2007-09-09 04:44:49-0700
@@ -252,7 +252,7 @@
final Command cmd = new NonUndoableCommand() {
@Override
- public void execute() {
+ public Object execute() {
Model.getPump().stopPumpingEvents();
creatingCurrentProject = true;
@@ -271,6 +271,7 @@
if (saveAction != null) {
saveAction.setEnabled(false);
}
+ return null;
}
};
cmd.execute();
@@ -350,7 +351,7 @@
* @param memento the memento.
* @see org.argouml.model.ModelCommandCreationObserver#modelCommandCreated(org.argouml.model.ModelCommand)
*/
- public void modelCommandCreated(final ModelCommand memento) {
+ public Object execute(final ModelCommand memento) {
if (saveAction != null) {
saveAction.setEnabled(true);
}
@@ -359,13 +360,13 @@
public void undo() {
modelMemento.undo();
}
- public void execute() {
- modelMemento.execute();
+ public Object execute() {
+ return modelMemento.execute();
}
public String toString() {
return modelMemento.toString();
}
};
- getCurrentProject().getUndoManager().addCommand(wrappedMemento);
+ return getCurrentProject().getUndoManager().execute(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=13520&p1=trunk/src_new/org/argouml/kernel/UndoManager.java&p2=trunk/src_new/org/argouml/kernel/UndoManager.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/kernel/UndoManager.java (original)
+++ trunk/src_new/org/argouml/kernel/UndoManager.java 2007-09-09 04:44:49-0700
@@ -46,8 +46,9 @@
/**
* Executes a command and add it to the undo stack.
* @param command the command.
+ * @return any resulting object the command creates
*/
- public abstract void execute(Command command);
+ public abstract Object execute(Command command);
/**
* Set the maximum number of interactions the stack can hold.
Modified: trunk/src_new/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectBrowser.java?view=diff&rev=13520&p1=trunk/src_new/org/argouml/ui/ProjectBrowser.java&p2=trunk/src_new/org/argouml/ui/ProjectBrowser.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectBrowser.java (original)
+++ trunk/src_new/org/argouml/ui/ProjectBrowser.java 2007-09-09 04:44:49-0700
@@ -1660,11 +1660,12 @@
oldProject);
project.getProjectSettings().init();
Command cmd = new NonUndoableCommand() {
- public void execute() {
+ public Object execute() {
// This is temporary. Load project
// should create a new project
// with its own UndoManager and so
// there should be no Command
+ return null;
}
};
project.getUndoManager().addCommand(cmd);
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=13520&p1=trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java&p2=trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/DiagramUndoManager.java 2007-09-09 04:44:49-0700
@@ -90,8 +90,9 @@
}
@Override
- public void execute() {
+ public Object execute() {
memento.redo();
+ return null;
}
@Override
Modified: trunk/src_new/org/argouml/uml/ui/ActionSaveProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSaveProject.java?view=diff&rev=13520&p1=trunk/src_new/org/argouml/uml/ui/ActionSaveProject.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSaveProject.java&r1=13519&r2=13520
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSaveProject.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSaveProject.java 2007-09-09 04:44:49-0700
@@ -96,8 +96,9 @@
return;
}
Command command = new AbstractCommand() {
- public void execute() {
+ public Object execute() {
internalSetEnabled(isEnabled);
+ return null;
}
public void undo() {
internalSetEnabled(!isEnabled);
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.