svn commit: r14739 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java

Author: tfmorris
Date: 2008-05-14 15:10:42-0700
New Revision: 14739

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

Log:
Issue 4734: isValidNamespace(ClassiferRole,*) should return false for any non-Collaboration 

http://argouml.tigris.org/issues/show_bug.cgi?id=4734

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=14739&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=14738&r2=14739
==============================================================================
--- 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 15:10:42-0700
@@ -1332,7 +1332,10 @@
                         || modelElement instanceof Stereotype)) {
                     return false;
                 }
+            } else if (modelElement instanceof ClassifierRole) {
+                return ns instanceof Collaboration;
             } else if (ns instanceof Collaboration) {
+
                 /*
                  * Although not represented in the OCL (or our Java), the
                  * English text of WFR #4 of Section 2.10.3.4 in the UML 1.4