svn commit: r16700 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram

Author: tfmorris
Date: 2009-01-25 11:37:20-0800
New Revision: 16700

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java

Log:
RESOLVED - task 5628: destroy action message is backwards and has wrong presentation 
http://argouml.tigris.org/issues/show_bug.cgi?id=5628

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java?view=diff&pathrev=16700&r1=16699&r2=16700
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigLifeLine.java	2009-01-25 11:37:20-0800
@@ -117,8 +117,7 @@
         
         // Check here if there are no incoming call actions
         // if not then create an activation at the top of the lifeline
-        if (!hasIncomingCallActions(figMessages) 
-                && !hasOutgoingDestroyActions(figMessages)) {
+        if (!hasIncomingCallActions(figMessages)) {
             currentAct = new FigActivation(getOwner(), new Rectangle(lineFig
                     .getX(), lineFig.getY(), 0, 0), getSettings());
         }
@@ -148,16 +147,16 @@
                     && !cr.equals(figMessage.getDestFigNode())
                     && Model.getFacade().isAReturnAction(action)) {
                 // if we are the source of a return action
-                // the figlifeline ends here.
+                // the activation ends here.
         	ySender = figMessage.getStartY();
                 currentAct.setHeight(ySender - currentAct.getY());
                 newActivations.add(currentAct);
                 currentAct = null;
             } else if (currentAct != null
-                    && cr.equals(figMessage.getSourceFigNode())
-                    && !cr.equals(figMessage.getDestFigNode())
+                    && cr.equals(figMessage.getDestFigNode())
+                    && !cr.equals(figMessage.getSourceFigNode())
                     && Model.getFacade().isADestroyAction(action)) {
-                // if we are the source of a destroy actionm
+                // if we are the target of a destroy action
                 // the figlifeline ends here and we add the activation
         	ySender = figMessage.getFinalY();
                 currentAct.setHeight(ySender - currentAct.getY());

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java?view=diff&pathrev=16700&r1=16699&r2=16700
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java	2009-01-25 11:37:20-0800
@@ -167,7 +167,7 @@
             getFig().setDashed(true);
         } else if (isDestroyAction()) {
             setDestArrowHead(new ArrowHeadGreater());
-            getFig().setDashed(true);
+            getFig().setDashed(false);
         } else if (isCreateAction()) {
             setDestArrowHead(new ArrowHeadTriangle());
             getFig().setDashed(false);

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

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