svn commit: r18739 - trunk/src: argouml-app/src/org/argouml/notation/providers/uml argouml-core-model/src/org/argouml/model

Author: mvw
Date: 2010-09-14 06:25:13-0700
New Revision: 18739

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java
   trunk/src/argouml-core-model/src/org/argouml/model/CommonBehaviorHelper.java

Log:
Fix for issue 6145: CallAction outside the Model in XMI.

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java?view=diff&pathrev=18739&r1=18738&r2=18739
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java	2010-09-14 06:25:13-0700
@@ -1,13 +1,13 @@
 /* $Id$
  *****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    mvw
+ *    Michiel van der Wulp
  *****************************************************************************
  *
  * Some portions of this file was previously release using the BSD License:
@@ -463,6 +463,9 @@
             if (body.equals(s)) {
                 return;
             }
+            /* Throw away the old actionExpression (see issue 6145):  */
+            Model.getCommonBehaviorHelper().setScript(old, null);
+            Model.getUmlFactory().delete(ae);
         }
         ae = Model.getDataTypesFactory().createActionExpression(language, s);
         Model.getCommonBehaviorHelper().setScript(old, ae);

Modified: trunk/src/argouml-core-model/src/org/argouml/model/CommonBehaviorHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CommonBehaviorHelper.java?view=diff&pathrev=18739&r1=18738&r2=18739
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/CommonBehaviorHelper.java	(original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/CommonBehaviorHelper.java	2010-09-14 06:25:13-0700
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *    tfmorris
- *    mvw
+ *    Michiel van der Wulp
  *******************************************************************************
  *
  * Some portions of this file was previously release using the BSD License:
@@ -259,7 +259,7 @@
      * Set the Expression (script) for an Action.
      *
      * @param handle Action
-     * @param expr the script (ActionExpression)
+     * @param expr the script (ActionExpression) or null
      */
     void setScript(Object handle, Object expr);

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

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