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

Author: bobtarling
Date: 2008-06-30 10:05:13-0700
New Revision: 15115

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

Log:
Reset classifier-role head position on dragHandle rather than mouseDragged

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/SelectionMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/SelectionMessage.java?view=diff&rev=15115&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/SelectionMessage.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/SelectionMessage.java&r1=15114&r2=15115
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/SelectionMessage.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/SelectionMessage.java	2008-06-30 10:05:13-0700
@@ -69,41 +69,30 @@
     }
 
     @Override
-    public void mouseDragged(MouseEvent me) {
-	FigMessage message = (FigMessage) getContent(); 
-	if (message.isSelfMessage()) {
-	    message.translate(0, me.getY() - message.getY());
-	}
-	else {
-	    super.mouseDragged(me);
-	}
-	handleMovement();
-    }
-
-    @Override
     public void dragHandle(int x, int y, int w, int h, Handle handle) {
         FigMessage message = (FigMessage) getContent(); 
-        if (!message.isSelfMessage()) {
+        if (message.isSelfMessage()) {
+            message.translate(0, y - message.getY());
+        } else {
             super.dragHandle(x, y, w, h, handle);
+            handleMovement();
         }
     }
     
     private void handleMovement() {
-        FigMessage message = (FigMessage) getContent();
+        FigMessage figMessage = (FigMessage) getContent();
         
         // if it is a create action, relocate its dest node.
-        if (Model.getFacade().isACreateAction(message.getAction())) {
-            ((FigClassifierRole) message.getDestFigNode()).relocate();
+        if (figMessage.isCreateAction()) {
+            ((FigClassifierRole) figMessage.getDestFigNode()).relocate();
         }
         
         // we recalculate all the activations
-        FigNode source = message.getSourceFigNode();
-        if (source != null && source instanceof FigClassifierRole) {
-            ((FigClassifierRole) source).createActivations();
-        }
-        FigNode dest = message.getDestFigNode();
-        if (dest != null && !message.isSelfMessage() 
-        	&& dest instanceof FigClassifierRole) {
+        FigNode source = figMessage.getSourceFigNode();
+        ((FigClassifierRole) source).createActivations();
+        
+        FigNode dest = figMessage.getDestFigNode();
+        if (!figMessage.isSelfMessage()) {
             ((FigClassifierRole) dest).createActivations();
         }
     }