Author: tfmorris Date: 2008-05-14 10:15:37-0700 New Revision: 14733 Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Log: Issue 4817: use getRoot() instead of getModel() for isValidNamespace() http://argouml.tigris.org/issues/show_bug.cgi?id=4817 Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&rev=14733&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&r1=14732&r2=14733 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java 2008-05-14 10:15:37-0700 @@ -1246,23 +1246,18 @@ Namespace ns = (Namespace) nsObj; try { - if (Model.getFacade().getModel(ns) != Model.getFacade().getModel( + if (Model.getFacade().getRoot(ns) != Model.getFacade().getRoot( modelElement)) { - // TODO: This will incorrectly return false for - // nested Models - tfm + // TODO: This restriction is from earlier versions of ArgoUML, + // but is it still valid? It will restrict moving elements + // between multiple root elements when we support them - tfm return false; } if (modelElement == ns) { return false; } - // TODO: Is this checking for circular containment? If so, it's - // done implicitly by MDR - tfm 20080514 -// if (modelElement instanceof Namespace -// && modelElement -// == getFirstSharedNamespace(modelElement, ns)) { -// return false; -// } + if (ns instanceof Interface || ns instanceof Actor || ns instanceof DataType --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
