svn commit: r12738 - trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java

Author: mvw
Date: 2007-06-01 10:14:39-0700
New Revision: 12738

Modified:
   trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java

Log:
Fix for issue 4712: Exception when using AssociationEnd tool.

This patch was supplied by Aleksandar.

Modified: trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java?view=diff&rev=12738&p1=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java&r1=12737&r2=12738
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java	2007-06-01 10:14:39-0700
@@ -155,12 +155,14 @@
             if (Model.getFacade().isAAssociationClass(source)
             	|| Model.getFacade().isAAssociationClass(dest)) {
                 // TODO: http://argouml.tigris.org/issues/show_bug.cgi?id=2991
-            } else if (Model.getFacade().isAAssociation(source)
-            	|| Model.getFacade().isAClassifier(dest)) {
+            } else if ((Model.getFacade().isAAssociation(source)
+                || Model.getFacade().isAClassifier(dest))
+                && !Model.getFacade().isAClassifier(source)) {
                 mouseReleasedOnClassifier(me, destFig);
                 return;
-            } else if (Model.getFacade().isAClassifier(dest)
-            	|| Model.getFacade().isAAssociation(dest)) {
+            } else if ((Model.getFacade().isAClassifier(dest)
+                || Model.getFacade().isAAssociation(dest))
+                && !Model.getFacade().isAClassifier(source)) {
                 mouseReleasedOnAssociation(me, destFig);
                 return;
             }