Author: tfmorris Date: 2008-05-08 11:57:52-0700 New Revision: 14672 Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CommandStackImpl.java trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java
Log: Remove Model subsystem CommandStack implementation Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CommandStackImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CommandStackImpl.java?view=diff&rev=14672&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CommandStackImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CommandStackImpl.java&r1=14671&r2=14672 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CommandStackImpl.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CommandStackImpl.java 2008-05-08 11:57:52-0700 @@ -26,13 +26,13 @@ package org.argouml.model.euml; -import org.argouml.model.CommandStack; +//import org.argouml.model.CommandStack; /** * CommandStack implementation to support Undo/Redo. * */ -public class CommandStackImpl implements CommandStack { +public class CommandStackImpl /*implements CommandStack*/ { private EUMLModelImplementation modelImplementation; Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java?view=diff&rev=14672&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java&r1=14671&r2=14672 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java 2008-05-08 11:57:52-0700 @@ -201,6 +201,9 @@ ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory( factories); + // TODO: This will need to be adapted to send undo/redo commands back + // to our consumer (e.g. ArgoUML) if a new undo mechanism is implemented + // for the Model subsystem - tfm editingDomain = new UML2AdapterFactoryEditingDomain( adapterFactory, commandStack); @@ -510,7 +513,7 @@ return null; } - public CommandStackImpl getCommandStack() { + private CommandStackImpl getCommandStack() { if (theCommandStack == null) { theCommandStack = new CommandStackImpl(this); } Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java?view=diff&rev=14672&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java&r1=14671&r2=14672 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java 2008-05-08 11:57:52-0700 @@ -177,9 +177,7 @@ public void addModelEventListener(PropertyChangeListener listener, Object modelelement, String[] propertyNames) { - if (!(modelelement instanceof EObject) - && !(modelelement instanceof String && modelelement - .equals(CommandStackImpl.COMMAND_STACK_UPDATE_EVENT))) { + if (!(modelelement instanceof EObject)) { throw new IllegalArgumentException( "The modelelement must be instance " //$NON-NLS-1$ + "of EObject."); //$NON-NLS-1$ @@ -238,9 +236,7 @@ public void removeModelEventListener(PropertyChangeListener listener, Object modelelement, String[] propertyNames) { - if (!(modelelement instanceof EObject) - && !(modelelement instanceof String && modelelement - .equals(CommandStackImpl.COMMAND_STACK_UPDATE_EVENT))) { + if (!(modelelement instanceof EObject)) { throw new IllegalArgumentException(); } unregisterListener( @@ -393,14 +389,6 @@ } } } - } else if (notification.getEventType() == COMMAND_STACK_UPDATE) { - events.add(new EventAndListeners( - new PropertyChangeEvent( - this, CommandStackImpl.COMMAND_STACK_UPDATE_EVENT, - false, false), - getListeners(CommandStackImpl.COMMAND_STACK_UPDATE_EVENT))); -// TODO: Why is this commented out? - tfm -// Model.notifyMementoCreationObserver(CommandStackImpl.getInstance(modelImpl)); } for (EventAndListeners e : events) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
