svn commit: r16689 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java

Author: bobtarling
Date: 2009-01-23 14:05:04-0800
New Revision: 16689

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java

Log:
Issue 5642: Guarantee the direction of association end

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java?view=diff&pathrev=16689&r1=16688&r2=16689
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java	2009-01-23 14:05:04-0800
@@ -30,6 +30,8 @@
 
 import org.argouml.model.IllegalModelElementConnectionException;
 import org.argouml.model.Model;
+import org.argouml.uml.diagram.static_structure.ui.FigClass;
+import org.argouml.uml.diagram.static_structure.ui.FigClassifierBox;
 import org.tigris.gef.base.Layer;
 import org.tigris.gef.base.LayerPerspective;
 import org.tigris.gef.graph.MutableGraphModel;
@@ -78,6 +80,15 @@
             Fig sourceFig,
             Fig destFig) {
         try {
+            // The source of an association end should not
+            // be the classifier. If it is the user has drawn the wrong way
+            // round so we swap here.
+            if (sourceFig instanceof FigClassifierBox) {
+                final Fig tempFig = sourceFig;
+                sourceFig = destFig;
+                destFig = tempFig;
+            }
+            
             Object associationEnd = 
                 Model.getUmlFactory().buildConnection(
                     edgeType,

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

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