[lookupGen] - Fixing example1_CG

4 files changed, 37 insertions, 85 deletions

diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl
index d5f399b2f..688a46329 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl
@@ -48,13 +48,13 @@ def : _env(child : ocl::OclElement) : lookup::LookupEnvironment =
 		.addElements(ownedA)
 		
 context A1
-def : _qualification_env() : lookup::LookupEnvironment =
+def : _qualified_env() : lookup::LookupEnvironment =
 	let env = lookup::LookupEnvironment{}
 	in env
 		.addElements(ownsB)
 
 def : _lookupQualifiedB(bName : String) : B[?] =
-	let foundB = _lookupB(_qualification_env(), bName)
+	let foundB = _lookupB(_qualified_env(), bName)
 	in  if foundB->isEmpty()
 		then null
 		else foundB->first()
@@ -71,13 +71,13 @@ def : _env(child : ocl::OclElement) : lookup::LookupEnvironment =
 	else parentEnv()
 	endif
 context A2
-def : _qualification_env() : lookup::LookupEnvironment =
+def : _qualified_env() : lookup::LookupEnvironment =
 	let env = lookup::LookupEnvironment{}
 	in env
 		.addElements(ownsC)
 
 def : _lookupQualifiedC(cName : String) : C[?] =
-	let foundC = _lookupC(_qualification_env(), cName)
+	let foundC = _lookupC(_qualified_env(), cName)
 	in  if foundC->isEmpty()
 		then null
 		else foundC->first()
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/TargetDefaultLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/TargetDefaultLookupVisitor.java
deleted file mode 100644
index 72ccdaa8a..000000000
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/TargetDefaultLookupVisitor.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * <copyright>
- * 
- * </copyright>
- *
- * This code is auto-generated
- * from: org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/TargetMM1.genmodel
- *
- * Only the copyright statement is editable.
- *******************************************************************************/
-package	example1.target.lookup.util;
-
-import org.eclipse.jdt.annotation.NonNull;
-import example1.target.lookup.LookupEnvironment;
-import example1.target.util.AbstractTargetLookupVisitor;
-
-public class TargetDefaultLookupVisitor extends AbstractTargetLookupVisitor {
-
-	public TargetDefaultLookupVisitor(@NonNull LookupEnvironment context) {
-		super(context);
-	}
-
-}
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/TargetQualificationLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/TargetQualificationLookupVisitor.java
deleted file mode 100644
index 04806f526..000000000
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/TargetQualificationLookupVisitor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * <copyright>
- * 
- * </copyright>
- *
- * This code is auto-generated
- * from: uk.ac.york.cs.asbh.lang.cs2as/model/TargetMM1.genmodel
- *
- * Only the copyright statement is editable.
- *******************************************************************************/
-package	example1.target.lookup.util;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-
-import example1.target.A1;
-import example1.target.A2;
-import example1.target.B;
-import example1.target.C;
-import example1.target.lookup.LookupEnvironment;
-import example1.target.util.AbstractTargetLookupVisitor;
-import example1.target.util.Visitable;
-
-public class TargetQualificationLookupVisitor extends AbstractTargetLookupVisitor {
-
-	public TargetQualificationLookupVisitor(@NonNull LookupEnvironment context) {
-		super(context);
-	}
-
-    @Override
-    public @Nullable LookupEnvironment visiting(@NonNull Visitable visitable) {
-        return context;
-    }
-    
-    @Override
-    public @Nullable LookupEnvironment visitA1(@NonNull A1 element) {
-    	   	
-	    @SuppressWarnings("null")
-	    final @NonNull /*@Thrown*/ List<B> ownsB = element.getOwnsB();
-	    @SuppressWarnings("null")
-	    final @NonNull /*@Thrown*/ LookupEnvironment addElements = context.addElements((EList<B>)ownsB);
-	    return addElements;
-    }
-    
-    @Override
-    public @Nullable LookupEnvironment visitA2(@NonNull A2 element) {
-    	   	
-	    @SuppressWarnings("null")
-	    final @NonNull /*@Thrown*/ List<C> ownsC = element.getOwnsC();
-	    @SuppressWarnings("null")
-	    final @NonNull /*@Thrown*/ LookupEnvironment addElements = context.addElements((EList<C>)ownsC);
-	    return addElements;
-    }
-    
-}
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/AbstractTargetQualifiedLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/AbstractTargetQualifiedLookupVisitor.java
index da0468db9..b6310299d 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/AbstractTargetQualifiedLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/AbstractTargetQualifiedLookupVisitor.java
@@ -9,10 +9,15 @@
 
 package example1.target.util;
 
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.pivot.ids.IdManager;
 import org.eclipse.ocl.pivot.ids.TypeId;
 
+import example1.target.B;
+import example1.target.C;
 import example1.target.TargetPackage;
 import example1.target.lookup.EnvironmentPackage;
 import example1.target.lookup.LookupEnvironment;
@@ -46,4 +51,32 @@ public class AbstractTargetQualifiedLookupVisitor
     public AbstractTargetQualifiedLookupVisitor(@NonNull LookupEnvironment context) {
         super(context);
     }
+    
+    /**
+     * visitA1(element : target::A1[1]) : lookup::LookupEnvironment[?]
+     * 
+     * _'null' : lookup::LookupEnvironment[?]
+     */
+    @Override
+    public /*@NonInvalid*/ LookupEnvironment visitA1(final /*@NonInvalid*/ example1.target.@org.eclipse.jdt.annotation.NonNull A1 element_5) {
+        @SuppressWarnings("null")
+        final /*@Thrown*/ List<B> ownsB = element_5.getOwnsB();
+        @SuppressWarnings("null")
+        final /*@Thrown*/ example1.target.lookup.@org.eclipse.jdt.annotation.NonNull LookupEnvironment addElements = context.addElements((EList<B>)ownsB);
+        return addElements;
+    }
+    
+    /**
+     * visitA2(element : target::A2[1]) : lookup::LookupEnvironment[?]
+     * 
+     * _'null' : lookup::LookupEnvironment[?]
+     */
+    @Override
+    public /*@NonInvalid*/ LookupEnvironment visitA2(final /*@NonInvalid*/ example1.target.@org.eclipse.jdt.annotation.NonNull A2 element_6) {
+        @SuppressWarnings("null")
+        final /*@Thrown*/ List<C> ownsC = element_6.getOwnsC();
+        @SuppressWarnings("null")
+        final /*@Thrown*/ example1.target.lookup.@org.eclipse.jdt.annotation.NonNull LookupEnvironment addElements = context.addElements((EList<C>)ownsC);
+        return addElements;
+    }
 }