From 30a761771634e78886f75b65fead4f785ed75337 Mon Sep 17 00:00:00 2001
From: Ed Willink
Date: Fri, 19 Jun 2015 10:22:59 +0100
Subject: [463313] Replace Evaluator by Executor while retaining API
compatibility
---
.../tests/models/example1/EnvExample1.ecore | 4 +-
.../tests/models/example1/Source2Target.qvtias | 378 ++++++++++++++-------
.../models/example1/java/LookupEnvironment.java | 16 +-
.../tests/models/example2/EnvExample2.ecore | 4 +-
.../models/example2/java/LookupEnvironment.java | 16 +-
5 files changed, 274 insertions(+), 144 deletions(-)
(limited to 'tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd')
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/EnvExample1.ecore b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/EnvExample1.ecore
index 2944c2642..6d1410d81 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/EnvExample1.ecore
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/EnvExample1.ecore
@@ -37,12 +37,12 @@
-
+
-
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.qvtias b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.qvtias
index f28152239..8179e8c84 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.qvtias
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.qvtias
@@ -9,8 +9,12 @@
-
-
+
+
+
+
+
+
@@ -258,7 +262,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -267,20 +282,17 @@
+ referredVariable="#//@ownedPackages.0/@ownedClasses.0/@rule.8/@bottomPattern/@assignment.1/@value/@ownedIterators.0"/>
-
-
-
-
-
-
+
+
+
+
@@ -316,18 +328,27 @@
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -363,7 +384,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -371,7 +403,7 @@
+ referredVariable="#//@ownedPackages.0/@ownedClasses.0/@rule.10/@bottomPattern/@assignment.1/@value/@ownedSource/@ownedIterators.0"/>
@@ -380,20 +412,17 @@
-
+
-
-
-
-
-
-
+
+
+
+
@@ -426,18 +455,27 @@
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -470,7 +508,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -478,7 +527,7 @@
+ referredVariable="#//@ownedPackages.0/@ownedClasses.0/@rule.12/@bottomPattern/@assignment.1/@value/@ownedSource/@ownedIterators.0"/>
@@ -487,20 +536,17 @@
-
+
-
-
-
-
-
-
+
+
+
+
@@ -524,18 +570,27 @@
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -559,7 +614,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -567,7 +633,7 @@
+ referredVariable="#//@ownedPackages.0/@ownedClasses.0/@rule.14/@bottomPattern/@assignment.1/@value/@ownedSource/@ownedIterators.0"/>
@@ -576,20 +642,17 @@
-
+
-
-
-
-
-
-
+
+
+
+
@@ -606,7 +669,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -616,13 +690,10 @@
-
-
-
-
-
-
+
+
+
+
@@ -639,18 +710,27 @@
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -667,7 +747,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -677,13 +768,10 @@
-
-
-
-
-
-
+
+
+
+
@@ -700,18 +788,27 @@
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -742,7 +839,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -798,7 +903,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -843,7 +956,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -895,7 +1016,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -1222,6 +1351,7 @@
+
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/java/LookupEnvironment.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/java/LookupEnvironment.java
index f6125d841..d8c5b4b2d 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/java/LookupEnvironment.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/java/LookupEnvironment.java
@@ -13,7 +13,7 @@ package org.eclipse.qvtd.cs2as.compiler.tests.models.example1.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 example1.env.Environment;
import example1.env.impl.EnvironmentImpl;
@@ -22,26 +22,26 @@ import example1.target.NamedElement;
public class LookupEnvironment extends EnvironmentImpl {
- private @NonNull Evaluator evaluator;
+ private @NonNull Executor executor;
private @NonNull String name;
private boolean isLocal;
- public LookupEnvironment(@NonNull Evaluator evaluator, @NonNull String name, boolean isLocalLookup) {
- this.evaluator = evaluator;
+ public LookupEnvironment(@NonNull Executor executor, @NonNull String name, boolean isLocalLookup) {
+ this.executor = executor;
this.name = name;
this.isLocal = isLocalLookup;
}
- public LookupEnvironment(@NonNull Evaluator evaluator, @NonNull PathElementCS pathElement, boolean isLocalLookup) {
- this.evaluator = evaluator;
+ public LookupEnvironment(@NonNull Executor executor, @NonNull PathElementCS pathElement, boolean isLocalLookup) {
+ this.executor = executor;
this.name = pathElement.getName();
this.isLocal = isLocalLookup;
}
@Override
@NonNull
- public Evaluator getEvaluator() {
- return evaluator;
+ public Executor getExecutor() {
+ return executor;
}
@Override
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 @@
-
+
-
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
--
cgit v1.2.3