svn commit: r16370 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui

Author: bobtarling
Date: 2008-12-17 03:22:24-0800
New Revision: 16370

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigMessage.java

Log:
Remove redundent calls to createActivations and the check for a removed element that was required as a result of that.

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java?view=diff&pathrev=16370&r1=16369&r2=16370
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java	2008-12-17 03:22:24-0800
@@ -261,18 +261,13 @@
 
         // if the removed edge is a Create Message it will affect the position
         // of the ClassifierRole so it should be repositioned
-        if (equals(figMessage.getDestFigNode())
-                && !equals(figMessage.getSourceFigNode())  
-                && figMessage.isCreateAction()) {
+        if (figMessage.isCreateAction()
+                && equals(figMessage.getDestFigNode())
+                && !equals(figMessage.getSourceFigNode())) {
             relocate();
         }
 
-        // in any case we need to update the activations of both 
-        // classifier roles.
-        ((FigClassifierRole)figMessage.getDestFigNode()).createActivations();
-        if (! figMessage.isSelfMessage()){
-            ((FigClassifierRole)figMessage.getSourceFigNode()).createActivations();
-        }
+        createActivations();
     }
     
     @Override

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigMessage.java?view=diff&pathrev=16370&r1=16369&r2=16370
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigMessage.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigMessage.java	2008-12-17 03:22:24-0800
@@ -200,11 +200,7 @@
      * @return true if they are the same, otherwise false. 
      */
     boolean isSelfMessage() {
-        if (Model.getUmlFactory().isRemoved(getOwner())) {
-            return getDestFigNode().equals(getSourceFigNode());
-        } else {
-            return getDestination().equals(getSource());
-        }
+        return getDestination().equals(getSource());
     }
     
     /**

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

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