Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2015-06-09 11:00:58 +0000
committerAnsgar Radermacher2015-06-09 11:02:57 +0000
commit8803a1ba212bb23ed5df265ee9724c578e653f0a (patch)
tree40b06f5d1597b9bc86b3745ac88b0cdf75867caf
parentad3e3788e73a11bb7d698212c99091e8fa01f83f (diff)
downloadorg.eclipse.papyrus-8803a1ba212bb23ed5df265ee9724c578e653f0a.tar.gz
org.eclipse.papyrus-8803a1ba212bb23ed5df265ee9724c578e653f0a.tar.xz
org.eclipse.papyrus-8803a1ba212bb23ed5df265ee9724c578e653f0a.zip
469232 - [OCL for Papyrus] OCL queries embedded into plugin.xml fail due to missing initialization (revert changes for RC3)
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java
index ee5063a96be..06ab39c5163 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.validation.service.IConstraintDescriptor;
import org.eclipse.ocl.pivot.ExpressionInOCL;
import org.eclipse.ocl.pivot.evaluation.AbstractConstraintEvaluator;
import org.eclipse.ocl.pivot.evaluation.EvaluationVisitor;
-import org.eclipse.ocl.pivot.uml.UMLStandaloneSetup;
import org.eclipse.ocl.pivot.uml.internal.validation.UMLOCLEValidator;
import org.eclipse.ocl.pivot.utilities.OCL;
import org.eclipse.ocl.pivot.utilities.ParserException;
@@ -116,8 +115,6 @@ public abstract class AbstractOCLpivotModelConstraint implements IModelConstrain
}
WeakOCLReference oclRef = oclRefMap.get(rs);
if ((oclRef == null) || (oclRef.get() == null)) {
- // call init before reference creation.
- UMLStandaloneSetup.init();
oclRef = new WeakOCLReference(new OCLAndQueries());
oclRefMap.put(rs, oclRef);
}

Back to the top