[514590] atlqvtr regen

13 files changed, 243 insertions, 1170 deletions

diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr.java
deleted file mode 100644
index b46b506bc..000000000
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*******************************************************************************
- * «codeGenHelper.getCopyright(' * ')»
- *
- * This code is 100% auto-generated
- * using: org.eclipse.qvtd.codegen.qvti.java.QVTiCodeGenerator
- *
- * Do not edit it.
- ********************************************************************************/
-
-package org.eclipse.qvtd.atl.atl2qvtr;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.m2m.atl.common.ATL.ATLPackage;
-import org.eclipse.m2m.atl.common.ATL.Helper;
-import org.eclipse.m2m.atl.common.ATL.InPattern;
-import org.eclipse.m2m.atl.common.ATL.MatchedRule;
-import org.eclipse.m2m.atl.common.ATL.Module;
-import org.eclipse.m2m.atl.common.OCL.OCLPackage;
-import org.eclipse.m2m.atl.common.OCL.OclFeature;
-import org.eclipse.m2m.atl.common.OCL.OclFeatureDefinition;
-import org.eclipse.m2m.atl.common.OCL.OclModel;
-import org.eclipse.m2m.atl.common.OCL.Operation;
-import org.eclipse.ocl.pivot.PivotFactory;
-import org.eclipse.ocl.pivot.ids.ClassId;
-import org.eclipse.ocl.pivot.ids.CollectionTypeId;
-import org.eclipse.ocl.pivot.ids.IdManager;
-import org.eclipse.ocl.pivot.ids.NsURIPackageId;
-import org.eclipse.ocl.pivot.ids.PropertyId;
-import org.eclipse.ocl.pivot.ids.RootPackageId;
-import org.eclipse.ocl.pivot.ids.TypeId;
-import org.eclipse.ocl.pivot.internal.library.UnboxedCompositionProperty;
-import org.eclipse.ocl.pivot.utilities.ValueUtil;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrFactory;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.THelper2Function;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.TInPattern2RelationDomain;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.TMatchedRule2Relation;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.TModel2RelationalTransformation;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.TOclModel2ModelParameter_create;
-import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.TOclModel2ModelParameter_from;
-import org.eclipse.qvtd.pivot.qvtbase.Function;
-import org.eclipse.qvtd.pivot.qvtbase.QVTbaseFactory;
-import org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage;
-import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
-import org.eclipse.qvtd.pivot.qvtrelation.QVTrelationFactory;
-import org.eclipse.qvtd.pivot.qvtrelation.QVTrelationPackage;
-import org.eclipse.qvtd.pivot.qvtrelation.Relation;
-import org.eclipse.qvtd.pivot.qvtrelation.RelationDomain;
-import org.eclipse.qvtd.pivot.qvtrelation.RelationModel;
-import org.eclipse.qvtd.pivot.qvtrelation.RelationalTransformation;
-import org.eclipse.qvtd.runtime.evaluation.AbstractTransformer;
-import org.eclipse.qvtd.runtime.evaluation.Connection;
-import org.eclipse.qvtd.runtime.evaluation.InvalidEvaluationException;
-import org.eclipse.qvtd.runtime.evaluation.TransformationExecutor;
-
-/**
- * The ATL2QVTr transformation:
- * <p>
- * Construct with an evaluator
- * <br>
- * Populate each input model with {@link addRootObjects(String,List)}
- * <br>
- * {@link run()}
- * <br>
- * Extract each output model with {@link getRootObjects(String)}
- */
-@SuppressWarnings("unused")
-public class ATL2QVTr extends AbstractTransformer
-{
-	public static final /*@NonInvalid*/ @NonNull RootPackageId PACKid_$metamodel$ = IdManager.getRootPackageId("$metamodel$");
-	public static final /*@NonInvalid*/ @NonNull NsURIPackageId PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_ATL = IdManager.getNsURIPackageId("http://www.eclipse.org/gmt/2005/ATL", null, ATLPackage.eINSTANCE);
-	public static final /*@NonInvalid*/ @NonNull NsURIPackageId PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_OCL = IdManager.getNsURIPackageId("http://www.eclipse.org/gmt/2005/OCL", null, OCLPackage.eINSTANCE);
-	public static final /*@NonInvalid*/ @NonNull NsURIPackageId PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTbase = IdManager.getNsURIPackageId("http://www.eclipse.org/qvt/2017/QVTbase", null, QVTbasePackage.eINSTANCE);
-	public static final /*@NonInvalid*/ @NonNull NsURIPackageId PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTrelation = IdManager.getNsURIPackageId("http://www.eclipse.org/qvt/2017/QVTrelation", null, QVTrelationPackage.eINSTANCE);
-	public static final /*@NonInvalid*/ @NonNull NsURIPackageId PACKid_http_c_s_s_www_eclipse_org_s_qvtd_m_example_s_org_s_eclipse_s_qvtd_s_atl_s_atl2qvtr_s_ATL2QVTr = IdManager.getNsURIPackageId("http://www.eclipse.org/qvtd-example/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr", "PATL2QVTr", PATL2QVTrPackage.eINSTANCE);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Function = PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTbase.getClassId("Function", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Helper = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_ATL.getClassId("Helper", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_InPattern = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_ATL.getClassId("InPattern", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_MatchedRule = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_ATL.getClassId("MatchedRule", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Module = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_ATL.getClassId("Module", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_OclFeature = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_OCL.getClassId("OclFeature", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_OclFeatureDefinition = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_OCL.getClassId("OclFeatureDefinition", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_OclModel = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_OCL.getClassId("OclModel", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Operation = PACKid_http_c_s_s_www_eclipse_org_s_gmt_s_2005_s_OCL.getClassId("Operation", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Package = PACKid_$metamodel$.getClassId("Package", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Relation = PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTrelation.getClassId("Relation", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_RelationDomain = PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTrelation.getClassId("RelationDomain", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_RelationModel = PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTrelation.getClassId("RelationModel", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_RelationalTransformation = PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTrelation.getClassId("RelationalTransformation", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_THelper2Function = PACKid_http_c_s_s_www_eclipse_org_s_qvtd_m_example_s_org_s_eclipse_s_qvtd_s_atl_s_atl2qvtr_s_ATL2QVTr.getClassId("THelper2Function", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_TInPattern2RelationDomain = PACKid_http_c_s_s_www_eclipse_org_s_qvtd_m_example_s_org_s_eclipse_s_qvtd_s_atl_s_atl2qvtr_s_ATL2QVTr.getClassId("TInPattern2RelationDomain", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_TMatchedRule2Relation = PACKid_http_c_s_s_www_eclipse_org_s_qvtd_m_example_s_org_s_eclipse_s_qvtd_s_atl_s_atl2qvtr_s_ATL2QVTr.getClassId("TMatchedRule2Relation", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_TModel2RelationalTransformation = PACKid_http_c_s_s_www_eclipse_org_s_qvtd_m_example_s_org_s_eclipse_s_qvtd_s_atl_s_atl2qvtr_s_ATL2QVTr.getClassId("TModel2RelationalTransformation", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_TOclModel2ModelParameter_create = PACKid_http_c_s_s_www_eclipse_org_s_qvtd_m_example_s_org_s_eclipse_s_qvtd_s_atl_s_atl2qvtr_s_ATL2QVTr.getClassId("TOclModel2ModelParameter_create", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_TOclModel2ModelParameter_from = PACKid_http_c_s_s_www_eclipse_org_s_qvtd_m_example_s_org_s_eclipse_s_qvtd_s_atl_s_atl2qvtr_s_ATL2QVTr.getClassId("TOclModel2ModelParameter_from", 0);
-	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_TypedModel = PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2017_s_QVTbase.getClassId("TypedModel", 0);
-	public static final /*@NonInvalid*/ @NonNull CollectionTypeId ORD_CLSSid_OclModel = TypeId.ORDERED_SET.getSpecializedId(CLSSid_OclModel);
-	public static final /*@NonInvalid*/ @NonNull PropertyId PROPid_aRule = CLSSid_TInPattern2RelationDomain.getPropertyId("aRule");
-	public static final /*@NonInvalid*/ @NonNull PropertyId PROPid_inModels = CLSSid_Module.getPropertyId("inModels");
-	public static final /*@NonInvalid*/ @NonNull PropertyId PROPid_matchedRule = CLSSid_TMatchedRule2Relation.getPropertyId("matchedRule");
-	public static final /*@NonInvalid*/ @NonNull PropertyId PROPid_module = CLSSid_TModel2RelationalTransformation.getPropertyId("module");
-	public static final /*@NonInvalid*/ @NonNull PropertyId PROPid_outModels = CLSSid_Module.getPropertyId("outModels");
-	public static final /*@NonInvalid*/ @NonNull CollectionTypeId SET_CLSSid_OclModel = TypeId.SET.getSpecializedId(CLSSid_OclModel);
-
-	/*
-	 * Property-source to Property-target unnavigable navigation caches
-	 */
-	protected final @NonNull Map<MatchedRule,TInPattern2RelationDomain> OPPOSITE_OF_TInPattern2RelationDomain_aRule = new HashMap<MatchedRule,TInPattern2RelationDomain>();
-	protected final @NonNull Map<MatchedRule,TMatchedRule2Relation> OPPOSITE_OF_TMatchedRule2Relation_matchedRule = new HashMap<MatchedRule,TMatchedRule2Relation>();
-	protected final @NonNull Map<Module,TModel2RelationalTransformation> OPPOSITE_OF_TModel2RelationalTransformation_module = new HashMap<Module,TModel2RelationalTransformation>();
-
-	/*
-	 * Array of the source PropertyIds of each Property for which unnavigable opposite property navigation may occur.
-	 */
-	private static final @NonNull PropertyId @NonNull [] oppositeIndex2propertyId = new @NonNull PropertyId[]{
-		PROPid_module,		// 0 => module
-		PROPid_matchedRule,		// 1 => matchedRule
-		PROPid_aRule		// 2 => aRule
-	};
-
-	/*
-	 * Array of the ClassIds of each class for which allInstances() may be invoked. Array index is the ClassIndex.
-	 */
-	private static final @NonNull ClassId @NonNull [] classIndex2classId = new @NonNull ClassId[]{
-		CLSSid_Helper,                        // 0 => Helper
-		CLSSid_InPattern,                     // 1 => InPattern
-		CLSSid_MatchedRule,                   // 2 => MatchedRule
-		CLSSid_Module,                        // 3 => Module
-		CLSSid_OclModel                       // 4 => OclModel
-	};
-
-	/*
-	 * Mapping from each ClassIndex to all the ClassIndexes to which an object of the outer index
-	 * may contribute results to an allInstances() invocation.
-	 * Non trivial inner arrays arise when one ClassId is a derivation of another and so an
-	 * instance of the derived classId contributes to derived and inherited ClassIndexes.
-	 */
-	private final static int @NonNull [] @NonNull [] classIndex2allClassIndexes = new int @NonNull [] @NonNull [] {
-		{0},                          // 0 : Helper -> {Helper}
-		{1},                          // 1 : InPattern -> {InPattern}
-		{2},                          // 2 : MatchedRule -> {MatchedRule}
-		{3},                          // 3 : Module -> {Module}
-		{4}                           // 4 : OclModel -> {OclModel}
-	};
-
-
-	public ATL2QVTr(final @NonNull TransformationExecutor executor) {
-		super(executor, new @NonNull String[] {"middle", "atl", "qvtr", "$primitive$"}, oppositeIndex2propertyId, classIndex2classId, classIndex2allClassIndexes);
-	}
-
-	@Override
-	public boolean run() {
-		final @NonNull Connection ji_Helper = models[1/*atl*/].getConnection(0/*ATL::Helper*/);
-		final @NonNull Connection ji_InPattern = models[1/*atl*/].getConnection(1/*ATL::InPattern*/);
-		final @NonNull Connection ji_MatchedRule = models[1/*atl*/].getConnection(2/*ATL::MatchedRule*/);
-		final @NonNull Connection ji_Module = models[1/*atl*/].getConnection(3/*ATL::Module*/);
-		final @NonNull Connection ji_OclModel = models[1/*atl*/].getConnection(4/*OCL::OclModel*/);
-		return MAP___root__(ji_Helper, ji_InPattern, ji_MatchedRule, ji_Module, ji_OclModel) && invocationManager.flush();
-	}
-
-	/**
-	 *
-	 * map __root__ in ATL2QVTr {
-	 *
-	 *   append ji_Helper  : ATL::Helper[1];
-	 * append ji_InPattern  : ATL::InPattern[1];
-	 * append ji_MatchedRule  : ATL::MatchedRule[1];
-	 * append ji_Module  : ATL::Module[1];
-	 * append ji_OclModel  : OCL::OclModel[1];
-	 * ::jm_THelper2Function : PATL2QVTr::THelper2Function[1]::jm_TInPattern2RelationDomain : PATL2QVTr::TInPattern2RelationDomain[1]::jm_TMatchedRule2Relation : PATL2QVTr::TMatchedRule2Relation[1]::jm_TOclModel2ModelParameter__create : PATL2QVTr::TOclModel2ModelParameter_create[1]::jm_TOclModel2ModelParameter__from : PATL2QVTr::TOclModel2ModelParameter_from[1]install m_TModel2RelationalTransformation__3__4_module_relTx_r0 {
-	 * module consumes append ji_Module  : ATL::Module[1];
-	 * ;
-	 * }
-	 *   install m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0 {
-	 * helper consumes append ji_Helper  : ATL::Helper[1];
-	 * ;
-	 * jm_THelper2Function appendsTo jm_THelper2Function;
-	 * }
-	 *   install m_THelper2Function_function_relTx_lc {
-	 * trace consumes ::jm_THelper2Function : PATL2QVTr::THelper2Function[1];
-	 * }
-	 *   install m_TInPattern2RelationDomain_aPattern_aRule_p0 {
-	 * aPattern consumes append ji_InPattern  : ATL::InPattern[1];
-	 * ;
-	 * jm_TInPattern2RelationDomain appendsTo jm_TInPattern2RelationDomain;
-	 * }
-	 *   install m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0 {
-	 * jm_TMatchedRule2Relation appendsTo jm_TMatchedRule2Relation;
-	 * matchedRule consumes append ji_MatchedRule  : ATL::MatchedRule[1];
-	 * ;
-	 * }
-	 *   install m_TInPattern2RelationDomain_rDomain_p1 {
-	 * trace consumes ::jm_TInPattern2RelationDomain : PATL2QVTr::TInPattern2RelationDomain[1];
-	 * }
-	 *   install m_TMatchedRule2Relation_rRule_p1 {
-	 * trace consumes ::jm_TMatchedRule2Relation : PATL2QVTr::TMatchedRule2Relation[1];
-	 * }
-	 *   install m_TInPattern2RelationDomain_rRule_p2 {
-	 * aRule consumes append ji_MatchedRule  : ATL::MatchedRule[1];
-	 * ;
-	 * }
-	 *   install m_TMatchedRule2Relation_relTx_p2 {
-	 * trace consumes ::jm_TMatchedRule2Relation : PATL2QVTr::TMatchedRule2Relation[1];
-	 * }
-	 *   install m_TOclModel2ModelParameter__create_aModule_oclModel__p0 {
-	 * jm_TOclModel2ModelParameter__create appendsTo jm_TOclModel2ModelParameter__create;
-	 * oclModel consumes append ji_OclModel  : OCL::OclModel[1];
-	 * ;
-	 * }
-	 *   install m_TOclModel2ModelParameter__create_relTM_p1 {
-	 * trace consumes ::jm_TOclModel2ModelParameter__create : PATL2QVTr::TOclModel2ModelParameter_create[1];
-	 * }
-	 *   install m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0 {
-	 * jm_TOclModel2ModelParameter__from appendsTo jm_TOclModel2ModelParameter__from;
-	 * oclModel consumes append ji_OclModel  : OCL::OclModel[1];
-	 * ;
-	 * }
-	 *   install m_TOclModel2ModelParameter__from_relTM_p1 {
-	 * trace consumes ::jm_TOclModel2ModelParameter__from : PATL2QVTr::TOclModel2ModelParameter_from[1];
-	 * }
-	 *   install m_TOclModel2ModelParameter__create_relTx_p2 {
-	 * trace consumes ::jm_TOclModel2ModelParameter__create : PATL2QVTr::TOclModel2ModelParameter_create[1];
-	 * }
-	 *   install m_TOclModel2ModelParameter__from_relTx_p2 {
-	 * trace consumes ::jm_TOclModel2ModelParameter__from : PATL2QVTr::TOclModel2ModelParameter_from[1];
-	 * }
-	 */
-	protected boolean MAP___root__(final @NonNull Connection ji_Helper, final @NonNull Connection ji_InPattern, final @NonNull Connection ji_MatchedRule, final @NonNull Connection ji_Module, final @NonNull Connection ji_OclModel)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP___root__" + ", " + ji_Helper + ", " + ji_InPattern + ", " + ji_MatchedRule + ", " + ji_Module + ", " + ji_OclModel);
-		}
-		// connection variables
-		final @NonNull Connection jm_THelper2Function_1 = createConnection("jm_THelper2Function", CLSSid_THelper2Function, false);
-		final @NonNull Connection jm_TInPattern2RelationDomain_1 = createConnection("jm_TInPattern2RelationDomain", CLSSid_TInPattern2RelationDomain, false);
-		final @NonNull Connection jm_TMatchedRule2Relation_1 = createConnection("jm_TMatchedRule2Relation", CLSSid_TMatchedRule2Relation, false);
-		final @NonNull Connection jm_TOclModel2ModelParameter__create_1 = createConnection("jm_TOclModel2ModelParameter__create", CLSSid_TOclModel2ModelParameter_create, false);
-		final @NonNull Connection jm_TOclModel2ModelParameter__from_1 = createConnection("jm_TOclModel2ModelParameter__from", CLSSid_TOclModel2ModelParameter_from, false);
-		// mapping statements
-		for (@NonNull Module module_0 : ji_Module.typedIterable(Module.class)) {
-			MAP_m_TModel2RelationalTransformation__3__4_module_relTx_r0(module_0);
-		}
-		for (@NonNull Helper helper_0 : ji_Helper.typedIterable(Helper.class)) {
-			MAP_m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0(helper_0, jm_THelper2Function_1);
-		}
-		for (@NonNull THelper2Function trace_7 : jm_THelper2Function_1.typedIterable(THelper2Function.class)) {
-			MAP_m_THelper2Function_function_relTx_lc(trace_7);
-		}
-		for (@NonNull InPattern aPattern_0 : ji_InPattern.typedIterable(InPattern.class)) {
-			MAP_m_TInPattern2RelationDomain_aPattern_aRule_p0(aPattern_0, jm_TInPattern2RelationDomain_1);
-		}
-		for (@NonNull MatchedRule matchedRule_0 : ji_MatchedRule.typedIterable(MatchedRule.class)) {
-			MAP_m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0(jm_TMatchedRule2Relation_1, matchedRule_0);
-		}
-		for (@NonNull TInPattern2RelationDomain trace_8 : jm_TInPattern2RelationDomain_1.typedIterable(TInPattern2RelationDomain.class)) {
-			MAP_m_TInPattern2RelationDomain_rDomain_p1(trace_8);
-		}
-		for (@NonNull TMatchedRule2Relation trace_9 : jm_TMatchedRule2Relation_1.typedIterable(TMatchedRule2Relation.class)) {
-			MAP_m_TMatchedRule2Relation_rRule_p1(trace_9);
-		}
-		for (@NonNull MatchedRule aRule_0 : ji_MatchedRule.typedIterable(MatchedRule.class)) {
-			MAP_m_TInPattern2RelationDomain_rRule_p2(aRule_0);
-		}
-		for (@NonNull TMatchedRule2Relation trace_10 : jm_TMatchedRule2Relation_1.typedIterable(TMatchedRule2Relation.class)) {
-			MAP_m_TMatchedRule2Relation_relTx_p2(trace_10);
-		}
-		for (@NonNull OclModel oclModel_1 : ji_OclModel.typedIterable(OclModel.class)) {
-			MAP_m_TOclModel2ModelParameter__create_aModule_oclModel__p0(jm_TOclModel2ModelParameter__create_1, oclModel_1);
-		}
-		for (@NonNull TOclModel2ModelParameter_create trace_11 : jm_TOclModel2ModelParameter__create_1.typedIterable(TOclModel2ModelParameter_create.class)) {
-			MAP_m_TOclModel2ModelParameter__create_relTM_p1(trace_11);
-		}
-		for (@NonNull OclModel oclModel_2 : ji_OclModel.typedIterable(OclModel.class)) {
-			MAP_m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0(jm_TOclModel2ModelParameter__from_1, oclModel_2);
-		}
-		for (@NonNull TOclModel2ModelParameter_from trace_12 : jm_TOclModel2ModelParameter__from_1.typedIterable(TOclModel2ModelParameter_from.class)) {
-			MAP_m_TOclModel2ModelParameter__from_relTM_p1(trace_12);
-		}
-		for (@NonNull TOclModel2ModelParameter_create trace_13 : jm_TOclModel2ModelParameter__create_1.typedIterable(TOclModel2ModelParameter_create.class)) {
-			MAP_m_TOclModel2ModelParameter__create_relTx_p2(trace_13);
-		}
-		for (@NonNull TOclModel2ModelParameter_from trace_14 : jm_TOclModel2ModelParameter__from_1.typedIterable(TOclModel2ModelParameter_from.class)) {
-			MAP_m_TOclModel2ModelParameter__from_relTx_p2(trace_14);
-		}
-		final /*@Thrown*/ @Nullable Boolean __root__ = ValueUtil.TRUE_VALUE;
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((__root__ ? "done "  : "fail ") + "MAP___root__");
-		}
-		return __root__;
-	}
-
-	/**
-	 *
-	 * map m_TModel2RelationalTransformation__3__4_module_relTx_r0 in ATL2QVTr {
-	 * guard:atl module  : ATL::Module[1];
-	 * var txName : String[1] := module.name;
-	 * contained new:qvtr _3 : Package[1];
-	 * new:qvtr _4 : qvtrelation::RelationModel[1];
-	 * contained new:qvtr relTx : qvtrelation::RelationalTransformation[1];
-	 * new:middle trace : PATL2QVTr::TModel2RelationalTransformation[1];
-	 * set _3.name := null;
-	 * set _4.name := null;
-	 * set _3.Model := _4;
-	 * set trace._3 := _3;
-	 * set trace._4 := _4;
-	 * set trace.module := module;
-	 * set trace.relTx := relTx;
-	 * set relTx.owningPackage := _3;
-	 * set relTx.name := txName;
-	 * set trace.txName := txName;
-	 *
-	 */
-	protected boolean MAP_m_TModel2RelationalTransformation__3__4_module_relTx_r0(final /*@NonInvalid*/ @NonNull Module module)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TModel2RelationalTransformation__3__4_module_relTx_r0" + ", " + module);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull String name = module.getName();
-		// creations
-		final @SuppressWarnings("null")org.eclipse.ocl.pivot.@NonNull Package _3 = PivotFactory.eINSTANCE.createPackage();
-		models[2/*qvtr*/].add(_3, true);
-		final @NonNull RelationModel _4 = QVTrelationFactory.eINSTANCE.createRelationModel();
-		models[2/*qvtr*/].add(_4, false);
-		final @NonNull RelationalTransformation relTx = QVTrelationFactory.eINSTANCE.createRelationalTransformation();
-		models[2/*qvtr*/].add(relTx, true);
-		final @SuppressWarnings("null")@NonNull TModel2RelationalTransformation trace_7 = PATL2QVTrFactory.eINSTANCE.createTModel2RelationalTransformation();
-		models[0/*middle*/].add(trace_7, false);
-		// mapping statements
-		_3.setName(null);
-		_4.setName(null);
-		_4.getOwnedPackages().add(_3);
-		trace_7.set_3(_3);
-		trace_7.set_4(_4);
-		OPPOSITE_OF_TModel2RelationalTransformation_module.put(module, trace_7);
-		trace_7.setModule(module);
-		trace_7.setRelTx(relTx);
-		relTx.setOwningPackage(_3);
-		relTx.setName(name);
-		trace_7.setTxName(name);
-		final /*@Thrown*/ @Nullable Boolean m_TModel2RelationalTransformation__3__4_module_relTx_r0 = ValueUtil.TRUE_VALUE;
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((m_TModel2RelationalTransformation__3__4_module_relTx_r0 ? "done "  : "fail ") + "MAP_m_TModel2RelationalTransformation__3__4_module_relTx_r0");
-		}
-		return m_TModel2RelationalTransformation__3__4_module_relTx_r0;
-	}
-
-	/**
-	 *
-	 * map m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0 in ATL2QVTr {
-	 * guard:atl helper  : ATL::Helper[1];
-	 * append jm_THelper2Function  : PATL2QVTr::THelper2Function[1];
-	 * var aDef : OCL::OclFeatureDefinition[1] := helper.definition;
-	 * var aModule : ATL::Module[1] := helper.module;
-	 * var aFeat : OCL::OclFeature[1] := aDef.feature;
-	 * check var aFeat1 : OCL::Operation[1] := aFeat;
-	 * var opName : String[1] := aFeat1.name;
-	 * new:middle trace : PATL2QVTr::THelper2Function[1];
-	 * set trace.helper := helper;
-	 * set trace.aDef := aDef;
-	 * set trace.aModule := aModule;
-	 * set trace.aFeat := aFeat1;
-	 * set trace.opName := opName;
-	 * add jm_THelper2Function += trace;
-	 *
-	 */
-	protected boolean MAP_m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0(final /*@NonInvalid*/ @NonNull Helper helper, final @NonNull Connection jm_THelper2Function)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0" + ", " + helper + ", " + jm_THelper2Function);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull OclFeatureDefinition definition = helper.getDefinition();
-		final /*@NonInvalid*/ @Nullable Module module_0 = helper.getModule();
-		final /*@NonInvalid*/ boolean symbol_0 = module_0 != null;
-		/*@Thrown*/ @Nullable Boolean raw_aModule;
-		if (symbol_0) {
-			if (module_0 == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@NonInvalid*/ @NonNull OclFeature feature = definition.getFeature();
-			final /*@NonInvalid*/ boolean symbol_1 = feature instanceof Operation;
-			/*@Thrown*/ @Nullable Boolean symbol_10;
-			if (symbol_1) {
-				final /*@NonInvalid*/ @NonNull Operation symbol_2 = (Operation)feature;
-				@SuppressWarnings("null")
-				final /*@NonInvalid*/ @NonNull String name = symbol_2.getName();
-				// creations
-				final @SuppressWarnings("null")@NonNull THelper2Function trace_7 = PATL2QVTrFactory.eINSTANCE.createTHelper2Function();
-				models[0/*middle*/].add(trace_7, false);
-				// mapping statements
-				trace_7.setHelper(helper);
-				trace_7.setADef(definition);
-				trace_7.setAModule(module_0);
-				trace_7.setAFeat(symbol_2);
-				trace_7.setOpName(name);
-				jm_THelper2Function.appendElement(trace_7);
-				final /*@Thrown*/ @Nullable Boolean m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0 = ValueUtil.TRUE_VALUE;
-				symbol_10 = m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0;
-			}
-			else {
-				symbol_10 = ValueUtil.FALSE_VALUE;
-			}
-			raw_aModule = symbol_10;
-		}
-		else {
-			raw_aModule = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_aModule ? "done "  : "fail ") + "MAP_m_THelper2Function_aDef_aFeat_aModule_helper_opName_p0");
-		}
-		return raw_aModule;
-	}
-
-	/**
-	 *
-	 * map m_THelper2Function_function_relTx_lc in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::THelper2Function[1];
-	 * var aModule : ATL::Module[1] := trace.aModule;
-	 * var opName : String[1] := trace.opName;
-	 * var when_TModel2RelationalTransformation : PATL2QVTr::TModel2RelationalTransformation[1] := aModule.TModel2RelationalTransformation;
-	 * var relTx : qvtrelation::RelationalTransformation[1] := when_TModel2RelationalTransformation.relTx;
-	 * new:qvtr function : qvtbase::Function[1];
-	 * set trace.function := function;
-	 * set function.name := opName;
-	 * set trace.relTx := relTx;
-	 * set function.owningClass := relTx;
-	 *
-	 */
-	protected boolean MAP_m_THelper2Function_function_relTx_lc(final /*@NonInvalid*/ @NonNull THelper2Function trace)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_THelper2Function_function_relTx_lc" + ", " + trace);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Module aModule = trace.getAModule();
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull String opName = trace.getOpName();
-		final /*@NonInvalid*/ @Nullable TModel2RelationalTransformation TModel2RelationalTransformation = OPPOSITE_OF_TModel2RelationalTransformation_module.get(aModule);
-		final /*@NonInvalid*/ boolean symbol_0 = TModel2RelationalTransformation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TModel2RelationalTransformation;
-		if (symbol_0) {
-			if (TModel2RelationalTransformation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@Thrown*/ @NonNull RelationalTransformation relTx = TModel2RelationalTransformation.getRelTx();
-			// creations
-			final @NonNull Function function = QVTbaseFactory.eINSTANCE.createFunction();
-			models[2/*qvtr*/].add(function, false);
-			// mapping statements
-			trace.setFunction(function);
-			function.setName(opName);
-			trace.setRelTx(relTx);
-			function.setOwningClass(relTx);
-			final /*@Thrown*/ @Nullable Boolean m_THelper2Function_function_relTx_lc = ValueUtil.TRUE_VALUE;
-			raw_when_TModel2RelationalTransformation = m_THelper2Function_function_relTx_lc;
-		}
-		else {
-			raw_when_TModel2RelationalTransformation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TModel2RelationalTransformation ? "done "  : "fail ") + "MAP_m_THelper2Function_function_relTx_lc");
-		}
-		return raw_when_TModel2RelationalTransformation;
-	}
-
-	/**
-	 *
-	 * map m_TInPattern2RelationDomain_aPattern_aRule_p0 in ATL2QVTr {
-	 * guard:atl aPattern  : ATL::InPattern[1];
-	 * append jm_TInPattern2RelationDomain  : PATL2QVTr::TInPattern2RelationDomain[1];
-	 * var aRule : ATL::MatchedRule[1] := aPattern.rule;
-	 * new:middle trace : PATL2QVTr::TInPattern2RelationDomain[1];
-	 * set trace.aPattern := aPattern;
-	 * set trace.aRule := aRule;
-	 * add jm_TInPattern2RelationDomain += trace;
-	 *
-	 */
-	protected boolean MAP_m_TInPattern2RelationDomain_aPattern_aRule_p0(final /*@NonInvalid*/ @NonNull InPattern aPattern, final @NonNull Connection jm_TInPattern2RelationDomain)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TInPattern2RelationDomain_aPattern_aRule_p0" + ", " + aPattern + ", " + jm_TInPattern2RelationDomain);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull MatchedRule rule = aPattern.getRule();
-		// creations
-		final @SuppressWarnings("null")@NonNull TInPattern2RelationDomain trace_7 = PATL2QVTrFactory.eINSTANCE.createTInPattern2RelationDomain();
-		models[0/*middle*/].add(trace_7, false);
-		// mapping statements
-		trace_7.setAPattern(aPattern);
-		OPPOSITE_OF_TInPattern2RelationDomain_aRule.put(rule, trace_7);
-		trace_7.setARule(rule);
-		jm_TInPattern2RelationDomain.appendElement(trace_7);
-		final /*@Thrown*/ @Nullable Boolean m_TInPattern2RelationDomain_aPattern_aRule_p0 = ValueUtil.TRUE_VALUE;
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((m_TInPattern2RelationDomain_aPattern_aRule_p0 ? "done "  : "fail ") + "MAP_m_TInPattern2RelationDomain_aPattern_aRule_p0");
-		}
-		return m_TInPattern2RelationDomain_aPattern_aRule_p0;
-	}
-
-	/**
-	 *
-	 * map m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0 in ATL2QVTr {
-	 * guard:atl matchedRule  : ATL::MatchedRule[1];
-	 * append jm_TMatchedRule2Relation  : PATL2QVTr::TMatchedRule2Relation[1];
-	 * var aModule : ATL::Module[1] := matchedRule.module;
-	 * var ruleName : String[1] := matchedRule.name;
-	 * new:middle trace : PATL2QVTr::TMatchedRule2Relation[1];
-	 * set trace.matchedRule := matchedRule;
-	 * set trace.ruleName := ruleName;
-	 * set trace.aModule := aModule;
-	 * add jm_TMatchedRule2Relation += trace;
-	 *
-	 */
-	protected boolean MAP_m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0(final @NonNull Connection jm_TMatchedRule2Relation, final /*@NonInvalid*/ @NonNull MatchedRule matchedRule)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0" + ", " + jm_TMatchedRule2Relation + ", " + matchedRule);
-		}
-		final /*@NonInvalid*/ @Nullable Module module_0 = matchedRule.getModule();
-		final /*@NonInvalid*/ boolean symbol_0 = module_0 != null;
-		/*@Thrown*/ @Nullable Boolean raw_aModule;
-		if (symbol_0) {
-			if (module_0 == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@NonInvalid*/ @NonNull String name = matchedRule.getName();
-			// creations
-			final @SuppressWarnings("null")@NonNull TMatchedRule2Relation trace_7 = PATL2QVTrFactory.eINSTANCE.createTMatchedRule2Relation();
-			models[0/*middle*/].add(trace_7, false);
-			// mapping statements
-			OPPOSITE_OF_TMatchedRule2Relation_matchedRule.put(matchedRule, trace_7);
-			trace_7.setMatchedRule(matchedRule);
-			trace_7.setRuleName(name);
-			trace_7.setAModule(module_0);
-			jm_TMatchedRule2Relation.appendElement(trace_7);
-			final /*@Thrown*/ @Nullable Boolean m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0 = ValueUtil.TRUE_VALUE;
-			raw_aModule = m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0;
-		}
-		else {
-			raw_aModule = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_aModule ? "done "  : "fail ") + "MAP_m_TMatchedRule2Relation_aModule_matchedRule_ruleName_p0");
-		}
-		return raw_aModule;
-	}
-
-	/**
-	 *
-	 * map m_TInPattern2RelationDomain_rDomain_p1 in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::TInPattern2RelationDomain[1];
-	 * var aRule : ATL::MatchedRule[1] := trace.aRule;
-	 * var when_TMatchedRule2Relation : PATL2QVTr::TMatchedRule2Relation[1] := aRule.TMatchedRule2Relation;
-	 * contained new:qvtr rDomain : qvtrelation::RelationDomain[1];
-	 * set rDomain.isCheckable := true;
-	 * set rDomain.isEnforceable := false;
-	 * set trace.rDomain := rDomain;
-	 *
-	 */
-	protected boolean MAP_m_TInPattern2RelationDomain_rDomain_p1(final /*@NonInvalid*/ @NonNull TInPattern2RelationDomain trace_0)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TInPattern2RelationDomain_rDomain_p1" + ", " + trace_0);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull MatchedRule aRule_0 = trace_0.getARule();
-		final /*@NonInvalid*/ @Nullable TMatchedRule2Relation TMatchedRule2Relation = OPPOSITE_OF_TMatchedRule2Relation_matchedRule.get(aRule_0);
-		final /*@NonInvalid*/ boolean symbol_0 = TMatchedRule2Relation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TMatchedRule2Relation;
-		if (symbol_0) {
-			if (TMatchedRule2Relation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			// creations
-			final @NonNull RelationDomain rDomain = QVTrelationFactory.eINSTANCE.createRelationDomain();
-			models[2/*qvtr*/].add(rDomain, true);
-			// mapping statements
-			rDomain.setIsCheckable(ValueUtil.TRUE_VALUE);
-			rDomain.setIsEnforceable(ValueUtil.FALSE_VALUE);
-			trace_0.setRDomain(rDomain);
-			final /*@Thrown*/ @Nullable Boolean m_TInPattern2RelationDomain_rDomain_p1 = ValueUtil.TRUE_VALUE;
-			raw_when_TMatchedRule2Relation = m_TInPattern2RelationDomain_rDomain_p1;
-		}
-		else {
-			raw_when_TMatchedRule2Relation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TMatchedRule2Relation ? "done "  : "fail ") + "MAP_m_TInPattern2RelationDomain_rDomain_p1");
-		}
-		return raw_when_TMatchedRule2Relation;
-	}
-
-	/**
-	 *
-	 * map m_TMatchedRule2Relation_rRule_p1 in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::TMatchedRule2Relation[1];
-	 * var aModule : ATL::Module[1] := trace.aModule;
-	 * var ruleName : String[1] := trace.ruleName;
-	 * var when_TModel2RelationalTransformation : PATL2QVTr::TModel2RelationalTransformation[1] := aModule.TModel2RelationalTransformation;
-	 * contained new:qvtr rRule : qvtrelation::Relation[1];
-	 * set trace.rRule := rRule;
-	 * set rRule.name := ruleName;
-	 *
-	 */
-	protected boolean MAP_m_TMatchedRule2Relation_rRule_p1(final /*@NonInvalid*/ @NonNull TMatchedRule2Relation trace_1)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TMatchedRule2Relation_rRule_p1" + ", " + trace_1);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Module aModule = trace_1.getAModule();
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull String ruleName = trace_1.getRuleName();
-		final /*@NonInvalid*/ @Nullable TModel2RelationalTransformation TModel2RelationalTransformation = OPPOSITE_OF_TModel2RelationalTransformation_module.get(aModule);
-		final /*@NonInvalid*/ boolean symbol_0 = TModel2RelationalTransformation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TModel2RelationalTransformation;
-		if (symbol_0) {
-			if (TModel2RelationalTransformation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			// creations
-			final @NonNull Relation rRule = QVTrelationFactory.eINSTANCE.createRelation();
-			models[2/*qvtr*/].add(rRule, true);
-			// mapping statements
-			trace_1.setRRule(rRule);
-			rRule.setName(ruleName);
-			final /*@Thrown*/ @Nullable Boolean m_TMatchedRule2Relation_rRule_p1 = ValueUtil.TRUE_VALUE;
-			raw_when_TModel2RelationalTransformation = m_TMatchedRule2Relation_rRule_p1;
-		}
-		else {
-			raw_when_TModel2RelationalTransformation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TModel2RelationalTransformation ? "done "  : "fail ") + "MAP_m_TMatchedRule2Relation_rRule_p1");
-		}
-		return raw_when_TModel2RelationalTransformation;
-	}
-
-	/**
-	 *
-	 * map m_TInPattern2RelationDomain_rRule_p2 in ATL2QVTr {
-	 * guard:atl aRule  : ATL::MatchedRule[1];
-	 * var trace : PATL2QVTr::TInPattern2RelationDomain[1] := aRule.TInPattern2RelationDomain;
-	 * var when_TMatchedRule2Relation : PATL2QVTr::TMatchedRule2Relation[1] := aRule.TMatchedRule2Relation;
-	 * var rDomain : qvtrelation::RelationDomain[1] := trace.rDomain;
-	 * var rRule : qvtrelation::Relation[1] := when_TMatchedRule2Relation.rRule;
-	 * set rDomain.rule := rRule;
-	 * set trace.rRule := rRule;
-	 *
-	 */
-	protected boolean MAP_m_TInPattern2RelationDomain_rRule_p2(final /*@NonInvalid*/ @NonNull MatchedRule aRule)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TInPattern2RelationDomain_rRule_p2" + ", " + aRule);
-		}
-		final /*@NonInvalid*/ @Nullable TInPattern2RelationDomain TInPattern2RelationDomain = OPPOSITE_OF_TInPattern2RelationDomain_aRule.get(aRule);
-		final /*@NonInvalid*/ boolean symbol_0 = TInPattern2RelationDomain != null;
-		/*@Thrown*/ @Nullable Boolean raw_trace;
-		if (symbol_0) {
-			if (TInPattern2RelationDomain == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			final /*@NonInvalid*/ @Nullable TMatchedRule2Relation TMatchedRule2Relation = OPPOSITE_OF_TMatchedRule2Relation_matchedRule.get(aRule);
-			final /*@NonInvalid*/ boolean symbol_1 = TMatchedRule2Relation != null;
-			/*@Thrown*/ @Nullable Boolean raw_when_TMatchedRule2Relation;
-			if (symbol_1) {
-				if (TMatchedRule2Relation == null) {
-					throw new InvalidEvaluationException("Null where non-null value required");
-				}
-				@SuppressWarnings("null")
-				final /*@Thrown*/ @NonNull RelationDomain rDomain = TInPattern2RelationDomain.getRDomain();
-				@SuppressWarnings("null")
-				final /*@Thrown*/ @NonNull Relation rRule = TMatchedRule2Relation.getRRule();
-				// mapping statements
-				rDomain.setRule(rRule);
-				TInPattern2RelationDomain.setRRule(rRule);
-				final /*@Thrown*/ @Nullable Boolean m_TInPattern2RelationDomain_rRule_p2 = ValueUtil.TRUE_VALUE;
-				raw_when_TMatchedRule2Relation = m_TInPattern2RelationDomain_rRule_p2;
-			}
-			else {
-				raw_when_TMatchedRule2Relation = ValueUtil.FALSE_VALUE;
-			}
-			raw_trace = raw_when_TMatchedRule2Relation;
-		}
-		else {
-			raw_trace = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_trace ? "done "  : "fail ") + "MAP_m_TInPattern2RelationDomain_rRule_p2");
-		}
-		return raw_trace;
-	}
-
-	/**
-	 *
-	 * map m_TMatchedRule2Relation_relTx_p2 in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::TMatchedRule2Relation[1];
-	 * var aModule : ATL::Module[1] := trace.aModule;
-	 * var rRule : qvtrelation::Relation[1] := trace.rRule;
-	 * var when_TModel2RelationalTransformation : PATL2QVTr::TModel2RelationalTransformation[1] := aModule.TModel2RelationalTransformation;
-	 * var relTx : qvtrelation::RelationalTransformation[1] := when_TModel2RelationalTransformation.relTx;
-	 * set rRule.transformation := relTx;
-	 * set trace.relTx := relTx;
-	 *
-	 */
-	protected boolean MAP_m_TMatchedRule2Relation_relTx_p2(final /*@NonInvalid*/ @NonNull TMatchedRule2Relation trace_2)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TMatchedRule2Relation_relTx_p2" + ", " + trace_2);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Module aModule = trace_2.getAModule();
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Relation rRule = trace_2.getRRule();
-		final /*@NonInvalid*/ @Nullable TModel2RelationalTransformation TModel2RelationalTransformation = OPPOSITE_OF_TModel2RelationalTransformation_module.get(aModule);
-		final /*@NonInvalid*/ boolean symbol_0 = TModel2RelationalTransformation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TModel2RelationalTransformation;
-		if (symbol_0) {
-			if (TModel2RelationalTransformation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@Thrown*/ @NonNull RelationalTransformation relTx = TModel2RelationalTransformation.getRelTx();
-			// mapping statements
-			rRule.setTransformation(relTx);
-			trace_2.setRelTx(relTx);
-			final /*@Thrown*/ @Nullable Boolean m_TMatchedRule2Relation_relTx_p2 = ValueUtil.TRUE_VALUE;
-			raw_when_TModel2RelationalTransformation = m_TMatchedRule2Relation_relTx_p2;
-		}
-		else {
-			raw_when_TModel2RelationalTransformation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TModel2RelationalTransformation ? "done "  : "fail ") + "MAP_m_TMatchedRule2Relation_relTx_p2");
-		}
-		return raw_when_TModel2RelationalTransformation;
-	}
-
-	/**
-	 *
-	 * map m_TOclModel2ModelParameter__create_aModule_oclModel__p0 in ATL2QVTr {
-	 * guard:atl oclModel  : OCL::OclModel[1];
-	 * append jm_TOclModel2ModelParameter__create  : PATL2QVTr::TOclModel2ModelParameter_create[1];
-	 * var aModule : ATL::Module[1] := oclModel.Module;
-	 * var tmName : String[1] := oclModel.name;
-	 * new:middle trace : PATL2QVTr::TOclModel2ModelParameter_create[1];
-	 * set trace.oclModel := oclModel;
-	 * set trace.tmName := tmName;
-	 * set trace.aModule := aModule;
-	 * add jm_TOclModel2ModelParameter__create += trace;
-	 *
-	 */
-	protected boolean MAP_m_TOclModel2ModelParameter__create_aModule_oclModel__p0(final @NonNull Connection jm_TOclModel2ModelParameter__create, final /*@NonInvalid*/ @NonNull OclModel oclModel)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TOclModel2ModelParameter__create_aModule_oclModel__p0" + ", " + jm_TOclModel2ModelParameter__create + ", " + oclModel);
-		}
-		final /*@NonInvalid*/ @NonNull UnboxedCompositionProperty IMPPROPid_inModels = new UnboxedCompositionProperty(PROPid_inModels);
-		final /*@NonInvalid*/ @Nullable Module Module = (Module)IMPPROPid_inModels.evaluate(executor, CLSSid_Module, oclModel);
-		final /*@NonInvalid*/ boolean symbol_0 = Module != null;
-		/*@Thrown*/ @Nullable Boolean raw_aModule;
-		if (symbol_0) {
-			if (Module == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@NonInvalid*/ @NonNull String name = oclModel.getName();
-			// creations
-			final @SuppressWarnings("null")@NonNull TOclModel2ModelParameter_create trace_7 = PATL2QVTrFactory.eINSTANCE.createTOclModel2ModelParameter_create();
-			models[0/*middle*/].add(trace_7, false);
-			// mapping statements
-			trace_7.setOclModel(oclModel);
-			trace_7.setTmName(name);
-			trace_7.setAModule(Module);
-			jm_TOclModel2ModelParameter__create.appendElement(trace_7);
-			final /*@Thrown*/ @Nullable Boolean m_TOclModel2ModelParameter__create_aModule_oclModel__p0 = ValueUtil.TRUE_VALUE;
-			raw_aModule = m_TOclModel2ModelParameter__create_aModule_oclModel__p0;
-		}
-		else {
-			raw_aModule = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_aModule ? "done "  : "fail ") + "MAP_m_TOclModel2ModelParameter__create_aModule_oclModel__p0");
-		}
-		return raw_aModule;
-	}
-
-	/**
-	 *
-	 * map m_TOclModel2ModelParameter__create_relTM_p1 in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::TOclModel2ModelParameter_create[1];
-	 * var aModule : ATL::Module[1] := trace.aModule;
-	 * var tmName : String[1] := trace.tmName;
-	 * var when_TModel2RelationalTransformation : PATL2QVTr::TModel2RelationalTransformation[1] := aModule.TModel2RelationalTransformation;
-	 * contained new:qvtr relTM : qvtbase::TypedModel[1];
-	 * set trace.relTM := relTM;
-	 * set relTM.name := tmName;
-	 *
-	 */
-	protected boolean MAP_m_TOclModel2ModelParameter__create_relTM_p1(final /*@NonInvalid*/ @NonNull TOclModel2ModelParameter_create trace_3)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TOclModel2ModelParameter__create_relTM_p1" + ", " + trace_3);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Module aModule = trace_3.getAModule();
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull String tmName = trace_3.getTmName();
-		final /*@NonInvalid*/ @Nullable TModel2RelationalTransformation TModel2RelationalTransformation = OPPOSITE_OF_TModel2RelationalTransformation_module.get(aModule);
-		final /*@NonInvalid*/ boolean symbol_0 = TModel2RelationalTransformation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TModel2RelationalTransformation;
-		if (symbol_0) {
-			if (TModel2RelationalTransformation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			// creations
-			final @NonNull TypedModel relTM = QVTbaseFactory.eINSTANCE.createTypedModel();
-			models[2/*qvtr*/].add(relTM, true);
-			// mapping statements
-			trace_3.setRelTM(relTM);
-			relTM.setName(tmName);
-			final /*@Thrown*/ @Nullable Boolean m_TOclModel2ModelParameter__create_relTM_p1 = ValueUtil.TRUE_VALUE;
-			raw_when_TModel2RelationalTransformation = m_TOclModel2ModelParameter__create_relTM_p1;
-		}
-		else {
-			raw_when_TModel2RelationalTransformation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TModel2RelationalTransformation ? "done "  : "fail ") + "MAP_m_TOclModel2ModelParameter__create_relTM_p1");
-		}
-		return raw_when_TModel2RelationalTransformation;
-	}
-
-	/**
-	 *
-	 * map m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0 in ATL2QVTr {
-	 * guard:atl oclModel  : OCL::OclModel[1];
-	 * append jm_TOclModel2ModelParameter__from  : PATL2QVTr::TOclModel2ModelParameter_from[1];
-	 * var aModule : ATL::Module[1] := oclModel.Module;
-	 * var tmName : String[1] := oclModel.name;
-	 * new:middle trace : PATL2QVTr::TOclModel2ModelParameter_from[1];
-	 * set trace.oclModel := oclModel;
-	 * set trace.tmName := tmName;
-	 * set trace.aModule := aModule;
-	 * add jm_TOclModel2ModelParameter__from += trace;
-	 *
-	 */
-	protected boolean MAP_m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0(final @NonNull Connection jm_TOclModel2ModelParameter__from, final /*@NonInvalid*/ @NonNull OclModel oclModel_0)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0" + ", " + jm_TOclModel2ModelParameter__from + ", " + oclModel_0);
-		}
-		final /*@NonInvalid*/ @NonNull UnboxedCompositionProperty IMPPROPid_outModels = new UnboxedCompositionProperty(PROPid_outModels);
-		final /*@NonInvalid*/ @Nullable Module Module = (Module)IMPPROPid_outModels.evaluate(executor, CLSSid_Module, oclModel_0);
-		final /*@NonInvalid*/ boolean symbol_0 = Module != null;
-		/*@Thrown*/ @Nullable Boolean raw_aModule;
-		if (symbol_0) {
-			if (Module == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@NonInvalid*/ @NonNull String name = oclModel_0.getName();
-			// creations
-			final @SuppressWarnings("null")@NonNull TOclModel2ModelParameter_from trace_7 = PATL2QVTrFactory.eINSTANCE.createTOclModel2ModelParameter_from();
-			models[0/*middle*/].add(trace_7, false);
-			// mapping statements
-			trace_7.setOclModel(oclModel_0);
-			trace_7.setTmName(name);
-			trace_7.setAModule(Module);
-			jm_TOclModel2ModelParameter__from.appendElement(trace_7);
-			final /*@Thrown*/ @Nullable Boolean m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0 = ValueUtil.TRUE_VALUE;
-			raw_aModule = m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0;
-		}
-		else {
-			raw_aModule = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_aModule ? "done "  : "fail ") + "MAP_m_TOclModel2ModelParameter__from_aModule_oclModel_tm_p0");
-		}
-		return raw_aModule;
-	}
-
-	/**
-	 *
-	 * map m_TOclModel2ModelParameter__from_relTM_p1 in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::TOclModel2ModelParameter_from[1];
-	 * var aModule : ATL::Module[1] := trace.aModule;
-	 * var tmName : String[1] := trace.tmName;
-	 * var when_TModel2RelationalTransformation : PATL2QVTr::TModel2RelationalTransformation[1] := aModule.TModel2RelationalTransformation;
-	 * contained new:qvtr relTM : qvtbase::TypedModel[1];
-	 * set trace.relTM := relTM;
-	 * set relTM.name := tmName;
-	 *
-	 */
-	protected boolean MAP_m_TOclModel2ModelParameter__from_relTM_p1(final /*@NonInvalid*/ @NonNull TOclModel2ModelParameter_from trace_4)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TOclModel2ModelParameter__from_relTM_p1" + ", " + trace_4);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Module aModule = trace_4.getAModule();
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull String tmName = trace_4.getTmName();
-		final /*@NonInvalid*/ @Nullable TModel2RelationalTransformation TModel2RelationalTransformation = OPPOSITE_OF_TModel2RelationalTransformation_module.get(aModule);
-		final /*@NonInvalid*/ boolean symbol_0 = TModel2RelationalTransformation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TModel2RelationalTransformation;
-		if (symbol_0) {
-			if (TModel2RelationalTransformation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			// creations
-			final @NonNull TypedModel relTM = QVTbaseFactory.eINSTANCE.createTypedModel();
-			models[2/*qvtr*/].add(relTM, true);
-			// mapping statements
-			trace_4.setRelTM(relTM);
-			relTM.setName(tmName);
-			final /*@Thrown*/ @Nullable Boolean m_TOclModel2ModelParameter__from_relTM_p1 = ValueUtil.TRUE_VALUE;
-			raw_when_TModel2RelationalTransformation = m_TOclModel2ModelParameter__from_relTM_p1;
-		}
-		else {
-			raw_when_TModel2RelationalTransformation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TModel2RelationalTransformation ? "done "  : "fail ") + "MAP_m_TOclModel2ModelParameter__from_relTM_p1");
-		}
-		return raw_when_TModel2RelationalTransformation;
-	}
-
-	/**
-	 *
-	 * map m_TOclModel2ModelParameter__create_relTx_p2 in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::TOclModel2ModelParameter_create[1];
-	 * var aModule : ATL::Module[1] := trace.aModule;
-	 * var relTM : qvtbase::TypedModel[1] := trace.relTM;
-	 * var when_TModel2RelationalTransformation : PATL2QVTr::TModel2RelationalTransformation[1] := aModule.TModel2RelationalTransformation;
-	 * var relTx : qvtrelation::RelationalTransformation[1] := when_TModel2RelationalTransformation.relTx;
-	 * set relTM.transformation := relTx;
-	 * set trace.relTx := relTx;
-	 *
-	 */
-	protected boolean MAP_m_TOclModel2ModelParameter__create_relTx_p2(final /*@NonInvalid*/ @NonNull TOclModel2ModelParameter_create trace_5)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TOclModel2ModelParameter__create_relTx_p2" + ", " + trace_5);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Module aModule = trace_5.getAModule();
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull TypedModel relTM = trace_5.getRelTM();
-		final /*@NonInvalid*/ @Nullable TModel2RelationalTransformation TModel2RelationalTransformation = OPPOSITE_OF_TModel2RelationalTransformation_module.get(aModule);
-		final /*@NonInvalid*/ boolean symbol_0 = TModel2RelationalTransformation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TModel2RelationalTransformation;
-		if (symbol_0) {
-			if (TModel2RelationalTransformation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@Thrown*/ @NonNull RelationalTransformation relTx = TModel2RelationalTransformation.getRelTx();
-			// mapping statements
-			relTM.setTransformation(relTx);
-			trace_5.setRelTx(relTx);
-			final /*@Thrown*/ @Nullable Boolean m_TOclModel2ModelParameter__create_relTx_p2 = ValueUtil.TRUE_VALUE;
-			raw_when_TModel2RelationalTransformation = m_TOclModel2ModelParameter__create_relTx_p2;
-		}
-		else {
-			raw_when_TModel2RelationalTransformation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TModel2RelationalTransformation ? "done "  : "fail ") + "MAP_m_TOclModel2ModelParameter__create_relTx_p2");
-		}
-		return raw_when_TModel2RelationalTransformation;
-	}
-
-	/**
-	 *
-	 * map m_TOclModel2ModelParameter__from_relTx_p2 in ATL2QVTr {
-	 * guard:middle trace  : PATL2QVTr::TOclModel2ModelParameter_from[1];
-	 * var aModule : ATL::Module[1] := trace.aModule;
-	 * var relTM : qvtbase::TypedModel[1] := trace.relTM;
-	 * var when_TModel2RelationalTransformation : PATL2QVTr::TModel2RelationalTransformation[1] := aModule.TModel2RelationalTransformation;
-	 * var relTx : qvtrelation::RelationalTransformation[1] := when_TModel2RelationalTransformation.relTx;
-	 * set trace.relTx := relTx;
-	 * set relTM.transformation := relTx;
-	 *
-	 */
-	protected boolean MAP_m_TOclModel2ModelParameter__from_relTx_p2(final /*@NonInvalid*/ @NonNull TOclModel2ModelParameter_from trace_6)  {
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println("invoke MAP_m_TOclModel2ModelParameter__from_relTx_p2" + ", " + trace_6);
-		}
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull Module aModule = trace_6.getAModule();
-		@SuppressWarnings("null")
-		final /*@NonInvalid*/ @NonNull TypedModel relTM = trace_6.getRelTM();
-		final /*@NonInvalid*/ @Nullable TModel2RelationalTransformation TModel2RelationalTransformation = OPPOSITE_OF_TModel2RelationalTransformation_module.get(aModule);
-		final /*@NonInvalid*/ boolean symbol_0 = TModel2RelationalTransformation != null;
-		/*@Thrown*/ @Nullable Boolean raw_when_TModel2RelationalTransformation;
-		if (symbol_0) {
-			if (TModel2RelationalTransformation == null) {
-				throw new InvalidEvaluationException("Null where non-null value required");
-			}
-			@SuppressWarnings("null")
-			final /*@Thrown*/ @NonNull RelationalTransformation relTx = TModel2RelationalTransformation.getRelTx();
-			// mapping statements
-			trace_6.setRelTx(relTx);
-			relTM.setTransformation(relTx);
-			final /*@Thrown*/ @Nullable Boolean m_TOclModel2ModelParameter__from_relTx_p2 = ValueUtil.TRUE_VALUE;
-			raw_when_TModel2RelationalTransformation = m_TOclModel2ModelParameter__from_relTx_p2;
-		}
-		else {
-			raw_when_TModel2RelationalTransformation = ValueUtil.FALSE_VALUE;
-		}
-		if (debugInvocations) {
-			AbstractTransformer.INVOCATIONS.println((raw_when_TModel2RelationalTransformation ? "done "  : "fail ") + "MAP_m_TOclModel2ModelParameter__from_relTx_p2");
-		}
-		return raw_when_TModel2RelationalTransformation;
-	}
-}
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SInPattern2RelationDomain_guard.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SInPattern2RelationDomain_guard.java
index 7a8623d1a..4e6ebe17d 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SInPattern2RelationDomain_guard.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SInPattern2RelationDomain_guard.java
@@ -12,6 +12,10 @@ package org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr;
 
 import org.eclipse.emf.ecore.EObject;
 
