[320318] Working around validation failures due to missing subsets constraints in UML metamodel.
diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
index 93cd215..3ac33fd 100644
--- a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.100.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
index f2775d3..9942a30 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 205188, 204200
- * Kenn Hussey - 286329
+ * Kenn Hussey - 286329, 320318
*
- * $Id: UMLValidator.java,v 1.28 2010/03/02 03:10:31 khussey Exp $
+ * $Id: UMLValidator.java,v 1.29 2010/08/19 18:41:42 khussey Exp $
*/
package org.eclipse.uml2.uml.util;
@@ -20,7 +20,9 @@
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.util.EObjectValidator;
@@ -4532,6 +4534,19 @@
return result;
}
+ @Override
+ public boolean validate_BidirectionalReferenceIsPaired(EObject eObject,
+ EReference eReference, EReference eOpposite,
+ DiagnosticChain diagnostics, Map<Object, Object> context) {
+ // XXX 320318 - work around missing subsets constraints
+ return eReference == UMLPackage.Literals.ELEMENT__OWNER
+ || eReference == UMLPackage.Literals.ELEMENT__OWNED_ELEMENT
+ || eReference == UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE
+ || eReference == UMLPackage.Literals.NAMESPACE__OWNED_MEMBER
+ || super.validate_BidirectionalReferenceIsPaired(eObject,
+ eReference, eOpposite, diagnostics, context);
+ }
+
/**
* Validates the validateNotOwnSelf constraint of '<em>Element</em>'.
* <!-- begin-user-doc -->
