svn commit: r17180 - trunk/src/argouml-app/src/org/argouml/uml/ui/UMLExpressionModel2.java

Author: bobtarling
Date: 2009-07-10 13:01:36-0700
New Revision: 17180

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/UMLExpressionModel2.java

Log:
Delete previous expression when setting an expression

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLExpressionModel2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLExpressionModel2.java?view=diff&pathrev=17180&r1=17179&r2=17180
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLExpressionModel2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLExpressionModel2.java	2009-07-10 13:01:36-0700
@@ -169,12 +169,17 @@
     private void setExpression(String lang, String body) {
         // Expressions are DataTypes, not independent model elements
         // be careful not to reuse them
+        Object oldExpression = null;
         if (mustRefresh || expression == null) {
+            oldExpression = expression;
             expression = newExpression();
         }
         expression = Model.getDataTypesHelper().setLanguage(expression, lang);
         expression = Model.getDataTypesHelper().setBody(expression, body);
         setExpression(expression);
+        if (oldExpression != null) {
+            Model.getUmlFactory().delete(oldExpression);
+        }
     }
 
     /**

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

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