diff options
author | Ed Willink | 2017-02-20 16:33:44 +0000 |
---|---|---|
committer | Ed Willink | 2017-02-21 11:40:24 +0000 |
commit | 29b13bdb8551c20a787b823f01ac7f0dbf762e0d (patch) | |
tree | e209f15a72ab83afb2f21d94593958292d023a6f | |
parent | 3608f1d920facbaf1d9b55bab6453fb8c30a58eb (diff) | |
download | org.eclipse.ocl-29b13bdb8551c20a787b823f01ac7f0dbf762e0d.tar.gz org.eclipse.ocl-29b13bdb8551c20a787b823f01ac7f0dbf762e0d.tar.xz org.eclipse.ocl-29b13bdb8551c20a787b823f01ac7f0dbf762e0d.zip |
[512448] invariant EOperations do not need invocationDelegates
-rw-r--r-- | plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java index cc9e826cd7..6ca7581694 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java @@ -161,7 +161,7 @@ public class EcoreOCLEValidator implements EValidator message = message.replace("\n", ""); } diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR, EcoreValidator.DIAGNOSTIC_SOURCE, - 0, message, new Object[] { diagnosticEObject })); + 0, message, new Object[] { diagnosticEObject })); return Boolean.FALSE; } @@ -210,7 +210,7 @@ public class EcoreOCLEValidator implements EValidator protected static final class WeakOCLReference extends WeakReference<OCLInternal> { protected final @NonNull OCLInternal ocl; - + protected WeakOCLReference(@NonNull OCLInternal ocl) { super(ocl); this.ocl = ocl; @@ -243,7 +243,7 @@ public class EcoreOCLEValidator implements EValidator } } } - + protected final boolean mayUseNewLines; public EcoreOCLEValidator(boolean mayUseNewLines) { @@ -278,8 +278,8 @@ public class EcoreOCLEValidator implements EValidator @Override public boolean validate(EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate(eObject.eClass(), eObject, diagnostics, context); -// return true; + return validate(eObject.eClass(), eObject, diagnostics, context); + // return true; } @Override @@ -378,7 +378,7 @@ public class EcoreOCLEValidator implements EValidator if (eClassifier instanceof EClass) { EClass eClass = (EClass)eClassifier; for (EOperation eOperation : eClass.getEOperations()) { - if (OCLCommon.getDelegateAnnotation(eOperation) != null) { + if (!EcoreUtil.isInvariant(eOperation) && (OCLCommon.getDelegateAnnotation(eOperation) != null)) { needsInvocationDelegates = true; } } @@ -576,7 +576,7 @@ public class EcoreOCLEValidator implements EValidator assert asType != null; assert asExpressionType != null; if (!metamodelManager.conformsTo(asExpressionType, TemplateParameterSubstitutions.EMPTY, asType, TemplateParameterSubstitutions.EMPTY)) { -// metamodelManager.conformsTo(asExpressionType, TemplateParameterSubstitutions.EMPTY, asType, TemplateParameterSubstitutions.EMPTY); // Debugging + // metamodelManager.conformsTo(asExpressionType, TemplateParameterSubstitutions.EMPTY, asType, TemplateParameterSubstitutions.EMPTY); // Debugging if (diagnostics != null) { String objectLabel = EObjectValidator.getObjectLabel(eNamedElement, context); String message = role == null ? StringUtil.bind(INCOMPATIBLE_TYPE_1, asExpressionType, objectLabel) |