svn commit: r18923 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java

Author: bobtarling
Date: 2010-12-18 04:19:00-0800
New Revision: 18923

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

Log:
Issue 6174: Make sure all old links to the previous expression model are removed before attaching the body and loguage controls to the new expression model

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&pathrev=18923&r1=18922&r2=18923
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	2010-12-18 04:19:00-0800
@@ -2684,10 +2684,11 @@
                 && (expr == null || expr instanceof ProcedureExpression)) {
             ProcedureExpression oldPe = ((Method)handle).getBody();
             if (!equal(oldPe, (ProcedureExpression) expr)) {
-                ((Method) handle).setBody((ProcedureExpression) expr);
+                ((Method) handle).setBody(null);
                 if (oldPe != null) {
                     Model.getUmlFactory().delete(oldPe);
                 }
+                ((Method) handle).setBody((ProcedureExpression) expr);
             }
             return;
         }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2691633

To unsubscribe from this discussion, e-mail: [[email protected]].