[releng] Track refined OCL signature
diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVariableFinder.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVariableFinder.java
index 3b0ecfd..239f29b 100644
--- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVariableFinder.java
+++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVariableFinder.java
@@ -18,7 +18,6 @@
import org.eclipse.ocl.examples.debug.vm.VariableFinder;
import org.eclipse.ocl.examples.debug.vm.data.VMVariableData;
import org.eclipse.ocl.examples.debug.vm.evaluator.VMEvaluationEnvironment;
-import org.eclipse.ocl.pivot.TypedElement;
import org.eclipse.ocl.pivot.VariableDeclaration;
import org.eclipse.qvtd.pivot.qvtbase.Transformation;
import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
@@ -126,9 +125,9 @@
}
}
- @Override
- protected @Nullable VMVariableData getVariable(@NonNull TypedElement variable, @Nullable Object pcObject) {
- /* EObject eContainer = variable.eContainer();
+ /* @Override
+ protected @Nullable VMVariableData getVariable(@NonNull VariableDeclaration variable, @Nullable Object pcObject) {
+ / * EObject eContainer = variable.eContainer();
if (eContainer instanceof Transformation) {
Transformation transformation = (Transformation)eContainer;
String varName = variable.getName();
@@ -153,9 +152,9 @@
setValueAndType(var, model, "Resource");
return var;
}
- } */
+ } * /
return super.getVariable(variable, pcObject);
- }
+ } */
@Override
public void setValueAndType(@NonNull VMVariableData variable, @Nullable Object value, @Nullable String declaredTypeName) {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java
index 9a0cc2f..46e3a84 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java
@@ -1060,7 +1060,7 @@
}
@Override
- public boolean replace(@NonNull TypedElement asVariable, @Nullable Object value, boolean checkType) {
+ public boolean replace(@NonNull VariableDeclaration asVariable, @Nullable Object value, boolean checkType) {
if (value == null) {
if (asVariable.isIsRequired()) {
// throw new InvalidValueException("Attempted to assign null value to " + asVariable);
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiExecutor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiExecutor.java
index 5e12121..780324d 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiExecutor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiExecutor.java
@@ -19,7 +19,7 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.pivot.OperationCallExp;
-import org.eclipse.ocl.pivot.TypedElement;
+import org.eclipse.ocl.pivot.VariableDeclaration;
import org.eclipse.ocl.pivot.evaluation.EvaluationVisitor;
import org.eclipse.ocl.pivot.internal.evaluation.ExecutorInternal;
import org.eclipse.qvtd.pivot.qvtbase.Function;
@@ -52,7 +52,7 @@
void internalExecuteSetStatement(@NonNull SetStatement setStatement, @NonNull Object slotObject, @Nullable Object ecoreValue);
@Nullable Boolean internalExecuteSpeculateStatement(@NonNull SpeculateStatement speculateStatement);
@Nullable Object internalExecuteTransformation(@NonNull ImperativeTransformation transformation, @NonNull EvaluationVisitor undecoratedVisitor);
- boolean replace(@NonNull TypedElement referredVariable, @Nullable Object value, boolean checkType);
+ boolean replace(@NonNull VariableDeclaration referredVariable, @Nullable Object value, boolean checkType);
void saveModels(@Nullable Map<?, ?> savingOptions) throws IOException;
void saveOutput(@NonNull String outName, @NonNull URI outURI);
}
