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&l