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

Author: bobtarling
Date: 2009-02-01 15:43:31-0800
New Revision: 16738

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

Log:
Defect 5661: Keep the overall size of the FigNode when a destroy message comes in, just change the length of the dashed line. Remove calls that are needed to calcBounds.

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java?view=diff&pathrev=16738&r1=16737&r2=16738
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java	2009-02-01 15:43:31-0800
@@ -181,7 +181,11 @@
                 ww, h - offset - headFig.getHeight());
         getBigPort().setBounds(x, y, ww, h);
 
-        calcBounds();
+        _x = x;
+        _y = y;
+        _w = w;
+        _h = h;
+        
         updateEdges();
         firePropChange("bounds", oldBounds, getBounds());
     }

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=16738&r1=16737&r2=16738
==============================================================================
--- 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-02-01 15:43:31-0800
@@ -102,6 +102,7 @@
         for (FigActivation figAct : stackedActivations) {
             addFig(figAct);
         }       
+	// TODO: Do we need this?
         calcBounds();
     }
 
@@ -124,11 +125,10 @@
         
         for (FigMessage figMessage : figMessages) {
             int ySender = 0;
-            final Object action = figMessage.getAction();
             if (currentAct == null
                     && cr.equals(figMessage.getDestFigNode())
                     && !cr.equals(figMessage.getSourceFigNode())
-                    && Model.getFacade().isACallAction(action)) {
+                    && figMessage.isCallAction()) {
                 // if we are the dest and is a call action, create the 
                 // activation, but don't add it until the height is set.
         	ySender = figMessage.getFinalY();        	
@@ -137,7 +137,7 @@
             } else if (currentAct == null
                     && cr.equals(figMessage.getDestFigNode())
                     && !cr.equals(figMessage.getSourceFigNode())
-                    && Model.getFacade().isACreateAction(action)) {
+                    && figMessage.isCreateAction()) {
                 // if we are the dest of a create action, create the
                 // entire activation, because we should need the destroy X
                 currentAct = new FigActivation(getOwner(), new Rectangle(
@@ -145,7 +145,7 @@
             } else if (currentAct != null
                     && cr.equals(figMessage.getSourceFigNode()) 
                     && !cr.equals(figMessage.getDestFigNode())
-                    && Model.getFacade().isAReturnAction(action)) {
+                    && figMessage.isReturnAction()) {
                 // if we are the source of a return action
                 // the activation ends here.
         	ySender = figMessage.getStartY();
@@ -155,13 +155,13 @@
             } else if (currentAct != null
                     && cr.equals(figMessage.getDestFigNode())
                     && !cr.equals(figMessage.getSourceFigNode())
-                    && Model.getFacade().isADestroyAction(action)) {
+                    && figMessage.isDestroyAction()) {
                 // 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());
                 currentAct.setDestroy(true);
-                this.setHeight(ySender - getY());
+                lineFig.setHeight(ySender - getY());
                 newActivations.add(currentAct);
                 currentAct = null;
             }
@@ -279,8 +279,11 @@
             }
             addFig(act);
         }
-        damage();        
-        calcBounds();        
+        damage();
+        _x = x;
+        _y = y;
+        _w = w;
+        _h = h;
         firePropChange("bounds", oldBounds, getBounds());
     }

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

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