[522292] Suppress redundant applied profile delegated constraints
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java
index b6307a2..7dd0266 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java
@@ -85,10 +85,13 @@
assert validatableNode != null;
return validatableNode.getConstrainedObject();
}
-
+
@Override
public @Nullable Map<@NonNull EObject, @NonNull List<@NonNull LeafConstrainingNode>> getConstraints(@NonNull ValidityModel validityModel,
@NonNull EPackage ePackage, @NonNull Set<@NonNull Resource> resources, @NonNull Monitor monitor) {
+ if (ePackage.eContainer() instanceof EAnnotation) { // Applied UML Profiles are UML not Ecore constraints
+ return null;
+ }
Map<@NonNull EObject, @NonNull List<@NonNull LeafConstrainingNode>> map = null;
for (@SuppressWarnings("null")@NonNull EClassifier eClassifier : ePackage.getEClassifiers()) {
if (monitor.isCanceled()) {
@@ -211,9 +214,9 @@
org.eclipse.ocl.pivot.Type primaryType = type != null ? metamodelManager.getPrimaryType(type) : null;
EClassifier classifier = primaryType != null ? (EClassifier)primaryType.getESObject() : null;
return classifier != null ? classifier.getName() : "??";
-// return ClassUtil.getLabel(classifier, object, context);
+ // return ClassUtil.getLabel(classifier, object, context);
}
-
+
};
Diagnostic diagnostic = constraintEvaluator.evaluate(evaluationVisitor);
result.setDiagnostic(diagnostic);
