svn commit: r13509 - trunk/src/model-mdr/src/org/argouml/model/mdr

Author: bobtarling
Date: 2007-09-07 16:46:29-0700
New Revision: 13509

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java

Log:
Allow a model element name change to be undone back to null

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&rev=13509&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&r1=13508&r2=13509
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	2007-09-07 16:46:29-0700
@@ -40,8 +40,10 @@
 import org.argouml.model.CoreHelper;
 import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
+import org.argouml.model.ModelCommand;
 import org.argouml.model.ModelManagementHelper;
 import org.argouml.model.NotImplementedException;
+import org.argouml.model.mdr.UndoCoreHelperDecorator.StringSetter;
 import org.omg.uml.behavioralelements.activitygraphs.ActivityGraph;
 import org.omg.uml.behavioralelements.activitygraphs.ClassifierInState;
 import org.omg.uml.behavioralelements.activitygraphs.ObjectFlowState;
@@ -2696,9 +2698,18 @@
     }
 
 
-    public void setName(Object handle, String name) {
+    public void setName(final Object handle, final String name) {
         if ((handle instanceof ModelElement) && (name != null)) {
-            ((ModelElement) handle).setName(name);
+            createCommand(
+                new StringSetter() {
+                    public void set(String value) {
+                        ((ModelElement) handle).setName(value);
+                    }
+                },
+                name,
+                Model.getFacade().getName(handle),
+                "name = " + name);
+            
             return;
         }
         throw new IllegalArgumentException("handle: " + handle + " or name: "
@@ -3146,5 +3157,42 @@
         }
         return names;
     }
-
+    
+    
+    /**
+     * Create a memento for a setter of a String value.
+     *
+     * @param accesser The accesser.
+     * @param newValue The new value.
+     * @param oldValue The old value.
+     */
+    private void createCommand(
+            final StringSetter accesser,
+            final String newValue,
+            final String oldValue,
+            final String descr) {
+        if (newValue == oldValue) {
+            return;
+        }
+        if (newValue != null
+                && newValue.equals(oldValue)) {
+            return;
+        }
+        ModelCommand command = new ModelCommand() {
+            public void undo() {
+                accesser.set(oldValue);
+            }
+            public void execute() {
+                accesser.set(newValue);
+            }
+            public boolean isUndoable() {
+                return true;
+            }
+            public String toString() {
+                return descr;
+            }
+        };
+        Model.notifyModelCommandCreationObserver(command);
+        command.execute();
+    }
 }

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java?view=diff&rev=13509&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java&r1=13508&r2=13509
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java	2007-09-07 16:46:29-0700
@@ -272,16 +272,6 @@
         }, arg, Model.getFacade().getMultiplicity(handle));
     }
 
-
-    public void setName(final Object handle, String name) {
-        createCommand(new StringSetter() {
-            public void set(String value) {
-                getComponent().setName(handle, value);
-            }
-        }, name, Model.getFacade().getName(handle));
-    }
-
-
     public void setBody(final Object handle, String body) {
         createCommand(new StringSetter() {
             public void set(String value) {