+import org.eclipse.m2m.atl.common.ATL.InPattern;
+
+import org.eclipse.qvtd.pivot.qvtrelation.Relation;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>SIn Pattern2 Relation Domain guard</b></em>'.
@@ -39,13 +43,14 @@ public interface SInPattern2RelationDomain_guard extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>APattern</em>' reference.
-	 * @see #setAPattern(SInPattern2RelationDomain_guard)
+	 * @see #setAPattern(InPattern)
 	 * @see org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage#getSInPattern2RelationDomain_guard_APattern()
 	 * @model required="true"
+	 *        annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='SInPattern2RelationDomain_guard' unique='false' upper='*'"
 	 *        annotation="http://www.eclipse.org/qvt#Domains referredDomain='atl'"
 	 * @generated
 	 */
-	SInPattern2RelationDomain_guard getAPattern();
+	InPattern getAPattern();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.SInPattern2RelationDomain_guard#getAPattern <em>APattern</em>}' reference.
@@ -55,7 +60,7 @@ public interface SInPattern2RelationDomain_guard extends EObject {
 	 * @see #getAPattern()
 	 * @generated
 	 */
-	void setAPattern(SInPattern2RelationDomain_guard value);
+	void setAPattern(InPattern value);
 
 	/**
 	 * Returns the value of the '<em><b>RRule</b></em>' reference.
@@ -66,13 +71,14 @@ public interface SInPattern2RelationDomain_guard extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>RRule</em>' reference.
-	 * @see #setRRule(SInPattern2RelationDomain_guard)
+	 * @see #setRRule(Relation)
 	 * @see org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage#getSInPattern2RelationDomain_guard_RRule()
 	 * @model required="true"
+	 *        annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='SInPattern2RelationDomain_guard' unique='false' upper='*'"
 	 *        annotation="http://www.eclipse.org/qvt#Domains referredDomain='qvtr'"
 	 * @generated
 	 */
-	SInPattern2RelationDomain_guard getRRule();
+	Relation getRRule();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.SInPattern2RelationDomain_guard#getRRule <em>RRule</em>}' reference.
@@ -82,6 +88,6 @@ public interface SInPattern2RelationDomain_guard extends EObject {
 	 * @see #getRRule()
 	 * @generated
 	 */
-	void setRRule(SInPattern2RelationDomain_guard value);
+	void setRRule(Relation value);
 
 } // SInPattern2RelationDomain_guard
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SOclExpression2OCLExpression.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SOclExpression2OCLExpression.java
index d03ebcf96..cdd855c9c 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SOclExpression2OCLExpression.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/SOclExpression2OCLExpression.java
@@ -12,6 +12,10 @@ package org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr;
 
 import org.eclipse.emf.ecore.EObject;
 
+import org.eclipse.m2m.atl.common.OCL.OclExpression;
+
+import org.eclipse.ocl.pivot.OCLExpression;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>SOcl Expression2 OCL Expression</b></em>'.
@@ -39,13 +43,14 @@ public interface SOclExpression2OCLExpression extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>AExpression</em>' reference.
-	 * @see #setAExpression(SOclExpression2OCLExpression)
+	 * @see #setAExpression(OclExpression)
 	 * @see org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage#getSOclExpression2OCLExpression_AExpression()
 	 * @model required="true"
+	 *        annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='SOclExpression2OCLExpression'"
 	 *        annotation="http://www.eclipse.org/qvt#Domains referredDomain='atl'"
 	 * @generated
 	 */
-	SOclExpression2OCLExpression getAExpression();
+	OclExpression getAExpression();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.SOclExpression2OCLExpression#getAExpression <em>AExpression</em>}' reference.
@@ -55,7 +60,7 @@ public interface SOclExpression2OCLExpression extends EObject {
 	 * @see #getAExpression()
 	 * @generated
 	 */
-	void setAExpression(SOclExpression2OCLExpression value);
+	void setAExpression(OclExpression value);
 
 	/**
 	 * Returns the value of the '<em><b>RExpression</b></em>' reference.
@@ -66,13 +71,14 @@ public interface SOclExpression2OCLExpression extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>RExpression</em>' reference.
-	 * @see #setRExpression(SOclExpression2OCLExpression)
+	 * @see #setRExpression(OCLExpression)
 	 * @see org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage#getSOclExpression2OCLExpression_RExpression()
 	 * @model required="true"
+	 *        annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='SOclExpression2OCLExpression'"
 	 *        annotation="http://www.eclipse.org/qvt#Domains referredDomain='qvtr'"
 	 * @generated
 	 */
-	SOclExpression2OCLExpression getRExpression();
+	OCLExpression getRExpression();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.SOclExpression2OCLExpression#getRExpression <em>RExpression</em>}' reference.
@@ -82,6 +88,6 @@ public interface SOclExpression2OCLExpression extends EObject {
 	 * @see #getRExpression()
 	 * @generated
 	 */
-	void setRExpression(SOclExpression2OCLExpression value);
+	void setRExpression(OCLExpression value);
 
 } // SOclExpression2OCLExpression
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain.java
index 929c1a2ac..c3864dc3d 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain.java
@@ -188,7 +188,7 @@ public interface TInPattern2RelationDomain extends EObject {
 	 * @return the value of the '<em>Where In Pattern2 Relation Domain guard</em>' reference.
 	 * @see #setWhere_InPattern2RelationDomain_guard(SInPattern2RelationDomain_guard)
 	 * @see org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage#getTInPattern2RelationDomain_Where_InPattern2RelationDomain_guard()
-	 * @model resolveProxies="false" transient="true"
+	 * @model
 	 * @generated
 	 */
 	SInPattern2RelationDomain_guard getWhere_InPattern2RelationDomain_guard();
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain_guard.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain_guard.java
index e05ba0f23..c8fe5354d 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain_guard.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/TInPattern2RelationDomain_guard.java
@@ -217,7 +217,7 @@ public interface TInPattern2RelationDomain_guard extends EObject {
 	 * @return the value of the '<em>When Ocl Expression2 OCL Expression</em>' reference.
 	 * @see #setWhen_OclExpression2OCLExpression(SOclExpression2OCLExpression)
 	 * @see org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage#getTInPattern2RelationDomain_guard_When_OclExpression2OCLExpression()
-	 * @model resolveProxies="false" transient="true"
+	 * @model
 	 * @generated
 	 */
 	SOclExpression2OCLExpression getWhen_OclExpression2OCLExpression();
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/PATL2QVTrPackageImpl.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/PATL2QVTrPackageImpl.java
index 5f9514e88..25204ad5b 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/PATL2QVTrPackageImpl.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/PATL2QVTrPackageImpl.java
@@ -859,12 +859,12 @@ public class PATL2QVTrPackageImpl extends EPackageImpl implements PATL2QVTrPacka
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		PATL2QVTrPackage thePATL2QVTrPackage_1 = (PATL2QVTrPackage)EPackage.Registry.INSTANCE.getEPackage(PATL2QVTrPackage.eNS_URI);
-		OCLPackage theOCLPackage = (OCLPackage)EPackage.Registry.INSTANCE.getEPackage(OCLPackage.eNS_URI);
 		ATLPackage theATLPackage = (ATLPackage)EPackage.Registry.INSTANCE.getEPackage(ATLPackage.eNS_URI);
-		QVTbasePackage theQVTbasePackage = (QVTbasePackage)EPackage.Registry.INSTANCE.getEPackage(QVTbasePackage.eNS_URI);
 		QVTrelationPackage theQVTrelationPackage = (QVTrelationPackage)EPackage.Registry.INSTANCE.getEPackage(QVTrelationPackage.eNS_URI);
+		OCLPackage theOCLPackage = (OCLPackage)EPackage.Registry.INSTANCE.getEPackage(OCLPackage.eNS_URI);
 		PivotPackage thePivotPackage = (PivotPackage)EPackage.Registry.INSTANCE.getEPackage(PivotPackage.eNS_URI);
+		QVTbasePackage theQVTbasePackage = (QVTbasePackage)EPackage.Registry.INSTANCE.getEPackage(QVTbasePackage.eNS_URI);
+		PATL2QVTrPackage thePATL2QVTrPackage_1 = (PATL2QVTrPackage)EPackage.Registry.INSTANCE.getEPackage(PATL2QVTrPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -874,12 +874,12 @@ public class PATL2QVTrPackageImpl extends EPackageImpl implements PATL2QVTrPacka
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(sInPattern2RelationDomain_guardEClass, SInPattern2RelationDomain_guard.class, "SInPattern2RelationDomain_guard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSInPattern2RelationDomain_guard_APattern(), thePATL2QVTrPackage_1.getSInPattern2RelationDomain_guard(), null, "aPattern", null, 1, 1, SInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSInPattern2RelationDomain_guard_RRule(), thePATL2QVTrPackage_1.getSInPattern2RelationDomain_guard(), null, "rRule", null, 1, 1, SInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSInPattern2RelationDomain_guard_APattern(), theATLPackage.getInPattern(), null, "aPattern", null, 1, 1, SInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSInPattern2RelationDomain_guard_RRule(), theQVTrelationPackage.getRelation(), null, "rRule", null, 1, 1, SInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(sOclExpression2OCLExpressionEClass, SOclExpression2OCLExpression.class, "SOclExpression2OCLExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSOclExpression2OCLExpression_AExpression(), thePATL2QVTrPackage_1.getSOclExpression2OCLExpression(), null, "aExpression", null, 1, 1, SOclExpression2OCLExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSOclExpression2OCLExpression_RExpression(), thePATL2QVTrPackage_1.getSOclExpression2OCLExpression(), null, "rExpression", null, 1, 1, SOclExpression2OCLExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSOclExpression2OCLExpression_AExpression(), theOCLPackage.getOclExpression(), null, "aExpression", null, 1, 1, SOclExpression2OCLExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSOclExpression2OCLExpression_RExpression(), thePivotPackage.getOCLExpression(), null, "rExpression", null, 1, 1, SOclExpression2OCLExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(tHelper2FunctionEClass, THelper2Function.class, "THelper2Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getTHelper2Function_ADef(), theOCLPackage.getOclFeatureDefinition(), null, "aDef", null, 1, 1, THelper2Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -896,7 +896,7 @@ public class PATL2QVTrPackageImpl extends EPackageImpl implements PATL2QVTrPacka
 		initEReference(getTInPattern2RelationDomain_RDomain(), theQVTrelationPackage.getRelationDomain(), null, "rDomain", null, 1, 1, TInPattern2RelationDomain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getTInPattern2RelationDomain_RRule(), theQVTrelationPackage.getRelation(), null, "rRule", null, 1, 1, TInPattern2RelationDomain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getTInPattern2RelationDomain_TmName(), ecorePackage.getEString(), "tmName", null, 1, 1, TInPattern2RelationDomain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTInPattern2RelationDomain_Where_InPattern2RelationDomain_guard(), thePATL2QVTrPackage_1.getSInPattern2RelationDomain_guard(), null, "where_InPattern2RelationDomain_guard", null, 0, 1, TInPattern2RelationDomain.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTInPattern2RelationDomain_Where_InPattern2RelationDomain_guard(), thePATL2QVTrPackage_1.getSInPattern2RelationDomain_guard(), null, "where_InPattern2RelationDomain_guard", null, 0, 1, TInPattern2RelationDomain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(tInPattern2RelationDomain_guardEClass, TInPattern2RelationDomain_guard.class, "TInPattern2RelationDomain_guard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getTInPattern2RelationDomain_guard_AExpression(), theOCLPackage.getOperationCallExp(), null, "aExpression", null, 1, 1, TInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -905,7 +905,7 @@ public class PATL2QVTrPackageImpl extends EPackageImpl implements PATL2QVTrPacka
 		initEReference(getTInPattern2RelationDomain_guard_RExpression(), thePivotPackage.getOperationCallExp(), null, "rExpression", null, 1, 1, TInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getTInPattern2RelationDomain_guard_RRule(), theQVTrelationPackage.getRelation(), null, "rRule", null, 1, 1, TInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getTInPattern2RelationDomain_guard_W(), theQVTbasePackage.getPattern(), null, "w", null, 1, 1, TInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTInPattern2RelationDomain_guard_When_OclExpression2OCLExpression(), thePATL2QVTrPackage_1.getSOclExpression2OCLExpression(), null, "when_OclExpression2OCLExpression", null, 0, 1, TInPattern2RelationDomain_guard.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTInPattern2RelationDomain_guard_When_OclExpression2OCLExpression(), thePATL2QVTrPackage_1.getSOclExpression2OCLExpression(), null, "when_OclExpression2OCLExpression", null, 0, 1, TInPattern2RelationDomain_guard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(tMatchedRule2RelationEClass, TMatchedRule2Relation.class, "TMatchedRule2Relation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getTMatchedRule2Relation_AModule(), theATLPackage.getModule(), null, "aModule", null, 1, 1, TMatchedRule2Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -947,10 +947,138 @@ public class PATL2QVTrPackageImpl extends EPackageImpl implements PATL2QVTrPacka
 		createResource(eNS_URI);
 
 		// Create annotations
-		// http://www.eclipse.org/qvt#Domains
-		createQvtDomainsAnnotations();
 		// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
 		createEmofAnnotations();
+		// http://www.eclipse.org/qvt#Domains
+		createQvtDomainsAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEmofAnnotations() {
+		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";	
+		addAnnotation
+		  (getSInPattern2RelationDomain_guard_APattern(), 
+		   source, 
+		   new String[] {
+			 "body", "SInPattern2RelationDomain_guard",
+			 "unique", "false",
+			 "upper", "*"
+		   });	
+		addAnnotation
+		  (getSInPattern2RelationDomain_guard_RRule(), 
+		   source, 
+		   new String[] {
+			 "body", "SInPattern2RelationDomain_guard",
+			 "unique", "false",
+			 "upper", "*"
+		   });	
+		addAnnotation
+		  (getSOclExpression2OCLExpression_AExpression(), 
+		   source, 
+		   new String[] {
+			 "body", "SOclExpression2OCLExpression"
+		   });	
+		addAnnotation
+		  (getSOclExpression2OCLExpression_RExpression(), 
+		   source, 
+		   new String[] {
+			 "body", "SOclExpression2OCLExpression"
+		   });	
+		addAnnotation
+		  (getTHelper2Function_ADef(), 
+		   source, 
+		   new String[] {
+			 "body", "THelper2Function"
+		   });	
+		addAnnotation
+		  (getTHelper2Function_AFeat(), 
+		   source, 
+		   new String[] {
+			 "body", "THelper2Function"
+		   });	
+		addAnnotation
+		  (getTHelper2Function_Function(), 
+		   source, 
+		   new String[] {
+			 "body", "THelper2Function"
+		   });	
+		addAnnotation
+		  (getTHelper2Function_Helper(), 
+		   source, 
+		   new String[] {
+			 "body", "THelper2Function"
+		   });	
+		addAnnotation
+		  (getTInPattern2RelationDomain_APattern(), 
+		   source, 
+		   new String[] {
+			 "body", "TInPattern2RelationDomain"
+		   });	
+		addAnnotation
+		  (getTInPattern2RelationDomain_ARule(), 
+		   source, 
+		   new String[] {
+			 "body", "TInPattern2RelationDomain"
+		   });	
+		addAnnotation
+		  (getTInPattern2RelationDomain_RDomain(), 
+		   source, 
+		   new String[] {
+			 "body", "TInPattern2RelationDomain"
+		   });	
+		addAnnotation
+		  (getTMatchedRule2Relation_MatchedRule(), 
+		   source, 
+		   new String[] {
+			 "body", "TMatchedRule2Relation"
+		   });	
+		addAnnotation
+		  (getTMatchedRule2Relation_RRule(), 
+		   source, 
+		   new String[] {
+			 "body", "TMatchedRule2Relation"
+		   });	
+		addAnnotation
+		  (getTModel2RelationalTransformation_Module(), 
+		   source, 
+		   new String[] {
+			 "body", "TModel2RelationalTransformation"
+		   });	
+		addAnnotation
+		  (getTModel2RelationalTransformation_RelTx(), 
+		   source, 
+		   new String[] {
+			 "body", "TModel2RelationalTransformation"
+		   });	
+		addAnnotation
+		  (getTOclExpression2OCLExpression_AExpression(), 
+		   source, 
+		   new String[] {
+			 "body", "TOclExpression2OCLExpression"
+		   });	
+		addAnnotation
+		  (getTOclExpression2OCLExpression_RExpression(), 
+		   source, 
+		   new String[] {
+			 "body", "TOclExpression2OCLExpression"
+		   });	
+		addAnnotation
+		  (getTOperationCallExp2OperationCallExp_AExpression(), 
+		   source, 
+		   new String[] {
+			 "body", "TOperationCallExp2OperationCallExp"
+		   });	
+		addAnnotation
+		  (getTOperationCallExp2OperationCallExp_RExpression(), 
+		   source, 
+		   new String[] {
+			 "body", "TOperationCallExp2OperationCallExp"
+		   });
 	}
 
 	/**
@@ -1203,104 +1331,4 @@ public class PATL2QVTrPackageImpl extends EPackageImpl implements PATL2QVTrPacka
 		   });
 	}
 
-	/**
-	 * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createEmofAnnotations() {
-		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";	
-		addAnnotation
-		  (getTHelper2Function_ADef(), 
-		   source, 
-		   new String[] {
-			 "body", "THelper2Function"
-		   });	
-		addAnnotation
-		  (getTHelper2Function_AFeat(), 
-		   source, 
-		   new String[] {
-			 "body", "THelper2Function"
-		   });	
-		addAnnotation
-		  (getTHelper2Function_Function(), 
-		   source, 
-		   new String[] {
-			 "body", "THelper2Function"
-		   });	
-		addAnnotation
-		  (getTHelper2Function_Helper(), 
-		   source, 
-		   new String[] {
-			 "body", "THelper2Function"
-		   });	
-		addAnnotation
-		  (getTInPattern2RelationDomain_APattern(), 
-		   source, 
-		   new String[] {
-			 "body", "TInPattern2RelationDomain"
-		   });	
-		addAnnotation
-		  (getTInPattern2RelationDomain_ARule(), 
-		   source, 
-		   new String[] {
-			 "body", "TInPattern2RelationDomain"
-		   });	
-		addAnnotation
-		  (getTInPattern2RelationDomain_RDomain(), 
-		   source, 
-		   new String[] {
-			 "body", "TInPattern2RelationDomain"
-		   });	
-		addAnnotation
-		  (getTMatchedRule2Relation_MatchedRule(), 
-		   source, 
-		   new String[] {
-			 "body", "TMatchedRule2Relation"
-		   });	
-		addAnnotation
-		  (getTMatchedRule2Relation_RRule(), 
-		   source, 
-		   new String[] {
-			 "body", "TMatchedRule2Relation"
-		   });	
-		addAnnotation
-		  (getTModel2RelationalTransformation_Module(), 
-		   source, 
-		   new String[] {
-			 "body", "TModel2RelationalTransformation"
-		   });	
-		addAnnotation
-		  (getTModel2RelationalTransformation_RelTx(), 
-		   source, 
-		   new String[] {
-			 "body", "TModel2RelationalTransformation"
-		   });	
-		addAnnotation
-		  (getTOclExpression2OCLExpression_AExpression(), 
-		   source, 
-		   new String[] {
-			 "body", "TOclExpression2OCLExpression"
-		   });	
-		addAnnotation
-		  (getTOclExpression2OCLExpression_RExpression(), 
-		   source, 
-		   new String[] {
-			 "body", "TOclExpression2OCLExpression"
-		   });	
-		addAnnotation
-		  (getTOperationCallExp2OperationCallExp_AExpression(), 
-		   source, 
-		   new String[] {
-			 "body", "TOperationCallExp2OperationCallExp"
-		   });	
-		addAnnotation
-		  (getTOperationCallExp2OperationCallExp_RExpression(), 
-		   source, 
-		   new String[] {
-			 "body", "TOperationCallExp2OperationCallExp"
-		   });
-	}
-
 } //PATL2QVTrPackageImpl
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SInPattern2RelationDomain_guardImpl.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SInPattern2RelationDomain_guardImpl.java
index 81afa7b3d..bacc5c3e2 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SInPattern2RelationDomain_guardImpl.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SInPattern2RelationDomain_guardImpl.java
@@ -18,9 +18,13 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
+import org.eclipse.m2m.atl.common.ATL.InPattern;
+
 import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage;
 import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.SInPattern2RelationDomain_guard;
 
+import org.eclipse.qvtd.pivot.qvtrelation.Relation;
+
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>SIn Pattern2 Relation Domain guard</b></em>'.
@@ -44,7 +48,7 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * @generated
 	 * @ordered
 	 */
-	protected SInPattern2RelationDomain_guard aPattern;
+	protected InPattern aPattern;
 
 	/**
 	 * The cached value of the '{@link #getRRule() <em>RRule</em>}' reference.
@@ -54,7 +58,7 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * @generated
 	 * @ordered
 	 */
-	protected SInPattern2RelationDomain_guard rRule;
+	protected Relation rRule;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -80,10 +84,10 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SInPattern2RelationDomain_guard getAPattern() {
+	public InPattern getAPattern() {
 		if (aPattern != null && aPattern.eIsProxy()) {
 			InternalEObject oldAPattern = (InternalEObject)aPattern;
-			aPattern = (SInPattern2RelationDomain_guard)eResolveProxy(oldAPattern);
+			aPattern = (InPattern)eResolveProxy(oldAPattern);
 			if (aPattern != oldAPattern) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__APATTERN, oldAPattern, aPattern));
@@ -97,7 +101,7 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SInPattern2RelationDomain_guard basicGetAPattern() {
+	public InPattern basicGetAPattern() {
 		return aPattern;
 	}
 
@@ -106,8 +110,8 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAPattern(SInPattern2RelationDomain_guard newAPattern) {
-		SInPattern2RelationDomain_guard oldAPattern = aPattern;
+	public void setAPattern(InPattern newAPattern) {
+		InPattern oldAPattern = aPattern;
 		aPattern = newAPattern;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__APATTERN, oldAPattern, aPattern));
@@ -118,10 +122,10 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SInPattern2RelationDomain_guard getRRule() {
+	public Relation getRRule() {
 		if (rRule != null && rRule.eIsProxy()) {
 			InternalEObject oldRRule = (InternalEObject)rRule;
-			rRule = (SInPattern2RelationDomain_guard)eResolveProxy(oldRRule);
+			rRule = (Relation)eResolveProxy(oldRRule);
 			if (rRule != oldRRule) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__RRULE, oldRRule, rRule));
@@ -135,7 +139,7 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SInPattern2RelationDomain_guard basicGetRRule() {
+	public Relation basicGetRRule() {
 		return rRule;
 	}
 
@@ -144,8 +148,8 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setRRule(SInPattern2RelationDomain_guard newRRule) {
-		SInPattern2RelationDomain_guard oldRRule = rRule;
+	public void setRRule(Relation newRRule) {
+		Relation oldRRule = rRule;
 		rRule = newRRule;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__RRULE, oldRRule, rRule));
@@ -178,10 +182,10 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__APATTERN:
-				setAPattern((SInPattern2RelationDomain_guard)newValue);
+				setAPattern((InPattern)newValue);
 				return;
 			case PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__RRULE:
-				setRRule((SInPattern2RelationDomain_guard)newValue);
+				setRRule((Relation)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -196,10 +200,10 @@ public class SInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	public void eUnset(int featureID) {
 		switch (featureID) {
 			case PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__APATTERN:
-				setAPattern((SInPattern2RelationDomain_guard)null);
+				setAPattern((InPattern)null);
 				return;
 			case PATL2QVTrPackage.SIN_PATTERN2_RELATION_DOMAIN_GUARD__RRULE:
-				setRRule((SInPattern2RelationDomain_guard)null);
+				setRRule((Relation)null);
 				return;
 		}
 		super.eUnset(featureID);
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SOclExpression2OCLExpressionImpl.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SOclExpression2OCLExpressionImpl.java
index 72f7b29a1..0425eb88d 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SOclExpression2OCLExpressionImpl.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/SOclExpression2OCLExpressionImpl.java
@@ -18,6 +18,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
+import org.eclipse.m2m.atl.common.OCL.OclExpression;
+
+import org.eclipse.ocl.pivot.OCLExpression;
+
 import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.PATL2QVTrPackage;
 import org.eclipse.qvtd.atl.atl2qvtr.PATL2QVTr.SOclExpression2OCLExpression;
 
@@ -44,7 +48,7 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * @generated
 	 * @ordered
 	 */
-	protected SOclExpression2OCLExpression aExpression;
+	protected OclExpression aExpression;
 
 	/**
 	 * The cached value of the '{@link #getRExpression() <em>RExpression</em>}' reference.
@@ -54,7 +58,7 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * @generated
 	 * @ordered
 	 */
-	protected SOclExpression2OCLExpression rExpression;
+	protected OCLExpression rExpression;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -80,10 +84,10 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SOclExpression2OCLExpression getAExpression() {
+	public OclExpression getAExpression() {
 		if (aExpression != null && aExpression.eIsProxy()) {
 			InternalEObject oldAExpression = (InternalEObject)aExpression;
-			aExpression = (SOclExpression2OCLExpression)eResolveProxy(oldAExpression);
+			aExpression = (OclExpression)eResolveProxy(oldAExpression);
 			if (aExpression != oldAExpression) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__AEXPRESSION, oldAExpression, aExpression));
@@ -97,7 +101,7 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SOclExpression2OCLExpression basicGetAExpression() {
+	public OclExpression basicGetAExpression() {
 		return aExpression;
 	}
 
@@ -106,8 +110,8 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAExpression(SOclExpression2OCLExpression newAExpression) {
-		SOclExpression2OCLExpression oldAExpression = aExpression;
+	public void setAExpression(OclExpression newAExpression) {
+		OclExpression oldAExpression = aExpression;
 		aExpression = newAExpression;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__AEXPRESSION, oldAExpression, aExpression));
@@ -118,10 +122,10 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SOclExpression2OCLExpression getRExpression() {
+	public OCLExpression getRExpression() {
 		if (rExpression != null && rExpression.eIsProxy()) {
 			InternalEObject oldRExpression = (InternalEObject)rExpression;
-			rExpression = (SOclExpression2OCLExpression)eResolveProxy(oldRExpression);
+			rExpression = (OCLExpression)eResolveProxy(oldRExpression);
 			if (rExpression != oldRExpression) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__REXPRESSION, oldRExpression, rExpression));
@@ -135,7 +139,7 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SOclExpression2OCLExpression basicGetRExpression() {
+	public OCLExpression basicGetRExpression() {
 		return rExpression;
 	}
 
@@ -144,8 +148,8 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setRExpression(SOclExpression2OCLExpression newRExpression) {
-		SOclExpression2OCLExpression oldRExpression = rExpression;
+	public void setRExpression(OCLExpression newRExpression) {
+		OCLExpression oldRExpression = rExpression;
 		rExpression = newRExpression;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__REXPRESSION, oldRExpression, rExpression));
@@ -178,10 +182,10 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__AEXPRESSION:
-				setAExpression((SOclExpression2OCLExpression)newValue);
+				setAExpression((OclExpression)newValue);
 				return;
 			case PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__REXPRESSION:
-				setRExpression((SOclExpression2OCLExpression)newValue);
+				setRExpression((OCLExpression)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -196,10 +200,10 @@ public class SOclExpression2OCLExpressionImpl extends MinimalEObjectImpl.Contain
 	public void eUnset(int featureID) {
 		switch (featureID) {
 			case PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__AEXPRESSION:
-				setAExpression((SOclExpression2OCLExpression)null);
+				setAExpression((OclExpression)null);
 				return;
 			case PATL2QVTrPackage.SOCL_EXPRESSION2_OCL_EXPRESSION__REXPRESSION:
-				setRExpression((SOclExpression2OCLExpression)null);
+				setRExpression((OCLExpression)null);
 				return;
 		}
 		super.eUnset(featureID);
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomainImpl.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomainImpl.java
index 3451f5f27..ad659b459 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomainImpl.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomainImpl.java
@@ -315,6 +315,23 @@ public class TInPattern2RelationDomainImpl extends MinimalEObjectImpl.Container
 	 * @generated
 	 */
 	public SInPattern2RelationDomain_guard getWhere_InPattern2RelationDomain_guard() {
+		if (where_InPattern2RelationDomain_guard != null && where_InPattern2RelationDomain_guard.eIsProxy()) {
+			InternalEObject oldWhere_InPattern2RelationDomain_guard = (InternalEObject)where_InPattern2RelationDomain_guard;
+			where_InPattern2RelationDomain_guard = (SInPattern2RelationDomain_guard)eResolveProxy(oldWhere_InPattern2RelationDomain_guard);
+			if (where_InPattern2RelationDomain_guard != oldWhere_InPattern2RelationDomain_guard) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PATL2QVTrPackage.TIN_PATTERN2_RELATION_DOMAIN__WHERE_IN_PATTERN2_RELATION_DOMAIN_GUARD, oldWhere_InPattern2RelationDomain_guard, where_InPattern2RelationDomain_guard));
+			}
+		}
+		return where_InPattern2RelationDomain_guard;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SInPattern2RelationDomain_guard basicGetWhere_InPattern2RelationDomain_guard() {
 		return where_InPattern2RelationDomain_guard;
 	}
 
@@ -353,7 +370,8 @@ public class TInPattern2RelationDomainImpl extends MinimalEObjectImpl.Container
 			case PATL2QVTrPackage.TIN_PATTERN2_RELATION_DOMAIN__TM_NAME:
 				return getTmName();
 			case PATL2QVTrPackage.TIN_PATTERN2_RELATION_DOMAIN__WHERE_IN_PATTERN2_RELATION_DOMAIN_GUARD:
-				return getWhere_InPattern2RelationDomain_guard();
+				if (resolve) return getWhere_InPattern2RelationDomain_guard();
+				return basicGetWhere_InPattern2RelationDomain_guard();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
diff --git a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomain_guardImpl.java b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomain_guardImpl.java
index c4ff030b1..fd040ebe0 100644
--- a/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomain_guardImpl.java
+++ b/plugins/org.eclipse.qvtd.atl/src-gen/org/eclipse/qvtd/atl/atl2qvtr/PATL2QVTr/impl/TInPattern2RelationDomain_guardImpl.java
@@ -374,6 +374,23 @@ public class TInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 	 * @generated
 	 */
 	public SOclExpression2OCLExpression getWhen_OclExpression2OCLExpression() {
+		if (when_OclExpression2OCLExpression != null && when_OclExpression2OCLExpression.eIsProxy()) {
+			InternalEObject oldWhen_OclExpression2OCLExpression = (InternalEObject)when_OclExpression2OCLExpression;
+			when_OclExpression2OCLExpression = (SOclExpression2OCLExpression)eResolveProxy(oldWhen_OclExpression2OCLExpression);
+			if (when_OclExpression2OCLExpression != oldWhen_OclExpression2OCLExpression) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PATL2QVTrPackage.TIN_PATTERN2_RELATION_DOMAIN_GUARD__WHEN_OCL_EXPRESSION2_OCL_EXPRESSION, oldWhen_OclExpression2OCLExpression, when_OclExpression2OCLExpression));
+			}
+		}
+		return when_OclExpression2OCLExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SOclExpression2OCLExpression basicGetWhen_OclExpression2OCLExpression() {
 		return when_OclExpression2OCLExpression;
 	}
 
@@ -416,7 +433,8 @@ public class TInPattern2RelationDomain_guardImpl extends MinimalEObjectImpl.Cont
 				if (resolve) return getW();
 				return basicGetW();
 			case PATL2QVTrPackage.TIN_PATTERN2_RELATION_DOMAIN_GUARD__WHEN_OCL_EXPRESSION2_OCL_EXPRESSION:
-				return getWhen_OclExpression2OCLExpression();
+				if (resolve) return getWhen_OclExpression2OCLExpression();
+				return basicGetWhen_OclExpression2OCLExpression();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
diff --git a/plugins/org.eclipse.qvtd.atl/src/org/eclipse/qvtd/atl/atl2qvtr/.~lock.ATL2QVTr.odt# b/plugins/org.eclipse.qvtd.atl/src/org/eclipse/qvtd/atl/atl2qvtr/.~lock.ATL2QVTr.odt#
deleted file mode 100644
index 150a16b33..000000000
--- a/plugins/org.eclipse.qvtd.atl/src/org/eclipse/qvtd/atl/atl2qvtr/.~lock.ATL2QVTr.odt#
+++ /dev/null
@@ -1 +0,0 @@
-Edward Willink,CHITAL/Edward,CHITAL,13.04.2017 17:37,file:///C:/Users/Edward/AppData/Roaming/OpenOffice/4;
\ No newline at end of file
diff --git a/plugins/org.eclipse.qvtd.atl/src/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr.odt b/plugins/org.eclipse.qvtd.atl/src/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr.odt
index 105849873..2af3e68f4 100644
--- a/plugins/org.eclipse.qvtd.atl/src/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr.odt
+++ b/plugins/org.eclipse.qvtd.atl/src/org/eclipse/qvtd/atl/atl2qvtr/ATL2QVTr.odt
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
index ca245bb20..ffcad1053 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
@@ -32,7 +32,6 @@ import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.CompilerChain.Key;
 import org.eclipse.qvtd.compiler.QVTrCompilerChain;
 import org.eclipse.qvtd.compiler.internal.qvtm2qvts.QVTm2QVTs;
-import org.eclipse.qvtd.compiler.internal.qvtr2qvtc.QVTr2QVTc;
 import org.eclipse.qvtd.compiler.internal.qvts2qvts.merger.EarlyMerger;
 import org.eclipse.qvtd.compiler.internal.qvts2qvts.merger.LateConsumerMerger;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTransformation;