svn commit: r18766 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2010-09-18 16:18:13-0700
New Revision: 18766

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java

Log:
Clean up annotations

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&pathrev=18766&r1=18765&r2=18766
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2010-09-18 16:18:13-0700
@@ -1383,7 +1383,7 @@
     }
 
 
-    @SuppressWarnings("deprecation")
+    @Deprecated
     public Object getChangeability(Object handle) {
         try {
             if (handle instanceof StructuralFeature) {
@@ -2547,7 +2547,7 @@
     }
 
 
-    @SuppressWarnings("deprecation")
+    @Deprecated
     public Object getDiscriminator(Object handle) {
         try {
             if (handle instanceof Generalization) {
@@ -3493,7 +3493,7 @@
     }
 
 
-    @SuppressWarnings("deprecation")
+    @Deprecated
     public Object getTargetScope(Object handle) {
         try {
             if (handle instanceof StructuralFeature) {

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java?view=diff&pathrev=18766&r1=18765&r2=18766
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java	2010-09-18 16:18:13-0700
@@ -115,7 +115,6 @@
         }
     }
     
-    @SuppressWarnings("deprecation")
     @Deprecated
     public void setRootModel(Object rootModel) {
         if (rootModel != null && !(rootModel instanceof Model)) {
@@ -127,7 +126,6 @@
     }
 
 
-    @SuppressWarnings("deprecation")
     @Deprecated
     public Object getRootModel() {
         return theRootModel;

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java?view=diff&pathrev=18766&r1=18765&r2=18766
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	2010-09-18 16:18:13-0700
@@ -456,19 +456,37 @@
     public void setExpression(Object handle, Object value) {
         if (handle instanceof Guard
                 && (value == null || value instanceof BooleanExpression)) {
-            ((Guard) handle).setExpression((BooleanExpression) value);
+            Expression oldExp = ((Guard) handle).getExpression();
+            if (!equal(oldExp,(Expression) value)) {
+                ((Guard) handle).setExpression((BooleanExpression) value);
+                if (oldExp != null) {
+                    Model.getUmlFactory().delete(oldExp);
+                }
+            }
             return;
         }
         if (handle instanceof ChangeEvent
                 && (value == null || value instanceof BooleanExpression)) {
             ChangeEvent ce = (ChangeEvent) handle;
-            ce.setChangeExpression((BooleanExpression) value);
+            Expression oldExp = ce.getChangeExpression();
+            if (!equal(oldExp,(Expression) value)) {
+                ce.setChangeExpression((BooleanExpression) value);
+                if (oldExp != null) {
+                    Model.getUmlFactory().delete(oldExp);
+                }
+            }
             return;
         }
         if (handle instanceof Argument
                 && (value == null || value instanceof Expression)) {
             Argument arg = (Argument) handle;
-            arg.setValue((Expression) value);
+            Expression oldExp = arg.getValue();
+            if (!equal(oldExp,(Expression) value)) {
+                arg.setValue((Expression) value);
+                if (oldExp != null) {
+                    Model.getUmlFactory().delete(oldExp);
+                }
+            }
             return;
         }
         throw new IllegalArgumentException("handle: " + handle + " or value: "
@@ -476,6 +494,19 @@
     }
 
 
+    private boolean equal(Expression expr1, Expression expr2) {
+        if (expr1 == null) {
+            if (expr2 == null) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return expr1.equals(expr2);
+        }
+    }
+    
+    
     public void setGuard(Object handle, Object guard) {
         if (handle instanceof Transition
                 && (guard == null || guard instanceof Guard)) {
@@ -601,7 +632,13 @@
     public void setWhen(Object handle, Object value) {
         if (handle instanceof TimeEvent
                 && (value == null || value instanceof TimeExpression)) {
-            ((TimeEvent) handle).setWhen((TimeExpression) value);
+            Expression oldExp = ((TimeEvent) handle).getWhen();
+            if (!equal(oldExp,(Expression) value)) {
+                ((TimeEvent) handle).setWhen((TimeExpression) value);
+                if (oldExp != null) {
+                    Model.getUmlFactory().delete(oldExp);
+                }
+            }
             return;
         }
         throw new IllegalArgumentException("handle: " + handle + " or value: "
@@ -612,8 +649,14 @@
     public void setChangeExpression(Object handle, Object value) {
         if (handle instanceof ChangeEvent
                 && (value == null || value instanceof BooleanExpression)) {
-            ((ChangeEvent) handle)
-                    .setChangeExpression((BooleanExpression) value);
+            Expression oldExp = ((ChangeEvent) handle).getChangeExpression();
+            if (!equal(oldExp, (Expression) value)) {
+                ((ChangeEvent) handle)
+                        .setChangeExpression((BooleanExpression) value);
+                if (oldExp != null) {
+                    Model.getUmlFactory().delete(oldExp);
+                }
+            }
             return;
         }
         throw new IllegalArgumentException("handle: " + handle + " or value: "

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

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