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

Author: tfmorris
Date: 2009-01-25 10:59:12-0800
New Revision: 16697

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
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java

Log:
RESOLVED - task 5531: Missing tool for message with SendAction 
http://argouml.tigris.org/issues/show_bug.cgi?id=5531

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=16697&r1=16696&r2=16697
==============================================================================
--- 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 10:59:12-0800
@@ -219,7 +219,7 @@
         for (FigMessage figMessage : figMessages) {
             if (cr.equals(figMessage.getDestFigNode())
                     && !cr.equals(figMessage.getSourceFigNode())
-                    && (figMessage.isCallAction())) {
+                    && figMessage.isCallAction()) {
                 return true;
             }
         }

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=16697&r1=16696&r2=16697
==============================================================================
--- 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 10:59:12-0800
@@ -57,7 +57,7 @@
     private SDNotationSettings notationSettings;
     
     /**
-     * Constructs a new figlink and sets the owner of the figlink.
+     * Constructs a new FigMessage and sets the owner of the FigMessage.
      *
      * @param owner is the owner.
      * @deprecated for 0.28.alpha3 by penyaskito. Use
@@ -137,44 +137,48 @@
         updateArrow();
     }
     
-    public boolean isCallAction() {
+    boolean isCallAction() {
     	return Model.getFacade().isACallAction(getAction());
     }
 
-    public boolean isCreateAction() {
+    boolean isCreateAction() {
     	return Model.getFacade().isACreateAction(getAction());
     }
 
-    public boolean isDestroyAction() {
+    boolean isDestroyAction() {
     	return Model.getFacade().isADestroyAction(getAction());
     }
 
-    public boolean isReturnAction() {
+    boolean isReturnAction() {
     	return Model.getFacade().isAReturnAction(getAction());
     }
 
+    boolean isSendAction() {
+        return Model.getFacade().isASendAction(getAction());
+    }
+    
     /**
      * Updates the arrow head and the arrow line according
      * to the action type..
      */
     private void updateArrow() {
-	if (Model.getFacade().isAReturnAction(getAction())) {
-	    setDestArrowHead(new ArrowHeadGreater());
-	    getFig().setDashed(true);
-	}
-	else if (Model.getFacade().isADestroyAction(getAction())) {
-	    setDestArrowHead(new ArrowHeadGreater());
-	    getFig().setDashed(true);
-	}
-	else if (Model.getFacade().isACreateAction(getAction())) {
-	    setDestArrowHead(new ArrowHeadTriangle());
+        if (isReturnAction()) {
+            setDestArrowHead(new ArrowHeadGreater());
+            getFig().setDashed(true);
+        } else if (isDestroyAction()) {
+            setDestArrowHead(new ArrowHeadGreater());
+            getFig().setDashed(true);
+        } else if (isCreateAction()) {
+            setDestArrowHead(new ArrowHeadTriangle());
             getFig().setDashed(false);
-	}
-	else if (Model.getFacade().isACallAction(getAction())) {
-	    setDestArrowHead(new ArrowHeadTriangle());
+        } else if (isCallAction()) {
+            setDestArrowHead(new ArrowHeadTriangle());
             getFig().setDashed(false);
-	}
-	getDestArrowHead().setLineColor(getLineColor());
+        } else if (isSendAction()) {
+            setDestArrowHead(new ArrowHeadGreater());
+            getFig().setDashed(false);
+        }
+        getDestArrowHead().setLineColor(getLineColor());
 	getDestArrowHead().setFillColor(getLineColor());
     }
 

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java?view=diff&pathrev=16697&r1=16696&r2=16697
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java	2009-01-25 10:59:12-0800
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2008 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -327,7 +327,7 @@
             action = Model.getCommonBehaviorFactory().createDestroyAction();
         } else if (Model.getMetaTypes().getSendAction()
                 .equals(actionType)) {
-            // no implementation, not of importance to sequence diagrams
+            action = Model.getCommonBehaviorFactory().createSendAction();
         } else if (Model.getMetaTypes().getTerminateAction()
                 .equals(actionType)) {
             // not implemented yet

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java?view=diff&pathrev=16697&r1=16696&r2=16697
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	2009-01-25 10:59:12-0800
@@ -112,21 +112,25 @@
     @Override
     protected Object[] getUmlActions() {
         if (actions == null) {
-            actions = new Object[7];
-            actions[0] = new RadioAction(new ActionAddClassifierRole());        
-            actions[1] = new RadioAction(new ActionSetAddMessageMode(
+            actions = new Object[8];
+            int i = 0;
+            actions[i++] = new RadioAction(new ActionAddClassifierRole());
+            actions[i++] = new RadioAction(new ActionSetAddMessageMode(
                     Model.getMetaTypes().getCallAction(),
                     "button.new-callaction"));
-            actions[2] = new RadioAction(new ActionSetAddMessageMode(
+            actions[i++] = new RadioAction(new ActionSetAddMessageMode(
+                    Model.getMetaTypes().getSendAction(),
+                    "button.new-sendaction"));
+            actions[i++] = new RadioAction(new ActionSetAddMessageMode(
                     Model.getMetaTypes().getReturnAction(),
                     "button.new-returnaction"));
-            actions[3] = new RadioAction(new ActionSetAddMessageMode(
+            actions[i++] = new RadioAction(new ActionSetAddMessageMode(
                     Model.getMetaTypes().getCreateAction(),
                     "button.new-createaction"));
-            actions[4] = new RadioAction(new ActionSetAddMessageMode(
+            actions[i++] = new RadioAction(new ActionSetAddMessageMode(
                     Model.getMetaTypes().getDestroyAction(),
                     "button.new-destroyaction"));
-            actions[5] = new RadioAction(new ActionSetMode(
+            actions[i++] = new RadioAction(new ActionSetMode(
                     ModeBroomMessages.class,
                     "button.broom-messages"));
         }
@@ -173,7 +177,7 @@
     /**
      * A sequence diagram can accept all classifiers. It will add them as a new 
      * Classifier Role with that classifier as a base.
-     * @param objectToAccept
+     * @param objectToAccept element to test for acceptability
      * @return true if the element is acceptable
      * @see org.argouml.uml.diagram.ui.UMLDiagram#doesAccept(java.lang.Object)
      */

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

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