diff options
author | Ed Willink | 2015-06-19 09:22:59 +0000 |
---|---|---|
committer | Ed Willink | 2015-06-19 09:22:59 +0000 |
commit | 30a761771634e78886f75b65fead4f785ed75337 (patch) | |
tree | 46ea8ac7dd67e577eecd2297b01c769de0accd7f /tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2 | |
parent | b8aeda96a33047e008e112f622fc8b429b4a577c (diff) | |
download | org.eclipse.qvtd-30a761771634e78886f75b65fead4f785ed75337.tar.gz org.eclipse.qvtd-30a761771634e78886f75b65fead4f785ed75337.tar.xz org.eclipse.qvtd-30a761771634e78886f75b65fead4f785ed75337.zip |
[463313] Replace Evaluator by Executor while retaining API compatibility
Diffstat (limited to 'tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2')
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/EnvExample2.ecore b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/EnvExample2.ecore index 78518f6c5..a842beadb 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/EnvExample2.ecore +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/EnvExample2.ecore @@ -37,12 +37,12 @@ <details key="body" value="throw new <%java.lang.UnsupportedOperationException%>("Enviroment::hasFinalResult() has been created for CG purposes. Don't call this method");"/> </eAnnotations> </eOperations> - <eOperations name="getEvaluator" eType="#//Evaluator"> + <eOperations name="getExecutor" eType="#//Executor"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="body" value="throw new <%java.lang.UnsupportedOperationException%>("Enviroment::getEvaluator() has been created for CG purposes. Don't call this method");"/> </eAnnotations> </eOperations> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Evaluator" instanceClassName="org.eclipse.ocl.pivot.evaluation.Evaluator" + <eClassifiers xsi:type="ecore:EClass" name="Executor" instanceClassName="org.eclipse.ocl.pivot.evaluation.Executor" abstract="true" interface="true"/> </ecore:EPackage> diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/java/LookupEnvironment.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/java/LookupEnvironment.java index f5574544e..a664b42b0 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/java/LookupEnvironment.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/java/LookupEnvironment.java @@ -13,7 +13,7 @@ package org.eclipse.qvtd.cs2as.compiler.tests.models.example2.java; import org.eclipse.emf.common.util.EList; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.ocl.pivot.evaluation.Evaluator; +import org.eclipse.ocl.pivot.evaluation.Executor; import example2.classes.NamedElement; import example2.classescs.PathElementCS; @@ -23,23 +23,23 @@ import example2.env.impl.EnvironmentImpl; public class LookupEnvironment extends EnvironmentImpl { - private @NonNull Evaluator evaluator; + private @NonNull Executor executor; private @NonNull String name; - public LookupEnvironment(@NonNull Evaluator evaluator, @NonNull String name) { - this.evaluator = evaluator; + public LookupEnvironment(@NonNull Executor executor, @NonNull String name) { + this.executor = executor; this.name = name; } - public LookupEnvironment(@NonNull Evaluator evaluator, @NonNull PathElementCS pathElement) { - this.evaluator = evaluator; + public LookupEnvironment(@NonNull Executor executor, @NonNull PathElementCS pathElement) { + this.executor = executor; this.name = pathElement.getName(); } @Override @NonNull - public Evaluator getEvaluator() { - return evaluator; + public Executor getExecutor() { + return executor; } @Override |