svn commit: r14346 - trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java

[tfmorris]

Author: tfmorris
Date: 2008-04-14 13:40:29-0700
New Revision: 14346

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java

Log:
Reverse logic.  Association needs to go in namespace of NON-navigable end.

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=14346&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=14345&r2=14346
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java       
(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java       
2008-04-14 13:40:29-0700
@@ -438,11 +438,11 @@
         }
         
         // We'll put the association in the namespace of whichever end
-        // is navigable.  If they both are, we'll use the namepace of c1.
+        // is not navigable.  If they both are, we'll use the namepace of c1.
         Namespace ns = null;
-        if (nav1) {
+        if (nav2) {
             ns = ns1;
-        } else if (nav2) {
+        } else if (nav1) {
             ns = ns2;
         } else {
             throw new IllegalArgumentException(

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]