fix junit/rcptt tests & update related patterns & fix pom

Change-Id: Ibb07e1bfe9eb9055cb0941371d8d387fccd6d72d
diff --git a/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar b/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar
index 9c3af85..e69de29 100644
--- a/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar
+++ b/plugins/org.eclipse.egf.application/ant_tasks/egf.ant.tasks.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index 2f34ea3..30c5e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2018 THALES GLOBAL SERVICES.
+  Copyright (c) 2018, 2019 THALES GLOBAL SERVICES.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -54,8 +54,8 @@
 	  	<sonar.exclusions>**/generated/**/*.java,**/src-gen/**/*.java</sonar.exclusions>
 	  	<sonar.test.exclusions>**/tests/**/*.java,**/test/**/*.java</sonar.test.exclusions>
 
-		<!--  useless properties ? -->
-		<testFiltreClass>**/*TestSuite.java</testFiltreClass>
+		<os>linux</os>
+		<ws>gtk</ws>
 	  	
 
 	</properties>
@@ -178,7 +178,11 @@
 				<activeByDefault>false</activeByDefault>
 			</activation>
 			<modules>
-				<module>tests/org.eclipse.emf.egf.core.test.rcptt</module> 
+ 				<module>tests/org.eclipse.emf.egf.core.test.rcptt</module> 
+				<module>tests/org.eclipse.egf.core.test</module>
+				<module>tests/org.eclipse.egf.core.test.model</module>
+
+				<module>tests/org.eclipse.egf.core.test.pattern</module>
 			</modules>
 		</profile>
 		<profile>
@@ -188,11 +192,6 @@
 			</activation>
 			<modules>
 				<!-- plugins -->
-				<module>tests/org.eclipse.egf.core.test</module>
-				<module>tests/org.eclipse.egf.core.test.model</module>
-				<module>tests/org.eclipse.egf.core.test.model.edit</module>
-				<module>tests/org.eclipse.egf.core.test.model.editor</module>
-				<module>tests/org.eclipse.egf.core.test.pattern</module>
 				<module>tests/org.eclipse.egf.portfolio.task.ant.test</module>
 				<module>examples/workspace/org.eclipse.egf.examples.installer</module>
 				<module>examples/workspace/org.eclipse.egf.example.emf.docgen.html</module>
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
index a467dbb..8cd6dec 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
@@ -53,6 +53,7 @@
 import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
 import org.eclipse.sirius.business.api.dialect.DialectManager;
 import org.eclipse.sirius.business.api.dialect.command.CreateRepresentationCommand;
+import org.eclipse.sirius.business.api.dialect.command.RefreshRepresentationsCommand;
 import org.eclipse.sirius.business.api.modelingproject.ModelingProject;
 import org.eclipse.sirius.business.api.session.CustomDataConstants;
 import org.eclipse.sirius.business.api.session.DefaultLocalSessionCreationOperation;
@@ -321,13 +322,7 @@
 	 */
 	private void refreshDiagram(final Session session, final DDiagram diagram) {
 		final TransactionalEditingDomain editingDomain = session.getTransactionalEditingDomain();
-		RecordingCommand command = new RecordingCommand(editingDomain) {
-			@Override
-			protected void doExecute() {
-				//diagram.refresh();
-			}
-		};
-		editingDomain.getCommandStack().execute(command);
+		editingDomain.getCommandStack().execute(new RefreshRepresentationsCommand(editingDomain, new NullProgressMonitor(), diagram));
 	}
 
 	private void populateEdges(final Session session, final DDiagram diagram, EPackage ePackage) {
diff --git a/releng/org.eclipse.egf.targets/core-photon.target b/releng/org.eclipse.egf.targets/core-photon.target
index df7a17a..d08bec8 100644
--- a/releng/org.eclipse.egf.targets/core-photon.target
+++ b/releng/org.eclipse.egf.targets/core-photon.target
@@ -58,7 +58,7 @@
       <unit id="org.eclipse.sirius.runtime.acceleo.source.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.sirius.runtime.aql.source.feature.group" version="0.0.0"/>

-      <repository id="Sirus" location="http://download.eclipse.org/sirius/updates/milestones/6.0.0M6/photon"/>

+      <repository id="Sirus" location="https://download.eclipse.org/sirius/updates/releases/6.1.1/photon"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>

diff --git a/releng/org.eclipse.egf.targets/core-photon.targetplatform b/releng/org.eclipse.egf.targets/core-photon.targetplatform
index 6282a43..0d40d96 100644
--- a/releng/org.eclipse.egf.targets/core-photon.targetplatform
+++ b/releng/org.eclipse.egf.targets/core-photon.targetplatform
@@ -33,7 +33,7 @@
 	org.eclipse.acceleo.sdk.feature.group lazy

 }

 

-location Sirus "http://download.eclipse.org/sirius/updates/milestones/6.0.0M6/photon" {

+location Sirus "https://download.eclipse.org/sirius/updates/releases/6.1.1/photon" {

 	org.eclipse.sirius.doc.feature.feature.group lazy

 	org.eclipse.sirius.runtime.ide.eef.feature.group lazy

 	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy

diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/base/AttributePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/base/AttributePattern.java
index 67cda4c..b9839b3 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/base/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/base/AttributePattern.java
@@ -1,124 +1,123 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class AttributePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = "[attribute ";
-	protected final String TEXT_3 = "]";
-	protected final String TEXT_4 = "[end attribute]";
-	protected final String TEXT_5 = NL;
-	protected final String TEXT_6 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_5);
-		stringBuffer.append(TEXT_6);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_4);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class AttributePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = "[attribute ";

+	protected final String TEXT_3 = "]";

+	protected final String TEXT_4 = "[end attribute]";

+	protected final String TEXT_5 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_5);

