diff options
| author | khussey | 2010-08-19 18:41:42 +0000 |
|---|---|---|
| committer | khussey | 2010-08-19 18:41:42 +0000 |
| commit | 97ca339a70c37227c5a5db180556b1b65b58ac34 (patch) | |
| tree | 24a6c90105e8270fd2f5177e16222978942f6117 | |
| parent | cef73e0d0f79d8ec3e970ce49e06110ef5c5617a (diff) | |
| download | org.eclipse.uml2.test-97ca339a70c37227c5a5db180556b1b65b58ac34.tar.gz org.eclipse.uml2.test-97ca339a70c37227c5a5db180556b1b65b58ac34.tar.xz org.eclipse.uml2.test-97ca339a70c37227c5a5db180556b1b65b58ac34.zip | |
[320318] Working around validation failures due to missing subsets constraints in UML metamodel.v201008191510
| -rw-r--r-- | plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF index 93cd215d..3ac33fd0 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 @@ Manifest-Version: 1.0 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 f2775d36..9942a300 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.Diagnostic; 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 @@ public class UMLValidator 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 --> |