Bug 446865: lowerValue and upperValue cardinality values not accessible

through UI
https://bugs.eclipse.org/bugs/show_bug.cgi?id=446865

Correction of minor issues :
- The validation is still enabled for exotic multiplicities and reports
warnings (e.g. when typing 2..MAX, you will get a validation warning)
-> The validation correction was done on OCL validation but not on EMF
-> The EMF validation is managed by a new ValisationProvider which allow
to override existing validation constraint method

- When typing "*" in the Upper bound, using the XText Multiplicity
editor, the editor displays "null=*" (It may also happen for other
values, but it doesn't seem to be consistent)
-> Wrong test in Label Provider

- The Simple Multiplicity Editor doesn't properly refresh its read-only
state. If you switch from a Property [1..2] to a property [1..MAX], the
editor remains writable. Switching in the other direction, the editor
remains read-only
-> Need to refresh the read-only with the value refresh
-> Manage the ExtendedMultiplicityObservableValue with a support for the
dispose management

Change-Id: I7b12a7fe73cd8f951535c137f15b9168a33bb93a
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@all4tec.net>
Reviewed-on: https://git.eclipse.org/r/46642
Tested-by: Hudson CI
Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>

1 files changed, 0 insertions, 20 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/OCLEValidatorAdapter.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/OCLEValidatorAdapter.java
index 9a002a174ff..7f8cf94dc23 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/OCLEValidatorAdapter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/OCLEValidatorAdapter.java
@@ -26,9 +26,6 @@ import org.eclipse.ocl.pivot.internal.delegate.OCLDelegateValidator;
 import org.eclipse.ocl.pivot.uml.internal.validation.UMLOCLEValidator;
 import org.eclipse.papyrus.infra.services.validation.EValidatorAdapter;
 import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.LiteralInteger;
-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
-import org.eclipse.uml2.uml.MultiplicityElement;
 import org.eclipse.uml2.uml.OpaqueAction;
 import org.eclipse.uml2.uml.OpaqueBehavior;
 import org.eclipse.uml2.uml.OpaqueExpression;
@@ -75,23 +72,6 @@ public class OCLEValidatorAdapter
 		return batchValidate(eObject, diagnostics, context);
 	}
 
-	/**
-	 * Validate if only the lower and the upper are integer values.
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.uml2.uml.util.UMLValidator#validateMultiplicityElement_validateUpperGeLower(org.eclipse.uml2.uml.MultiplicityElement, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 */
-	@Override
-	public boolean validateMultiplicityElement_validateUpperGeLower(final MultiplicityElement multiplicityElement, final DiagnosticChain diagnostics, final Map<Object, Object> context) {
-		boolean result = false;
-		if (((multiplicityElement.getLowerValue() instanceof LiteralInteger || multiplicityElement.getLowerValue() instanceof LiteralUnlimitedNatural)
-				&& (multiplicityElement.getUpperValue() instanceof LiteralInteger || multiplicityElement.getUpperValue() instanceof LiteralUnlimitedNatural))) {
-			result = super.validateMultiplicityElement_validateUpperGeLower(multiplicityElement, diagnostics, context);
-		}
-
-		return result;
-	}
-
 	@Override
 	public boolean validateInstanceSpecification(InstanceSpecification instanceSpecification,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {