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

Author: bobtarling
Date: 2008-09-01 14:27:49-0700
New Revision: 15666

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:
Issue 5347: Allow deletion of message (does not effect 0.26)

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&rev=15666&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java&r1=15665&r2=15666
==============================================================================
--- 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-09-01 14:27:49-0700
@@ -255,14 +255,12 @@
         // if the removed edge is a Create Message it will affect the position
         // of the ClassifierRole so it should be repositioned
         if (edge instanceof FigMessage) {
-            FigMessage mess = (FigMessage) edge;
-            if (equals(mess.getDestFigNode())
-                    && !equals(mess.getSourceFigNode())  
-                    && Model.getFacade().isACreateAction(mess.getAction())) {
-                  
-                LOG.info("Removed a create message");
+            final FigMessage figMessage = (FigMessage) edge;
+            if (equals(figMessage.getDestFigNode())
+                    && !equals(figMessage.getSourceFigNode())  
+                    && figMessage.isCreateAction()) {
                 relocate();
-            }         
+            }
         }
     }
     

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&rev=15666&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigMessage.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigMessage.java&r1=15665&r2=15666
==============================================================================
--- 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-09-01 14:27:49-0700
@@ -52,6 +52,11 @@
     private ArrowHead arrowHead;
     
     /**
+     * The action owned by the message
+     */
+    private Object action = null;
+    
+    /**
      * Contructs a new figlink and sets the owner of the figlink.
      *
      * @param owner is the owner.
@@ -68,6 +73,7 @@
     @Override
     public void setOwner(Object owner) {       
         super.setOwner(owner);
+        action = Model.getFacade().getAction(owner);
         updateArrow();
     }
     
@@ -126,11 +132,6 @@
      * @return the action
      */
     public Object getAction() {
-        Object owner = getOwner();
-        Object action = null;
-        if (Model.getFacade().isAMessage(owner)) {          
-            action = Model.getFacade().getAction(owner);
-        }
         return action;
     }