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

Author: tfmorris
Date: 2008-05-20 07:24:07-0700
New Revision: 14777

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

Log:
Put realization in computed namespace on creation

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=14777&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=14776&r2=14777
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	2008-05-20 07:24:07-0700
@@ -1203,14 +1203,13 @@
         Abstraction realization = createAbstraction();
         Namespace nsc = client.getNamespace();
         Namespace nss = supplier.getNamespace();
-        // TODO: Shouldn't this use this computed nsc value below? - tfm
-        realization.setNamespace(nsc);
         Namespace ns = null;
         if (nsc.equals(nss)) {
             ns = nsc;
         } else {
             ns = (Namespace) model;
         }
+        realization.setNamespace(nsc);
         modelImpl.getExtensionMechanismsFactory().buildStereotype(realization,
                 CoreFactory.REALIZE_STEREOTYPE, ns);
         modelImpl.getCoreHelper().addClientDependency(client, realization);