+		stringBuffer.append(TEXT_5);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_4);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/base/BasePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/base/BasePattern.java
index 0604c58..ac60f4c 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/base/BasePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/base/BasePattern.java
@@ -1,84 +1,83 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class BasePattern {
-	protected static String nl;
-
-	public static synchronized BasePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		BasePattern result = new BasePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = "// Pipo from parent";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public BasePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_pipo(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_pipo(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "pipo", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class BasePattern {

+	protected static String nl;

+

+	public static synchronized BasePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		BasePattern result = new BasePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = "// Pipo from parent";

+	protected final String TEXT_3 = NL;

+

+	public BasePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_pipo(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_pipo(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "pipo", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/base/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/base/ClassPattern.java
index 6283696..7ef5394 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/base/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/base/ClassPattern.java
@@ -1,124 +1,123 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = "[class ";
-	protected final String TEXT_3 = "]";
-	protected final String TEXT_4 = "[end class]";
-	protected final String TEXT_5 = NL;
-	protected final String TEXT_6 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_5);
-		stringBuffer.append(TEXT_6);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_4);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = "[class ";

+	protected final String TEXT_3 = "]";

+	protected final String TEXT_4 = "[end class]";

+	protected final String TEXT_5 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_5);

+		stringBuffer.append(TEXT_5);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_4);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/base/PackagePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/base/PackagePattern.java
index 60cd8c3..c536a40 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/base/PackagePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/base/PackagePattern.java
@@ -1,116 +1,115 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class PackagePattern {
-	protected static String nl;
-
-	public static synchronized PackagePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		PackagePattern result = new PackagePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[package ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end package]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public PackagePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class PackagePattern {

+	protected static String nl;

+

+	public static synchronized PackagePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		PackagePattern result = new PackagePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[package ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end package]";

+	protected final String TEXT_4 = NL;

+

+	public PackagePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution/ClassPatternExtended.java b/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution/ClassPatternExtended.java
index 109f9e2..267d522 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution/ClassPatternExtended.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution/ClassPatternExtended.java
@@ -1,95 +1,94 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package base.substitution;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPatternExtended extends base.ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPatternExtended create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPatternExtended result = new ClassPatternExtended();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[extended class ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ClassPatternExtended() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package base.substitution;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPatternExtended extends base.ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPatternExtended create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPatternExtended result = new ClassPatternExtended();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[extended class ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = NL;

+

+	public ClassPatternExtended() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_2/ClassExtension.java b/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_2/ClassExtension.java
index 59edb69..7aba6cc 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_2/ClassExtension.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_2/ClassExtension.java
@@ -1,95 +1,94 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package base.substitution_1_2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassExtension extends base.ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassExtension create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassExtension result = new ClassExtension();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[another extension class ";
-	protected final String TEXT_2 = "]" + NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ClassExtension() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package base.substitution_1_2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassExtension extends base.ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassExtension create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassExtension result = new ClassExtension();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[another extension class ";

+	protected final String TEXT_2 = "]" + NL;

+	protected final String TEXT_3 = NL;

+

+	public ClassExtension() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_3/ClassConditionPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_3/ClassConditionPattern.java
index 539c604..43b8e1c 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_3/ClassConditionPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/base/substitution_1_3/ClassConditionPattern.java
@@ -1,99 +1,98 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package base.substitution_1_3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassConditionPattern extends base.ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassConditionPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassConditionPattern result = new ClassConditionPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[class ";
-	protected final String TEXT_2 = " with condition]";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ClassConditionPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Employee".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package base.substitution_1_3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassConditionPattern extends base.ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassConditionPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassConditionPattern result = new ClassConditionPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[class ";

+	protected final String TEXT_2 = " with condition]";

+	protected final String TEXT_3 = NL;

+

+	public ClassConditionPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Employee".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/AttributePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/AttributePattern.java
index d5d42d7..cda1e77 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/AttributePattern.java
@@ -1,116 +1,115 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class AttributePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Attribute ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Attribute]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class AttributePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Attribute ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Attribute]";

+	protected final String TEXT_4 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/ClassPattern.java
index cf10156..ff24cac 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/ClassPattern.java
@@ -1,116 +1,115 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[class ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Class]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[class ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Class]";

+	protected final String TEXT_4 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/PackagePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/PackagePattern.java
index ce1f641..bad28c1 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/PackagePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter/PackagePattern.java
@@ -1,116 +1,115 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class PackagePattern {
-	protected static String nl;
-
-	public static synchronized PackagePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		PackagePattern result = new PackagePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[package ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Package]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public PackagePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class PackagePattern {

+	protected static String nl;

+

+	public static synchronized PackagePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		PackagePattern result = new PackagePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[package ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Package]";

+	protected final String TEXT_4 = NL;

+

+	public PackagePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/AttributePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/AttributePattern.java
index 016f875..1bc1c61 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/AttributePattern.java
@@ -1,109 +1,108 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class AttributePattern extends callbackAndReporter2.BasePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Attribute ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Attribute]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class AttributePattern extends callbackAndReporter2.BasePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Attribute ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Attribute]";

+	protected final String TEXT_4 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/BasePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/BasePattern.java
index 6b997e1..b9d7a51 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/BasePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/BasePattern.java
@@ -1,89 +1,88 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class BasePattern {
-	protected static String nl;
-
-	public static synchronized BasePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		BasePattern result = new BasePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public BasePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class BasePattern {

+	protected static String nl;

+

+	public static synchronized BasePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		BasePattern result = new BasePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = NL;

+

+	public BasePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/ClassPattern.java
index 7ff038e..f0a4fd1 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/ClassPattern.java
@@ -1,109 +1,108 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern extends callbackAndReporter2.BasePattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[class ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Class]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern extends callbackAndReporter2.BasePattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[class ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Class]";

+	protected final String TEXT_4 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/PackagePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/PackagePattern.java
index e2115d7..7a9d5af 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/PackagePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter2/PackagePattern.java
@@ -1,109 +1,108 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class PackagePattern extends callbackAndReporter2.BasePattern {
-	protected static String nl;
-
-	public static synchronized PackagePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		PackagePattern result = new PackagePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[package ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Package]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public PackagePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class PackagePattern extends callbackAndReporter2.BasePattern {

+	protected static String nl;

+

+	public static synchronized PackagePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		PackagePattern result = new PackagePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[package ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Package]";

+	protected final String TEXT_4 = NL;

+

+	public PackagePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/AttributePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/AttributePattern.java
index 60dbfad..9193aea 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/AttributePattern.java
@@ -1,118 +1,117 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class AttributePattern extends callbackAndReporter3.BasePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Attribute ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Attribute]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class AttributePattern extends callbackAndReporter3.BasePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Attribute ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Attribute]";

+	protected final String TEXT_4 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/BasePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/BasePattern.java
index 941cc7e..f86b336 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/BasePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/BasePattern.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class BasePattern {
-	protected static String nl;
-
-	public static synchronized BasePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		BasePattern result = new BasePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[body]";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public BasePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class BasePattern {

+	protected static String nl;

+

+	public static synchronized BasePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		BasePattern result = new BasePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[body]";

+	protected final String TEXT_2 = NL;

+

+	public BasePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/ClassPattern.java
index 8251052..77ce765 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/ClassPattern.java
@@ -1,118 +1,117 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern extends callbackAndReporter3.BasePattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Class ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Class]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern extends callbackAndReporter3.BasePattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Class ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Class]";

+	protected final String TEXT_4 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/PackagePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/PackagePattern.java
index c159963..b2ed8db 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/PackagePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter3/PackagePattern.java
@@ -1,118 +1,117 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class PackagePattern extends callbackAndReporter3.BasePattern {
-	protected static String nl;
-
-	public static synchronized PackagePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		PackagePattern result = new PackagePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Package ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Package]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public PackagePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class PackagePattern extends callbackAndReporter3.BasePattern {

+	protected static String nl;

+

+	public static synchronized PackagePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		PackagePattern result = new PackagePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Package ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Package]";

+	protected final String TEXT_4 = NL;

+

+	public PackagePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter4/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter4/ClassPattern.java
index 4d41bd8..4383481 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter4/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callbackAndReporter4/ClassPattern.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package callbackAndReporter4;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[updated class ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callbackAndReporter4;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[updated class ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/AttributePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/AttributePattern.java
index 9a7a531..93b33b0 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/AttributePattern.java
@@ -1,113 +1,112 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package callback_1.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class AttributePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "   Attribute ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "after", stringBuffer.toString());
-	}
-
-	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "before", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callback_1.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class AttributePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "   Attribute ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "after", stringBuffer.toString());

+	}

+

+	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "before", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/ClassPattern.java
index 7973c49..ba6fff2 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/ClassPattern.java
@@ -1,124 +1,123 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package callback_1.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = "  [class ";
-	protected final String TEXT_3 = "]" + NL;
-	protected final String TEXT_4 = "  [end class]" + NL;
-	protected final String TEXT_5 = NL;
-	protected final String TEXT_6 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_5);
-		stringBuffer.append(TEXT_6);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_before(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_after(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "before", stringBuffer.toString());
-	}
-
-	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_4);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "after", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callback_1.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = "  [class ";

+	protected final String TEXT_3 = "]" + NL;

+	protected final String TEXT_4 = "  [end class]" + NL;

+	protected final String TEXT_5 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_5);

+		stringBuffer.append(TEXT_5);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_before(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_after(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "before", stringBuffer.toString());

+	}

+

+	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_4);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "after", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/PackagePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/PackagePattern.java
index b64aefb..92a1775 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/PackagePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/callback_1/strategy/PackagePattern.java
@@ -1,124 +1,123 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package callback_1.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class PackagePattern {
-	protected static String nl;
-
-	public static synchronized PackagePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		PackagePattern result = new PackagePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "";
-	protected final String TEXT_2 = "[Package ";
-	protected final String TEXT_3 = "]" + NL;
-	protected final String TEXT_4 = "[End Package]" + NL + NL + NL;
-	protected final String TEXT_5 = NL;
-	protected final String TEXT_6 = NL;
-
-	public PackagePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_5);
-		stringBuffer.append(TEXT_6);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_before(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_after(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "before", stringBuffer.toString());
-	}
-
-	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_4);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "after", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package callback_1.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class PackagePattern {

+	protected static String nl;

+

+	public static synchronized PackagePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		PackagePattern result = new PackagePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = "[Package ";

+	protected final String TEXT_3 = "]" + NL;

+	protected final String TEXT_4 = "[End Package]" + NL + NL + NL;

+	protected final String TEXT_5 = NL;

+

+	public PackagePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_5);

+		stringBuffer.append(TEXT_5);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_before(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_after(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "before", stringBuffer.toString());

+	}

+

+	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_4);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "after", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/Launcher.java b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/Launcher.java
index 9e46c70..0b1ce43 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/Launcher.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/Launcher.java
@@ -1,111 +1,113 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package egf.uc1_9.pattern;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Launcher {
-	protected static String nl;
-
-	public static synchronized Launcher create(String lineSeparator) {
-		nl = lineSeparator;
-		Launcher result = new Launcher();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "launch \"";
-	protected final String TEXT_2 = "\" pattern" + NL;
-	protected final String TEXT_3 = NL + " ";
-	protected final String TEXT_4 = NL;
-
-	public Launcher() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("parameter", this.parameter);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/PatternCall_and_Callback.fcore#_sdGdsF6JEeCOmYMivg_FIg", ctx_local, parameters);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_9.pattern;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Launcher {

+	protected static String nl;

+

+	public static synchronized Launcher create(String lineSeparator) {

+		nl = lineSeparator;

+		Launcher result = new Launcher();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "launch \"";

+	protected final String TEXT_2 = "\" pattern" + NL;

+	protected final String TEXT_3 = NL + " ";

+	protected final String TEXT_4 = NL;

+

+	public Launcher() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("parameter", this.parameter);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/PatternCall_and_Callback.fcore#_sdGdsF6JEeCOmYMivg_FIg",

+					ctx_local, parameters);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/myPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/myPattern.java
index 2cc6ece..0bced0f 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/myPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/myPattern.java
@@ -1,50 +1,50 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package egf.uc1_9.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.common.helper.*;
-
-public class myPattern {
-
-	public myPattern() {
-		//Here is the constructor
-		// add initialisation of the pattern variables (declaration has been already done).
-	}
-
-	public void generate(Object argument) throws Exception {
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		IQuery.ParameterDescription paramDesc = null;
-		Map<String, String> queryCtx = null;
-		Node.Container currentNode = ctx.getNode();
-
-		if (preCondition(ctx))
-			orchestration((PatternContext) argument);
-
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		Node.Container currentNode = ictx.getNode();
-		ictx.setNode(currentNode);
-		return null;
-	}
-
-	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {
-		//default content
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
-
-}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_9.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.common.helper.*;

+

+public class myPattern {

+

+	public myPattern() {

+		//Here is the constructor

+		// add initialisation of the pattern variables (declaration has been already done).

+	}

+

+	public void generate(Object argument) throws Exception {

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		IQuery.ParameterDescription paramDesc = null;

+		Map<String, String> queryCtx = null;

+		Node.Container currentNode = ctx.getNode();

+

+		if (preCondition(ctx))

+			orchestration((PatternContext) argument);

+

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		Node.Container currentNode = ictx.getNode();

+		ictx.setNode(currentNode);

+		return null;

+	}

+

+	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {

+		//default content

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+

+}

diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Class1_9.java b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Class1_9.java
index ab2d211..4dcec5a 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Class1_9.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Class1_9.java
@@ -1,123 +1,121 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package egf.uc1_9.pattern.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Class1_9 {
-	protected static String nl;
-
-	public static synchronized Class1_9 create(String lineSeparator) {
-		nl = lineSeparator;
-		Class1_9 result = new Class1_9();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[start class=";
-	protected final String TEXT_2 = "]" + NL;
-	protected final String TEXT_3 = "[end class=";
-	protected final String TEXT_4 = "]" + NL;
-	protected final String TEXT_5 = NL;
-	protected final String TEXT_6 = NL;
-
-	public Class1_9() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_5);
-		stringBuffer.append(TEXT_6);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_4);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_9.pattern.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Class1_9 {

+	protected static String nl;

+

+	public static synchronized Class1_9 create(String lineSeparator) {

+		nl = lineSeparator;

+		Class1_9 result = new Class1_9();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[start class=";

+	protected final String TEXT_2 = "]" + NL;

+	protected final String TEXT_3 = "[end class=";

+	protected final String TEXT_4 = NL;

+

+	public Class1_9() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Operation1_9.java b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Operation1_9.java
index 83d5f40..5be397e 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Operation1_9.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/egf/uc1_9/pattern/strategy/Operation1_9.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package egf.uc1_9.pattern.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Operation1_9 {
-	protected static String nl;
-
-	public static synchronized Operation1_9 create(String lineSeparator) {
-		nl = lineSeparator;
-		Operation1_9 result = new Operation1_9();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "    [operation=";
-	protected final String TEXT_2 = "]" + NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Operation1_9() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EOperation) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EOperation parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EOperation object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_9.pattern.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Operation1_9 {

+	protected static String nl;

+

+	public static synchronized Operation1_9 create(String lineSeparator) {

+		nl = lineSeparator;

+		Operation1_9 result = new Operation1_9();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "    [operation=";

+	protected final String TEXT_2 = "]" + NL;

+	protected final String TEXT_3 = NL;

+

+	public Operation1_9() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EOperation) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EOperation parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EOperation object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/child.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/child.java
index d06fa41..cc2487a 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/child.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/child.java
@@ -1,99 +1,99 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_1;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class child extends inheritance_1.parent {
-	protected static String nl;
-
-	public static synchronized child create(String lineSeparator) {
-		nl = lineSeparator;
-		child result = new child();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "fromChild : ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public child() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_1;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class child extends inheritance_1.parent {

+	protected static String nl;

+

+	public static synchronized child create(String lineSeparator) {

+		nl = lineSeparator;

+		child result = new child();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "fromChild : ";

+	protected final String TEXT_2 = NL;

+

+	public child() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/parent.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/parent.java
index 54f1c16..420948e 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/parent.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_1/parent.java
@@ -1,75 +1,74 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_1;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class parent {
-	protected static String nl;
-
-	public static synchronized parent create(String lineSeparator) {
-		nl = lineSeparator;
-		parent result = new parent();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "fromParent";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public parent() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_1;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class parent {

+	protected static String nl;

+

+	public static synchronized parent create(String lineSeparator) {

+		nl = lineSeparator;

+		parent result = new parent();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "fromParent";

+	protected final String TEXT_2 = NL;

+

+	public parent() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/child.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/child.java
index 99a6b45..d8bc43b 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/child.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/child.java
@@ -1,126 +1,127 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class child extends inheritance_2.parent {
-	protected static String nl;
-
-	public static synchronized child create(String lineSeparator) {
-		nl = lineSeparator;
-		child result = new child();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "fromChild : ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public child() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		method_setToInject(new StringBuffer(), ictx);
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, toInject);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/inheritance_2.fcore#_nfk5LCH-Ed-CStHKuCL0dg", ctx_local);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass toInject = null;
-
-	public void set_toInject(org.eclipse.emf.ecore.EClass object) {
-		this.toInject = object;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_setToInject(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		toInject = parameter;
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "setToInject", stringBuffer.toString());
-	}
-
-	protected void method_setVariables(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		targetFile = "/org.eclipse.egf.core.test.pattern/result/" + parameter.getName();
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "setVariables", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class child extends inheritance_2.parent {

+	protected static String nl;

+

+	public static synchronized child create(String lineSeparator) {

+		nl = lineSeparator;

+		child result = new child();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "fromChild : ";

+	protected final String TEXT_2 = NL;

+

+	public child() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		method_setToInject(new StringBuffer(), ictx);

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, toInject);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/inheritance_2.fcore#_nfk5LCH-Ed-CStHKuCL0dg",

+					ctx_local);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass toInject = null;

+

+	public void set_toInject(org.eclipse.emf.ecore.EClass object) {

+		this.toInject = object;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_setToInject(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		toInject = parameter;

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "setToInject", stringBuffer.toString());

+	}

+

+	protected void method_setVariables(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		targetFile = "/org.eclipse.egf.core.test.pattern/result/" + parameter.getName();

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "setVariables", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/parent.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/parent.java
index 234a395..7202f57 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/parent.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2/parent.java
@@ -1,100 +1,100 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class parent {
-	protected static String nl;
-
-	public static synchronized parent create(String lineSeparator) {
-		nl = lineSeparator;
-		parent result = new parent();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "fromParent" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public parent() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_setVariables(new StringBuffer(), ictx);
-
-		method_body(new StringBuffer(), ictx);
-
-		method_putVariablesInContesxt(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	protected java.lang.String targetFile = null;
-
-	public void set_targetFile(java.lang.String object) {
-		this.targetFile = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_setVariables(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		targetFile = null;
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "setVariables", stringBuffer.toString());
-	}
-
-	protected void method_putVariablesInContesxt(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		ctx.setValue("targetFile", targetFile);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "putVariablesInContesxt", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class parent {

+	protected static String nl;

+

+	public static synchronized parent create(String lineSeparator) {

+		nl = lineSeparator;

+		parent result = new parent();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "fromParent" + NL;

+	protected final String TEXT_2 = NL;

+

+	public parent() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_setVariables(new StringBuffer(), ictx);

+

+		method_body(new StringBuffer(), ictx);

+

+		method_putVariablesInContesxt(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	protected java.lang.String targetFile = null;

+

+	public void set_targetFile(java.lang.String object) {

+		this.targetFile = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_setVariables(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		targetFile = null;

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "setVariables", stringBuffer.toString());

+	}

+

+	protected void method_putVariablesInContesxt(final StringBuffer stringBuffer, final PatternContext ctx)

+			throws Exception {

+

+		ctx.setValue("targetFile", targetFile);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "putVariablesInContesxt", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2_called/calledByInjection.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2_called/calledByInjection.java
index cf8c14f..0806ea3 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2_called/calledByInjection.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_2_called/calledByInjection.java
@@ -1,100 +1,100 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_2_called;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class calledByInjection {
-	protected static String nl;
-
-	public static synchronized calledByInjection create(String lineSeparator) {
-		nl = lineSeparator;
-		calledByInjection result = new calledByInjection();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "  fromInjected : ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public calledByInjection() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EAttribute");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_2_called;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class calledByInjection {

+	protected static String nl;

+

+	public static synchronized calledByInjection create(String lineSeparator) {

+		nl = lineSeparator;

+		calledByInjection result = new calledByInjection();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "  fromInjected : ";

+	protected final String TEXT_2 = NL;

+

+	public calledByInjection() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EAttribute");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/called.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/called.java
index c5c72b4..23d3051 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/called.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/called.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class called {
-	protected static String nl;
-
-	public static synchronized called create(String lineSeparator) {
-		nl = lineSeparator;
-		called result = new called();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//called on ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public called() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class called {

+	protected static String nl;

+

+	public static synchronized called create(String lineSeparator) {

+		nl = lineSeparator;

+		called result = new called();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//called on ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public called() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/child.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/child.java
index da3ad5b..6836be7 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/child.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/child.java
@@ -1,112 +1,114 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class child extends inheritance_3.parent {
-	protected static String nl;
-
-	public static synchronized child create(String lineSeparator) {
-		nl = lineSeparator;
-		child result = new child();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = "// child on ";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public child() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		method_hehe(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("parameter", this.parameter);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/inheritance_3.fcore#_AHSpICIUEd-XdOucj2euiQ", ctx_local, parameters);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_hehe(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "hehe", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class child extends inheritance_3.parent {

+	protected static String nl;

+

+	public static synchronized child create(String lineSeparator) {

+		nl = lineSeparator;

+		child result = new child();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = "// child on ";

+	protected final String TEXT_3 = NL;

+	protected final String TEXT_4 = NL;

+

+	public child() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		method_hehe(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("parameter", this.parameter);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/inheritance_3.fcore#_AHSpICIUEd-XdOucj2euiQ",

+					ctx_local, parameters);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_hehe(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "hehe", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/parent.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/parent.java
index 3ecb703..8e38b08 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/parent.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_3/parent.java
@@ -1,110 +1,110 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class parent {
-	protected static String nl;
-
-	public static synchronized parent create(String lineSeparator) {
-		nl = lineSeparator;
-		parent result = new parent();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = "//mywork on ";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public parent() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_mywork(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_mywork(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "mywork", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class parent {

+	protected static String nl;

+

+	public static synchronized parent create(String lineSeparator) {

+		nl = lineSeparator;

+		parent result = new parent();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = "//mywork on ";

+	protected final String TEXT_3 = NL;

+	protected final String TEXT_4 = NL;

+

+	public parent() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_mywork(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_mywork(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "mywork", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_4/strategy/classPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_4/strategy/classPattern.java
index ff793ec..31e5d2f 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_4/strategy/classPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/inheritance_4/strategy/classPattern.java
@@ -1,111 +1,110 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package inheritance_4.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class classPattern extends base.BasePattern {
-	protected static String nl;
-
-	public static synchronized classPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		classPattern result = new classPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = "//additional work on ";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public classPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		method_work(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_work(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "work", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package inheritance_4.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class classPattern extends base.BasePattern {

+	protected static String nl;

+

+	public static synchronized classPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		classPattern result = new classPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = "//additional work on ";

+	protected final String TEXT_3 = NL;

+	protected final String TEXT_4 = NL;

+

+	public classPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		method_work(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_work(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "work", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Callee.java b/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Callee.java
index 9bfa27e..2040df6 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Callee.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Callee.java
@@ -1,96 +1,96 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package jet_tags;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.common.helper.*;
-
-public class Callee {
-
-	public Callee() {
-		//Here is the constructor
-		// add initialisation of the pattern variables (declaration has been already done).
-	}
-
-	public void generate(Object argument) throws Exception {
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		IQuery.ParameterDescription paramDesc = null;
-		Map<String, String> queryCtx = null;
-		Node.Container currentNode = ctx.getNode();
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-		List<Object> parameter2List = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-			for (Object parameter2Parameter : parameter2List) {
-
-				this.parameter = (java.lang.Object) parameterParameter;
-				this.parameter2 = (java.lang.Object) parameter2Parameter;
-
-				{
-					ctx.setNode(new Node.Container(currentNode, getClass()));
-					orchestration((PatternContext) argument);
-
-				}
-			}
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		Node.Container currentNode = ictx.getNode();
-		method_body(new StringBuffer(), ictx);
-		ictx.setNode(currentNode);
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			parameterValues.put("parameter2", this.parameter2);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {
-		out.append("Callee : ");
-
-		out.append("parameter=");
-		if (parameter != null)
-			out.append(parameter.toString());
-
-		out.append(", parameter2=");
-		if (parameter2 != null)
-			out.append(parameter2.toString());
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());
-	}
-
-	protected java.lang.Object parameter;
-
-	public void set_parameter(java.lang.Object parameter) {
-		this.parameter = parameter;
-	}
-
-	protected java.lang.Object parameter2;
-
-	public void set_parameter2(java.lang.Object parameter2) {
-		this.parameter2 = parameter2;
-	}
-
-	public Map<String, Object> getParameters() {
-		Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		parameters.put("parameter2", this.parameter2);
-		return parameters;
-	}
-
-}
+//Generated with EGF 1.6.0.201901231006

+package jet_tags;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.common.helper.*;

+

+public class Callee {

+

+	public Callee() {

+		//Here is the constructor

+		// add initialisation of the pattern variables (declaration has been already done).

+	}

+

+	public void generate(Object argument) throws Exception {

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		IQuery.ParameterDescription paramDesc = null;

+		Map<String, String> queryCtx = null;

+		Node.Container currentNode = ctx.getNode();

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> parameter2List = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+			for (Object parameter2Parameter : parameter2List) {

+

+				this.parameter = (java.lang.Object) parameterParameter;

+				this.parameter2 = (java.lang.Object) parameter2Parameter;

+

+				{

+					ctx.setNode(new Node.Container(currentNode, getClass()));

+					orchestration((PatternContext) argument);

+

+				}

+			}

+		}

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		Node.Container currentNode = ictx.getNode();

+		method_body(new StringBuffer(), ictx);

+		ictx.setNode(currentNode);

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			parameterValues.put("parameter2", this.parameter2);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {

+		out.append("Callee : ");

+

+		out.append("parameter=");

+		if (parameter != null)

+			out.append(parameter.toString());

+

+		out.append(", parameter2=");

+		if (parameter2 != null)

+			out.append(parameter2.toString());

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());

+	}

+

+	protected java.lang.Object parameter;

+

+	public void set_parameter(java.lang.Object parameter) {

+		this.parameter = parameter;

+	}

+

+	protected java.lang.Object parameter2;

+

+	public void set_parameter2(java.lang.Object parameter2) {

+		this.parameter2 = parameter2;

+	}

+

+	public Map<String, Object> getParameters() {

+		Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		parameters.put("parameter2", this.parameter2);

+		return parameters;

+	}

+

+}

diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/CalleeInjected.java b/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/CalleeInjected.java
index 9fc7aed..236b0e1 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/CalleeInjected.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/CalleeInjected.java
@@ -1,80 +1,81 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package jet_tags;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.common.helper.*;
-
-public class CalleeInjected {
-
-	public CalleeInjected() {
-		//Here is the constructor
-		// add initialisation of the pattern variables (declaration has been already done).
-	}
-
-	public void generate(Object argument) throws Exception {
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		IQuery.ParameterDescription paramDesc = null;
-		Map<String, String> queryCtx = null;
-		Node.Container currentNode = ctx.getNode();
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration((PatternContext) argument);
-
-			}
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		Node.Container currentNode = ictx.getNode();
-		method_body(new StringBuffer(), ictx);
-		ictx.setNode(currentNode);
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {
-		out.append("CalleeInjected : ");
-
-		out.append("className=");
-		if (parameter != null)
-			out.append(parameter.getName());
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass parameter) {
-		this.parameter = parameter;
-	}
-
-	public Map<String, Object> getParameters() {
-		Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-}
+//Generated with EGF 1.6.0.201901231006

+package jet_tags;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.common.helper.*;

+

+public class CalleeInjected {

+

+	public CalleeInjected() {

+		//Here is the constructor

+		// add initialisation of the pattern variables (declaration has been already done).

+	}

+

+	public void generate(Object argument) throws Exception {

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		IQuery.ParameterDescription paramDesc = null;

+		Map<String, String> queryCtx = null;

+		Node.Container currentNode = ctx.getNode();

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration((PatternContext) argument);

+

+			}

+		}

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		Node.Container currentNode = ictx.getNode();

+		method_body(new StringBuffer(), ictx);

+		ictx.setNode(currentNode);

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {

+		out.append("CalleeInjected : ");

+

+		out.append("className=");

+		if (parameter != null)

+			out.append(parameter.getName());

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass parameter) {

+		this.parameter = parameter;

+	}

+

+	public Map<String, Object> getParameters() {

+		Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+}

diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Caller.java b/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Caller.java
index 2dda01e..e089621 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Caller.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/jet_tags/Caller.java
@@ -1,130 +1,132 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package jet_tags;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Caller {
-	protected static String nl;
-
-	public static synchronized Caller create(String lineSeparator) {
-		nl = lineSeparator;
-		Caller result = new Caller();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Caller() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	protected java.lang.Object variable = null;
-
-	public void set_variable(java.lang.Object object) {
-		this.variable = object;
-	}
-
-	protected java.lang.Object variable2 = null;
-
-	public void set_variable2(java.lang.Object object) {
-		this.variable2 = object;
-	}
-
-	protected org.eclipse.emf.ecore.EClass toInject = null;
-
-	public void set_toInject(org.eclipse.emf.ecore.EClass object) {
-		this.toInject = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		variable = "CallValue";
-		variable2 = "CallValue2";
-
-		stringBuffer.append(TEXT_1);
-		{
-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#LogicalName=jet_tags.Callee" args="variable:parameter, variable2:parameter2" %>
-
-			InternalPatternContext ictx = (InternalPatternContext) ctx;
-			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());
-			stringBuffer.setLength(0);
-
-			final Map<String, Object> callParameters = new HashMap<String, Object>();
-			callParameters.put("parameter", variable);
-			callParameters.put("parameter2", variable2);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#_0FqG8FaPEd-xDMudhFTQKg", new ExecutionContext((InternalPatternContext) ctx), callParameters);
-			stringBuffer.setLength(0);
-		}
-
-		toInject = EcoreFactory.eINSTANCE.createEClass();
-		toInject.setName("MyClassName");
-
-		stringBuffer.append(TEXT_2);
-		{
-			//<%@ egf:patternInjectedCall patternId="platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#LogicalName=jet_tags.CalleeInjected" toInject="toInject" %>
-
-			InternalPatternContext ictx = (InternalPatternContext) ctx;
-			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());
-			stringBuffer.setLength(0);
-
-			ExecutionContext callCtx = new ExecutionContext((InternalPatternContext) ctx);
-			callCtx.setValue(PatternContext.INJECTED_CONTEXT, toInject);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#_-d1XsFa7Ed-_dcUlU_GyPA", callCtx);
-			stringBuffer.setLength(0);
-
-		}
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package jet_tags;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Caller {

+	protected static String nl;

+

+	public static synchronized Caller create(String lineSeparator) {

+		nl = lineSeparator;

+		Caller result = new Caller();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public Caller() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	protected java.lang.Object variable = null;

+

+	public void set_variable(java.lang.Object object) {

+		this.variable = object;

+	}

+

+	protected java.lang.Object variable2 = null;

+

+	public void set_variable2(java.lang.Object object) {

+		this.variable2 = object;

+	}

+

+	protected org.eclipse.emf.ecore.EClass toInject = null;

+

+	public void set_toInject(org.eclipse.emf.ecore.EClass object) {

+		this.toInject = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		variable = "CallValue";

+		variable2 = "CallValue2";

+

+		stringBuffer.append(TEXT_1);

+		{

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#LogicalName=jet_tags.Callee" args="variable:parameter, variable2:parameter2" %>

+

+			InternalPatternContext ictx = (InternalPatternContext) ctx;

+			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+			stringBuffer.setLength(0);

+

+			final Map<String, Object> callParameters = new HashMap<String, Object>();

+			callParameters.put("parameter", variable);

+			callParameters.put("parameter2", variable2);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#_0FqG8FaPEd-xDMudhFTQKg",

+					new ExecutionContext((InternalPatternContext) ctx), callParameters);

+			stringBuffer.setLength(0);

+		}

+

+		toInject = EcoreFactory.eINSTANCE.createEClass();

+		toInject.setName("MyClassName");

+

+		stringBuffer.append(TEXT_2);

+		{

+			//<%@ egf:patternInjectedCall patternId="platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#LogicalName=jet_tags.CalleeInjected" toInject="toInject" %>

+

+			InternalPatternContext ictx = (InternalPatternContext) ctx;

+			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+			stringBuffer.setLength(0);

+

+			ExecutionContext callCtx = new ExecutionContext((InternalPatternContext) ctx);

+			callCtx.setValue(PatternContext.INJECTED_CONTEXT, toInject);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/jet_tags.fcore#_-d1XsFa7Ed-_dcUlU_GyPA",

+					callCtx);

+			stringBuffer.setLength(0);

+

+		}

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/all.java b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/all.java
index 5e89a93..6bea2e9 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/all.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/all.java
@@ -1,101 +1,108 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package linefeed;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class all {
-	protected static String nl;
-
-	public static synchronized all create(String lineSeparator) {
-		nl = lineSeparator;
-		all result = new all();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "-----" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public all() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_fW0RcF3DEd-W5eBkkAoHaA", ctx_local, parameters);
-		}
-
-		method_separator(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_s8JesF3DEd-W5eBkkAoHaA", ctx_local, parameters);
-		}
-
-		method_separator(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_5P020F3DEd-W5eBkkAoHaA", ctx_local, parameters);
-		}
-
-		method_separator(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_DAhtIF3KEd-mZb1ihLU3ug", ctx_local, parameters);
-		}
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_separator(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "separator", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package linefeed;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class all {

+	protected static String nl;

+

+	public static synchronized all create(String lineSeparator) {

+		nl = lineSeparator;

+		all result = new all();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "-----" + NL;

+	protected final String TEXT_2 = NL;

+

+	public all() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_fW0RcF3DEd-W5eBkkAoHaA",

+					ctx_local, parameters);

+		}

+

+		method_separator(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_s8JesF3DEd-W5eBkkAoHaA",

+					ctx_local, parameters);

+		}

+

+		method_separator(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_5P020F3DEd-W5eBkkAoHaA",

+					ctx_local, parameters);

+		}

+

+		method_separator(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_DAhtIF3KEd-mZb1ihLU3ug",

+					ctx_local, parameters);

+		}

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_separator(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "separator", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/one.java b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/one.java
index 5b31587..49c6c5d 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/one.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/one.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package linefeed;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class one {
-	protected static String nl;
-
-	public static synchronized one create(String lineSeparator) {
-		nl = lineSeparator;
-		one result = new one();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "one";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public one() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package linefeed;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class one {

+	protected static String nl;

+

+	public static synchronized one create(String lineSeparator) {

+		nl = lineSeparator;

+		one result = new one();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "one";

+	protected final String TEXT_2 = NL;

+

+	public one() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/three.java b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/three.java
index 9f5aa3a..ec92688 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/three.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/three.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package linefeed;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class three {
-	protected static String nl;
-
-	public static synchronized three create(String lineSeparator) {
-		nl = lineSeparator;
-		three result = new three();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "three" + NL + " ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public three() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package linefeed;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class three {

+	protected static String nl;

+

+	public static synchronized three create(String lineSeparator) {

+		nl = lineSeparator;

+		three result = new three();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "three" + NL + " ";

+	protected final String TEXT_2 = NL;

+

+	public three() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/two.java b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/two.java
index 015bd98..8fa5559 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/two.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed/two.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package linefeed;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class two {
-	protected static String nl;
-
-	public static synchronized two create(String lineSeparator) {
-		nl = lineSeparator;
-		two result = new two();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "two" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public two() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package linefeed;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class two {

+	protected static String nl;

+

+	public static synchronized two create(String lineSeparator) {

+		nl = lineSeparator;

+		two result = new two();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "two" + NL;

+	protected final String TEXT_2 = NL;

+

+	public two() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/a.java b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/a.java
index 020a1ed..af3f054 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/a.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/a.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package linefeed2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class a {
-	protected static String nl;
-
-	public static synchronized a create(String lineSeparator) {
-		nl = lineSeparator;
-		a result = new a();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "a";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public a() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package linefeed2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class a {

+	protected static String nl;

+

+	public static synchronized a create(String lineSeparator) {

+		nl = lineSeparator;

+		a result = new a();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "a";

+	protected final String TEXT_2 = NL;

+

+	public a() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/all2.java b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/all2.java
index ed09e97..0b68471 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/all2.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/all2.java
@@ -1,98 +1,101 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package linefeed2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class all2 {
-	protected static String nl;
-
-	public static synchronized all2 create(String lineSeparator) {
-		nl = lineSeparator;
-		all2 result = new all2();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "c";
-	protected final String TEXT_2 = "d";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public all2() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_id8LsF3JEd-mZb1ihLU3ug", ctx_local, parameters);
-		}
-
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_sv0rMF3JEd-mZb1ihLU3ug", ctx_local, parameters);
-		}
-
-		method_d(new StringBuffer(), ictx);
-
-		method_c(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_c(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "c", stringBuffer.toString());
-	}
-
-	protected void method_d(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "d", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package linefeed2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class all2 {

+	protected static String nl;

+

+	public static synchronized all2 create(String lineSeparator) {

+		nl = lineSeparator;

+		all2 result = new all2();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "c";

+	protected final String TEXT_2 = "d";

+	protected final String TEXT_3 = NL;

+

+	public all2() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_id8LsF3JEd-mZb1ihLU3ug",

+					ctx_local, parameters);

+		}

+

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/linefeed.fcore#_sv0rMF3JEd-mZb1ihLU3ug",

+					ctx_local, parameters);

+		}

+

+		method_d(new StringBuffer(), ictx);

+

+		method_c(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_c(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "c", stringBuffer.toString());

+	}

+

+	protected void method_d(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "d", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/b.java b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/b.java
index c91369b..c53085b 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/b.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/linefeed2/b.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package linefeed2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class b {
-	protected static String nl;
-
-	public static synchronized b create(String lineSeparator) {
-		nl = lineSeparator;
-		b result = new b();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "b";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public b() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package linefeed2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class b {

+	protected static String nl;

+

+	public static synchronized b create(String lineSeparator) {

+		nl = lineSeparator;

+		b result = new b();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "b";

+	protected final String TEXT_2 = NL;

+

+	public b() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Attribute.java b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Attribute.java
index a59f28e..024162e 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Attribute.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Attribute.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package model.driven.startegy.condition;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Attribute {
-	protected static String nl;
-
-	public static synchronized Attribute create(String lineSeparator) {
-		nl = lineSeparator;
-		Attribute result = new Attribute();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "found Attribute ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Attribute() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package model.driven.startegy.condition;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Attribute {

+	protected static String nl;

+

+	public static synchronized Attribute create(String lineSeparator) {

+		nl = lineSeparator;

+		Attribute result = new Attribute();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "found Attribute ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public Attribute() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/ClassTest.java b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/ClassTest.java
index 32d8a1b..a52780f 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/ClassTest.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/ClassTest.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package model.driven.startegy.condition;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassTest {
-	protected static String nl;
-
-	public static synchronized ClassTest create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassTest result = new ClassTest();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "found special Class Test !  (element name is ";
-	protected final String TEXT_2 = ")" + NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ClassTest() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package model.driven.startegy.condition;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassTest {

+	protected static String nl;

+

+	public static synchronized ClassTest create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassTest result = new ClassTest();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "found special Class Test !  (element name is ";

+	protected final String TEXT_2 = ")" + NL;

+	protected final String TEXT_3 = NL;

+

+	public ClassTest() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Clazz.java b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Clazz.java
index 8139d2e..74721bd 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Clazz.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Clazz.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package model.driven.startegy.condition;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Clazz {
-	protected static String nl;
-
-	public static synchronized Clazz create(String lineSeparator) {
-		nl = lineSeparator;
-		Clazz result = new Clazz();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "found Class ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Clazz() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package model.driven.startegy.condition;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Clazz {

+	protected static String nl;

+

+	public static synchronized Clazz create(String lineSeparator) {

+		nl = lineSeparator;

+		Clazz result = new Clazz();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "found Class ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public Clazz() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Package.java b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Package.java
index a34c056..1822cc0 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Package.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/model/driven/startegy/condition/Package.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package model.driven.startegy.condition;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Package {
-	protected static String nl;
-
-	public static synchronized Package create(String lineSeparator) {
-		nl = lineSeparator;
-		Package result = new Package();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "found Package ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Package() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package model.driven.startegy.condition;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Package {

+	protected static String nl;

+

+	public static synchronized Package create(String lineSeparator) {

+		nl = lineSeparator;

+		Package result = new Package();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "found Package ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public Package() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/AttributePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/AttributePattern.java
index abf4c5c..b6f2be0 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/AttributePattern.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package no_callback.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class AttributePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Attribute ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package no_callback.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class AttributePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Attribute ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/ClassPattern.java
index 33e9f53..b601c9d 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/ClassPattern.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package no_callback.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Class ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package no_callback.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Class ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/PackagePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/PackagePattern.java
index 1f5c3eb..d111e0a 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/PackagePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/no_callback/strategy/PackagePattern.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package no_callback.strategy;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class PackagePattern {
-	protected static String nl;
-
-	public static synchronized PackagePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		PackagePattern result = new PackagePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Package ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public PackagePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package no_callback.strategy;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class PackagePattern {

+	protected static String nl;

+

+	public static synchronized PackagePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		PackagePattern result = new PackagePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Package ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public PackagePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCallee1.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCallee1.java
index ac37ef3..4c5926a 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCallee1.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCallee1.java
@@ -1,107 +1,107 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call.condition1;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCallee1 {
-	protected static String nl;
-
-	public static synchronized CCallee1 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCallee1 result = new CCallee1();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Callee has found the 'test' EClass (element name is ";
-	protected final String TEXT_2 = ")" + NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public CCallee1() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call.condition1;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCallee1 {

+	protected static String nl;

+

+	public static synchronized CCallee1 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCallee1 result = new CCallee1();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Callee has found the 'test' EClass (element name is ";

+	protected final String TEXT_2 = ")" + NL;

+	protected final String TEXT_3 = NL;

+

+	public CCallee1() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCaller1.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCaller1.java
index a2f1cac..e0cc7bc 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCaller1.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition1/CCaller1.java
@@ -1,111 +1,113 @@
-//Generated on Wed Jan 18 17:28:09 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call.condition1;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCaller1 {
-	protected static String nl;
-
-	public static synchronized CCaller1 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCaller1 result = new CCaller1();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Message from caller: found ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public CCaller1() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition1.fcore#_1vJscHeNEd-eFrQyPU1i3Q", ctx_local);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call.condition1;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCaller1 {

+	protected static String nl;

+

+	public static synchronized CCaller1 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCaller1 result = new CCaller1();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Message from caller: found ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public CCaller1() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition1.fcore#_1vJscHeNEd-eFrQyPU1i3Q",

+					ctx_local);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCallee2.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCallee2.java
index 4fe0284..ca091e9 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCallee2.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCallee2.java
@@ -1,103 +1,103 @@
-//Generated on Wed Jan 18 17:28:12 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call.condition2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCallee2 {
-	protected static String nl;
-
-	public static synchronized CCallee2 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCallee2 result = new CCallee2();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Callee has found the 'test' EClass";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public CCallee2() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call.condition2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCallee2 {

+	protected static String nl;

+

+	public static synchronized CCallee2 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCallee2 result = new CCallee2();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Callee has found the 'test' EClass";

+	protected final String TEXT_2 = NL;

+

+	public CCallee2() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCaller2.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCaller2.java
index 29547c3..64a2253 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCaller2.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition2/CCaller2.java
@@ -1,108 +1,110 @@
-//Generated on Wed Jan 18 17:28:11 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call.condition2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCaller2 {
-	protected static String nl;
-
-	public static synchronized CCaller2 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCaller2 result = new CCaller2();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Message from caller" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public CCaller2() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EPackage");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition2.fcore#_r-OdkHeQEd-ent-ImclT8w", ctx_local);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call.condition2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCaller2 {

+	protected static String nl;

+

+	public static synchronized CCaller2 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCaller2 result = new CCaller2();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Message from caller" + NL;

+	protected final String TEXT_2 = NL;

+

+	public CCaller2() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EPackage");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition2.fcore#_r-OdkHeQEd-ent-ImclT8w",

+					ctx_local);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCallee3.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCallee3.java
index 7cd1ae2..533f05f 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCallee3.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCallee3.java
@@ -1,102 +1,101 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call.condition3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCallee3 {
-	protected static String nl;
-
-	public static synchronized CCallee3 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCallee3 result = new CCallee3();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Callee has found the 'test' EClass" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public CCallee3() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call.condition3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCallee3 {

+	protected static String nl;

+

+	public static synchronized CCallee3 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCallee3 result = new CCallee3();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Callee has found the 'test' EClass" + NL;

+	protected final String TEXT_2 = NL;

+

+	public CCallee3() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCaller3.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCaller3.java
index 00251ff..2710bf0 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCaller3.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call/condition3/CCaller3.java
@@ -1,112 +1,114 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call.condition3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCaller3 {
-	protected static String nl;
-
-	public static synchronized CCaller3 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCaller3 result = new CCaller3();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Message from caller: found ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public CCaller3() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("parameter", this.parameter);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition3.fcore#_oG_wgHeUEd-ent-ImclT8w", ctx_local, parameters);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call.condition3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCaller3 {

+	protected static String nl;

+

+	public static synchronized CCaller3 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCaller3 result = new CCaller3();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Message from caller: found ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public CCaller3() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("parameter", this.parameter);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition3.fcore#_oG_wgHeUEd-ent-ImclT8w",

+					ctx_local, parameters);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Callee.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Callee.java
index d7938f1..876f3c0 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Callee.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Callee.java
@@ -1,46 +1,46 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call1;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.common.helper.*;
-
-public class Callee {
-
-	public Callee() {
-		//Here is the constructor
-		// add initialisation of the pattern variables (declaration has been already done).
-	}
-
-	public void generate(Object argument) throws Exception {
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		IQuery.ParameterDescription paramDesc = null;
-		Map<String, String> queryCtx = null;
-		Node.Container currentNode = ctx.getNode();
-
-		orchestration((PatternContext) argument);
-
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		Node.Container currentNode = ictx.getNode();
-		method_body(new StringBuffer(), ictx);
-		ictx.setNode(currentNode);
-		return null;
-	}
-
-	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {
-		out.append("Message from Callee");
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());
-	}
-
-}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call1;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.common.helper.*;

+

+public class Callee {

+

+	public Callee() {

+		//Here is the constructor

+		// add initialisation of the pattern variables (declaration has been already done).

+	}

+

+	public void generate(Object argument) throws Exception {

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		IQuery.ParameterDescription paramDesc = null;

+		Map<String, String> queryCtx = null;

+		Node.Container currentNode = ctx.getNode();

+

+		orchestration((PatternContext) argument);

+

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		Node.Container currentNode = ictx.getNode();

+		method_body(new StringBuffer(), ictx);

+		ictx.setNode(currentNode);

+		return null;

+	}

+

+	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {

+		out.append("Message from Callee");

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());

+	}

+

+}

diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Caller.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Caller.java
index 0a8c196..3add65f 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Caller.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call1/Caller.java
@@ -1,87 +1,88 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call1;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Caller {
-	protected static String nl;
-
-	public static synchronized Caller create(String lineSeparator) {
-		nl = lineSeparator;
-		Caller result = new Caller();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Message from caller";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public Caller() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, variable);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_1.fcore#_F9NFkFa3Ed-upsLSxDR5IA", ctx_local);
-		}
-
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass variable = null;
-
-	public void set_variable(org.eclipse.emf.ecore.EClass object) {
-		this.variable = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call1;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Caller {

+	protected static String nl;

+

+	public static synchronized Caller create(String lineSeparator) {

+		nl = lineSeparator;

+		Caller result = new Caller();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Message from caller";

+	protected final String TEXT_2 = NL;

+

+	public Caller() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, variable);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_1.fcore#_F9NFkFa3Ed-upsLSxDR5IA",

+					ctx_local);

+		}

+

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass variable = null;

+

+	public void set_variable(org.eclipse.emf.ecore.EClass object) {

+		this.variable = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Callee2.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Callee2.java
index 878a12b..035f9bd 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Callee2.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Callee2.java
@@ -1,75 +1,75 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call2;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.common.helper.*;
-
-public class Callee2 {
-
-	public Callee2() {
-		//Here is the constructor
-		// add initialisation of the pattern variables (declaration has been already done).
-	}
-
-	public void generate(Object argument) throws Exception {
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		IQuery.ParameterDescription paramDesc = null;
-		Map<String, String> queryCtx = null;
-		Node.Container currentNode = ctx.getNode();
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration((PatternContext) argument);
-
-			}
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		Node.Container currentNode = ictx.getNode();
-		method_body(new StringBuffer(), ictx);
-		ictx.setNode(currentNode);
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {
-		out.append("callee on " + parameter.getName() + "\n");
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass parameter) {
-		this.parameter = parameter;
-	}
-
-	public Map<String, Object> getParameters() {
-		Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call2;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.common.helper.*;

+

+public class Callee2 {

+

+	public Callee2() {

+		//Here is the constructor

+		// add initialisation of the pattern variables (declaration has been already done).

+	}

+

+	public void generate(Object argument) throws Exception {

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		IQuery.ParameterDescription paramDesc = null;

+		Map<String, String> queryCtx = null;

+		Node.Container currentNode = ctx.getNode();

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration((PatternContext) argument);

+

+			}

+		}

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		Node.Container currentNode = ictx.getNode();

+		method_body(new StringBuffer(), ictx);

+		ictx.setNode(currentNode);

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {

+		out.append("callee on " + parameter.getName() + "\n");

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass parameter) {

+		this.parameter = parameter;

+	}

+

+	public Map<String, Object> getParameters() {

+		Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+}

diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Caller2.java b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Caller2.java
index 697523b..15d6740 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Caller2.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/pattern/call2/Caller2.java
@@ -1,108 +1,110 @@
-//Generated on Wed Jan 18 17:28:07 CET 2012 with EGF 0.6.1.qualifier
-package pattern.call2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Caller2 {
-	protected static String nl;
-
-	public static synchronized Caller2 create(String lineSeparator) {
-		nl = lineSeparator;
-		Caller2 result = new Caller2();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Caller on ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Caller2() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("parameter", this.parameter);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_2.fcore#_VA72IFdJEd-TZKuCZ4UIfg", ctx_local, parameters);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package pattern.call2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Caller2 {

+	protected static String nl;

+

+	public static synchronized Caller2 create(String lineSeparator) {

+		nl = lineSeparator;

+		Caller2 result = new Caller2();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Caller on ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public Caller2() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("parameter", this.parameter);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_2.fcore#_VA72IFdJEd-TZKuCZ4UIfg",

+					ctx_local, parameters);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension2/CCallee4Child.java b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension2/CCallee4Child.java
index d563353..f564685 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension2/CCallee4Child.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension2/CCallee4Child.java
@@ -1,96 +1,95 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package patternCall.Condition.extension2;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCallee4Child extends substitution5.CCallee4 {
-	protected static String nl;
-
-	public static synchronized CCallee4Child create(String lineSeparator) {
-		nl = lineSeparator;
-		CCallee4Child result = new CCallee4Child();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Extension: callee applied on 'Test' EClass" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public CCallee4Child() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package patternCall.Condition.extension2;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCallee4Child extends substitution5.CCallee4 {

+	protected static String nl;

+

+	public static synchronized CCallee4Child create(String lineSeparator) {

+		nl = lineSeparator;

+		CCallee4Child result = new CCallee4Child();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Extension: callee applied on 'Test' EClass" + NL;

+	protected final String TEXT_2 = NL;

+

+	public CCallee4Child() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/ClassPattern.java
index 0c16a04..05116cc 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/ClassPattern.java
@@ -1,106 +1,105 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package patternCall.Condition.extension3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "found the EClass 'Test' (element name is ";
-	protected final String TEXT_2 = ")" + NL + " ";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-
-	}
+//Generated with EGF 1.6.0.201901231006

+package patternCall.Condition.extension3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "found the EClass 'Test' (element name is ";

+	protected final String TEXT_2 = ")" + NL + " ";

+	protected final String TEXT_3 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/extendedClass.java b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/extendedClass.java
index 933de9a..03ac63d 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/extendedClass.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension3/extendedClass.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package patternCall.Condition.extension3;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class extendedClass {
-	protected static String nl;
-
-	public static synchronized extendedClass create(String lineSeparator) {
-		nl = lineSeparator;
-		extendedClass result = new extendedClass();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "found the EClass 'Company' (element name is ";
-	protected final String TEXT_2 = ")" + NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public extendedClass() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Company".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package patternCall.Condition.extension3;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class extendedClass {

+	protected static String nl;

+

+	public static synchronized extendedClass create(String lineSeparator) {

+		nl = lineSeparator;

+		extendedClass result = new extendedClass();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "found the EClass 'Company' (element name is ";

+	protected final String TEXT_2 = ")" + NL;

+	protected final String TEXT_3 = NL;

+

+	public extendedClass() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Company".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Callee5.java b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Callee5.java
index 5e99c63..49b3b96 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Callee5.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Callee5.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package patternCall.Condition.extension4;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Callee5 {
-	protected static String nl;
-
-	public static synchronized Callee5 create(String lineSeparator) {
-		nl = lineSeparator;
-		Callee5 result = new Callee5();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Callee has found the 'Test' EClass (on element ";
-	protected final String TEXT_2 = ")" + NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Callee5() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package patternCall.Condition.extension4;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Callee5 {

+	protected static String nl;

+

+	public static synchronized Callee5 create(String lineSeparator) {

+		nl = lineSeparator;

+		Callee5 result = new Callee5();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Callee has found the 'Test' EClass (on element ";

+	protected final String TEXT_2 = ")" + NL;

+	protected final String TEXT_3 = NL;

+

+	public Callee5() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Caller5.java b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Caller5.java
index f987107..0d481ba 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Caller5.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/Caller5.java
@@ -1,118 +1,122 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package patternCall.Condition.extension4;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Caller5 {
-	protected static String nl;
-
-	public static synchronized Caller5 create(String lineSeparator) {
-		nl = lineSeparator;
-		Caller5 result = new Caller5();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Caller on ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public Caller5() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("parameter", this.parameter);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition_extension.fcore#_7EB6AHiLEd-ESZ0E4UoGEA", ctx_local, parameters);
-		}
-
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition_extension.fcore#_GDn-oHiNEd-ESZ0E4UoGEA", ctx_local);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package patternCall.Condition.extension4;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Caller5 {

+	protected static String nl;

+

+	public static synchronized Caller5 create(String lineSeparator) {

+		nl = lineSeparator;

+		Caller5 result = new Caller5();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Caller on ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public Caller5() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("parameter", this.parameter);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition_extension.fcore#_7EB6AHiLEd-ESZ0E4UoGEA",

+					ctx_local, parameters);

+		}

+

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition_extension.fcore#_GDn-oHiNEd-ESZ0E4UoGEA",

+					ctx_local);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/InjectedCallee5.java b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/InjectedCallee5.java
index 726d74d..17d5953 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/InjectedCallee5.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/patternCall/Condition/extension4/InjectedCallee5.java
@@ -1,106 +1,106 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package patternCall.Condition.extension4;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class InjectedCallee5 {
-	protected static String nl;
-
-	public static synchronized InjectedCallee5 create(String lineSeparator) {
-		nl = lineSeparator;
-		InjectedCallee5 result = new InjectedCallee5();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "InjectedCallee has found the 'Test' EClass (on element ";
-	protected final String TEXT_2 = ")" + NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public InjectedCallee5() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Test".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package patternCall.Condition.extension4;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class InjectedCallee5 {

+	protected static String nl;

+

+	public static synchronized InjectedCallee5 create(String lineSeparator) {

+		nl = lineSeparator;

+		InjectedCallee5 result = new InjectedCallee5();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "InjectedCallee has found the 'Test' EClass (on element ";

+	protected final String TEXT_2 = ")" + NL;

+	protected final String TEXT_3 = NL;

+

+	public InjectedCallee5() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Test".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/AttributePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/AttributePattern.java
index 006edac..e4e219f 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/AttributePattern.java
@@ -1,109 +1,108 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class AttributePattern extends substitution.another.base.BasePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Attribute ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Attribute]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class AttributePattern extends substitution.another.base.BasePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Attribute ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Attribute]";

+	protected final String TEXT_4 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/BasePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/BasePattern.java
index a5643b2..9af5496 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/BasePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/BasePattern.java
@@ -1,95 +1,94 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class BasePattern {
-	protected static String nl;
-
-	public static synchronized BasePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		BasePattern result = new BasePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public BasePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class BasePattern {

+	protected static String nl;

+

+	public static synchronized BasePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		BasePattern result = new BasePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = NL;

+

+	public BasePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/ClassPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/ClassPattern.java
index d9f636d..3bfc0bd 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/ClassPattern.java
@@ -1,129 +1,132 @@
-//Generated on Wed Jan 18 17:28:05 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern extends substitution.another.base.BasePattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Class ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Class]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_start(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("parameter", this.parameter);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_2.fcore#_4ahL8Eh5Ed-A7KV9v5yLhw", ctx_local, parameters);
-		}
-
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_2.fcore#_7RsNYEh5Ed-A7KV9v5yLhw", ctx_local);
-		}
-
-		method_end(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern extends substitution.another.base.BasePattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Class ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Class]";

+	protected final String TEXT_4 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_start(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("parameter", this.parameter);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_2.fcore#_4ahL8Eh5Ed-A7KV9v5yLhw",

+					ctx_local, parameters);

+		}

+

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, parameter);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_2.fcore#_7RsNYEh5Ed-A7KV9v5yLhw",

+					ctx_local);

+		}

+

+		method_end(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/PackagePattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/PackagePattern.java
index d3494e0..5a7fc0b 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/PackagePattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/base/PackagePattern.java
@@ -1,109 +1,108 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class PackagePattern extends substitution.another.base.BasePattern {
-	protected static String nl;
-
-	public static synchronized PackagePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		PackagePattern result = new PackagePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Package ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = "[end Package]";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public PackagePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EPackage parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());
-	}
-
-	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class PackagePattern extends substitution.another.base.BasePattern {

+	protected static String nl;

+

+	public static synchronized PackagePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		PackagePattern result = new PackagePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Package ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = "[end Package]";

+	protected final String TEXT_4 = NL;

+

+	public PackagePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EPackage) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EPackage parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EPackage object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_start(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "start", stringBuffer.toString());

+	}

+

+	protected void method_end(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "end", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/CalledPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/CalledPattern.java
index 22c081d..3cf4be6 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/CalledPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/CalledPattern.java
@@ -1,98 +1,97 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.call;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CalledPattern {
-	protected static String nl;
-
-	public static synchronized CalledPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		CalledPattern result = new CalledPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = " - some details - ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public CalledPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.call;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CalledPattern {

+	protected static String nl;

+

+	public static synchronized CalledPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		CalledPattern result = new CalledPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = " - some details - ";

+	protected final String TEXT_2 = NL;

+

+	public CalledPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/InjectedPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/InjectedPattern.java
index d451356..58a3aca 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/InjectedPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/InjectedPattern.java
@@ -1,102 +1,102 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.call;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class InjectedPattern {
-	protected static String nl;
-
-	public static synchronized InjectedPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		InjectedPattern result = new InjectedPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[eReference ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public InjectedPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EReference");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EReference) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EReference parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EReference object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.call;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class InjectedPattern {

+	protected static String nl;

+

+	public static synchronized InjectedPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		InjectedPattern result = new InjectedPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[eReference ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = NL;

+

+	public InjectedPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EReference");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EReference) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EReference parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EReference object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myCalledPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myCalledPattern.java
index 3bbbfca..94da83b 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myCalledPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myCalledPattern.java
@@ -1,98 +1,97 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.call;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class myCalledPattern {
-	protected static String nl;
-
-	public static synchronized myCalledPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		myCalledPattern result = new myCalledPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = " - improved details - ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public myCalledPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.call;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class myCalledPattern {

+	protected static String nl;

+

+	public static synchronized myCalledPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		myCalledPattern result = new myCalledPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = " - improved details - ";

+	protected final String TEXT_2 = NL;

+

+	public myCalledPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myInjectedPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myInjectedPattern.java
index a83bb7d..2f92ef1 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myInjectedPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/myInjectedPattern.java
@@ -1,96 +1,96 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.call;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class myInjectedPattern extends substitution.another.call.InjectedPattern {
-	protected static String nl;
-
-	public static synchronized myInjectedPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		myInjectedPattern result = new myInjectedPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "[Improved EReference ";
-	protected final String TEXT_2 = "]";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public myInjectedPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EReference");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EReference) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.call;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class myInjectedPattern extends substitution.another.call.InjectedPattern {

+	protected static String nl;

+

+	public static synchronized myInjectedPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		myInjectedPattern result = new myInjectedPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "[Improved EReference ";

+	protected final String TEXT_2 = "]";

+	protected final String TEXT_3 = NL;

+

+	public myInjectedPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EReference");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EReference) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/mySecondCallPattern.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/mySecondCallPattern.java
index b2b9f69..9c03f23 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/mySecondCallPattern.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/another/call/mySecondCallPattern.java
@@ -1,92 +1,91 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution.another.call;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class mySecondCallPattern extends substitution.another.call.CalledPattern {
-	protected static String nl;
-
-	public static synchronized mySecondCallPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		mySecondCallPattern result = new mySecondCallPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = " - another kind of details - ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public mySecondCallPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.another.call;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class mySecondCallPattern extends substitution.another.call.CalledPattern {

+	protected static String nl;

+

+	public static synchronized mySecondCallPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		mySecondCallPattern result = new mySecondCallPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = " - another kind of details - ";

+	protected final String TEXT_2 = NL;

+

+	public mySecondCallPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassName.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassName.java
index 4d3b562..a626187 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassName.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassName.java
@@ -1,103 +1,102 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution.preCondition;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassName {
-	protected static String nl;
-
-	public static synchronized ClassName create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassName result = new ClassName();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public ClassName() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.preCondition;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassName {

+	protected static String nl;

+

+	public static synchronized ClassName create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassName result = new ClassName();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public ClassName() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassNameForCompanyOnly.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassNameForCompanyOnly.java
index 58a6283..d5ce95e 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassNameForCompanyOnly.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution/preCondition/ClassNameForCompanyOnly.java
@@ -1,97 +1,96 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution.preCondition;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassNameForCompanyOnly extends substitution.preCondition.ClassName {
-	protected static String nl;
-
-	public static synchronized ClassNameForCompanyOnly create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassNameForCompanyOnly result = new ClassNameForCompanyOnly();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "found ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public ClassNameForCompanyOnly() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return "Company".equals(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution.preCondition;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassNameForCompanyOnly extends substitution.preCondition.ClassName {

+	protected static String nl;

+

+	public static synchronized ClassNameForCompanyOnly create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassNameForCompanyOnly result = new ClassNameForCompanyOnly();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "found ";

+	protected final String TEXT_2 = NL;

+

+	public ClassNameForCompanyOnly() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return "Company".equals(parameter.getName());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/base/A.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/base/A.java
index d52efd5..c538380 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/base/A.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/base/A.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package substitution3.base;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class A {
-	protected static String nl;
-
-	public static synchronized A create(String lineSeparator) {
-		nl = lineSeparator;
-		A result = new A();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "A on ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public A() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution3.base;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class A {

+	protected static String nl;

+

+	public static synchronized A create(String lineSeparator) {

+		nl = lineSeparator;

+		A result = new A();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "A on ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public A() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/B.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/B.java
index 31af862..ba70199 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/B.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/B.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package substitution3.extension;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class B {
-	protected static String nl;
-
-	public static synchronized B create(String lineSeparator) {
-		nl = lineSeparator;
-		B result = new B();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "B on ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public B() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution3.extension;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class B {

+	protected static String nl;

+

+	public static synchronized B create(String lineSeparator) {

+		nl = lineSeparator;

+		B result = new B();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "B on ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public B() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/C.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/C.java
index 5b0252d..e97c61c 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/C.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution3/extension/C.java
@@ -1,101 +1,100 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package substitution3.extension;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class C {
-	protected static String nl;
-
-	public static synchronized C create(String lineSeparator) {
-		nl = lineSeparator;
-		C result = new C();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "C on ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public C() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			{
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution3.extension;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class C {

+	protected static String nl;

+

+	public static synchronized C create(String lineSeparator) {

+		nl = lineSeparator;

+		C result = new C();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "C on ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public C() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCallee4.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCallee4.java
index a215791..5295560 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCallee4.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCallee4.java
@@ -1,105 +1,104 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package substitution5;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCallee4 {
-	protected static String nl;
-
-	public static synchronized CCallee4 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCallee4 result = new CCallee4();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Message from Callee pattern: ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public CCallee4() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution5;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCallee4 {

+	protected static String nl;

+

+	public static synchronized CCallee4 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCallee4 result = new CCallee4();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Message from Callee pattern: ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public CCallee4() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCaller4.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCaller4.java
index be2f71b..ca987d7 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCaller4.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution5/CCaller4.java
@@ -1,112 +1,114 @@
-//Generated on Wed Jan 18 17:28:10 CET 2012 with EGF 0.6.1.qualifier
-package substitution5;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class CCaller4 {
-	protected static String nl;
-
-	public static synchronized CCaller4 create(String lineSeparator) {
-		nl = lineSeparator;
-		CCaller4 result = new CCaller4();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Message from Caller pattern: ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public CCaller4() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("parameter", this.parameter);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition_extension.fcore#_ZjDFQHecEd-ent-ImclT8w", ctx_local, parameters);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution5;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class CCaller4 {

+	protected static String nl;

+

+	public static synchronized CCaller4 create(String lineSeparator) {

+		nl = lineSeparator;

+		CCaller4 result = new CCaller4();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Message from Caller pattern: ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public CCaller4() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("parameter", this.parameter);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/patternCall_Condition_extension.fcore#_ZjDFQHecEd-ent-ImclT8w",

+					ctx_local, parameters);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/a.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/a.java
index 4c571b4..258ae4c 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/a.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/a.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution_4;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class a {
-	protected static String nl;
-
-	public static synchronized a create(String lineSeparator) {
-		nl = lineSeparator;
-		a result = new a();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "a";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public a() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_4;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class a {

+	protected static String nl;

+

+	public static synchronized a create(String lineSeparator) {

+		nl = lineSeparator;

+		a result = new a();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "a";

+	protected final String TEXT_2 = NL;

+

+	public a() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/b.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/b.java
index 504d5bd..6b375c6 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/b.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/b.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution_4;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class b {
-	protected static String nl;
-
-	public static synchronized b create(String lineSeparator) {
-		nl = lineSeparator;
-		b result = new b();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "b";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public b() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_4;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class b {

+	protected static String nl;

+

+	public static synchronized b create(String lineSeparator) {

+		nl = lineSeparator;

+		b result = new b();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "b";

+	protected final String TEXT_2 = NL;

+

+	public b() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/c.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/c.java
index 5fc28d8..dc02574 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/c.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_4/c.java
@@ -1,76 +1,75 @@
-//Generated on Wed Jan 18 17:28:08 CET 2012 with EGF 0.6.1.qualifier
-package substitution_4;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class c {
-	protected static String nl;
-
-	public static synchronized c create(String lineSeparator) {
-		nl = lineSeparator;
-		c result = new c();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "c";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public c() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		{
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_4;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class c {

+	protected static String nl;

+

+	public static synchronized c create(String lineSeparator) {

+		nl = lineSeparator;

+		c result = new c();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "c";

+	protected final String TEXT_2 = NL;

+

+	public c() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/caller.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/caller.java
index 7198e17..2b123f6 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/caller.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/caller.java
@@ -1,55 +1,57 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_chain;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.common.helper.*;
-
-public class caller {
-
-	public caller() {
-		//Here is the constructor
-		// add initialisation of the pattern variables (declaration has been already done).
-	}
-
-	public void generate(Object argument) throws Exception {
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		IQuery.ParameterDescription paramDesc = null;
-		Map<String, String> queryCtx = null;
-		Node.Container currentNode = ctx.getNode();
-
-		if (preCondition(ctx))
-			orchestration((PatternContext) argument);
-
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		Node.Container currentNode = ictx.getNode();
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_chain.fcore#_9yQgsJmOEd-BDZHgxyTzjQ", ctx_local, parameters);
-		}
-		ictx.setNode(currentNode);
-		return null;
-	}
-
-	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {
-		//default content
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
-
-}
+//Generated with EGF 1.6.0.201901231006

+package substitution_chain;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.common.helper.*;

+

+public class caller {

+

+	public caller() {

+		//Here is the constructor

+		// add initialisation of the pattern variables (declaration has been already done).

+	}

+

+	public void generate(Object argument) throws Exception {

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		IQuery.ParameterDescription paramDesc = null;

+		Map<String, String> queryCtx = null;

+		Node.Container currentNode = ctx.getNode();

+

+		if (preCondition(ctx))

+			orchestration((PatternContext) argument);

+

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		Node.Container currentNode = ictx.getNode();

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_chain.fcore#_9yQgsJmOEd-BDZHgxyTzjQ",

+					ctx_local, parameters);

+		}

+		ictx.setNode(currentNode);

+		return null;

+	}

+

+	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {

+		//default content

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+

+}

diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace1.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace1.java
index b891de0..2cdad9c 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace1.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace1.java
@@ -1,80 +1,79 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_chain;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class replace1 {
-	protected static String nl;
-
-	public static synchronized replace1 create(String lineSeparator) {
-		nl = lineSeparator;
-		replace1 result = new replace1();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "replace1" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public replace1() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		if (preCondition(ctx)) {
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_chain;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class replace1 {

+	protected static String nl;

+

+	public static synchronized replace1 create(String lineSeparator) {

+		nl = lineSeparator;

+		replace1 result = new replace1();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "replace1" + NL;

+	protected final String TEXT_2 = NL;

+

+	public replace1() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		if (preCondition(ctx)) {

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace2.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace2.java
index 2d08c77..ddfaa2e 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace2.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace2.java
@@ -1,80 +1,79 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_chain;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class replace2 {
-	protected static String nl;
-
-	public static synchronized replace2 create(String lineSeparator) {
-		nl = lineSeparator;
-		replace2 result = new replace2();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "replace2" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public replace2() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		if (preCondition(ctx)) {
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_chain;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class replace2 {

+	protected static String nl;

+

+	public static synchronized replace2 create(String lineSeparator) {

+		nl = lineSeparator;

+		replace2 result = new replace2();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "replace2" + NL;

+	protected final String TEXT_2 = NL;

+

+	public replace2() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		if (preCondition(ctx)) {

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace3.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace3.java
index 108c545..0d69d30 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace3.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replace3.java
@@ -1,80 +1,79 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_chain;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class replace3 {
-	protected static String nl;
-
-	public static synchronized replace3 create(String lineSeparator) {
-		nl = lineSeparator;
-		replace3 result = new replace3();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "replace3" + NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public replace3() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		if (preCondition(ctx)) {
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_chain;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class replace3 {

+	protected static String nl;

+

+	public static synchronized replace3 create(String lineSeparator) {

+		nl = lineSeparator;

+		replace3 result = new replace3();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "replace3" + NL;

+	protected final String TEXT_2 = NL;

+

+	public replace3() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		if (preCondition(ctx)) {

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replaced.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replaced.java
index 12f751f..0886bcd 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replaced.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_chain/replaced.java
@@ -1,78 +1,78 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_chain;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class replaced {
-	protected static String nl;
-
-	public static synchronized replaced create(String lineSeparator) {
-		nl = lineSeparator;
-		replaced result = new replaced();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "";
-	protected final String TEXT_2 = NL;
-
-	public replaced() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		if (preCondition(ctx)) {
-			ctx.setNode(new Node.Container(currentNode, getClass()));
-			orchestration(ctx);
-		}
-
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(TEXT_2);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		return null;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_chain;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class replaced {

+	protected static String nl;

+

+	public static synchronized replaced create(String lineSeparator) {

+		nl = lineSeparator;

+		replaced result = new replaced();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public replaced() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		if (preCondition(ctx)) {

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/added.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/added.java
index 237bd5a..ed7313a 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/added.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/added.java
@@ -1,105 +1,103 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_patternCall;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class added {
-	protected static String nl;
-
-	public static synchronized added create(String lineSeparator) {
-		nl = lineSeparator;
-		added result = new added();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "added eClass : ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public added() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> eClassList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object eClassParameter : eClassList) {
-
-			this.eClass = (org.eclipse.emf.ecore.EClass) eClassParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("eClass", this.eClass);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass eClass = null;
-
-	public void set_eClass(org.eclipse.emf.ecore.EClass object) {
-		this.eClass = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("eClass", this.eClass);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(eClass.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_patternCall;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class added {

+	protected static String nl;

+

+	public static synchronized added create(String lineSeparator) {

+		nl = lineSeparator;

+		added result = new added();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "added eClass : ";

+	protected final String TEXT_2 = NL;

+

+	public added() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> eClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object eClassParameter : eClassList) {

+

+			this.eClass = (org.eclipse.emf.ecore.EClass) eClassParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("eClass", this.eClass);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass eClass = null;

+

+	public void set_eClass(org.eclipse.emf.ecore.EClass object) {

+		this.eClass = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("eClass", this.eClass);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(eClass.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/callee.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/callee.java
index c84c6bf..3bf651b 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/callee.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/callee.java
@@ -1,106 +1,105 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_patternCall;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class callee {
-	protected static String nl;
-
-	public static synchronized callee create(String lineSeparator) {
-		nl = lineSeparator;
-		callee result = new callee();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "  callee eAttribute : ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public callee() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		paramDesc = new IQuery.ParameterDescription("eAttribute", "http://www.eclipse.org/emf/2002/Ecore#//EAttribute");
-		queryCtx = new HashMap<String, String>();
-		List<Object> eAttributeList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object eAttributeParameter : eAttributeList) {
-
-			this.eAttribute = (org.eclipse.emf.ecore.EAttribute) eAttributeParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("eAttribute", this.eAttribute);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute eAttribute = null;
-
-	public void set_eAttribute(org.eclipse.emf.ecore.EAttribute object) {
-		this.eAttribute = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("eAttribute", this.eAttribute);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(eAttribute.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_patternCall;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class callee {

+	protected static String nl;

+

+	public static synchronized callee create(String lineSeparator) {

+		nl = lineSeparator;

+		callee result = new callee();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "  callee eAttribute : ";

+	protected final String TEXT_2 = NL;

+

+	public callee() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("eAttribute", "http://www.eclipse.org/emf/2002/Ecore#//EAttribute");

+		queryCtx = new HashMap<String, String>();

+		List<Object> eAttributeList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object eAttributeParameter : eAttributeList) {

+

+			this.eAttribute = (org.eclipse.emf.ecore.EAttribute) eAttributeParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("eAttribute", this.eAttribute);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute eAttribute = null;

+

+	public void set_eAttribute(org.eclipse.emf.ecore.EAttribute object) {

+		this.eAttribute = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("eAttribute", this.eAttribute);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(eAttribute.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/caller.java b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/caller.java
index da8b36e..8bf253d 100644
--- a/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/caller.java
+++ b/tests/org.eclipse.egf.core.test.pattern/generated/substitution_patternCall/caller.java
@@ -1,110 +1,110 @@
-//Generated on Wed Jan 18 17:28:06 CET 2012 with EGF 0.6.1.qualifier
-package substitution_patternCall;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class caller {
-	protected static String nl;
-
-	public static synchronized caller create(String lineSeparator) {
-		nl = lineSeparator;
-		caller result = new caller();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "caller eClass : ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public caller() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-		Node.Container currentNode = ctx.getNode();
-
-		List<Object> eClassList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object eClassParameter : eClassList) {
-
-			this.eClass = (org.eclipse.emf.ecore.EClass) eClassParameter;
-
-			if (preCondition(ctx)) {
-				ctx.setNode(new Node.Container(currentNode, getClass()));
-				orchestration(ctx);
-			}
-
-		}
-		ctx.setNode(currentNode);
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-
-		method_body(new StringBuffer(), ictx);
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, eClass);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_patternCall.fcore#_ZHxDMJAhEd-qRrvFxb1RDA", ctx_local);
-		}
-
-		if (ictx.useReporter()) {
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("eClass", this.eClass);
-			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
-			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-		}
-		return null;
-	}
-
-	protected org.eclipse.emf.ecore.EClass eClass = null;
-
-	public void set_eClass(org.eclipse.emf.ecore.EClass object) {
-		this.eClass = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("eClass", this.eClass);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(eClass.getName());
-		stringBuffer.append(TEXT_2);
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());
-	}
-
-	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package substitution_patternCall;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class caller {

+	protected static String nl;

+

+	public static synchronized caller create(String lineSeparator) {

+		nl = lineSeparator;

+		caller result = new caller();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "caller eClass : ";

+	protected final String TEXT_2 = NL;

+

+	public caller() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> eClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object eClassParameter : eClassList) {

+

+			this.eClass = (org.eclipse.emf.ecore.EClass) eClassParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, eClass);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.core.test.pattern/fc/substitution_patternCall.fcore#_ZHxDMJAhEd-qRrvFxb1RDA",

+					ctx_local);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("eClass", this.eClass);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass eClass = null;

+

+	public void set_eClass(org.eclipse.emf.ecore.EClass object) {

+		this.eClass = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("eClass", this.eClass);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(eClass.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test.pattern/test/Pattern_UC1.test b/tests/org.eclipse.egf.core.test.pattern/test/Pattern_UC1.test
index 383aa3e..af3ed96 100644
--- a/tests/org.eclipse.egf.core.test.pattern/test/Pattern_UC1.test
+++ b/tests/org.eclipse.egf.core.test.pattern/test/Pattern_UC1.test
@@ -29,7 +29,7 @@
     <activity xsi:type="fcore:FactoryComponent" href="../../../plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_7_Injection.fcore#_zOU6cBVhEd-JoY-b5_Vpcw"/>

   </tests>

   <tests xsi:type="test:EGFTestCase" name="UC1.8 WorkspaceDomain">

-    <result xsi:type="test:ConsoleOutputTestResult" text="--------------&#xA;Result of pattern:&#xA;File: .classpath&#xA;File: .gitignore&#xA;File: .project&#xA;Container: .settings&#xA;File: org.eclipse.core.resources.prefs&#xA;File: org.eclipse.jdt.core.prefs&#xA;Container: META-INF&#xA;File: MANIFEST.MF&#xA;File: about.html&#xA;Container: bin&#xA;Container: egf&#xA;Container: uc1_1&#xA;Container: pattern&#xA;File: attributePattern.class&#xA;File: classPattern.class&#xA;File: myPattern.class&#xA;Container: uc1_2&#xA;Container: pattern&#xA;File: ClassPattern.class&#xA;Container: parent&#xA;File: ParentPattern.class&#xA;Container: uc1_3&#xA;Container: pattern&#xA;File: HelloWorld.class&#xA;Container: friends&#xA;File: HelloFriends.class&#xA;Container: parent&#xA;File: Hello.class&#xA;Container: uc1_4&#xA;Container: pattern&#xA;File: AttributePattern.class&#xA;File: ClassPattern.class&#xA;Container: uc1_5&#xA;Container: pattern&#xA;File: ClassPattern.class&#xA;Container: uc1_6&#xA;Container: pattern&#xA;File: JetClassPattern.class&#xA;Container: java&#xA;File: JavaPattern.class&#xA;Container: uc1_7&#xA;Container: pattern&#xA;File: ClassPattern.class&#xA;Container: forInjection&#xA;File: ForInjectionPattern.class&#xA;Container: uc1_8&#xA;Container: pattern&#xA;File: ContainerPattern.class&#xA;File: FilePattern.class&#xA;Container: org&#xA;Container: eclipse&#xA;Container: egf&#xA;Container: usecase&#xA;Container: pattern&#xA;Container: uc1&#xA;File: HelloWorld.class&#xA;Container: callback&#xA;File: MyCallbackHandler.class&#xA;Container: helper&#xA;File: MyHelper.class&#xA;Container: query&#xA;File: ContentQuery.class&#xA;Container: reporter&#xA;File: MyReporter.class&#xA;File: build.properties&#xA;Container: egf&#xA;File: Pattern_UC1_0_AllTogether.fcore&#xA;File: Pattern_UC1_1_ClassPattern.fcore&#xA;File: Pattern_UC1_2_Inheritance.fcore&#xA;File: Pattern_UC1_3_InheritanceAndCall.fcore&#xA;File: Pattern_UC1_4_Callback_StrategyBased.fcore&#xA;File: Pattern_UC1_5_Callback_WithJavaClass.fcore&#xA;File: Pattern_UC1_6_JetPatternCallsJavaPattern.fcore&#xA;File: Pattern_UC1_7_Injection.fcore&#xA;File: Pattern_UC1_8_WorkspaceDomain.fcore&#xA;Container: generated&#xA;Container: egf&#xA;Container: uc1_1&#xA;Container: pattern&#xA;File: attributePattern.java&#xA;File: classPattern.java&#xA;File: myPattern.java&#xA;Container: uc1_2&#xA;Container: pattern&#xA;File: ClassPattern.java&#xA;Container: parent&#xA;File: ParentPattern.java&#xA;Container: uc1_3&#xA;Container: pattern&#xA;File: HelloWorld.java&#xA;Container: friends&#xA;File: HelloFriends.java&#xA;Container: parent&#xA;File: Hello.java&#xA;Container: uc1_4&#xA;Container: pattern&#xA;File: AttributePattern.java&#xA;File: ClassPattern.java&#xA;Container: uc1_5&#xA;Container: pattern&#xA;File: ClassPattern.java&#xA;Container: uc1_6&#xA;Container: pattern&#xA;File: JetClassPattern.java&#xA;Container: java&#xA;File: JavaPattern.java&#xA;Container: uc1_7&#xA;Container: pattern&#xA;File: ClassPattern.java&#xA;Container: forInjection&#xA;File: ForInjectionPattern.java&#xA;Container: uc1_8&#xA;Container: pattern&#xA;File: ContainerPattern.java&#xA;File: FilePattern.java&#xA;File: plugin.properties&#xA;File: plugin.xml&#xA;Container: src&#xA;Container: org&#xA;Container: eclipse&#xA;Container: egf&#xA;Container: usecase&#xA;Container: pattern&#xA;Container: uc1&#xA;File: HelloWorld.java&#xA;Container: callback&#xA;File: MyCallbackHandler.java&#xA;Container: helper&#xA;File: MyHelper.java&#xA;Container: query&#xA;File: ContentQuery.java&#xA;Container: reporter&#xA;File: MyReporter.java&#xA;Container: templates&#xA;Container: pattern._2Gd44AK5EeCbJtlATdOycQ&#xA;File: method._2Gd44gK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd44wK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd45AK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd45QK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd45gK5EeCbJtlATdOycQ.pt&#xA;Container: pattern._5JlroAK5EeCbJtlATdOycQ&#xA;File: method._5JlrogK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrowK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrpAK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrpQK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrpgK5EeCbJtlATdOycQ.pt&#xA;Container: pattern._7-a0kAzxEd-sdvrVfWaxAw&#xA;File: method._7-a0kQzxEd-sdvrVfWaxAw.pt&#xA;File: method._7-a0kgzxEd-sdvrVfWaxAw.pt&#xA;File: method._7-a0kwzxEd-sdvrVfWaxAw.pt&#xA;File: method._7-a0lAzxEd-sdvrVfWaxAw.pt&#xA;Container: pattern._7nKkcAzsEd-pgpX7a7GeEA&#xA;File: method._7nKkcQzsEd-pgpX7a7GeEA.pt&#xA;File: method._7nKkcgzsEd-pgpX7a7GeEA.pt&#xA;File: method._7nKkcwzsEd-pgpX7a7GeEA.pt&#xA;File: method._7nKkdAzsEd-pgpX7a7GeEA.pt&#xA;File: method._Z8MpMAztEd-pgpX7a7GeEA.pt&#xA;File: method._pn8JUAztEd-pgpX7a7GeEA.pt&#xA;Container: pattern._8lp8YBe1Ed-DaY2uHNBaQg&#xA;File: method._8lp8YRe1Ed-DaY2uHNBaQg.pt&#xA;File: method._8lp8Yhe1Ed-DaY2uHNBaQg.pt&#xA;File: method._8lp8Yxe1Ed-DaY2uHNBaQg.pt&#xA;File: method._8lp8ZBe1Ed-DaY2uHNBaQg.pt&#xA;File: method._CFlv0Be2Ed-DaY2uHNBaQg.pt&#xA;File: method._Co-JsBe2Ed-DaY2uHNBaQg.pt&#xA;Container: pattern._AVTZcAzrEd-pgpX7a7GeEA&#xA;File: method._AVTZcQzrEd-pgpX7a7GeEA.pt&#xA;File: method._AVTZcgzrEd-pgpX7a7GeEA.pt&#xA;File: method._AVTZcwzrEd-pgpX7a7GeEA.pt&#xA;File: method._AVTZdAzrEd-pgpX7a7GeEA.pt&#xA;Container: pattern._MTvCABe6Ed-O0P2188kAmA&#xA;File: method._MTvCARe6Ed-O0P2188kAmA.pt&#xA;File: method._MTvCAhe6Ed-O0P2188kAmA.pt&#xA;File: method._MTvCAxe6Ed-O0P2188kAmA.pt&#xA;File: method._MTvCBBe6Ed-O0P2188kAmA.pt&#xA;Container: pattern._NIgPYBVgEd-JoY-b5_Vpcw&#xA;File: method._NIg2cBVgEd-JoY-b5_Vpcw.pt&#xA;File: method._NIg2cRVgEd-JoY-b5_Vpcw.pt&#xA;File: method._NIg2chVgEd-JoY-b5_Vpcw.pt&#xA;File: method._NIg2cxVgEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._QdrPsBe2Ed-DaY2uHNBaQg&#xA;File: method._Qdr2wBe2Ed-DaY2uHNBaQg.pt&#xA;File: method._QdrPsRe2Ed-DaY2uHNBaQg.pt&#xA;File: method._QdrPshe2Ed-DaY2uHNBaQg.pt&#xA;File: method._QdrPsxe2Ed-DaY2uHNBaQg.pt&#xA;Container: pattern._QmXisBsZEd-Cmei4SZ1Naw&#xA;File: method._QmXisRsZEd-Cmei4SZ1Naw.pt&#xA;File: method._QmXishsZEd-Cmei4SZ1Naw.pt&#xA;File: method._QmXisxsZEd-Cmei4SZ1Naw.pt&#xA;File: method._QmXitBsZEd-Cmei4SZ1Naw.pt&#xA;Container: pattern._RdSMYBViEd-JoY-b5_Vpcw&#xA;File: method._RdSMYRViEd-JoY-b5_Vpcw.pt&#xA;File: method._RdSMYhViEd-JoY-b5_Vpcw.pt&#xA;File: method._RdSzcBViEd-JoY-b5_Vpcw.pt&#xA;File: method._RdSzcRViEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._RfrD8BVgEd-JoY-b5_Vpcw&#xA;File: method._PbStEBbvEd-thalzjBN9kg.pt&#xA;File: method._RfrD8RVgEd-JoY-b5_Vpcw.pt&#xA;File: method._RfrD8hVgEd-JoY-b5_Vpcw.pt&#xA;File: method._RfrD8xVgEd-JoY-b5_Vpcw.pt&#xA;File: method._RfrD9BVgEd-JoY-b5_Vpcw.pt&#xA;File: method._X63lwBVgEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._YVbI4BViEd-JoY-b5_Vpcw&#xA;File: method._AZL8wBVjEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbI4RViEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbv8BViEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbv8RViEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbv8hViEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._e1Lf4BsbEd-Cmei4SZ1Naw&#xA;File: method._e1Lf4RsbEd-Cmei4SZ1Naw.pt&#xA;File: method._e1Lf4hsbEd-Cmei4SZ1Naw.pt&#xA;File: method._e1Lf4xsbEd-Cmei4SZ1Naw.pt&#xA;File: method._e1Lf5BsbEd-Cmei4SZ1Naw.pt&#xA;Container: pattern._iXOsIBrgEd-cXtp4jDfJVg&#xA;File: method._iXOsIRrgEd-cXtp4jDfJVg.pt&#xA;File: method._iXOsIhrgEd-cXtp4jDfJVg.pt&#xA;File: method._iXOsIxrgEd-cXtp4jDfJVg.pt&#xA;File: method._iXOsJBrgEd-cXtp4jDfJVg.pt&#xA;Container: pattern._riKAEBrfEd-cXtp4jDfJVg&#xA;File: method._riKAERrfEd-cXtp4jDfJVg.pt&#xA;File: method._riKAEhrfEd-cXtp4jDfJVg.pt&#xA;File: method._riKAExrfEd-cXtp4jDfJVg.pt&#xA;File: method._riKAFBrfEd-cXtp4jDfJVg.pt&#xA;Container: test&#xA;File: Pattern_UC1.test&#xA;&#xA;"/>
+    <result xsi:type="test:ConsoleOutputTestResult" text="--------------&#xA;Result of pattern:&#xA;File: .classpath&#xA;File: .project&#xA;Container: .settings&#xA;File: org.eclipse.core.resources.prefs&#xA;File: org.eclipse.jdt.core.prefs&#xA;Container: META-INF&#xA;File: MANIFEST.MF&#xA;File: about.html&#xA;Container: bin&#xA;Container: egf&#xA;Container: uc1_1&#xA;Container: pattern&#xA;File: attributePattern.class&#xA;File: classPattern.class&#xA;Container: uc1_2&#xA;Container: pattern&#xA;File: ClassPattern.class&#xA;Container: parent&#xA;File: ParentPattern.class&#xA;Container: uc1_3&#xA;Container: pattern&#xA;File: HelloWorld.class&#xA;Container: friends&#xA;File: HelloFriends.class&#xA;Container: parent&#xA;File: Hello.class&#xA;Container: uc1_4&#xA;Container: pattern&#xA;File: AttributePattern.class&#xA;File: ClassPattern.class&#xA;Container: uc1_5&#xA;Container: pattern&#xA;File: ClassPattern.class&#xA;Container: uc1_6&#xA;Container: pattern&#xA;File: JetClassPattern.class&#xA;Container: java&#xA;File: JavaPattern.class&#xA;Container: uc1_7&#xA;Container: pattern&#xA;File: ClassPattern.class&#xA;Container: forInjection&#xA;File: ForInjectionPattern.class&#xA;Container: uc1_8&#xA;Container: pattern&#xA;File: ContainerPattern.class&#xA;File: FilePattern.class&#xA;Container: org&#xA;Container: eclipse&#xA;Container: egf&#xA;Container: usecase&#xA;Container: pattern&#xA;Container: uc1&#xA;File: HelloWorld.class&#xA;Container: callback&#xA;File: MyCallbackHandler.class&#xA;Container: helper&#xA;File: MyHelper.class&#xA;Container: query&#xA;File: ContentQuery.class&#xA;Container: reporter&#xA;File: MyReporter.class&#xA;File: build.properties&#xA;Container: egf&#xA;File: Pattern_UC1_0_AllTogether.fcore&#xA;File: Pattern_UC1_1_ClassPattern.fcore&#xA;File: Pattern_UC1_2_Inheritance.fcore&#xA;File: Pattern_UC1_3_InheritanceAndCall.fcore&#xA;File: Pattern_UC1_4_Callback_StrategyBased.fcore&#xA;File: Pattern_UC1_5_Callback_WithJavaClass.fcore&#xA;File: Pattern_UC1_6_JetPatternCallsJavaPattern.fcore&#xA;File: Pattern_UC1_7_Injection.fcore&#xA;File: Pattern_UC1_8_WorkspaceDomain.fcore&#xA;Container: generated&#xA;Container: egf&#xA;Container: uc1_1&#xA;Container: pattern&#xA;File: attributePattern.java&#xA;File: classPattern.java&#xA;Container: uc1_2&#xA;Container: pattern&#xA;File: ClassPattern.java&#xA;Container: parent&#xA;File: ParentPattern.java&#xA;Container: uc1_3&#xA;Container: pattern&#xA;File: HelloWorld.java&#xA;Container: friends&#xA;File: HelloFriends.java&#xA;Container: parent&#xA;File: Hello.java&#xA;Container: uc1_4&#xA;Container: pattern&#xA;File: AttributePattern.java&#xA;File: ClassPattern.java&#xA;Container: uc1_5&#xA;Container: pattern&#xA;File: ClassPattern.java&#xA;Container: uc1_6&#xA;Container: pattern&#xA;File: JetClassPattern.java&#xA;Container: java&#xA;File: JavaPattern.java&#xA;Container: uc1_7&#xA;Container: pattern&#xA;File: ClassPattern.java&#xA;Container: forInjection&#xA;File: ForInjectionPattern.java&#xA;Container: uc1_8&#xA;Container: pattern&#xA;File: ContainerPattern.java&#xA;File: FilePattern.java&#xA;File: plugin.properties&#xA;File: plugin.xml&#xA;Container: src&#xA;Container: org&#xA;Container: eclipse&#xA;Container: egf&#xA;Container: usecase&#xA;Container: pattern&#xA;Container: uc1&#xA;File: HelloWorld.java&#xA;Container: callback&#xA;File: MyCallbackHandler.java&#xA;Container: helper&#xA;File: MyHelper.java&#xA;Container: query&#xA;File: ContentQuery.java&#xA;Container: reporter&#xA;File: MyReporter.java&#xA;Container: templates&#xA;Container: pattern._2Gd44AK5EeCbJtlATdOycQ&#xA;File: method._2Gd44gK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd44wK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd45AK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd45QK5EeCbJtlATdOycQ.pt&#xA;File: method._2Gd45gK5EeCbJtlATdOycQ.pt&#xA;Container: pattern._5JlroAK5EeCbJtlATdOycQ&#xA;File: method._5JlrogK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrowK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrpAK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrpQK5EeCbJtlATdOycQ.pt&#xA;File: method._5JlrpgK5EeCbJtlATdOycQ.pt&#xA;Container: pattern._7-a0kAzxEd-sdvrVfWaxAw&#xA;File: method._7-a0kQzxEd-sdvrVfWaxAw.pt&#xA;File: method._7-a0kgzxEd-sdvrVfWaxAw.pt&#xA;File: method._7-a0kwzxEd-sdvrVfWaxAw.pt&#xA;File: method._7-a0lAzxEd-sdvrVfWaxAw.pt&#xA;Container: pattern._7nKkcAzsEd-pgpX7a7GeEA&#xA;File: method._7nKkcQzsEd-pgpX7a7GeEA.pt&#xA;File: method._7nKkcgzsEd-pgpX7a7GeEA.pt&#xA;File: method._7nKkcwzsEd-pgpX7a7GeEA.pt&#xA;File: method._7nKkdAzsEd-pgpX7a7GeEA.pt&#xA;File: method._Z8MpMAztEd-pgpX7a7GeEA.pt&#xA;File: method._pn8JUAztEd-pgpX7a7GeEA.pt&#xA;Container: pattern._8lp8YBe1Ed-DaY2uHNBaQg&#xA;File: method._8lp8YRe1Ed-DaY2uHNBaQg.pt&#xA;File: method._8lp8Yhe1Ed-DaY2uHNBaQg.pt&#xA;File: method._8lp8Yxe1Ed-DaY2uHNBaQg.pt&#xA;File: method._8lp8ZBe1Ed-DaY2uHNBaQg.pt&#xA;File: method._CFlv0Be2Ed-DaY2uHNBaQg.pt&#xA;File: method._Co-JsBe2Ed-DaY2uHNBaQg.pt&#xA;Container: pattern._AVTZcAzrEd-pgpX7a7GeEA&#xA;File: method._AVTZcQzrEd-pgpX7a7GeEA.pt&#xA;File: method._AVTZcgzrEd-pgpX7a7GeEA.pt&#xA;File: method._AVTZcwzrEd-pgpX7a7GeEA.pt&#xA;File: method._AVTZdAzrEd-pgpX7a7GeEA.pt&#xA;Container: pattern._MTvCABe6Ed-O0P2188kAmA&#xA;File: method._MTvCARe6Ed-O0P2188kAmA.pt&#xA;File: method._MTvCAhe6Ed-O0P2188kAmA.pt&#xA;File: method._MTvCAxe6Ed-O0P2188kAmA.pt&#xA;File: method._MTvCBBe6Ed-O0P2188kAmA.pt&#xA;Container: pattern._NIgPYBVgEd-JoY-b5_Vpcw&#xA;File: method._NIg2cBVgEd-JoY-b5_Vpcw.pt&#xA;File: method._NIg2cRVgEd-JoY-b5_Vpcw.pt&#xA;File: method._NIg2chVgEd-JoY-b5_Vpcw.pt&#xA;File: method._NIg2cxVgEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._QdrPsBe2Ed-DaY2uHNBaQg&#xA;File: method._Qdr2wBe2Ed-DaY2uHNBaQg.pt&#xA;File: method._QdrPsRe2Ed-DaY2uHNBaQg.pt&#xA;File: method._QdrPshe2Ed-DaY2uHNBaQg.pt&#xA;File: method._QdrPsxe2Ed-DaY2uHNBaQg.pt&#xA;Container: pattern._QmXisBsZEd-Cmei4SZ1Naw&#xA;File: method._QmXisRsZEd-Cmei4SZ1Naw.pt&#xA;File: method._QmXishsZEd-Cmei4SZ1Naw.pt&#xA;File: method._QmXisxsZEd-Cmei4SZ1Naw.pt&#xA;File: method._QmXitBsZEd-Cmei4SZ1Naw.pt&#xA;Container: pattern._RdSMYBViEd-JoY-b5_Vpcw&#xA;File: method._RdSMYRViEd-JoY-b5_Vpcw.pt&#xA;File: method._RdSMYhViEd-JoY-b5_Vpcw.pt&#xA;File: method._RdSzcBViEd-JoY-b5_Vpcw.pt&#xA;File: method._RdSzcRViEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._RfrD8BVgEd-JoY-b5_Vpcw&#xA;File: method._PbStEBbvEd-thalzjBN9kg.pt&#xA;File: method._RfrD8RVgEd-JoY-b5_Vpcw.pt&#xA;File: method._RfrD8hVgEd-JoY-b5_Vpcw.pt&#xA;File: method._RfrD8xVgEd-JoY-b5_Vpcw.pt&#xA;File: method._RfrD9BVgEd-JoY-b5_Vpcw.pt&#xA;File: method._X63lwBVgEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._YVbI4BViEd-JoY-b5_Vpcw&#xA;File: method._AZL8wBVjEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbI4RViEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbv8BViEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbv8RViEd-JoY-b5_Vpcw.pt&#xA;File: method._YVbv8hViEd-JoY-b5_Vpcw.pt&#xA;Container: pattern._e1Lf4BsbEd-Cmei4SZ1Naw&#xA;File: method._e1Lf4RsbEd-Cmei4SZ1Naw.pt&#xA;File: method._e1Lf4hsbEd-Cmei4SZ1Naw.pt&#xA;File: method._e1Lf4xsbEd-Cmei4SZ1Naw.pt&#xA;File: method._e1Lf5BsbEd-Cmei4SZ1Naw.pt&#xA;Container: pattern._iXOsIBrgEd-cXtp4jDfJVg&#xA;File: method._iXOsIRrgEd-cXtp4jDfJVg.pt&#xA;File: method._iXOsIhrgEd-cXtp4jDfJVg.pt&#xA;File: method._iXOsIxrgEd-cXtp4jDfJVg.pt&#xA;File: method._iXOsJBrgEd-cXtp4jDfJVg.pt&#xA;Container: pattern._riKAEBrfEd-cXtp4jDfJVg&#xA;File: method._riKAERrfEd-cXtp4jDfJVg.pt&#xA;File: method._riKAEhrfEd-cXtp4jDfJVg.pt&#xA;File: method._riKAExrfEd-cXtp4jDfJVg.pt&#xA;File: method._riKAFBrfEd-cXtp4jDfJVg.pt&#xA;&#xA;"/>

     <activity xsi:type="fcore:FactoryComponent" href="../../../plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_8_WorkspaceDomain.fcore#_Z9cYsQK5EeCbJtlATdOycQ"/>

   </tests>

 </test:TestSuite>

diff --git a/tests/org.eclipse.egf.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.egf.core.test/META-INF/MANIFEST.MF
index 4b6ad9b..193835d 100644
--- a/tests/org.eclipse.egf.core.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.egf.core.test/META-INF/MANIFEST.MF
@@ -15,5 +15,13 @@
  org.eclipse.egf.domain,
  org.eclipse.egf.model.fprod,
  org.eclipse.egf.producer.ftask,
- org.eclipse.egf.core.test.model
+ org.eclipse.egf.core.test.model,
+ org.eclipse.egf.example.fcs,
+ org.eclipse.egf.core.test.pattern,
+ org.eclipse.egf.example.fcs,
+ org.eclipse.egf.example.task.h1,
+ org.eclipse.egf.example.task.h4,
+ org.eclipse.egf.usecase.pattern.uc3.m2treporting,
+ org.eclipse.egf.usecase.pattern.uc1,
+ org.eclipse.egf.usecase.pattern.uc2
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.egf.core.test/build.properties b/tests/org.eclipse.egf.core.test/build.properties
index 28f4dec..9a98f79 100644
--- a/tests/org.eclipse.egf.core.test/build.properties
+++ b/tests/org.eclipse.egf.core.test/build.properties
@@ -1,5 +1,5 @@
 ##

-#  Copyright (c) 2009-2010 Thales Corporate Services S.A.S.

+#  Copyright (c) 2009-2019 Thales Corporate Services S.A.S.

 #  All rights reserved. This program and the accompanying materials

 #  are made available under the terms of the Eclipse Public License v1.0

 #  which accompanies this distribution, and is available at

@@ -18,5 +18,6 @@
                EGF_Core_Tests.launch,\

                plugin.properties,\

                plugin.xml,\

-               about.html

+               about.html,\

+               resources/

 src.includes = about.html

diff --git a/tests/org.eclipse.egf.core.test/pom.xml b/tests/org.eclipse.egf.core.test/pom.xml
new file mode 100644
index 0000000..077346f
--- /dev/null
+++ b/tests/org.eclipse.egf.core.test/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Copyright (c) 2018, 2019 THALES GLOBAL SERVICES.

+  All rights reserved. This program and the accompanying materials

+  are made available under the terms of the Eclipse Public License v1.0

+  which accompanies this distribution, and is available at

+  http://www.eclipse.org/legal/epl-v10.html

+

+  Contributors:

+       Thales - initial API and implementation

+-->

+<project xmlns="http://maven.apache.org/POM/4.0.0"

+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+  <modelVersion>4.0.0</modelVersion>

+

+	<parent>

+		<groupId>org.eclipse.egf</groupId>

+		<artifactId>egf_root</artifactId>

+		<version>1.6.0-SNAPSHOT</version>

+		<relativePath>../..</relativePath>

+	</parent>

+

+  <artifactId>org.eclipse.egf.core.test</artifactId>

+  <packaging>eclipse-test-plugin</packaging>

+

+  <build>

+    <plugins>

+       <plugin>

+        <groupId>org.eclipse.tycho</groupId>

+        <artifactId>tycho-surefire-plugin</artifactId>

+        <version>${tycho-version}</version>

+        <configuration>

+          <useUIHarness>true</useUIHarness>

+          <useUIThread>true</useUIThread>

+          <testFailureIgnore>true</testFailureIgnore>

+          <work>../../releng/org.eclipse.egf.product/target/products/org.eclipse.egf.product/${os}/${ws}/x86_64</work>

+          <includes>

+            <include>org/eclipse/egf/core/test/AllTests.java</include>

+          </includes>

+          <testRuntime>p2Installed</testRuntime>

+          

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+

+</project>

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.classpath b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.classpath
deleted file mode 100644
index f6e5811..0000000
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.gitignore b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.project b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.project
index 222866f..2cab7f5 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.project
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/.project
@@ -6,16 +6,6 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

-			<name>org.eclipse.egf.pattern.ui.PatternBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

 			<name>org.eclipse.pde.ManifestBuilder</name>

 			<arguments>

 			</arguments>

@@ -28,7 +18,5 @@
 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.egf.core.EGFNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

 	</natures>

 </projectDescription>

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/META-INF/MANIFEST.MF b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/META-INF/MANIFEST.MF
index 36d27c5..2f00cde 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/META-INF/MANIFEST.MF
@@ -5,8 +5,4 @@
 Bundle-Version: 1.6.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
-Require-Bundle: 
- org.eclipse.egf.model.ftask
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/about.html b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/about.html
new file mode 100644
index 0000000..7e766fe
--- /dev/null
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>

+

+

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

+<title>About</title>

+</head><body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, "Program" will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party ("Redistributor") and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body></html>
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/build.properties b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/build.properties
index 48fcbb0..cc46002 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/build.properties
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/build.properties
@@ -1,4 +1,19 @@
+##

+#  Copyright (c) 2018, 2019 Thales Corporate Services S.A.S.

+#  All rights reserved. This program and the accompanying materials

+#  are made available under the terms of the Eclipse Public License v1.0

+#  which accompanies this distribution, and is available at

+#  http://www.eclipse.org/legal/epl-v10.html

+# 

+#  Contributors:

+#      Thales Corporate Services S.A.S - initial API and implementation

+##

+source.. = src/

+output.. = bin/

 bin.includes = META-INF/,\

+               .,\

                egf/,\

                plugin.properties,\

+               about.html,\

                plugin.xml

+src.includes = about.html
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc1.fcore b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc1.fcore
index dbf7f4a..b74fd7a 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc1.fcore
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc1.fcore
@@ -1,62 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<fcore:FactoryComponent xmi:version="2.1"

-    xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:fcore="http://www.eclipse.org/egf/1.0.0/fcore"

-    xmlns:fprod="http://www.eclipse.org/egf/1.0.0/fprod" xmlns:ftask="http://www.eclipse.org/egf/1.0.0/ftask"

-    xmlns:types="http://www.eclipse.org/egf/1.0.0/types" xmi:id="Ko39UWVuEd64TpQQ4RciWw"

-    name="FC1">

-  <contractContainer xmi:id="_SmBtAL-2Ed6E7J0w9U7NFQ">

-    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_S7e_oL-2Ed6E7J0w9U7NFQ"

-        name="amount" mode="Out" invocationContracts="#_IDAaML-2Ed6E7J0w9U7NFQ">

-      <type xmi:type="types:TypeFloat" xmi:id="_MZ2CIb-3Ed61q9pxr2iF9w" value="100.0"/>

-    </contracts>

-    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_1SUNMcLoEd6YQfrk65kDFw"

-        name="price" mode="Out" invocationContracts="#_CO0UoBvlEd-WcvfvJ8d8ag">

-      <type xmi:type="types:TypeFloat" xmi:id="_BV5T0MLpEd6YQfrk65kDFw" value="11.0"/>

-    </contracts>

-    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_ljAQIMVjEd6ngr_25dSdnQ"

-        name="rebate" invocationContracts="#_YeTqwMVjEd6ngr_25dSdnQ">

-      <type xmi:type="types:TypeFloat" xmi:id="_na9QQMVjEd6ngr_25dSdnQ"/>

-    </contracts>

-    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_5siVYMnxEd62uJjVIIL53A"

-        name="jmerger" mode="Out" invocationContracts="#_HzSEYciDEd6oON34eIZwow">

-      <type xmi:type="types:TypeClass" xmi:id="_HBvg4DEJEd-NFKo1q2Gmvw" value="org.eclipse.emf.codegen.merge.java.JMerger"/>

-    </contracts>

-    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_aZgPYNW6Ed6dzvinGX1cMA"

-        name="parameters" invocationContracts="#_OHww8NW6Ed6dzvinGX1cMA">

-      <type xmi:type="types:TypeList" xmi:id="_ceRjgNW6Ed6dzvinGX1cMA"/>

-    </contracts>

-  </contractContainer>

-  <orchestration xmi:type="fprod:ProductionPlan" xmi:id="4w2VoabFEd692t-PG4ogiQ">

-    <orchestrationParameterContainer xmi:id="_pwxIoRuoEd-Z3--RgNYIJA">

-      <orchestrationParameters xmi:id="_qJNd0BuoEd-Z3--RgNYIJA" name="quantity" invocationContracts="#_bu7G8MVjEd6ngr_25dSdnQ">

-        <type xmi:type="types:TypeInteger" xmi:id="_sp_YgBuoEd-Z3--RgNYIJA" value="10"/>

-      </orchestrationParameters>

-    </orchestrationParameterContainer>

-    <invocations xmi:id="tKWXIabGEd69ANF1SOWYYg" name="h1" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#1Zvd4LdCEd6AWpPtW_wFiQ">

-      <invocationContractContainer xmi:id="_GuhTgb-2Ed6E7J0w9U7NFQ">

-        <invocationContracts xmi:id="_bu7G8MVjEd6ngr_25dSdnQ" orchestrationParameter="#_qJNd0BuoEd-Z3--RgNYIJA"

-            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_sZPqULpOEd6O-6ob3O13Lw"/>

-        <invocationContracts xmi:id="_YeTqwMVjEd6ngr_25dSdnQ" factoryComponentContract="#_ljAQIMVjEd6ngr_25dSdnQ"

-            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_5TrVYMBtEd60u-W6Ywx4cQ"/>

-        <invocationContracts xmi:id="_GpyuQb_nEd6gHIEE-OJ_Mw" targetInvocationContract="#_CO0UoBvlEd-WcvfvJ8d8ag"

-            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_xfSXELpOEd6O-6ob3O13Lw"/>

-        <invocationContracts xmi:id="_IDAaML-2Ed6E7J0w9U7NFQ" factoryComponentContract="#_S7e_oL-2Ed6E7J0w9U7NFQ"

-            targetInvocationContract="#_BOmNwBvlEd-WcvfvJ8d8ag" invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_2vwLILpOEd6O-6ob3O13Lw"/>

-        <invocationContracts xmi:id="_HzSEYciDEd6oON34eIZwow" factoryComponentContract="#_5siVYMnxEd62uJjVIIL53A"

-            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_f5cpETA_Ed-3jtwMRJbhpQ">

-          <type xmi:type="types:TypeClass" xmi:id="_bF848TJwEd-Cy9RNBjKxgQ" value="org.eclipse.emf.codegen.merge.java.JMerger"/>

-        </invocationContracts>

-        <invocationContracts xmi:id="_OHww8NW6Ed6dzvinGX1cMA" factoryComponentContract="#_aZgPYNW6Ed6dzvinGX1cMA"

-            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_l2A5kdT3Ed6Pk6ruhJpBtQ"/>

-      </invocationContractContainer>

-    </invocations>

-    <invocations xmi:id="ID2loKbGEd692t-PG4ogiQ" name="fc2" invokedActivity="fcore:FactoryComponent platform:/plugin/org.eclipse.egf.example.fcs/egf/fc2.fcore#6yt_IWV8Ed6WjOtbZOwqNA">

-      <invocationContractContainer xmi:id="_BAI7ABvlEd-WcvfvJ8d8ag">

-        <invocationContracts xmi:id="_BOmNwBvlEd-WcvfvJ8d8ag" sourceInvocationContract="#_IDAaML-2Ed6E7J0w9U7NFQ"

-            invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.example.fcs/egf/fc2.fcore#_2Nw9kBvkEd-WcvfvJ8d8ag"/>

-        <invocationContracts xmi:id="_CO0UoBvlEd-WcvfvJ8d8ag" factoryComponentContract="#_1SUNMcLoEd6YQfrk65kDFw"

-            sourceInvocationContract="#_GpyuQb_nEd6gHIEE-OJ_Mw" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.example.fcs/egf/fc2.fcore#_6H9iQBvkEd-WcvfvJ8d8ag"/>

-      </invocationContractContainer>

-    </invocations>

-  </orchestration>

-</fcore:FactoryComponent>

+<?xml version="1.0" encoding="UTF-8"?>
+<fcore:FactoryComponent xmi:version="2.1"
+    xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:domain="http://www.eclipse.org/egf/1.0.0/domain"
+    xmlns:fcore="http://www.eclipse.org/egf/1.0.0/fcore" xmlns:fprod="http://www.eclipse.org/egf/1.0.0/fprod"
+    xmlns:ftask="http://www.eclipse.org/egf/1.0.0/ftask" xmlns:types="http://www.eclipse.org/egf/1.0.0/types" xmi:id="Ko39UWVuEd64TpQQ4RciWw"
+    name="FC1">
+  <contractContainer xmi:id="_SmBtAL-2Ed6E7J0w9U7NFQ">
+    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_S7e_oL-2Ed6E7J0w9U7NFQ"
+        name="amount" mode="Out" invocationContracts="#_IDAaML-2Ed6E7J0w9U7NFQ">
+      <type xmi:type="types:TypeFloat" xmi:id="_o0esoNBTEd67h-iKUQB4KA"/>
+    </contracts>
+    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_1SUNMcLoEd6YQfrk65kDFw"
+        name="price" invocationContracts="#_GpyuQb_nEd6gHIEE-OJ_Mw">
+      <type xmi:type="types:TypeFloat" xmi:id="_BV5T0MLpEd6YQfrk65kDFw" value="11.0"/>
+    </contracts>
+    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_ih5EENXAEd6mBObdoXlr9g"
+        name="parameters" mode="In_Out" invocationContracts="#_aC43cNXAEd6mBObdoXlr9g">
+      <type xmi:type="types:TypeCollection" xmi:id="_i0XSYRciEd-OuMrFXG3KCA"/>
+    </contracts>
+  </contractContainer>
+  <viewpointContainer xmi:id="_iBhWMdgWEd6Q4-VfEsR1iA">
+    <viewpoints xmi:type="domain:DomainViewpoint" xmi:id="_iiANENgWEd6Q4-VfEsR1iA"/>
+  </viewpointContainer>
+  <orchestration xmi:type="fprod:ProductionPlan" xmi:id="4w2VoabFEd692t-PG4ogiQ">
+    <orchestrationParameterContainer xmi:id="_I6TxYcVjEd6ngr_25dSdnQ">
+      <orchestrationParameters xmi:id="_uNn24MVjEd6ngr_25dSdnQ" name="stock" invocationContracts="#_bu7G8MVjEd6ngr_25dSdnQ #_4qwyMdA6Ed6FD_8N74-4WA">
+        <type xmi:type="types:TypeInteger" xmi:id="_wKWpUMVjEd6ngr_25dSdnQ" value="10"/>
+      </orchestrationParameters>
+    </orchestrationParameterContainer>
+    <invocations xmi:id="tKWXIabGEd69ANF1SOWYYg" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#1Zvd4LdCEd6AWpPtW_wFiQ">
+      <invocationContractContainer xmi:id="_GuhTgb-2Ed6E7J0w9U7NFQ">
+        <invocationContracts xmi:id="_bu7G8MVjEd6ngr_25dSdnQ" orchestrationParameter="#_uNn24MVjEd6ngr_25dSdnQ"
+            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_sZPqULpOEd6O-6ob3O13Lw"/>
+        <invocationContracts xmi:id="_4qwyMdA6Ed6FD_8N74-4WA" orchestrationParameter="#_uNn24MVjEd6ngr_25dSdnQ"
+            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_Z65BAdA5Ed6LbMEN-DBMtQ"/>
+        <invocationContracts xmi:id="_GpyuQb_nEd6gHIEE-OJ_Mw" factoryComponentContract="#_1SUNMcLoEd6YQfrk65kDFw"
+            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_xfSXELpOEd6O-6ob3O13Lw"/>
+        <invocationContracts xmi:id="_IDAaML-2Ed6E7J0w9U7NFQ" factoryComponentContract="#_S7e_oL-2Ed6E7J0w9U7NFQ"
+            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_2vwLILpOEd6O-6ob3O13Lw"/>
+        <invocationContracts xmi:id="_aC43cNXAEd6mBObdoXlr9g" factoryComponentContract="#_ih5EENXAEd6mBObdoXlr9g"
+            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h1/egf/task_h1.fcore#_l2A5kdT3Ed6Pk6ruhJpBtQ"/>
+      </invocationContractContainer>
+    </invocations>
+  </orchestration>
+</fcore:FactoryComponent>
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc2.fcore b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc2.fcore
index 7f2a83c..72271e3 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc2.fcore
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/egf/fc2.fcore
@@ -1,27 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <fcore:FactoryComponent xmi:version="2.1"

     xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:fcore="http://www.eclipse.org/egf/1.0.0/fcore"

-    xmlns:fprod="http://www.eclipse.org/egf/1.0.0/fprod" xmlns:ftask="http://www.eclipse.org/egf/1.0.0/ftask"

-    xmlns:types="http://www.eclipse.org/egf/1.0.0/types" xmi:id="6yt_IWV8Ed6WjOtbZOwqNA"

+    xmlns:fprod="http://www.eclipse.org/egf/1.0.0/fprod" xmi:id="_jOwhodBQEd6dz4A7_XVBtQ"

     name="FC2">

-  <contractContainer xmi:id="_18x7QBvkEd-WcvfvJ8d8ag">

-    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_2Nw9kBvkEd-WcvfvJ8d8ag"

-        name="amount" invocationContracts="#_xOlt0BvkEd-WcvfvJ8d8ag">

-      <type xmi:type="types:TypeFloat" xmi:id="_4lwvsBvkEd-WcvfvJ8d8ag"/>

-    </contracts>

-    <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_6H9iQBvkEd-WcvfvJ8d8ag"

-        name="price" mode="In_Out" invocationContracts="#_yVg5oBvkEd-WcvfvJ8d8ag">

-      <type xmi:type="types:TypeFloat" xmi:id="_7dyswBvkEd-WcvfvJ8d8ag"/>

-    </contracts>

-  </contractContainer>

-  <orchestration xmi:type="fprod:ProductionPlan" xmi:id="zwp8wKbGEd69ANF1SOWYYg">

-    <invocations xmi:id="28WcsKbGEd69ANF1SOWYYg" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.example.task.h2/egf/task_h2.fcore#9hT-gKbGEd69ANF1SOWYYg">

-      <invocationContractContainer xmi:id="_xBK84BvkEd-WcvfvJ8d8ag">

-        <invocationContracts xmi:id="_xOlt0BvkEd-WcvfvJ8d8ag" factoryComponentContract="#_2Nw9kBvkEd-WcvfvJ8d8ag"

-            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h2/egf/task_h2.fcore#_rEAa4BvkEd-WcvfvJ8d8ag"/>

-        <invocationContracts xmi:id="_yVg5oBvkEd-WcvfvJ8d8ag" factoryComponentContract="#_6H9iQBvkEd-WcvfvJ8d8ag"

-            invokedContract="platform:/plugin/org.eclipse.egf.example.task.h2/egf/task_h2.fcore#_tEcooBvkEd-WcvfvJ8d8ag"/>

-      </invocationContractContainer>

-    </invocations>

+  <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_kzMI0NBQEd6dz4A7_XVBtQ">

+    <invocations xmi:id="_ldNWMNBQEd6dz4A7_XVBtQ" invokedActivity="fcore:FactoryComponent platform:/plugin/org.eclipse.egf.example.fcs/egf/fc1.fcore#Ko39UWVuEd64TpQQ4RciWw"/>

   </orchestration>

 </fcore:FactoryComponent>

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.xml b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.xml
index 39296ba..c6f8269 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.xml
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.example.fcs/plugin.xml
@@ -4,11 +4,12 @@
 >

    <extension

          point="org.eclipse.egf.core.fcore">

-      <fcore

+      <fcore 

             id="egf/fc1.fcore">

       </fcore>

       <fcore

             id="egf/fc2.fcore">

       </fcore>

-   </extension>

+   </extension>  

+      
 </plugin>

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/.gitignore b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/attributePattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/attributePattern.java
index f098839..d2e229a 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/attributePattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/attributePattern.java
@@ -1,97 +1,99 @@
-package egf.uc1_1.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class attributePattern {
-	protected static String nl;
-
-	public static synchronized attributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		attributePattern result = new attributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = NL + "  - ";
-	protected final String TEXT_2 = " attribute";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public attributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> anAttributeList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object anAttributeParameter : anAttributeList) {
-
-			this.anAttribute = (org.eclipse.emf.ecore.EAttribute) anAttributeParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("anAttribute", this.anAttribute);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute anAttribute = null;
-
-	public void set_anAttribute(org.eclipse.emf.ecore.EAttribute object) {
-		this.anAttribute = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("anAttribute", this.anAttribute);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(anAttribute.getName());
-		stringBuffer.append(TEXT_2);
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_1.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class attributePattern {

+	protected static String nl;

+

+	public static synchronized attributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		attributePattern result = new attributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = NL + "  - ";

+	protected final String TEXT_2 = " attribute";

+	protected final String TEXT_3 = NL;

+

+	public attributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> anAttributeList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object anAttributeParameter : anAttributeList) {

+

+			this.anAttribute = (org.eclipse.emf.ecore.EAttribute) anAttributeParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("anAttribute", this.anAttribute);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute anAttribute = null;

+

+	public void set_anAttribute(org.eclipse.emf.ecore.EAttribute object) {

+		this.anAttribute = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("anAttribute", this.anAttribute);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(anAttribute.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/classPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/classPattern.java
index b6addb1..53573c4 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/classPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/classPattern.java
@@ -1,97 +1,99 @@
-package egf.uc1_1.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class classPattern {
-	protected static String nl;
-
-	public static synchronized classPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		classPattern result = new classPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = NL + "- Hello ";
-	protected final String TEXT_2 = " Class";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public classPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> aClassList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object aClassParameter : aClassList) {
-
-			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("aClass", this.aClass);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EClass aClass = null;
-
-	public void set_aClass(org.eclipse.emf.ecore.EClass object) {
-		this.aClass = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("aClass", this.aClass);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(aClass.getName());
-		stringBuffer.append(TEXT_2);
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_1.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class classPattern {

+	protected static String nl;

+

+	public static synchronized classPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		classPattern result = new classPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = NL + "- Hello ";

+	protected final String TEXT_2 = " Class";

+	protected final String TEXT_3 = NL;

+

+	public classPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> aClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object aClassParameter : aClassList) {

+

+			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("aClass", this.aClass);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass aClass = null;

+

+	public void set_aClass(org.eclipse.emf.ecore.EClass object) {

+		this.aClass = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("aClass", this.aClass);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(aClass.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/myPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/myPattern.java
deleted file mode 100644
index 51c89df..0000000
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_1/pattern/myPattern.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package egf.uc1_1.pattern;

-

-import java.util.*;

-import org.eclipse.emf.ecore.*;

-import org.eclipse.egf.model.pattern.*;

-import org.eclipse.egf.pattern.execution.*;

-import org.eclipse.egf.pattern.query.*;

-

-public class myPattern {

-

-    protected static String nl;

-

-    public static synchronized myPattern create(String lineSeparator) {

-        nl = lineSeparator;

-        myPattern result = new myPattern();

-        nl = null;

-        return result;

-    }

-

-    public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

-

-    protected final String TEXT_1 = NL + "  - ";

-

-    protected final String TEXT_2 = " attribute";

-

-    protected final String TEXT_3 = NL;

-

-    protected final String TEXT_4 = NL;

-

-    public myPattern() {

-        //Here is the constructor

-        StringBuffer stringBuffer = new StringBuffer();

-

-        // add initialisation of the pattern variables (declaration has been already done).

-

-    }

-

-    public String generate(Object argument) throws Exception {

-        final StringBuffer stringBuffer = new StringBuffer();

-

-        InternalPatternContext ctx = (InternalPatternContext) argument;

-        Map<String, String> queryCtx = null;

-        IQuery.ParameterDescription paramDesc = null;

-

-        List<Object> anAttributeList = null;

-        //this pattern can only be called by another (i.e. it's not an entry point in execution)

-

-        for (Object anAttributeParameter : anAttributeList) {

-

-            this.anAttribute = (org.eclipse.emf.ecore.EAttribute) anAttributeParameter;

-

-            orchestration(ctx);

-

-        }

-        if (ctx.useReporter()) {

-            ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);

-            ctx.clearBuffer();

-        }

-

-        stringBuffer.append(TEXT_3);

-        stringBuffer.append(TEXT_4);

-        return stringBuffer.toString();

-    }

-

-    public String orchestration(PatternContext ctx) throws Exception {

-        InternalPatternContext ictx = (InternalPatternContext) ctx;

-        int executionIndex = ictx.getExecutionBuffer().length();

-

-        method_body(ictx.getBuffer(), ictx);

-

-        String loop = ictx.getBuffer().toString();

-        if (ictx.useReporter()) {

-            ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));

-            ictx.setExecutionCurrentIndex(0);

-            Map<String, Object> parameterValues = new HashMap<String, Object>();

-            parameterValues.put("anAttribute", this.anAttribute);

-            String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);

-            ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

-            ictx.clearBuffer();

-        }

-        return loop;

-    }

-

-    protected org.eclipse.emf.ecore.EAttribute anAttribute = null;

-

-    public void set_anAttribute(org.eclipse.emf.ecore.EAttribute object) {

-        this.anAttribute = object;

-    }

-

-    public Map<String, Object> getParameters() {

-        final Map<String, Object> parameters = new HashMap<String, Object>();

-        parameters.put("anAttribute", this.anAttribute);

-        return parameters;

-    }

-

-    protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

-

-        stringBuffer.append(TEXT_1);

-        stringBuffer.append(anAttribute.getName());

-        stringBuffer.append(TEXT_2);

-    }

-}

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/ClassPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/ClassPattern.java
index eda447b..ef8e881 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/ClassPattern.java
@@ -1,97 +1,99 @@
-package egf.uc1_2.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern extends egf.uc1_2.pattern.parent.ParentPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = " and me: ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		super.orchestration(new SuperOrchestrationContext(ictx));
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_2.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern extends egf.uc1_2.pattern.parent.ParentPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = " and me: ";

+	protected final String TEXT_2 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		super.orchestration(new SuperOrchestrationContext(ictx));

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/parent/ParentPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/parent/ParentPattern.java
index 1cb93f7..69830f5 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/parent/ParentPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_2/pattern/parent/ParentPattern.java
@@ -1,89 +1,92 @@
-package egf.uc1_2.pattern.parent;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ParentPattern {
-	protected static String nl;
-
-	public static synchronized ParentPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ParentPattern result = new ParentPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = NL + "Hello ";
-	protected final String TEXT_3 = " from my parent";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public ParentPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		orchestration(ctx);
-
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_sayHello(ictx.getBuffer(), ictx);
-
-		method_sayFromParent(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-	}
-
-	protected void method_sayHello(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-	}
-
-	protected void method_sayFromParent(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_2.pattern.parent;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ParentPattern {

+	protected static String nl;

+

+	public static synchronized ParentPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ParentPattern result = new ParentPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = NL + "Hello ";

+	protected final String TEXT_3 = " from my parent";

+	protected final String TEXT_4 = NL;

+

+	public ParentPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_sayHello(new StringBuffer(), ictx);

+

+		method_sayFromParent(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_sayHello(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "sayHello", stringBuffer.toString());

+	}

+

+	protected void method_sayFromParent(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "sayFromParent", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/HelloWorld.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/HelloWorld.java
index 14d70d6..dfe3028 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/HelloWorld.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/HelloWorld.java
@@ -1,105 +1,109 @@
-package egf.uc1_3.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class HelloWorld extends egf.uc1_3.pattern.parent.Hello {
-	protected static String nl;
-
-	public static synchronized HelloWorld create(String lineSeparator) {
-		nl = lineSeparator;
-		HelloWorld result = new HelloWorld();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = " ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public HelloWorld() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> aClassList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object aClassParameter : aClassList) {
-
-			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_SayHello(ictx.getBuffer(), ictx);
-
-		method_body(ictx.getBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("element", this.aClass);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_3_InheritanceAndCall.fcore#_7-a0kAzxEd-sdvrVfWaxAw", ctx_local, parameters);
-		}
-
-		method_finish(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("aClass", this.aClass);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EClass aClass = null;
-
-	public void set_aClass(org.eclipse.emf.ecore.EClass object) {
-		this.aClass = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("aClass", this.aClass);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(aClass.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_3.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class HelloWorld extends egf.uc1_3.pattern.parent.Hello {

+	protected static String nl;

+

+	public static synchronized HelloWorld create(String lineSeparator) {

+		nl = lineSeparator;

+		HelloWorld result = new HelloWorld();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = " ";

+	protected final String TEXT_2 = NL;

+

+	public HelloWorld() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> aClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object aClassParameter : aClassList) {

+

+			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_SayHello(new StringBuffer(), ictx);

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("element", this.aClass);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_3_InheritanceAndCall.fcore#_7-a0kAzxEd-sdvrVfWaxAw",

+					ctx_local, parameters);

+		}

+

+		method_finish(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("aClass", this.aClass);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass aClass = null;

+

+	public void set_aClass(org.eclipse.emf.ecore.EClass object) {

+		this.aClass = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("aClass", this.aClass);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(aClass.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/friends/HelloFriends.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/friends/HelloFriends.java
index 0b64df4..4fa954c 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/friends/HelloFriends.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/friends/HelloFriends.java
@@ -1,95 +1,97 @@
-package egf.uc1_3.pattern.friends;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class HelloFriends {
-	protected static String nl;
-
-	public static synchronized HelloFriends create(String lineSeparator) {
-		nl = lineSeparator;
-		HelloFriends result = new HelloFriends();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = ", and all friends of ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public HelloFriends() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> elementList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object elementParameter : elementList) {
-
-			this.element = (org.eclipse.emf.ecore.EClass) elementParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("element", this.element);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EClass element = null;
-
-	public void set_element(org.eclipse.emf.ecore.EClass object) {
-		this.element = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("element", this.element);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(element.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_3.pattern.friends;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class HelloFriends {

+	protected static String nl;

+

+	public static synchronized HelloFriends create(String lineSeparator) {

+		nl = lineSeparator;

+		HelloFriends result = new HelloFriends();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = ", and all friends of ";

+	protected final String TEXT_2 = NL;

+

+	public HelloFriends() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> elementList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object elementParameter : elementList) {

+

+			this.element = (org.eclipse.emf.ecore.EClass) elementParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("element", this.element);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass element = null;

+

+	public void set_element(org.eclipse.emf.ecore.EClass object) {

+		this.element = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("element", this.element);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(element.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/parent/Hello.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/parent/Hello.java
index 902e5a8..a15316b 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/parent/Hello.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_3/pattern/parent/Hello.java
@@ -1,87 +1,90 @@
-package egf.uc1_3.pattern.parent;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class Hello {
-	protected static String nl;
-
-	public static synchronized Hello create(String lineSeparator) {
-		nl = lineSeparator;
-		Hello result = new Hello();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = NL + "Hello";
-	protected final String TEXT_3 = "!";
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public Hello() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		orchestration(ctx);
-
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-	}
-
-	protected void method_SayHello(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-	}
-
-	protected void method_finish(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_3);
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_3.pattern.parent;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class Hello {

+	protected static String nl;

+

+	public static synchronized Hello create(String lineSeparator) {

+		nl = lineSeparator;

+		Hello result = new Hello();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = NL + "Hello";

+	protected final String TEXT_3 = "!";

+	protected final String TEXT_4 = NL;

+

+	public Hello() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		{

+			ctx.setNode(new Node.Container(currentNode, getClass()));

+			orchestration(ctx);

+		}

+

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		return null;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_SayHello(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "SayHello", stringBuffer.toString());

+	}

+

+	protected void method_finish(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "finish", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/AttributePattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/AttributePattern.java
index 00e1a10..385b77b 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/AttributePattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/AttributePattern.java
@@ -1,102 +1,104 @@
-package egf.uc1_4.pattern;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.usecase.pattern.uc1.helper.*;
-
-public class AttributePattern {
-	protected static String nl;
-
-	public static synchronized AttributePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		AttributePattern result = new AttributePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "\t[Attribute '";
-	protected final String TEXT_2 = "']  ";
-	protected final String TEXT_3 = NL + NL;
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public AttributePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EAttribute parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		MyHelper.incCounter(ctx);
-		stringBuffer.append(TEXT_3);
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_4.pattern;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.usecase.pattern.uc1.helper.*;

+

+public class AttributePattern {

+	protected static String nl;

+

+	public static synchronized AttributePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		AttributePattern result = new AttributePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "\t[Attribute '";

+	protected final String TEXT_2 = "']  ";

+	protected final String TEXT_3 = NL + NL;

+	protected final String TEXT_4 = NL;

+

+	public AttributePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EAttribute) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_4);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EAttribute parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EAttribute object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		MyHelper.incCounter(ctx);

+		stringBuffer.append(TEXT_3);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/ClassPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/ClassPattern.java
index 5c07d8e..44130a8 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_4/pattern/ClassPattern.java
@@ -1,139 +1,142 @@
-package egf.uc1_4.pattern;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.usecase.pattern.uc1.helper.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "//default content";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL + "[Begin. ";
-	protected final String TEXT_4 = "]" + NL + NL;
-	protected final String TEXT_5 = "\t=> ";
-	protected final String TEXT_6 = " attribute(s)" + NL + "[End. ";
-	protected final String TEXT_7 = "]" + NL + NL;
-	protected final String TEXT_8 = NL;
-	protected final String TEXT_9 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		_separator = "'";
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_8);
-		stringBuffer.append(TEXT_9);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_before(ictx.getBuffer(), ictx);
-		{
-			ictx.setExecutionCurrentIndex(ictx.getBuffer().length());
-			ictx.getExecutionBuffer().append(ictx.getBuffer());
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		method_after(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected java.lang.String _separator = null;
-
-	public void set__separator(java.lang.String object) {
-		this._separator = object;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-	}
-
-	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_2);
-		MyHelper.resetCounter(ctx);
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(_separator);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(_separator);
-		stringBuffer.append(TEXT_4);
-	}
-
-	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_5);
-		stringBuffer.append(MyHelper.getCounter(ctx));
-		stringBuffer.append(TEXT_6);
-		stringBuffer.append(_separator);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(_separator);
-		stringBuffer.append(TEXT_7);
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_4.pattern;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.usecase.pattern.uc1.helper.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "//default content";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL + "[Begin. ";

+	protected final String TEXT_4 = "]" + NL + NL;

+	protected final String TEXT_5 = "\t=> ";

+	protected final String TEXT_6 = " attribute(s)" + NL + "[End. ";

+	protected final String TEXT_7 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		_separator = "'";

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_7);

+		stringBuffer.append(TEXT_7);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_before(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		method_after(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected java.lang.String _separator = null;

+

+	public void set__separator(java.lang.String object) {

+		this._separator = object;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_before(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_2);

+		MyHelper.resetCounter(ctx);

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(_separator);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(_separator);

+		stringBuffer.append(TEXT_4);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "before", stringBuffer.toString());

+	}

+

+	protected void method_after(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_5);

+		stringBuffer.append(MyHelper.getCounter(ctx));

+		stringBuffer.append(TEXT_6);

+		stringBuffer.append(_separator);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(_separator);

+		stringBuffer.append(TEXT_4);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "after", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_5/pattern/ClassPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_5/pattern/ClassPattern.java
index 3fcd25c..7383999 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_5/pattern/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_5/pattern/ClassPattern.java
@@ -1,103 +1,104 @@
-package egf.uc1_5.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(TEXT_3);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-		{
-			ictx.setExecutionCurrentIndex(ictx.getBuffer().length());
-			ictx.getExecutionBuffer().append(ictx.getBuffer());
-			final Map<String, Object> parameters = getParameters();
-			CallbackContext ctx_callback = new CallbackContext(ictx);
-			CallHelper.callBack(ctx_callback, parameters);
-		}
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_5.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//EClass");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.basic.query").execute(paramDesc,

+				queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = getParameters();

+			CallbackContext ctx_callback = new CallbackContext(ictx);

+			CallHelper.callBack(ctx_callback, parameters);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/JetClassPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/JetClassPattern.java
index a7f8a81..8ed8bf7 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/JetClassPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/JetClassPattern.java
@@ -1,103 +1,106 @@
-package egf.uc1_6.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class JetClassPattern {
-	protected static String nl;
-
-	public static synchronized JetClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		JetClassPattern result = new JetClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "- Jet: ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public JetClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> aClassList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object aClassParameter : aClassList) {
-
-			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-		{
-			final Map<String, Object> parameters = new HashMap<String, Object>();
-			parameters.put("aClass", this.aClass);
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			CallHelper.executeWithParameterInjection("platform:/plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_6_JetPatternCallsJavaPattern.fcore#_iXOsIBrgEd-cXtp4jDfJVg", ctx_local, parameters);
-		}
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("aClass", this.aClass);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EClass aClass = null;
-
-	public void set_aClass(org.eclipse.emf.ecore.EClass object) {
-		this.aClass = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("aClass", this.aClass);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(aClass.getName());
-		stringBuffer.append(TEXT_2);
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_6.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class JetClassPattern {

+	protected static String nl;

+

+	public static synchronized JetClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		JetClassPattern result = new JetClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "- Jet: ";

+	protected final String TEXT_2 = NL;

+

+	public JetClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> aClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object aClassParameter : aClassList) {

+

+			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+		{

+			final Map<String, Object> parameters = new HashMap<String, Object>();

+			parameters.put("aClass", this.aClass);

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			CallHelper.executeWithParameterInjection(

+					"platform:/plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_6_JetPatternCallsJavaPattern.fcore#_iXOsIBrgEd-cXtp4jDfJVg",

+					ctx_local, parameters);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("aClass", this.aClass);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass aClass = null;

+

+	public void set_aClass(org.eclipse.emf.ecore.EClass object) {

+		this.aClass = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("aClass", this.aClass);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(aClass.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/java/JavaPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/java/JavaPattern.java
index b6b28b2..4a98b19 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/java/JavaPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_6/pattern/java/JavaPattern.java
@@ -1,77 +1,80 @@
-package egf.uc1_6.pattern.java;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-import org.eclipse.egf.core.EGFCorePlugin;
-
-public class JavaPattern {
-
-	public JavaPattern() {
-		//Here is the constructor
-		// add initialisation of the pattern variables (declaration has been already done).
-	}
-
-	public void generate(Object argument) throws Exception {
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		IQuery.ParameterDescription paramDesc = null;
-		Map<String, String> queryCtx = null;
-		List<Object> aClassList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object aClassParameter : aClassList) {
-
-			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;
-
-			orchestration((PatternContext) argument);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("aClass", this.aClass);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {
-
-		// Message on the default console
-		System.out.println("Java: " + aClass.getName()); //$NON-NLS-1$
-
-		// Message on the EGF console
-		EGFCorePlugin.getDefault().logInfo("Java: " + aClass.getName());
-
-	}
-
-	protected org.eclipse.emf.ecore.EClass aClass;
-
-	public void set_aClass(org.eclipse.emf.ecore.EClass aClass) {
-		this.aClass = aClass;
-	}
-
-	public Map<String, Object> getParameters() {
-		Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("aClass", this.aClass);
-		return parameters;
-	}
-
-}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_6.pattern.java;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+import org.eclipse.egf.core.EGFCorePlugin;

+

+public class JavaPattern {

+

+	public JavaPattern() {

+		//Here is the constructor

+		// add initialisation of the pattern variables (declaration has been already done).

+	}

+

+	public void generate(Object argument) throws Exception {

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		IQuery.ParameterDescription paramDesc = null;

+		Map<String, String> queryCtx = null;

+		Node.Container currentNode = ctx.getNode();

+		List<Object> aClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object aClassParameter : aClassList) {

+

+			this.aClass = (org.eclipse.emf.ecore.EClass) aClassParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration((PatternContext) argument);

+

+			}

+		}

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		Node.Container currentNode = ictx.getNode();

+		method_body(new StringBuffer(), ictx);

+		ictx.setNode(currentNode);

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("aClass", this.aClass);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected void method_body(final StringBuffer out, final PatternContext ctx) throws Exception {

+

+		// Message on the default console

+		System.out.println("Java: " + aClass.getName()); //$NON-NLS-1$

+

+		// Message on the EGF console

+		EGFCorePlugin.getDefault().logInfo("Java: " + aClass.getName());

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", out.toString());

+	}

+

+	protected org.eclipse.emf.ecore.EClass aClass;

+

+	public void set_aClass(org.eclipse.emf.ecore.EClass aClass) {

+		this.aClass = aClass;

+	}

+

+	public Map<String, Object> getParameters() {

+		Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("aClass", this.aClass);

+		return parameters;

+	}

+

+}

diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/ClassPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/ClassPattern.java
index 8f6de80..80514a6 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/ClassPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/ClassPattern.java
@@ -1,117 +1,122 @@
-package egf.uc1_7.pattern;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ClassPattern {
-	protected static String nl;
-
-	public static synchronized ClassPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ClassPattern result = new ClassPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = NL;
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = " contains:" + NL;
-	protected final String TEXT_4 = NL;
-	protected final String TEXT_5 = NL;
-
-	public ClassPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_4);
-		stringBuffer.append(TEXT_5);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		method_setupVariable(ictx.getBuffer(), ictx);
-		{
-			ExecutionContext ctx_local = new ExecutionContext(ictx);
-			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, variable);
-			CallHelper.executeWithContextInjection("platform:/plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_7_Injection.fcore#_RdSMYBViEd-JoY-b5_Vpcw", ctx_local);
-		}
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.EClass variable = null;
-
-	public void set_variable(org.eclipse.emf.ecore.EClass object) {
-		this.variable = object;
-	}
-
-	protected org.eclipse.emf.ecore.EClass parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.EClass object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_3);
-	}
-
-	protected void method_setupVariable(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		variable = parameter;
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_7.pattern;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassPattern {

+	protected static String nl;

+

+	public static synchronized ClassPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassPattern result = new ClassPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = NL;

+	protected final String TEXT_2 = " contains:" + NL;

+	protected final String TEXT_3 = NL;

+

+	public ClassPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.EClass) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		method_setupVariable(new StringBuffer(), ictx);

+		{

+			ExecutionContext ctx_local = new ExecutionContext(ictx);

+			ctx_local.setValue(PatternContext.INJECTED_CONTEXT, variable);

+			CallHelper.executeWithContextInjection(

+					"platform:/plugin/org.eclipse.egf.usecase.pattern.uc1/egf/Pattern_UC1_7_Injection.fcore#_RdSMYBViEd-JoY-b5_Vpcw",

+					ctx_local);

+		}

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.EClass variable = null;

+

+	public void set_variable(org.eclipse.emf.ecore.EClass object) {

+		this.variable = object;

+	}

+

+	protected org.eclipse.emf.ecore.EClass parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.EClass object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	protected void method_setupVariable(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		variable = parameter;

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "setupVariable", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/forInjection/ForInjectionPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/forInjection/ForInjectionPattern.java
index d343ea8..d9fc2ce 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/forInjection/ForInjectionPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_7/pattern/forInjection/ForInjectionPattern.java
@@ -1,99 +1,103 @@
-package egf.uc1_7.pattern.forInjection;
-
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ForInjectionPattern {
-	protected static String nl;
-
-	public static synchronized ForInjectionPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ForInjectionPattern result = new ForInjectionPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = NL + "    - \"";
-	protected final String TEXT_2 = "\" ";
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ForInjectionPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		paramDesc = new IQuery.ParameterDescription("parameter", "http://www.eclipse.org/emf/2002/Ecore#//ENamedElement");
-		queryCtx = new HashMap<String, String>();
-		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery").execute(paramDesc, queryCtx, ctx);
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.emf.ecore.ENamedElement) parameterParameter;
-
-			orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.emf.ecore.ENamedElement parameter = null;
-
-	public void set_parameter(org.eclipse.emf.ecore.ENamedElement object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-		stringBuffer.append(parameter.getClass().getSimpleName());
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_7.pattern.forInjection;

+

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ForInjectionPattern {

+	protected static String nl;

+

+	public static synchronized ForInjectionPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ForInjectionPattern result = new ForInjectionPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = NL + "    - \"";

+	protected final String TEXT_2 = "\" ";

+	protected final String TEXT_3 = NL;

+

+	public ForInjectionPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		paramDesc = new IQuery.ParameterDescription("parameter",

+				"http://www.eclipse.org/emf/2002/Ecore#//ENamedElement");

+		queryCtx = new HashMap<String, String>();

+		List<Object> parameterList = QueryHelper.load(ctx, "org.eclipse.egf.pattern.query.EObjectInjectedContextQuery")

+				.execute(paramDesc, queryCtx, ctx);

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.emf.ecore.ENamedElement) parameterParameter;

+

+			{

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.ecore.ENamedElement parameter = null;

+

+	public void set_parameter(org.eclipse.emf.ecore.ENamedElement object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		stringBuffer.append(parameter.getClass().getSimpleName());

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/ContainerPattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/ContainerPattern.java
index 914261e..5c56ec3 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/ContainerPattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/ContainerPattern.java
@@ -1,103 +1,104 @@
-package egf.uc1_8.pattern;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class ContainerPattern {
-	protected static String nl;
-
-	public static synchronized ContainerPattern create(String lineSeparator) {
-		nl = lineSeparator;
-		ContainerPattern result = new ContainerPattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "Container: ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public ContainerPattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.core.resources.IContainer) parameterParameter;
-
-			if (preCondition())
-				orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.core.resources.IContainer parameter = null;
-
-	public void set_parameter(org.eclipse.core.resources.IContainer object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-	}
-
-	public boolean preCondition() throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_8.pattern;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ContainerPattern {

+	protected static String nl;

+

+	public static synchronized ContainerPattern create(String lineSeparator) {

+		nl = lineSeparator;

+		ContainerPattern result = new ContainerPattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "Container: ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public ContainerPattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.core.resources.IContainer) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.core.resources.IContainer parameter = null;

+

+	public void set_parameter(org.eclipse.core.resources.IContainer object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/FilePattern.java b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/FilePattern.java
index b78ccbb..14679db 100644
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/FilePattern.java
+++ b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/generated/egf/uc1_8/pattern/FilePattern.java
@@ -1,103 +1,104 @@
-package egf.uc1_8.pattern;
-
-import org.eclipse.egf.common.helper.*;
-import java.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.egf.model.pattern.*;
-import org.eclipse.egf.pattern.execution.*;
-import org.eclipse.egf.pattern.query.*;
-
-public class FilePattern {
-	protected static String nl;
-
-	public static synchronized FilePattern create(String lineSeparator) {
-		nl = lineSeparator;
-		FilePattern result = new FilePattern();
-		nl = null;
-		return result;
-	}
-
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = "File: ";
-	protected final String TEXT_2 = NL;
-	protected final String TEXT_3 = NL;
-	protected final String TEXT_4 = NL;
-
-	public FilePattern() {
-		//Here is the constructor
-		StringBuffer stringBuffer = new StringBuffer();
-
-		// add initialisation of the pattern variables (declaration has been already done).
-
-	}
-
-	public String generate(Object argument) throws Exception {
-		final StringBuffer stringBuffer = new StringBuffer();
-
-		InternalPatternContext ctx = (InternalPatternContext) argument;
-		Map<String, String> queryCtx = null;
-		IQuery.ParameterDescription paramDesc = null;
-
-		List<Object> parameterList = null;
-		//this pattern can only be called by another (i.e. it's not an entry point in execution)
-
-		for (Object parameterParameter : parameterList) {
-
-			this.parameter = (org.eclipse.core.resources.IFile) parameterParameter;
-
-			if (preCondition())
-				orchestration(ctx);
-
-		}
-		if (ctx.useReporter()) {
-			ctx.getReporter().executionFinished(ctx.getExecutionBuffer().toString(), ctx);
-			ctx.clearBuffer();
-		}
-
-		stringBuffer.append(TEXT_3);
-		stringBuffer.append(TEXT_4);
-		return stringBuffer.toString();
-	}
-
-	public String orchestration(PatternContext ctx) throws Exception {
-		InternalPatternContext ictx = (InternalPatternContext) ctx;
-		int executionIndex = ictx.getExecutionBuffer().length();
-
-		method_body(ictx.getBuffer(), ictx);
-
-		String loop = ictx.getBuffer().toString();
-		if (ictx.useReporter()) {
-			ictx.getExecutionBuffer().append(ictx.getBuffer().substring(ictx.getExecutionCurrentIndex()));
-			ictx.setExecutionCurrentIndex(0);
-			Map<String, Object> parameterValues = new HashMap<String, Object>();
-			parameterValues.put("parameter", this.parameter);
-			String outputWithCallBack = ictx.getExecutionBuffer().substring(executionIndex);
-			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
-			ictx.clearBuffer();
-		}
-		return loop;
-	}
-
-	protected org.eclipse.core.resources.IFile parameter = null;
-
-	public void set_parameter(org.eclipse.core.resources.IFile object) {
-		this.parameter = object;
-	}
-
-	public Map<String, Object> getParameters() {
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("parameter", this.parameter);
-		return parameters;
-	}
-
-	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
-
-		stringBuffer.append(TEXT_1);
-		stringBuffer.append(parameter.getName());
-		stringBuffer.append(TEXT_2);
-	}
-
-	public boolean preCondition() throws Exception {
-		return true;
-	}
+//Generated with EGF 1.6.0.201901231006

+package egf.uc1_8.pattern;

+

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class FilePattern {

+	protected static String nl;

+

+	public static synchronized FilePattern create(String lineSeparator) {

+		nl = lineSeparator;

+		FilePattern result = new FilePattern();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "File: ";

+	protected final String TEXT_2 = NL;

+	protected final String TEXT_3 = NL;

+

+	public FilePattern() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> parameterList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object parameterParameter : parameterList) {

+

+			this.parameter = (org.eclipse.core.resources.IFile) parameterParameter;

+

+			if (preCondition(ctx)) {

+				ctx.setNode(new Node.Container(currentNode, getClass()));

+				orchestration(ctx);

+			}

+

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_3);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_body(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("parameter", this.parameter);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.core.resources.IFile parameter = null;

+

+	public void set_parameter(org.eclipse.core.resources.IFile object) {

+		this.parameter = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("parameter", this.parameter);

+		return parameters;

+	}

+

+	protected void method_body(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(parameter.getName());

+		stringBuffer.append(TEXT_2);

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "body", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/test/Pattern_UC1.test b/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/test/Pattern_UC1.test
deleted file mode 100644
index df82880..0000000
--- a/tests/org.eclipse.egf.core.test/resources/org.eclipse.egf.usecase.pattern.uc1/test/Pattern_UC1.test
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<test:TestSuite xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fcore="http://www.eclipse.org/egf/1.0.0/fcore" xmlns:test="http://www.eclipse.org/egf/1.0.0/test" name="Pattern UC1 Test Suite">

-  <tests xsi:type="test:EGFTestCase" name="UC1.1 ClassPattern">

-    <result xsi:type="test:ConsoleOutputTestResult" text="--------------&#xD;&#xA;Result of pattern:&#xD;&#xA;&#xD;&#xA;- Hello ModelElement Class&#xD;&#xA;  - iD attribute&#xD;&#xA;  - description attribute&#xD;&#xA;- Hello NamedModelElement Class&#xD;&#xA;  - name attribute&#xD;&#xA;- Hello Activity Class&#xD;&#xA;- Hello Contract Class&#xD;&#xA;  - mandatory attribute&#xD;&#xA;  - mode attribute&#xD;&#xA;- Hello FactoryComponent Class&#xD;&#xA;- Hello ContractContainer Class&#xD;&#xA;- Hello FactoryComponentContract Class&#xD;&#xA;- Hello ViewpointContainer Class&#xD;&#xA;- Hello Viewpoint Class&#xD;&#xA;- Hello Orchestration Class&#xD;&#xA;- Hello OrchestrationParameterContainer Class&#xD;&#xA;- Hello OrchestrationParameter Class&#xD;&#xA;- Hello Invocation Class&#xD;&#xA;- Hello InvocationContractContainer Class&#xD;&#xA;- Hello InvocationContract Class&#xD;&#xA;"/>

-    <activity xsi:type="fcore:FactoryComponent" href="../egf/Pattern_UC1_1_ClassPattern.fcore#_0BNZAOTGEd6iCM6xyOQ7FA"/>

-  </tests>

-  <tests xsi:type="test:EGFTestCase" name="UC1.2 Inherance">

-    <result xsi:type="test:ConsoleOutputTestResult" text="--------------&#xD;&#xA;Result of pattern:&#xD;&#xA;&#xD;&#xA;Hello  from my parent and me: ModelElement&#xD;&#xA;Hello  from my parent and me: NamedModelElement&#xD;&#xA;Hello  from my parent and me: Activity&#xD;&#xA;Hello  from my parent and me: Contract&#xD;&#xA;Hello  from my parent and me: FactoryComponent&#xD;&#xA;Hello  from my parent and me: ContractContainer&#xD;&#xA;Hello  from my parent and me: FactoryComponentContract&#xD;&#xA;Hello  from my parent and me: ViewpointContainer&#xD;&#xA;Hello  from my parent and me: Viewpoint&#xD;&#xA;Hello  from my parent and me: Orchestration&#xD;&#xA;Hello  from my parent and me: OrchestrationParameterContainer&#xD;&#xA;Hello  from my parent and me: OrchestrationParameter&#xD;&#xA;Hello  from my parent and me: Invocation&#xD;&#xA;Hello  from my parent and me: InvocationContractContainer&#xD;&#xA;Hello  from my parent and me: InvocationContract&#xD;&#xA;"/>

-    <activity xsi:type="fcore:FactoryComponent" href="../egf/Pattern_UC1_2_Inheritance.fcore#_94fB8RVfEd-JoY-b5_Vpcw"/>

-  </tests>

-  <tests xsi:type="test:EGFTestCase" name="UC1.3 InheranceAndCall">

-    <result xsi:type="test:ConsoleOutputTestResult" text="--------------&#xD;&#xA;Result of pattern:&#xD;&#xA;&#xD;&#xA;Hello ModelElement, and all friends of ModelElement!&#xD;&#xA;Hello NamedModelElement, and all friends of NamedModelElement!&#xD;&#xA;Hello Activity, and all friends of Activity!&#xD;&#xA;Hello Contract, and all friends of Contract!&#xD;&#xA;Hello FactoryComponent, and all friends of FactoryComponent!&#xD;&#xA;Hello ContractContainer, and all friends of ContractContainer!&#xD;&#xA;Hello FactoryComponentContract, and all friends of FactoryComponentContract!&#xD;&#xA;Hello ViewpointContainer, and all friends of ViewpointContainer!&#xD;&#xA;Hello Viewpoint, and all friends of Viewpoint!&#xD;&#xA;Hello Orchestration, and all friends of Orchestration!&#xD;&#xA;Hello OrchestrationParameterContainer, and all friends of OrchestrationParameterContainer!&#xD;&#xA;Hello OrchestrationParameter, and all friends of OrchestrationParameter!&#xD;&#xA;Hello Invocation, and all friends of Invocation!&#xD;&#xA;Hello InvocationContractContainer, and all friends of InvocationContractContainer!&#xD;&#xA;Hello InvocationContract, and all friends of InvocationContract!&#xD;&#xA;"/>

-    <activity xsi:type="fcore:FactoryComponent" href="../egf/Pattern_UC1_3_InheritanceAndCall.fcore#_Onwn4AzqEd-pgpX7a7GeEA"/>

-  </tests>

-  <tests xsi:type="test:EGFTestCase" name="UC1.4 Callback_StategyBased">

-    <result xsi:type="test:ConsoleOutputTestResult" text="--------------&#xA;Result of pattern:&#xA;&#xA;&#xA;[Begin. 'ModelElement']&#xA;&#xA;&#x9;[Attribute 'iD']  &#xA;&#xA;&#x9;[Attribute 'description']  &#xA;&#xA;&#x9;=> 2 attribute(s)&#xA;[End. 'ModelElement']&#xA;&#xA;&#xA;&#xA;[Begin. 'NamedModelElement']&#xA;&#xA;&#x9;[Attribute 'name']  &#xA;&#xA;&#x9;=> 1 attribute(s)&#xA;[End. 'NamedModelElement']&#xA;&#xA;&#xA;&#xA;[Begin. 'Activity']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'Activity']&#xA;&#xA;&#xA;&#xA;[Begin. 'Contract']&#xA;&#xA;&#x9;[Attribute 'mandatory']  &#xA;&#xA;&#x9;[Attribute 'mode']  &#xA;&#xA;&#x9;=> 2 attribute(s)&#xA;[End. 'Contract']&#xA;&#xA;&#xA;&#xA;[Begin. 'FactoryComponent']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'FactoryComponent']&#xA;&#xA;&#xA;&#xA;[Begin. 'ContractContainer']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'ContractContainer']&#xA;&#xA;&#xA;&#xA;[Begin. 'FactoryComponentContract']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'FactoryComponentContract']&#xA;&#xA;&#xA;&#xA;[Begin. 'ViewpointContainer']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'ViewpointContainer']&#xA;&#xA;&#xA;&#xA;[Begin. 'Viewpoint']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'Viewpoint']&#xA;&#xA;&#xA;&#xA;[Begin. 'Orchestration']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'Orchestration']&#xA;&#xA;&#xA;&#xA;[Begin. 'OrchestrationParameterContainer']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'OrchestrationParameterContainer']&#xA;&#xA;&#xA;&#xA;[Begin. 'OrchestrationParameter']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'OrchestrationParameter']&#xA;&#xA;&#xA;&#xA;[Begin. 'Invocation']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'Invocation']&#xA;&#xA;&#xA;&#xA;[Begin. 'InvocationContractContainer']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'InvocationContractContainer']&#xA;&#xA;&#xA;&#xA;[Begin. 'InvocationContract']&#xA;&#xA;&#x9;=> 0 attribute(s)&#xA;[End. 'InvocationContract']&#xA;&#xA;&#xA;"/>

-    <activity xsi:type="fcore:FactoryComponent" href="../egf/Pattern_UC1_4_Callback_StrategyBased.fcore#_oWQD0Be1Ed-DaY2uHNBaQg"/>

-  </tests>

-  <tests xsi:type="test:EGFTestCase" name="UC1.5 Callback_WithJavaClass">

-    <result xsi:type="test:ConsoleOutputTestResult" text="Callback on parameter &#xA;ModelElement&#xA;Callback on parameter &#xA;NamedModelElement&#xA;Callback on parameter &#xA;Activity&#xA;Callback on parameter &#xA;Contract&#xA;Callback on parameter &#xA;FactoryComponent&#xA;Callback on parameter &#xA;ContractContainer&#xA;Callback on parameter &#xA;FactoryComponentContract&#xA;Callback on parameter &#xA;ViewpointContainer&#xA;Callback on parameter &#xA;Viewpoint&#xA;Callback on parameter &#xA;Orchestration&#xA;Callback on parameter &#xA;OrchestrationParameterContainer&#xA;Callback on parameter &#xA;OrchestrationParameter&#xA;Callback on parameter &#xA;Invocation&#xA;Callback on parameter &#xA;InvocationContractContainer&#xA;Callback on parameter &#xA;InvocationContract&#xA;ModelElementNamedModelElementActivityContractFactoryComponentContractContainerFactoryComponentContractViewpointContainerViewpointOrchestrationOrchestrationParameterContainerOrchestrationParameterInvocationInvocationContractContainerInvocationContract&#xA;"/>

-    <activity xsi:type="fcore:FactoryComponent" href="../egf/Pattern_UC1_5_Callback_WithJavaClass.fcore#_1di_UBe3Ed-DaY2uHNBaQg"/>

-  </tests>

-  <tests xsi:type="test:EGFTestCase" name="UC1.6 JetPatternCallsJavaPattern">

-    <result xsi:type="test:ConsoleOutputTestResult" text="Java: ModelElement&#xA;Java: NamedModelElement&#xA;Java: Activity&#xA;Java: Contract&#xA;Java: FactoryComponent&#xA;Java: ContractContainer&#xA;Java: FactoryComponentContract&#xA;Java: ViewpointContainer&#xA;Java: Viewpoint&#xA;Java: Orchestration&#xA;Java: OrchestrationParameterContainer&#xA;Java: OrchestrationParameter&#xA;Java: Invocation&#xA;Java: InvocationContractContainer&#xA;Java: InvocationContract&#xA;--------------&#xA;Result of pattern:&#xA;- Jet: ModelElement&#xA;- Jet: NamedModelElement&#xA;- Jet: Activity&#xA;- Jet: Contract&#xA;- Jet: FactoryComponent&#xA;- Jet: ContractContainer&#xA;- Jet: FactoryComponentContract&#xA;- Jet: ViewpointContainer&#xA;- Jet: Viewpoint&#xA;- Jet: Orchestration&#xA;- Jet: OrchestrationParameterContainer&#xA;- Jet: OrchestrationParameter&#xA;- Jet: Invocation&#xA;- Jet: InvocationContractContainer&#xA;- Jet: InvocationContract&#xA;&#xA;"/>

-    <activity xsi:type="fcore:FactoryComponent" href="../egf/Pattern_UC1_6_JetPatternCallsJavaPattern.fcore#_a-kDcBfVEd-JToveUSgqRw"/>

-  </tests>

-  <tests xsi:type="test:EGFTestCase" name="UC1.7 Injection">

-    <result xsi:type="test:ConsoleOutputTestResult" text="--------------&#xD;&#xA;Result of pattern:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;ModelElement contains:&#xD;&#xA;&#xD;&#xA;    - &quot;ModelElement&quot; EClassImpl&#xD;&#xA;    - &quot;getActivities&quot; EOperationImpl&#xD;&#xA;    - &quot;getResources&quot; EOperationImpl&#xD;&#xA;    - &quot;iD&quot; EAttributeImpl&#xD;&#xA;    - &quot;description&quot; EAttributeImpl&#xD;&#xA;&#xD;&#xA;NamedModelElement contains:&#xD;&#xA;&#xD;&#xA;    - &quot;NamedModelElement&quot; EClassImpl&#xD;&#xA;    - &quot;name&quot; EAttributeImpl&#xD;&#xA;&#xD;&#xA;Activity contains:&#xD;&#xA;&#xD;&#xA;    - &quot;Activity&quot; EClassImpl&#xD;&#xA;    - &quot;getActivities&quot; EOperationImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getContract&quot; EOperationImpl&#xD;&#xA;    - &quot;name&quot; EParameterImpl&#xD;&#xA;    - &quot;contractContainer&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;Contract contains:&#xD;&#xA;&#xD;&#xA;    - &quot;Contract&quot; EClassImpl&#xD;&#xA;    - &quot;getActivity&quot; EOperationImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;contractContainer&quot; EReferenceImpl&#xD;&#xA;    - &quot;mandatory&quot; EAttributeImpl&#xD;&#xA;    - &quot;mode&quot; EAttributeImpl&#xD;&#xA;    - &quot;type&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;FactoryComponent contains:&#xD;&#xA;&#xD;&#xA;    - &quot;FactoryComponent&quot; EClassImpl&#xD;&#xA;    - &quot;getActivities&quot; EOperationImpl&#xD;&#xA;    - &quot;getResources&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;viewpointContainer&quot; EReferenceImpl&#xD;&#xA;    - &quot;orchestration&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;ContractContainer contains:&#xD;&#xA;&#xD;&#xA;    - &quot;ContractContainer&quot; EClassImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;activity&quot; EReferenceImpl&#xD;&#xA;    - &quot;contracts&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;FactoryComponentContract contains:&#xD;&#xA;&#xD;&#xA;    - &quot;FactoryComponentContract&quot; EClassImpl&#xD;&#xA;    - &quot;invocationContracts&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;ViewpointContainer contains:&#xD;&#xA;&#xD;&#xA;    - &quot;ViewpointContainer&quot; EClassImpl&#xD;&#xA;    - &quot;getViewpoint&quot; EOperationImpl&#xD;&#xA;    - &quot;clazz&quot; EParameterImpl&#xD;&#xA;    - &quot;factoryComponent&quot; EReferenceImpl&#xD;&#xA;    - &quot;viewpoints&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;Viewpoint contains:&#xD;&#xA;&#xD;&#xA;    - &quot;Viewpoint&quot; EClassImpl&#xD;&#xA;    - &quot;viewpointContainer&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;Orchestration contains:&#xD;&#xA;&#xD;&#xA;    - &quot;Orchestration&quot; EClassImpl&#xD;&#xA;    - &quot;getInvocations&quot; EOperationImpl&#xD;&#xA;    - &quot;T&quot; ETypeParameterImpl&#xD;&#xA;    - &quot;getOrchestrationParameters&quot; EOperationImpl&#xD;&#xA;    - &quot;getOrchestrationParameters&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;factoryComponent&quot; EReferenceImpl&#xD;&#xA;    - &quot;orchestrationParameterContainer&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;OrchestrationParameterContainer contains:&#xD;&#xA;&#xD;&#xA;    - &quot;OrchestrationParameterContainer&quot; EClassImpl&#xD;&#xA;    - &quot;getFactoryComponent&quot; EOperationImpl&#xD;&#xA;    - &quot;getOrchestrationParameters&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;orchestration&quot; EReferenceImpl&#xD;&#xA;    - &quot;orchestrationParameters&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;OrchestrationParameter contains:&#xD;&#xA;&#xD;&#xA;    - &quot;OrchestrationParameter&quot; EClassImpl&#xD;&#xA;    - &quot;getFactoryComponent&quot; EOperationImpl&#xD;&#xA;    - &quot;getOrchestration&quot; EOperationImpl&#xD;&#xA;    - &quot;orchestrationParameterContainer&quot; EReferenceImpl&#xD;&#xA;    - &quot;invocationContracts&quot; EReferenceImpl&#xD;&#xA;    - &quot;type&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;Invocation contains:&#xD;&#xA;&#xD;&#xA;    - &quot;Invocation&quot; EClassImpl&#xD;&#xA;    - &quot;getFactoryComponent&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvocationContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvokedContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvokedContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvokedContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;getInvokedContracts&quot; EOperationImpl&#xD;&#xA;    - &quot;type&quot; EParameterImpl&#xD;&#xA;    - &quot;mode&quot; EParameterImpl&#xD;&#xA;    - &quot;invocationContractContainer&quot; EReferenceImpl&#xD;&#xA;    - &quot;invokedActivity&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;InvocationContractContainer contains:&#xD;&#xA;&#xD;&#xA;    - &quot;InvocationContractContainer&quot; EClassImpl&#xD;&#xA;    - &quot;getFactoryComponent&quot; EOperationImpl&#xD;&#xA;    - &quot;invocation&quot; EReferenceImpl&#xD;&#xA;    - &quot;invocationContracts&quot; EReferenceImpl&#xD;&#xA;&#xD;&#xA;InvocationContract contains:&#xD;&#xA;&#xD;&#xA;    - &quot;InvocationContract&quot; EClassImpl&#xD;&#xA;    - &quot;getFactoryComponent&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvocation&quot; EOperationImpl&#xD;&#xA;    - &quot;getInvokedMode&quot; EOperationImpl&#xD;&#xA;    - &quot;invocationContractContainer&quot; EReferenceImpl&#xD;&#xA;    - &quot;factoryComponentContract&quot; EReferenceImpl&#xD;&#xA;    - &quot;orchestrationParameter&quot; EReferenceImpl&#xD;&#xA;    - &quot;sourceInvocationContract&quot; EReferenceImpl&#xD;&#xA;    - &quot;targetInvocationContract&quot; EReferenceImpl&#xD;&#xA;    - &quot;invokedContract&quot; EReferenceImpl&#xD;&#xA;    - &quot;type&quot; EReferenceImpl&#xD;&#xA;"/>

-    <activity xsi:type="fcore:FactoryComponent" href="../egf/Pattern_UC1_7_Injection.fcore#_zOU6cBVhEd-JoY-b5_Vpcw"/>

-  </tests>

-</test:TestSuite>