svn commit: r14560 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/ModeCreateMessage.java

Author: bobtarling
Date: 2008-05-01 08:42:23-0700
New Revision: 14560

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

Log:
Mark the return edge as complete.

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/ModeCreateMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/ModeCreateMessage.java?view=diff&rev=14560&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/ModeCreateMessage.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/ModeCreateMessage.java&r1=14559&r2=14560
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/ModeCreateMessage.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/ModeCreateMessage.java	2008-05-01 08:42:23-0700
@@ -35,6 +35,7 @@
 import org.tigris.gef.base.ModeCreatePolyEdge;
 import org.tigris.gef.presentation.Fig;
 import org.tigris.gef.presentation.FigEdge;
+import org.tigris.gef.presentation.FigPoly;
 
 /**
  * Mode to create a link between two figclassifierroles. 
@@ -83,14 +84,6 @@
         final Object action = Model.getFacade().getAction(message);
         if (Model.getFacade().isACallAction(action)) {
             
-            // we need to create a ModeCreateMessage for adding
-            // a new message                
-//                ModeManager modeManager = editor.getModeManager();
-//                ModeCreateMessage mode = new ModeCreateMessage(editor);
-//                mode.getArgs().put("action", 
-//                        Model.getMetaTypes().getReturnAction()); 
-//                modeManager.push(mode);
-
             // get the source of the return message
             final Object returnMessageSource =
                 Model.getFacade().getReceiver(message);
@@ -125,7 +118,7 @@
             returnEdge.setDestFigNode(scr);
             
             final Point[] points = returnEdge.getPoints();
-            for (int i=0; i < points.length; ++i) {
+            for (int i = 0; i < points.length; ++i) {
                 // TODO: this shouldn't be hardcoded
                 // 20 is the height of the spline
                 // 50 is the default activation height
@@ -136,6 +129,14 @@
             if (returnEdge.isSelfMessage()) {
                 returnEdge.convertToArc();
             }
+            
+            // Mark the contain FigPoly as complete.
+            // TODO: I think more work is needed in GEF to either do this
+            // automatically when both ends are set or at the very least
+            // Give a setComplete method on FigPolyEdge that calls its
+            // contained poly
+            FigPoly poly = (FigPoly) returnEdge.getFig();
+            poly.setComplete(true);
         }
         dcr.createActivations();
         dcr.renderingChanged();