Merge branch 'master' of

ssh://jhaug@git.eclipse.org:29418/etrice/org.eclipse.etrice.git

Conflicts:
	plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
	plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend
	plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._trace

Change-Id: Idb15029b0a22ab872f58c1cee1457452daff46c5

7 files changed, 1207 insertions, 1180 deletions

diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index 412e494ab..f91e8ba53 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: eTrice C Generator

 Bundle-Vendor: eTrice (Incubation)

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true

 Bundle-ActivationPolicy: lazy

-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.2.0",

- org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",

- org.eclipse.etrice.generator;bundle-version="0.2.0",

- org.eclipse.etrice.generator.doc;bundle-version="0.2.0",

+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.3.0",

+ org.eclipse.etrice.core.genmodel;bundle-version="0.3.0",

+ org.eclipse.etrice.generator;bundle-version="0.3.0",

+ org.eclipse.etrice.generator.doc;bundle-version="0.3.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.ui;bundle-version="3.7.0",

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
index f28d21c40..78617013e 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
@@ -15,7 +15,6 @@ package org.eclipse.etrice.generator.c;
 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.emf.ecore.resource.ResourceSet;

 import org.eclipse.etrice.core.genmodel.etricegen.Root;

 import org.eclipse.etrice.generator.base.AbstractGenerator;

 import org.eclipse.etrice.generator.c.gen.Validator;

@@ -100,14 +99,12 @@ public class Main extends AbstractGenerator {
 	}

 

 	protected boolean runGenerator(List<String> uriList, String genModelPath, boolean genInstDiag, boolean asLibrary) {

-		ResourceSet rs = resourceSetProvider.get();

+		loadModels(uriList);

 

-		loadModels(uriList, rs);

-

-		if (!validateModels(rs))

+		if (!validateModels())

 			return false;

 

-		Root genModel = createGeneratorModel(rs, asLibrary, genModelPath);

+		Root genModel = createGeneratorModel(asLibrary, genModelPath);

 		if (genModel==null)

 			return false;

 		

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
index 7a0f41f70..7a8a45971 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
@@ -20,6 +20,7 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root
 import org.eclipse.xtext.generator.IFileSystemAccess

 import org.eclipse.xtext.generator.IGenerator

 import org.eclipse.etrice.generator.generic.PrepareFileSystem

+import org.eclipse.etrice.generator.c.gen.SubSystemClassGen

 

 @Singleton

 class MainGen implements IGenerator {

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
index cd495f1f4..bb52c6841 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
@@ -26,7 +26,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
 import org.eclipse.etrice.core.room.ActorCommunicationType

 import org.eclipse.etrice.core.room.CommunicationType

 import org.eclipse.etrice.core.room.ProtocolClass

-import org.eclipse.etrice.core.room.SubSystemClass

 import org.eclipse.etrice.generator.generic.ILanguageExtension

 import org.eclipse.etrice.generator.generic.ProcedureHelpers

 import org.eclipse.etrice.generator.generic.RoomExtensions

@@ -51,26 +50,28 @@ class SubSystemClassGen {
 			var file = ssi.subSystemClass.getCHeaderFileName

 			logger.logInfo("generating SubSystemClass declaration: '"+file+"' in '"+path+"'")

 			fileAccess.setOutputPath(path)

-			fileAccess.generateFile(file, root.generateHeaderFile(ssi, ssi.subSystemClass))

+			fileAccess.generateFile(file, root.generateHeaderFile(ssi))

 			

 			file = ssi.subSystemClass.getCSourceFileName

 			logger.logInfo("generating SubSystemClass implementation: '"+file+"' in '"+path+"'")

 			fileAccess.setOutputPath(path)

-			fileAccess.generateFile(file, root.generateSourceFile(ssi, ssi.subSystemClass))

+			fileAccess.generateFile(file, root.generateSourceFile(ssi))

 			

 			file = ssi.subSystemClass.getInstSourceFileName

 			logger.logInfo("generating SubSystemClass instance file: '"+file+"' in '"+path+"'")

 			fileAccess.setOutputPath(path)

-			fileAccess.generateFile(file, root.generateInstanceFile(ssi, ssi.subSystemClass))

+			fileAccess.generateFile(file, root.generateInstanceFile(ssi))

 

 			file = ssi.subSystemClass.getDispSourceFileName

 			logger.logInfo("generating SubSystemClass dispatcher file: '"+file+"' in '"+path+"'")

 			fileAccess.setOutputPath(path)

-			fileAccess.generateFile(file, root.generateDispatcherFile(ssi, ssi.subSystemClass))

+			fileAccess.generateFile(file, root.generateDispatcherFile(ssi))

 		}

 	}

 

-	def private generateHeaderFile(Root root, SubSystemInstance ssi, SubSystemClass ssc) {'''

+	def private generateHeaderFile(Root root, SubSystemInstance ssi) {

+	val ssc = ssi.subSystemClass

+	'''

 		/**

 		 * @author generated by eTrice

 		 *

@@ -105,7 +106,9 @@ class SubSystemClassGen {
 	'''

 	}

 	

-	def private generateSourceFile(Root root, SubSystemInstance ssi, SubSystemClass ssc) {'''

+	def private generateSourceFile(Root root, SubSystemInstance ssi) {

+	val ssc = ssi.subSystemClass

+	'''

 		/**

 		 * @author generated by eTrice

 		 *

@@ -233,7 +236,9 @@ class SubSystemClassGen {
 	'''

 	}

 

-	def private generateInstanceFile(Root root, SubSystemInstance ssi, SubSystemClass ssc) {'''

+	def private generateInstanceFile(Root root, SubSystemInstance ssi) {

+	val ssc = ssi.subSystemClass

+	'''

 		/**

 		 * @author generated by eTrice

 		 *

@@ -433,7 +438,9 @@ class SubSystemClassGen {
 		return result

 	}

 	

-	def private generateDispatcherFile(Root root, SubSystemInstance ssi, SubSystemClass ssc) {'''

+	def private generateDispatcherFile(Root root, SubSystemInstance ssi) {

+	val ssc = ssi.subSystemClass

+	'''

 		/**

 		 * @author generated by eTrice

 		 *

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend
index 2d9d666fb..18dd17143 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend
@@ -15,7 +15,6 @@ package org.eclipse.etrice.generator.c.gen
 

 import com.google.inject.Inject

 import com.google.inject.Singleton

-import org.eclipse.etrice.core.room.SubSystemClass

 import org.eclipse.etrice.core.genmodel.etricegen.Root

 import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance

 import org.eclipse.xtext.generator.JavaIoFileSystemAccess

@@ -30,11 +29,13 @@ class SubSystemRunnerGen {
 	def doGenerate(Root root) {

 		for (sc: root.subSystemInstances) {

 			fileAccess.setOutputPath(sc.subSystemClass.generationTargetPath+sc.subSystemClass.getPath)

-			fileAccess.generateFile( sc.name+"_Runner.c", root.generateSourceFile(sc, sc.subSystemClass))

+			fileAccess.generateFile( sc.subSystemClass.name+"_Runner.c", root.generateSourceFile(sc))

 		}

 	}

 	

-	def generateSourceFile(Root root, SubSystemInstance ssi, SubSystemClass ssc) {'''

+	def generateSourceFile(Root root, SubSystemInstance ssi) {

+	val ssc = ssi.subSystemClass

+	'''

 		/**

 		 * @author generated by eTrice

 		 *

@@ -43,7 +44,7 @@ class SubSystemRunnerGen {
 		 */

 		

 		

-		#include "«ssi.name».h"

+		#include "«ssc.name».h"

 

 		#include "debugging/etLogger.h"

 		#include "debugging/etMSCLogger.h"

@@ -62,19 +63,19 @@ class SubSystemRunnerGen {
 			ET_MSC_LOGGER_OPEN("main");

 		

 			/* startup sequence  of lifecycle */

-			«ssi.name»_init(); 		/* lifecycle init */

-			«ssi.name»_start(); 	/* lifecycle start */

+			«ssc.name»_init(); 		/* lifecycle init */

+			«ssc.name»_start(); 	/* lifecycle start */

 		

 			etUserPreRun(); /* platform specific */

 

 			/* run Scheduler */

-			«ssi.name»_run();

+			«ssc.name»_run();

 		

 			etUserPostRun(); /* platform specific */

 

 			/* shutdown sequence of lifecycle */

-			«ssi.name»_stop(); 		/* lifecycle stop */

-			«ssi.name»_destroy(); 	/* lifecycle destroy */

+			«ssc.name»_stop(); 		/* lifecycle stop */

+			«ssc.name»_destroy(); 	/* lifecycle destroy */

 		

 			ET_MSC_LOGGER_CLOSE

 			etLogger_logInfo("***   T H E   E N D   ***");

diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
index fbfe286aa..83bf8f2d7 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
@@ -87,11 +87,10 @@ public class SubSystemClassGen {
         String _plus_3 = (_plus_2 + "\'");

         this.logger.logInfo(_plus_3);

         this.fileAccess.setOutputPath(path);

-        SubSystemClass _subSystemClass_3 = ssi.getSubSystemClass();

-        CharSequence _generateHeaderFile = this.generateHeaderFile(root, ssi, _subSystemClass_3);

+        CharSequence _generateHeaderFile = this.generateHeaderFile(root, ssi);

         this.fileAccess.generateFile(file, _generateHeaderFile);

-        SubSystemClass _subSystemClass_4 = ssi.getSubSystemClass();

-        String _cSourceFileName = this.stdExt.getCSourceFileName(_subSystemClass_4);

+        SubSystemClass _subSystemClass_3 = ssi.getSubSystemClass();

+        String _cSourceFileName = this.stdExt.getCSourceFileName(_subSystemClass_3);

         file = _cSourceFileName;

         String _plus_4 = ("generating SubSystemClass implementation: \'" + file);

         String _plus_5 = (_plus_4 + "\' in \'");

@@ -99,11 +98,10 @@ public class SubSystemClassGen {
         String _plus_7 = (_plus_6 + "\'");

         this.logger.logInfo(_plus_7);

         this.fileAccess.setOutputPath(path);

-        SubSystemClass _subSystemClass_5 = ssi.getSubSystemClass();

-        CharSequence _generateSourceFile = this.generateSourceFile(root, ssi, _subSystemClass_5);

+        CharSequence _generateSourceFile = this.generateSourceFile(root, ssi);

         this.fileAccess.generateFile(file, _generateSourceFile);

-        SubSystemClass _subSystemClass_6 = ssi.getSubSystemClass();

-        String _instSourceFileName = this.stdExt.getInstSourceFileName(_subSystemClass_6);

+        SubSystemClass _subSystemClass_4 = ssi.getSubSystemClass();

+        String _instSourceFileName = this.stdExt.getInstSourceFileName(_subSystemClass_4);

         file = _instSourceFileName;

         String _plus_8 = ("generating SubSystemClass instance file: \'" + file);

         String _plus_9 = (_plus_8 + "\' in \'");

@@ -111,11 +109,10 @@ public class SubSystemClassGen {
         String _plus_11 = (_plus_10 + "\'");

         this.logger.logInfo(_plus_11);

         this.fileAccess.setOutputPath(path);

-        SubSystemClass _subSystemClass_7 = ssi.getSubSystemClass();

-        CharSequence _generateInstanceFile = this.generateInstanceFile(root, ssi, _subSystemClass_7);

+        CharSequence _generateInstanceFile = this.generateInstanceFile(root, ssi);

         this.fileAccess.generateFile(file, _generateInstanceFile);

-        SubSystemClass _subSystemClass_8 = ssi.getSubSystemClass();

-        String _dispSourceFileName = this.stdExt.getDispSourceFileName(_subSystemClass_8);

+        SubSystemClass _subSystemClass_5 = ssi.getSubSystemClass();

+        String _dispSourceFileName = this.stdExt.getDispSourceFileName(_subSystemClass_5);

         file = _dispSourceFileName;

         String _plus_12 = ("generating SubSystemClass dispatcher file: \'" + file);

         String _plus_13 = (_plus_12 + "\' in \'");

@@ -123,698 +120,711 @@ public class SubSystemClassGen {
         String _plus_15 = (_plus_14 + "\'");

         this.logger.logInfo(_plus_15);

         this.fileAccess.setOutputPath(path);

-        SubSystemClass _subSystemClass_9 = ssi.getSubSystemClass();

-        CharSequence _generateDispatcherFile = this.generateDispatcherFile(root, ssi, _subSystemClass_9);

+        CharSequence _generateDispatcherFile = this.generateDispatcherFile(root, ssi);

         this.fileAccess.generateFile(file, _generateDispatcherFile);

       }

     }

   }

   

-  private CharSequence generateHeaderFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("/**");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* @author generated by eTrice");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* Header File of SubSystemClass ");

-    String _name = ssc.getName();

-    _builder.append(_name, " ");

-    _builder.newLineIfNotEmpty();

-    _builder.append(" ");

-    _builder.append("* ");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*/");

-    _builder.newLine();

-    _builder.newLine();

-    String _name_1 = ssc.getName();

-    CharSequence _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);

-    _builder.append(_generateIncludeGuardBegin, "");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    DetailCode _userCode1 = ssc.getUserCode1();

-    CharSequence _userCode = this.helpers.userCode(_userCode1);

-    _builder.append(_userCode, "");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("/* lifecycle functions");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* init -> start -> run (loop) -> stop -> destroy");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*/");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_2 = ssc.getName();

-    _builder.append(_name_2, "");

-    _builder.append("_init(void);\t\t/* lifecycle init  \t */");

-    _builder.newLineIfNotEmpty();

-    _builder.append("void ");

-    String _name_3 = ssc.getName();

-    _builder.append(_name_3, "");

-    _builder.append("_start(void);\t/* lifecycle start \t */");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_4 = ssc.getName();

-    _builder.append(_name_4, "");

-    _builder.append("_run(void);\t\t/* lifecycle run \t */");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_5 = ssc.getName();

-    _builder.append(_name_5, "");

-    _builder.append("_stop(void); \t/* lifecycle stop\t */");

-    _builder.newLineIfNotEmpty();

-    _builder.append("void ");

-    String _name_6 = ssc.getName();

-    _builder.append(_name_6, "");

-    _builder.append("_destroy(void); \t/* lifecycle destroy */");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("void SubSysClass_shutdown(void);  /* shutdown the dispatcher loop */");

-    _builder.newLine();

-    _builder.newLine();

-    DetailCode _userCode2 = ssc.getUserCode2();

-    CharSequence _userCode_1 = this.helpers.userCode(_userCode2);

-    _builder.append(_userCode_1, "");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    String _name_7 = ssc.getName();

-    CharSequence _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_7);

-    _builder.append(_generateIncludeGuardEnd, "");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.newLine();

-    return _builder;

+  private CharSequence generateHeaderFile(final Root root, final SubSystemInstance ssi) {

+    CharSequence _xblockexpression = null;

+    {

+      final SubSystemClass ssc = ssi.getSubSystemClass();

+      StringConcatenation _builder = new StringConcatenation();

+      _builder.append("/**");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* @author generated by eTrice");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* Header File of SubSystemClass ");

+      String _name = ssc.getName();

+      _builder.append(_name, " ");

+      _builder.newLineIfNotEmpty();

+      _builder.append(" ");

+      _builder.append("* ");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*/");

+      _builder.newLine();

+      _builder.newLine();

+      String _name_1 = ssc.getName();

+      CharSequence _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);

+      _builder.append(_generateIncludeGuardBegin, "");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      DetailCode _userCode1 = ssc.getUserCode1();

+      CharSequence _userCode = this.helpers.userCode(_userCode1);

+      _builder.append(_userCode, "");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("/* lifecycle functions");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* init -> start -> run (loop) -> stop -> destroy");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*/");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_2 = ssc.getName();

+      _builder.append(_name_2, "");

+      _builder.append("_init(void);\t\t/* lifecycle init  \t */");

+      _builder.newLineIfNotEmpty();

+      _builder.append("void ");

+      String _name_3 = ssc.getName();

+      _builder.append(_name_3, "");

+      _builder.append("_start(void);\t/* lifecycle start \t */");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_4 = ssc.getName();

+      _builder.append(_name_4, "");

+      _builder.append("_run(void);\t\t/* lifecycle run \t */");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_5 = ssc.getName();

+      _builder.append(_name_5, "");

+      _builder.append("_stop(void); \t/* lifecycle stop\t */");

+      _builder.newLineIfNotEmpty();

+      _builder.append("void ");

+      String _name_6 = ssc.getName();

+      _builder.append(_name_6, "");

+      _builder.append("_destroy(void); \t/* lifecycle destroy */");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("void SubSysClass_shutdown(void);  /* shutdown the dispatcher loop */");

+      _builder.newLine();

+      _builder.newLine();

+      DetailCode _userCode2 = ssc.getUserCode2();

+      CharSequence _userCode_1 = this.helpers.userCode(_userCode2);

+      _builder.append(_userCode_1, "");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      String _name_7 = ssc.getName();

+      CharSequence _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_7);

+      _builder.append(_generateIncludeGuardEnd, "");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.newLine();

+      _xblockexpression = (_builder);

+    }

+    return _xblockexpression;

   }

   

-  private CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("/**");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* @author generated by eTrice");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* Source File of SubSystemClass ");

-    String _name = ssc.getName();

-    _builder.append(_name, " ");

-    _builder.newLineIfNotEmpty();

-    _builder.append(" ");

-    _builder.append("* ");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*/");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("#include \"");

-    String _cHeaderFileName = this.stdExt.getCHeaderFileName(ssc);

-    _builder.append(_cHeaderFileName, "");

-    _builder.append("\"");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("/* include instances for all classes */");

-    _builder.newLine();

-    _builder.append("#include \"");

-    String _instSourceFileName = this.stdExt.getInstSourceFileName(ssc);

-    _builder.append(_instSourceFileName, "");

-    _builder.append("\"");

-    _builder.newLineIfNotEmpty();

-    _builder.append("#include \"");

-    String _dispSourceFileName = this.stdExt.getDispSourceFileName(ssc);

-    _builder.append(_dispSourceFileName, "");

-    _builder.append("\"");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("#include \"debugging/etLogger.h\"");

-    _builder.newLine();

-    _builder.append("#include \"debugging/etMSCLogger.h\"");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("#include \"platform/etTimer.h\"");

-    _builder.newLine();

-    _builder.append("#include \"etRuntimeConfig.h\"");

-    _builder.newLine();

-    _builder.newLine();

-    DetailCode _userCode3 = ssc.getUserCode3();

-    CharSequence _userCode = this.helpers.userCode(_userCode3);

-    _builder.append(_userCode, "");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("/* data for SubSysten ");

-    String _name_1 = ssc.getName();

-    _builder.append(_name_1, "");

-    _builder.append(" */");

-    _builder.newLineIfNotEmpty();

-    _builder.append("typedef struct ");

-    String _name_2 = ssc.getName();

-    _builder.append(_name_2, "");

-    _builder.append(" {");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("char *name;");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("volatile int shutdownRequest;");

-    _builder.newLine();

-    _builder.append("} ");

-    String _name_3 = ssc.getName();

-    _builder.append(_name_3, "");

-    _builder.append(";");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("static ");

-    String _name_4 = ssc.getName();

-    _builder.append(_name_4, "");

-    _builder.append(" ");

-    String _name_5 = ssc.getName();

-    _builder.append(_name_5, "");

-    _builder.append("Inst = {\"");

-    String _name_6 = ssc.getName();

-    _builder.append(_name_6, "");

-    _builder.append("\",0};");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_7 = ssc.getName();

-    _builder.append(_name_7, "");

-    _builder.append("_initActorInstances(void);");

-    _builder.newLineIfNotEmpty();

-    _builder.append("void ");

-    String _name_8 = ssc.getName();

-    _builder.append(_name_8, "");

-    _builder.append("_constructActorInstances(void);");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_9 = ssc.getName();

-    _builder.append(_name_9, "");

-    _builder.append("_init(void){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"init\")");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etLogger_logInfoF(\"%s_init\", ");

-    String _name_10 = ssc.getName();

-    _builder.append(_name_10, "	");

-    _builder.append("Inst.name);");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("/* construct all actors */");

-    _builder.newLine();

-    _builder.append("\t");

-    String _name_11 = ssc.getName();

-    _builder.append(_name_11, "	");

-    _builder.append("_constructActorInstances();");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("/* initialization of all message services */");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etMessageService_init(&msgService_Thread1, msgBuffer_Thread1, MESSAGE_POOL_MAX, MESSAGE_BLOCK_SIZE, MsgDispatcher_Thread1_receiveMessage);");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("/* init all actors */");

-    _builder.newLine();

-    _builder.append("\t");

-    String _name_12 = ssc.getName();

-    _builder.append(_name_12, "	");

-    _builder.append("_initActorInstances();");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_13 = ssc.getName();

-    _builder.append(_name_13, "");

-    _builder.append("_start(void){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"start\")");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etLogger_logInfoF(\"%s_start\", ");

-    String _name_14 = ssc.getName();

-    _builder.append(_name_14, "	");

-    _builder.append("Inst.name);");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_15 = ssc.getName();

-    _builder.append(_name_15, "");

-    _builder.append("_run(void){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"run\")");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("#ifdef ET_RUNTIME_ENDLESS");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("while(!(");

-    String _name_16 = ssc.getName();

-    _builder.append(_name_16, "		");

-    _builder.append("Inst.shutdownRequest)){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t\t");

-    _builder.append("if (etTimer_executeNeeded()){");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("etMessageService_execute(&msgService_Thread1);");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    CharSequence _generateDatadrivenExecutes = this.generateDatadrivenExecutes(root, ssi);

-    _builder.append(_generateDatadrivenExecutes, "				");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("#else");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("uint32 loopCounter = 0;");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("while(!(");

-    String _name_17 = ssc.getName();

-    _builder.append(_name_17, "		");

-    _builder.append("Inst.shutdownRequest)){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t\t");

-    _builder.append("if (etTimer_executeNeeded()){");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("etMessageService_execute(&msgService_Thread1);");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    CharSequence _generateDatadrivenExecutes_1 = this.generateDatadrivenExecutes(root, ssi);

-    _builder.append(_generateDatadrivenExecutes_1, "				");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t\t\t");

-    _builder.append("etLogger_logInfo(\"Execute\");");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("if (loopCounter++ > ET_RUNTIME_MAXLOOP){");

-    _builder.newLine();

-    _builder.append("\t\t\t\t\t");

-    _builder.append("break;");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("#endif");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_18 = ssc.getName();

-    _builder.append(_name_18, "");

-    _builder.append("_stop(void){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"stop\")");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etLogger_logInfoF(\"%s_stop\", ");

-    String _name_19 = ssc.getName();

-    _builder.append(_name_19, "	");

-    _builder.append("Inst.name);");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_20 = ssc.getName();

-    _builder.append(_name_20, "");

-    _builder.append("_destroy(void){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"destroy\")");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etLogger_logInfoF(\"%s_destroy\", ");

-    String _name_21 = ssc.getName();

-    _builder.append(_name_21, "	");

-    _builder.append("Inst.name);");

-    _builder.newLineIfNotEmpty();

+  private CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi) {

+    CharSequence _xblockexpression = null;

     {

-      EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();

-      List<ActorInstance> _reverseView = ListExtensions.<ActorInstance>reverseView(_allContainedInstances);

-      for(final ActorInstance ai : _reverseView) {

-        {

-          ActorClass _actorClass = ai.getActorClass();

-          EList<StandardOperation> _operations = _actorClass.getOperations();

-          final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {

-              public Boolean apply(final StandardOperation op) {

-                boolean _isDestructor = op.isDestructor();

-                return Boolean.valueOf(_isDestructor);

-              }

-            };

-          Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);

-          boolean _isEmpty = IterableExtensions.isEmpty(_filter);

-          boolean _not = (!_isEmpty);

-          if (_not) {

-            _builder.append("\t");

-            ActorClass _actorClass_1 = ai.getActorClass();

-            String _name_22 = _actorClass_1.getName();

-            ActorClass _actorClass_2 = ai.getActorClass();

-            String _name_23 = _actorClass_2.getName();

-            String _destructorName = this.languageExt.destructorName(_name_23);

-            String _memberInUse = this.languageExt.memberInUse(_name_22, _destructorName);

-            _builder.append(_memberInUse, "	");

-            _builder.append("(&");

-            String _path = ai.getPath();

-            String _pathName = this.roomExt.getPathName(_path);

-            _builder.append(_pathName, "	");

-            _builder.append(");");

-            _builder.newLineIfNotEmpty();

+      final SubSystemClass ssc = ssi.getSubSystemClass();

+      StringConcatenation _builder = new StringConcatenation();

+      _builder.append("/**");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* @author generated by eTrice");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* Source File of SubSystemClass ");

+      String _name = ssc.getName();

+      _builder.append(_name, " ");

+      _builder.newLineIfNotEmpty();

+      _builder.append(" ");

+      _builder.append("* ");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*/");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("#include \"");

+      String _cHeaderFileName = this.stdExt.getCHeaderFileName(ssc);

+      _builder.append(_cHeaderFileName, "");

+      _builder.append("\"");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("/* include instances for all classes */");

+      _builder.newLine();

+      _builder.append("#include \"");

+      String _instSourceFileName = this.stdExt.getInstSourceFileName(ssc);

+      _builder.append(_instSourceFileName, "");

+      _builder.append("\"");

+      _builder.newLineIfNotEmpty();

+      _builder.append("#include \"");

+      String _dispSourceFileName = this.stdExt.getDispSourceFileName(ssc);

+      _builder.append(_dispSourceFileName, "");

+      _builder.append("\"");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("#include \"debugging/etLogger.h\"");

+      _builder.newLine();

+      _builder.append("#include \"debugging/etMSCLogger.h\"");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("#include \"platform/etTimer.h\"");

+      _builder.newLine();

+      _builder.append("#include \"etRuntimeConfig.h\"");

+      _builder.newLine();

+      _builder.newLine();

+      DetailCode _userCode3 = ssc.getUserCode3();

+      CharSequence _userCode = this.helpers.userCode(_userCode3);

+      _builder.append(_userCode, "");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("/* data for SubSysten ");

+      String _name_1 = ssc.getName();

+      _builder.append(_name_1, "");

+      _builder.append(" */");

+      _builder.newLineIfNotEmpty();

+      _builder.append("typedef struct ");

+      String _name_2 = ssc.getName();

+      _builder.append(_name_2, "");

+      _builder.append(" {");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("char *name;");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("volatile int shutdownRequest;");

+      _builder.newLine();

+      _builder.append("} ");

+      String _name_3 = ssc.getName();

+      _builder.append(_name_3, "");

+      _builder.append(";");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("static ");

+      String _name_4 = ssc.getName();

+      _builder.append(_name_4, "");

+      _builder.append(" ");

+      String _name_5 = ssc.getName();

+      _builder.append(_name_5, "");

+      _builder.append("Inst = {\"");

+      String _name_6 = ssc.getName();

+      _builder.append(_name_6, "");

+      _builder.append("\",0};");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_7 = ssc.getName();

+      _builder.append(_name_7, "");

+      _builder.append("_initActorInstances(void);");

+      _builder.newLineIfNotEmpty();

+      _builder.append("void ");

+      String _name_8 = ssc.getName();

+      _builder.append(_name_8, "");

+      _builder.append("_constructActorInstances(void);");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_9 = ssc.getName();

+      _builder.append(_name_9, "");

+      _builder.append("_init(void){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"init\")");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etLogger_logInfoF(\"%s_init\", ");

+      String _name_10 = ssc.getName();

+      _builder.append(_name_10, "	");

+      _builder.append("Inst.name);");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("/* construct all actors */");

+      _builder.newLine();

+      _builder.append("\t");

+      String _name_11 = ssc.getName();

+      _builder.append(_name_11, "	");

+      _builder.append("_constructActorInstances();");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("/* initialization of all message services */");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etMessageService_init(&msgService_Thread1, msgBuffer_Thread1, MESSAGE_POOL_MAX, MESSAGE_BLOCK_SIZE, MsgDispatcher_Thread1_receiveMessage);");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("/* init all actors */");

+      _builder.newLine();

+      _builder.append("\t");

+      String _name_12 = ssc.getName();

+      _builder.append(_name_12, "	");

+      _builder.append("_initActorInstances();");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_13 = ssc.getName();

+      _builder.append(_name_13, "");

+      _builder.append("_start(void){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"start\")");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etLogger_logInfoF(\"%s_start\", ");

+      String _name_14 = ssc.getName();

+      _builder.append(_name_14, "	");

+      _builder.append("Inst.name);");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_15 = ssc.getName();

+      _builder.append(_name_15, "");

+      _builder.append("_run(void){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"run\")");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("#ifdef ET_RUNTIME_ENDLESS");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("while(!(");

+      String _name_16 = ssc.getName();

+      _builder.append(_name_16, "		");

+      _builder.append("Inst.shutdownRequest)){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t\t");

+      _builder.append("if (etTimer_executeNeeded()){");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("etMessageService_execute(&msgService_Thread1);");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      CharSequence _generateDatadrivenExecutes = this.generateDatadrivenExecutes(root, ssi);

+      _builder.append(_generateDatadrivenExecutes, "				");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("#else");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("uint32 loopCounter = 0;");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("while(!(");

+      String _name_17 = ssc.getName();

+      _builder.append(_name_17, "		");

+      _builder.append("Inst.shutdownRequest)){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t\t");

+      _builder.append("if (etTimer_executeNeeded()){");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("etMessageService_execute(&msgService_Thread1);");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      CharSequence _generateDatadrivenExecutes_1 = this.generateDatadrivenExecutes(root, ssi);

+      _builder.append(_generateDatadrivenExecutes_1, "				");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t\t\t");

+      _builder.append("etLogger_logInfo(\"Execute\");");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("if (loopCounter++ > ET_RUNTIME_MAXLOOP){");

+      _builder.newLine();

+      _builder.append("\t\t\t\t\t");

+      _builder.append("break;");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("#endif");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_18 = ssc.getName();

+      _builder.append(_name_18, "");

+      _builder.append("_stop(void){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"stop\")");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etLogger_logInfoF(\"%s_stop\", ");

+      String _name_19 = ssc.getName();

+      _builder.append(_name_19, "	");

+      _builder.append("Inst.name);");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_20 = ssc.getName();

+      _builder.append(_name_20, "");

+      _builder.append("_destroy(void){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"destroy\")");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etLogger_logInfoF(\"%s_destroy\", ");

+      String _name_21 = ssc.getName();

+      _builder.append(_name_21, "	");

+      _builder.append("Inst.name);");

+      _builder.newLineIfNotEmpty();

+      {

+        EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();

+        List<ActorInstance> _reverseView = ListExtensions.<ActorInstance>reverseView(_allContainedInstances);

+        for(final ActorInstance ai : _reverseView) {

+          {

+            ActorClass _actorClass = ai.getActorClass();

+            EList<StandardOperation> _operations = _actorClass.getOperations();

+            final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {

+                public Boolean apply(final StandardOperation op) {

+                  boolean _isDestructor = op.isDestructor();

+                  return Boolean.valueOf(_isDestructor);

+                }

+              };

+            Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);

+            boolean _isEmpty = IterableExtensions.isEmpty(_filter);

+            boolean _not = (!_isEmpty);

+            if (_not) {

+              _builder.append("\t");

+              ActorClass _actorClass_1 = ai.getActorClass();

+              String _name_22 = _actorClass_1.getName();

+              ActorClass _actorClass_2 = ai.getActorClass();

+              String _name_23 = _actorClass_2.getName();

+              String _destructorName = this.languageExt.destructorName(_name_23);

+              String _memberInUse = this.languageExt.memberInUse(_name_22, _destructorName);

+              _builder.append(_memberInUse, "	");

+              _builder.append("(&");

+              String _path = ai.getPath();

+              String _pathName = this.roomExt.getPathName(_path);

+              _builder.append(_pathName, "	");

+              _builder.append(");");

+              _builder.newLineIfNotEmpty();

+            }

           }

         }

       }

-    }

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void SubSysClass_shutdown(void){");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"shutdown\")");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etLogger_logInfoF(\"%s_shutdown\", ");

-    String _name_24 = ssc.getName();

-    _builder.append(_name_24, "	");

-    _builder.append("Inst.name);");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    String _name_25 = ssc.getName();

-    _builder.append(_name_25, "	");

-    _builder.append("Inst.shutdownRequest = 1;");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_26 = ssc.getName();

-    _builder.append(_name_26, "");

-    _builder.append("_constructActorInstances(void){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"");

-    String _name_27 = ssc.getName();

-    _builder.append(_name_27, "	");

-    _builder.append("\", \"constructActorInstances\")");

-    _builder.newLineIfNotEmpty();

-    {

-      EList<ActorInstance> _allContainedInstances_1 = ssi.getAllContainedInstances();

-      for(final ActorInstance ai_1 : _allContainedInstances_1) {

-        {

-          ActorClass _actorClass_3 = ai_1.getActorClass();

-          EList<StandardOperation> _operations_1 = _actorClass_3.getOperations();

-          final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {

-              public Boolean apply(final StandardOperation op) {

-                boolean _isConstructor = RoomHelpers.isConstructor(op);

-                return Boolean.valueOf(_isConstructor);

-              }

-            };

-          Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);

-          boolean _isEmpty_1 = IterableExtensions.isEmpty(_filter_1);

-          boolean _not_1 = (!_isEmpty_1);

-          if (_not_1) {

-            _builder.append("\t");

-            ActorClass _actorClass_4 = ai_1.getActorClass();

-            String _name_28 = _actorClass_4.getName();

-            ActorClass _actorClass_5 = ai_1.getActorClass();

-            String _name_29 = _actorClass_5.getName();

-            String _constructorName = this.languageExt.constructorName(_name_29);

-            String _memberInUse_1 = this.languageExt.memberInUse(_name_28, _constructorName);

-            _builder.append(_memberInUse_1, "	");

-            _builder.append("(&");

-            String _path_1 = ai_1.getPath();

-            String _pathName_1 = this.roomExt.getPathName(_path_1);

-            _builder.append(_pathName_1, "	");

-            _builder.append(");");

-            _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void SubSysClass_shutdown(void){");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"SubSys\", \"shutdown\")");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etLogger_logInfoF(\"%s_shutdown\", ");

+      String _name_24 = ssc.getName();

+      _builder.append(_name_24, "	");

+      _builder.append("Inst.name);");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      String _name_25 = ssc.getName();

+      _builder.append(_name_25, "	");

+      _builder.append("Inst.shutdownRequest = 1;");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_26 = ssc.getName();

+      _builder.append(_name_26, "");

+      _builder.append("_constructActorInstances(void){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"");

+      String _name_27 = ssc.getName();

+      _builder.append(_name_27, "	");

+      _builder.append("\", \"constructActorInstances\")");

+      _builder.newLineIfNotEmpty();

+      {

+        EList<ActorInstance> _allContainedInstances_1 = ssi.getAllContainedInstances();

+        for(final ActorInstance ai_1 : _allContainedInstances_1) {

+          {

+            ActorClass _actorClass_3 = ai_1.getActorClass();

+            EList<StandardOperation> _operations_1 = _actorClass_3.getOperations();

+            final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {

+                public Boolean apply(final StandardOperation op) {

+                  boolean _isConstructor = RoomHelpers.isConstructor(op);

+                  return Boolean.valueOf(_isConstructor);

+                }

+              };

+            Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);

+            boolean _isEmpty_1 = IterableExtensions.isEmpty(_filter_1);

+            boolean _not_1 = (!_isEmpty_1);

+            if (_not_1) {

+              _builder.append("\t");

+              ActorClass _actorClass_4 = ai_1.getActorClass();

+              String _name_28 = _actorClass_4.getName();

+              ActorClass _actorClass_5 = ai_1.getActorClass();

+              String _name_29 = _actorClass_5.getName();

+              String _constructorName = this.languageExt.constructorName(_name_29);

+              String _memberInUse_1 = this.languageExt.memberInUse(_name_28, _constructorName);

+              _builder.append(_memberInUse_1, "	");

+              _builder.append("(&");

+              String _path_1 = ai_1.getPath();

+              String _pathName_1 = this.roomExt.getPathName(_path_1);

+              _builder.append(_pathName_1, "	");

+              _builder.append(");");

+              _builder.newLineIfNotEmpty();

+            }

           }

         }

       }

-    }

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("void ");

-    String _name_30 = ssc.getName();

-    _builder.append(_name_30, "");

-    _builder.append("_initActorInstances(void){");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"");

-    String _name_31 = ssc.getName();

-    _builder.append(_name_31, "	");

-    _builder.append("\", \"initActorInstances\")");

-    _builder.newLineIfNotEmpty();

-    {

-      EList<ActorInstance> _allContainedInstances_2 = ssi.getAllContainedInstances();

-      for(final ActorInstance ai_2 : _allContainedInstances_2) {

-        _builder.append("\t");

-        ActorClass _actorClass_6 = ai_2.getActorClass();

-        String _name_32 = _actorClass_6.getName();

-        _builder.append(_name_32, "	");

-        _builder.append("_init(&");

-        String _path_2 = ai_2.getPath();

-        String _pathName_2 = this.roomExt.getPathName(_path_2);

-        _builder.append(_pathName_2, "	");

-        _builder.append(");");

-        _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("void ");

+      String _name_30 = ssc.getName();

+      _builder.append(_name_30, "");

+      _builder.append("_initActorInstances(void){");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"");

+      String _name_31 = ssc.getName();

+      _builder.append(_name_31, "	");

+      _builder.append("\", \"initActorInstances\")");

+      _builder.newLineIfNotEmpty();

+      {

+        EList<ActorInstance> _allContainedInstances_2 = ssi.getAllContainedInstances();

+        for(final ActorInstance ai_2 : _allContainedInstances_2) {

+          _builder.append("\t");

+          ActorClass _actorClass_6 = ai_2.getActorClass();

+          String _name_32 = _actorClass_6.getName();

+          _builder.append(_name_32, "	");

+          _builder.append("_init(&");

+          String _path_2 = ai_2.getPath();

+          String _pathName_2 = this.roomExt.getPathName(_path_2);

+          _builder.append(_pathName_2, "	");

+          _builder.append(");");

+          _builder.newLineIfNotEmpty();

+        }

       }

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _xblockexpression = (_builder);

     }

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    return _builder;

+    return _xblockexpression;

   }

   

-  private CharSequence generateInstanceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("/**");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* @author generated by eTrice");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* Instance File of SubSystemClass ");

-    String _name = ssc.getName();

-    _builder.append(_name, " ");

-    _builder.newLineIfNotEmpty();

-    _builder.append(" ");

-    _builder.append("* - instantiation of all actor instances and port instances");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* - configuration of data and connection of ports");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*/");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("#include \"messaging/etMessageService.h\"");

-    _builder.newLine();

-    _builder.append("#include \"platform/etMemory.h\"");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("/* instantiation of message services */");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("/* MessageService for Thread1 */");

-    _builder.newLine();

-    _builder.append("static uint8 msgBuffer_Thread1[MESSAGE_POOL_MAX*MESSAGE_BLOCK_SIZE];");

-    _builder.newLine();

-    _builder.append("static etMessageService msgService_Thread1;");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("/* include all used ActorClasses */");

-    _builder.newLine();

+  private CharSequence generateInstanceFile(final Root root, final SubSystemInstance ssi) {

+    CharSequence _xblockexpression = null;

     {

-      EList<ActorClass> _usedActorClasses = root.getUsedActorClasses();

-      for(final ActorClass actorClass : _usedActorClasses) {

-        _builder.append("#include \"");

-        String _name_1 = actorClass.getName();

-        _builder.append(_name_1, "");

-        _builder.append(".h\"");

-        _builder.newLineIfNotEmpty();

+      final SubSystemClass ssc = ssi.getSubSystemClass();

+      StringConcatenation _builder = new StringConcatenation();

+      _builder.append("/**");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* @author generated by eTrice");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* Instance File of SubSystemClass ");

+      String _name = ssc.getName();

+      _builder.append(_name, " ");

+      _builder.newLineIfNotEmpty();

+      _builder.append(" ");

+      _builder.append("* - instantiation of all actor instances and port instances");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* - configuration of data and connection of ports");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*/");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("#include \"messaging/etMessageService.h\"");

+      _builder.newLine();

+      _builder.append("#include \"platform/etMemory.h\"");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("/* instantiation of message services */");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("/* MessageService for Thread1 */");

+      _builder.newLine();

+      _builder.append("static uint8 msgBuffer_Thread1[MESSAGE_POOL_MAX*MESSAGE_BLOCK_SIZE];");

+      _builder.newLine();

+      _builder.append("static etMessageService msgService_Thread1;");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("/* include all used ActorClasses */");

+      _builder.newLine();

+      {

+        EList<ActorClass> _usedActorClasses = root.getUsedActorClasses();

+        for(final ActorClass actorClass : _usedActorClasses) {

+          _builder.append("#include \"");

+          String _name_1 = actorClass.getName();

+          _builder.append(_name_1, "");

+          _builder.append(".h\"");

+          _builder.newLineIfNotEmpty();

+        }

       }

-    }

-    _builder.newLine();

-    _builder.append("/* include all used ProtcolClasses */");

-    _builder.newLine();

-    {

-      EList<ProtocolClass> _usedProtocolClasses = root.getUsedProtocolClasses();

-      for(final ProtocolClass protocolClass : _usedProtocolClasses) {

-        _builder.append("#include \"");

-        String _name_2 = protocolClass.getName();

-        _builder.append(_name_2, "");

-        _builder.append(".h\"");

-        _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("/* include all used ProtcolClasses */");

+      _builder.newLine();

+      {

+        EList<ProtocolClass> _usedProtocolClasses = root.getUsedProtocolClasses();

+        for(final ProtocolClass protocolClass : _usedProtocolClasses) {

+          _builder.append("#include \"");

+          String _name_2 = protocolClass.getName();

+          _builder.append(_name_2, "");

+          _builder.append(".h\"");

+          _builder.newLineIfNotEmpty();

+        }

       }

-    }

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("/* declarations of all ActorClass instances (const and variable structs) */");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("/* forward declaration of variable actor structs */");

-    _builder.newLine();

-    {

-      EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();

-      for(final ActorInstance ai : _allContainedInstances) {

-        _builder.append("static ");

-        ActorClass _actorClass = ai.getActorClass();

-        String _name_3 = _actorClass.getName();

-        _builder.append(_name_3, "");

-        _builder.append(" ");

-        String _path = ai.getPath();

-        String _pathName = this.roomExt.getPathName(_path);

-        _builder.append(_pathName, "");

-        _builder.append(";");

-        _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("/* declarations of all ActorClass instances (const and variable structs) */");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("/* forward declaration of variable actor structs */");

+      _builder.newLine();

+      {

+        EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();

+        for(final ActorInstance ai : _allContainedInstances) {

+          _builder.append("static ");

+          ActorClass _actorClass = ai.getActorClass();

+          String _name_3 = _actorClass.getName();

+          _builder.append(_name_3, "");

+          _builder.append(" ");

+          String _path = ai.getPath();

+          String _pathName = this.roomExt.getPathName(_path);

+          _builder.append(_pathName, "");

+          _builder.append(";");

+          _builder.newLineIfNotEmpty();

+        }

       }

-    }

-    _builder.newLine();

-    _builder.append("/* forward declaration of variable port structs */\t\t");

-    _builder.newLine();

-    {

-      EList<ActorInstance> _allContainedInstances_1 = ssi.getAllContainedInstances();

-      for(final ActorInstance ai_1 : _allContainedInstances_1) {

-        {

-          EList<InterfaceItemInstance> _orderedIfItemInstances = ai_1.getOrderedIfItemInstances();

-          boolean _isEmpty = _orderedIfItemInstances.isEmpty();

-          if (_isEmpty) {

-            _builder.append("/*nothing to do */");

-            _builder.newLine();

-          } else {

-            {

-              EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai_1.getOrderedIfItemInstances();

-              for(final InterfaceItemInstance pi : _orderedIfItemInstances_1) {

-                {

-                  ProtocolClass _protocol = pi.getProtocol();

-                  boolean _isConjugated = this.roomExt.isConjugated(pi);

-                  PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);

-                  EList<Attribute> _attributes = _portClass==null?(EList<Attribute>)null:_portClass.getAttributes();

-                  boolean _isEmpty_1 = _attributes==null?false:_attributes.isEmpty();

-                  boolean _not = (!_isEmpty_1);

-                  if (_not) {

-                    _builder.append("static ");

-                    ProtocolClass _protocol_1 = pi.getProtocol();

-                    boolean _isConjugated_1 = this.roomExt.isConjugated(pi);

-                    String _portClassName = this.roomExt.getPortClassName(_protocol_1, _isConjugated_1);

-                    _builder.append(_portClassName, "");

-                    _builder.append("_var ");

-                    String _path_1 = pi.getPath();

-                    String _pathName_1 = this.roomExt.getPathName(_path_1);

-                    _builder.append(_pathName_1, "");

-                    _builder.append("_var");

-                    {

-                      boolean _isReplicated = pi.isReplicated();

-                      if (_isReplicated) {

-                        _builder.append("[");

-                        EList<InterfaceItemInstance> _peers = pi.getPeers();

-                        int _size = _peers.size();

-                        _builder.append(_size, "");

-                        _builder.append("]");

+      _builder.newLine();

+      _builder.append("/* forward declaration of variable port structs */\t\t");

+      _builder.newLine();

+      {

+        EList<ActorInstance> _allContainedInstances_1 = ssi.getAllContainedInstances();

+        for(final ActorInstance ai_1 : _allContainedInstances_1) {

+          {

+            EList<InterfaceItemInstance> _orderedIfItemInstances = ai_1.getOrderedIfItemInstances();

+            boolean _isEmpty = _orderedIfItemInstances.isEmpty();

+            if (_isEmpty) {

+              _builder.append("/*nothing to do */");

+              _builder.newLine();

+            } else {

+              {

+                EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai_1.getOrderedIfItemInstances();

+                for(final InterfaceItemInstance pi : _orderedIfItemInstances_1) {

+                  {

+                    ProtocolClass _protocol = pi.getProtocol();

+                    boolean _isConjugated = this.roomExt.isConjugated(pi);

+                    PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);

+                    EList<Attribute> _attributes = _portClass==null?(EList<Attribute>)null:_portClass.getAttributes();

+                    boolean _isEmpty_1 = _attributes==null?false:_attributes.isEmpty();

+                    boolean _not = (!_isEmpty_1);

+                    if (_not) {

+                      _builder.append("static ");

+                      ProtocolClass _protocol_1 = pi.getProtocol();

+                      boolean _isConjugated_1 = this.roomExt.isConjugated(pi);

+                      String _portClassName = this.roomExt.getPortClassName(_protocol_1, _isConjugated_1);

+                      _builder.append(_portClassName, "");

+                      _builder.append("_var ");

+                      String _path_1 = pi.getPath();

+                      String _pathName_1 = this.roomExt.getPathName(_path_1);

+                      _builder.append(_pathName_1, "");

+                      _builder.append("_var");

+                      {

+                        boolean _isReplicated = pi.isReplicated();

+                        if (_isReplicated) {

+                          _builder.append("[");

+                          EList<InterfaceItemInstance> _peers = pi.getPeers();

+                          int _size = _peers.size();

+                          _builder.append(_size, "");

+                          _builder.append("]");

+                        }

                       }

-                    }

-                    _builder.append("={");

-                    _builder.newLineIfNotEmpty();

-                    {

-                      EList<InterfaceItemInstance> _peers_1 = pi.getPeers();

-                      int _size_1 = _peers_1.size();

-                      IntegerRange _upTo = new IntegerRange(1, _size_1);

-                      boolean _hasElements = false;

-                      for(final Integer i : _upTo) {

-                        if (!_hasElements) {

-                          _hasElements = true;

-                        } else {

-                          _builder.appendImmediate(", ", "	");

+                      _builder.append("={");

+                      _builder.newLineIfNotEmpty();

+                      {

+                        EList<InterfaceItemInstance> _peers_1 = pi.getPeers();

+                        int _size_1 = _peers_1.size();

+                        IntegerRange _upTo = new IntegerRange(1, _size_1);

+                        boolean _hasElements = false;

+                        for(final Integer i : _upTo) {

+                          if (!_hasElements) {

+                            _hasElements = true;

+                          } else {

+                            _builder.appendImmediate(", ", "	");

+                          }

+                          _builder.append("\t");

+                          InterfaceItem _interfaceItem = pi.getInterfaceItem();

+                          PortClass _portClass_1 = RoomHelpers.getPortClass(_interfaceItem);

+                          EList<Attribute> _attributes_1 = _portClass_1.getAttributes();

+                          CharSequence _generateAttributeInit = this.attrInitGenAddon.generateAttributeInit(pi, _attributes_1);

+                          _builder.append(_generateAttributeInit, "	");

+                          _builder.newLineIfNotEmpty();

+                          _builder.append("\t\t\t\t\t\t\t");

                         }

-                        _builder.append("\t");

-                        InterfaceItem _interfaceItem = pi.getInterfaceItem();

-                        PortClass _portClass_1 = RoomHelpers.getPortClass(_interfaceItem);

-                        EList<Attribute> _attributes_1 = _portClass_1.getAttributes();

-                        CharSequence _generateAttributeInit = this.attrInitGenAddon.generateAttributeInit(pi, _attributes_1);

-                        _builder.append(_generateAttributeInit, "	");

-                        _builder.newLineIfNotEmpty();

-                        _builder.append("\t\t\t\t\t\t\t");

                       }

+                      _builder.append("};");

+                      _builder.newLineIfNotEmpty();

                     }

-                    _builder.append("};");

-                    _builder.newLineIfNotEmpty();

                   }

                 }

               }

@@ -822,34 +832,35 @@ public class SubSystemClassGen {
           }

         }

       }

-    }

-    _builder.newLine();

-    {

-      EList<ActorInstance> _allContainedInstances_2 = ssi.getAllContainedInstances();

-      for(final ActorInstance ai_2 : _allContainedInstances_2) {

-        _builder.newLine();

-        _builder.append("/* instance ");

-        String _path_2 = ai_2.getPath();

-        String _pathName_2 = this.roomExt.getPathName(_path_2);

-        _builder.append(_pathName_2, "");

-        _builder.append(" */");

-        _builder.newLineIfNotEmpty();

-        {

-          EList<InterfaceItemInstance> _orderedIfItemInstances_2 = ai_2.getOrderedIfItemInstances();

-          boolean _isEmpty_2 = _orderedIfItemInstances_2.isEmpty();

-          if (_isEmpty_2) {

-            _builder.append("/* no ports/saps/services - nothing to initialize statically */");

-            _builder.newLine();

-          } else {

-            CharSequence _genActorInstanceInitializer = this.genActorInstanceInitializer(root, ai_2);

-            _builder.append(_genActorInstanceInitializer, "");

-            _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      {

+        EList<ActorInstance> _allContainedInstances_2 = ssi.getAllContainedInstances();

+        for(final ActorInstance ai_2 : _allContainedInstances_2) {

+          _builder.newLine();

+          _builder.append("/* instance ");

+          String _path_2 = ai_2.getPath();

+          String _pathName_2 = this.roomExt.getPathName(_path_2);

+          _builder.append(_pathName_2, "");

+          _builder.append(" */");

+          _builder.newLineIfNotEmpty();

+          {

+            EList<InterfaceItemInstance> _orderedIfItemInstances_2 = ai_2.getOrderedIfItemInstances();

+            boolean _isEmpty_2 = _orderedIfItemInstances_2.isEmpty();

+            if (_isEmpty_2) {

+              _builder.append("/* no ports/saps/services - nothing to initialize statically */");

+              _builder.newLine();

+            } else {

+              CharSequence _genActorInstanceInitializer = this.genActorInstanceInitializer(root, ai_2);

+              _builder.append(_genActorInstanceInitializer, "");

+              _builder.newLineIfNotEmpty();

+            }

           }

         }

       }

+      _builder.newLine();

+      _xblockexpression = (_builder);

     }

-    _builder.newLine();

-    return _builder;

+    return _xblockexpression;

   }

   

   private CharSequence genActorInstanceInitializer(final Root root, final ActorInstance ai) {

@@ -1331,339 +1342,344 @@ public class SubSystemClassGen {
     return result;

   }

   

-  private CharSequence generateDispatcherFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("/**");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* @author generated by eTrice");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* Dispatcher File of SubSystemClass ");

-    String _name = ssc.getName();

-    _builder.append(_name, " ");

-    _builder.newLineIfNotEmpty();

-    _builder.append(" ");

-    _builder.append("* - one generated dispatcher for each MessageService (Thread)");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*/");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("#include \"messaging/etMessageReceiver.h\"");

-    _builder.newLine();

-    _builder.append("#include \"debugging/etLogger.h\"");

-    _builder.newLine();

-    _builder.append("#include \"debugging/etMSCLogger.h\"");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("static void MsgDispatcher_Thread1_receiveMessage(const etMessage* msg){");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"MsgDispatcher_Thread1\", \"receiveMessage\")");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("switch(msg->address){");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

+  private CharSequence generateDispatcherFile(final Root root, final SubSystemInstance ssi) {

+    CharSequence _xblockexpression = null;

     {

-      EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();

-      for(final ActorInstance ai : _allContainedInstances) {

-        _builder.append("\t\t");

-        _builder.append("/* interface items of ");

-        String _path = ai.getPath();

-        _builder.append(_path, "		");

-        _builder.append(" */");

-        _builder.newLineIfNotEmpty();

-        {

-          EList<InterfaceItemInstance> _orderedIfItemInstances = ai.getOrderedIfItemInstances();

-          final Function1<InterfaceItemInstance,Boolean> _function = new Function1<InterfaceItemInstance,Boolean>() {

-              public Boolean apply(final InterfaceItemInstance p) {

-                ProtocolClass _protocol = p.getProtocol();

-                CommunicationType _commType = _protocol.getCommType();

-                boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);

-                return Boolean.valueOf(_equals);

-              }

-            };

-          Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function);

-          for(final InterfaceItemInstance pi : _filter) {

-            {

-              boolean _isReplicated = pi.isReplicated();

-              if (_isReplicated) {

-                {

-                  EList<InterfaceItemInstance> _peers = pi.getPeers();

-                  for(final InterfaceItemInstance peer : _peers) {

-                    _builder.append("\t\t");

-                    _builder.append("case ");

-                    int _objId = pi.getObjId();

-                    EList<InterfaceItemInstance> _peers_1 = pi.getPeers();

-                    int _indexOf = _peers_1.indexOf(peer);

-                    int _plus = (_objId + _indexOf);

-                    _builder.append(_plus, "		");

-                    _builder.append(":");

-                    _builder.newLineIfNotEmpty();

-                    {

-                      ProtocolClass _protocol = pi.getProtocol();

-                      boolean _isConjugated = this.roomExt.isConjugated(pi);

-                      boolean _handlesReceive = this.roomExt.handlesReceive(_protocol, _isConjugated);

-                      if (_handlesReceive) {

-                        _builder.append("\t\t");

-                        _builder.append("switch (msg->evtID){");

-                        _builder.newLine();

-                        {

-                          ProtocolClass _protocol_1 = pi.getProtocol();

-                          boolean _isConjugated_1 = this.roomExt.isConjugated(pi);

-                          List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(_protocol_1, _isConjugated_1);

-                          for(final MessageHandler h : _receiveHandlers) {

-                            _builder.append("\t\t");

-                            _builder.append("\t");

-                            _builder.append("case ");

-                            ProtocolClass _protocol_2 = pi.getProtocol();

-                            String _name_1 = _protocol_2.getName();

-                            _builder.append(_name_1, "			");

-                            _builder.append("_");

-                            Message _msg = h.getMsg();

-                            String _codeName = this.roomExt.getCodeName(_msg);

-                            _builder.append(_codeName, "			");

-                            _builder.append(":");

-                            _builder.newLineIfNotEmpty();

-                            _builder.append("\t\t");

-                            _builder.append("\t");

-                            _builder.append("\t");

-                            ProtocolClass _protocol_3 = pi.getProtocol();

-                            boolean _isConjugated_2 = this.roomExt.isConjugated(pi);

-                            String _portClassName = this.roomExt.getPortClassName(_protocol_3, _isConjugated_2);

-                            _builder.append(_portClassName, "				");

-                            _builder.append("_");

-                            Message _msg_1 = h.getMsg();

-                            String _name_2 = _msg_1.getName();

-                            _builder.append(_name_2, "				");

-                            _builder.append("_receiveHandler((etPort *)&");

-                            String _path_1 = ai.getPath();

-                            String _pathName = this.roomExt.getPathName(_path_1);

-                            _builder.append(_pathName, "				");

-                            _builder.append("_const.");

-                            String _name_3 = pi.getName();

-                            _builder.append(_name_3, "				");

-                            _builder.append(".ports[");

-                            EList<InterfaceItemInstance> _peers_2 = pi.getPeers();

-                            int _indexOf_1 = _peers_2.indexOf(peer);

-                            _builder.append(_indexOf_1, "				");

-                            _builder.append("],msg,(void*)&");

-                            String _path_2 = ai.getPath();

-                            String _pathName_1 = this.roomExt.getPathName(_path_2);

-                            _builder.append(_pathName_1, "				");

-                            _builder.append(",");

-                            ActorClass _actorClass = ai.getActorClass();

-                            String _name_4 = _actorClass.getName();

-                            _builder.append(_name_4, "				");

-                            _builder.append("_receiveMessage);");

-                            _builder.newLineIfNotEmpty();

-                            _builder.append("\t\t");

-                            _builder.append("\t");

-                            _builder.append("break;");

-                            _builder.newLine();

+      final SubSystemClass ssc = ssi.getSubSystemClass();

+      StringConcatenation _builder = new StringConcatenation();

+      _builder.append("/**");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* @author generated by eTrice");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* Dispatcher File of SubSystemClass ");

+      String _name = ssc.getName();

+      _builder.append(_name, " ");

+      _builder.newLineIfNotEmpty();

+      _builder.append(" ");

+      _builder.append("* - one generated dispatcher for each MessageService (Thread)");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*/");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("#include \"messaging/etMessageReceiver.h\"");

+      _builder.newLine();

+      _builder.append("#include \"debugging/etLogger.h\"");

+      _builder.newLine();

+      _builder.append("#include \"debugging/etMSCLogger.h\"");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("static void MsgDispatcher_Thread1_receiveMessage(const etMessage* msg){");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"MsgDispatcher_Thread1\", \"receiveMessage\")");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("switch(msg->address){");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      {

+        EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();

+        for(final ActorInstance ai : _allContainedInstances) {

+          _builder.append("\t\t");

+          _builder.append("/* interface items of ");

+          String _path = ai.getPath();

+          _builder.append(_path, "		");

+          _builder.append(" */");

+          _builder.newLineIfNotEmpty();

+          {

+            EList<InterfaceItemInstance> _orderedIfItemInstances = ai.getOrderedIfItemInstances();

+            final Function1<InterfaceItemInstance,Boolean> _function = new Function1<InterfaceItemInstance,Boolean>() {

+                public Boolean apply(final InterfaceItemInstance p) {

+                  ProtocolClass _protocol = p.getProtocol();

+                  CommunicationType _commType = _protocol.getCommType();

+                  boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);

+                  return Boolean.valueOf(_equals);

+                }

+              };

+            Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function);

+            for(final InterfaceItemInstance pi : _filter) {

+              {

+                boolean _isReplicated = pi.isReplicated();

+                if (_isReplicated) {

+                  {

+                    EList<InterfaceItemInstance> _peers = pi.getPeers();

+                    for(final InterfaceItemInstance peer : _peers) {

+                      _builder.append("\t\t");

+                      _builder.append("case ");

+                      int _objId = pi.getObjId();

+                      EList<InterfaceItemInstance> _peers_1 = pi.getPeers();

+                      int _indexOf = _peers_1.indexOf(peer);

+                      int _plus = (_objId + _indexOf);

+                      _builder.append(_plus, "		");

+                      _builder.append(":");

+                      _builder.newLineIfNotEmpty();

+                      {

+                        ProtocolClass _protocol = pi.getProtocol();

+                        boolean _isConjugated = this.roomExt.isConjugated(pi);

+                        boolean _handlesReceive = this.roomExt.handlesReceive(_protocol, _isConjugated);

+                        if (_handlesReceive) {

+                          _builder.append("\t\t");

+                          _builder.append("switch (msg->evtID){");

+                          _builder.newLine();

+                          {

+                            ProtocolClass _protocol_1 = pi.getProtocol();

+                            boolean _isConjugated_1 = this.roomExt.isConjugated(pi);

+                            List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(_protocol_1, _isConjugated_1);

+                            for(final MessageHandler h : _receiveHandlers) {

+                              _builder.append("\t\t");

+                              _builder.append("\t");

+                              _builder.append("case ");

+                              ProtocolClass _protocol_2 = pi.getProtocol();

+                              String _name_1 = _protocol_2.getName();

+                              _builder.append(_name_1, "			");

+                              _builder.append("_");

+                              Message _msg = h.getMsg();

+                              String _codeName = this.roomExt.getCodeName(_msg);

+                              _builder.append(_codeName, "			");

+                              _builder.append(":");

+                              _builder.newLineIfNotEmpty();

+                              _builder.append("\t\t");

+                              _builder.append("\t");

+                              _builder.append("\t");

+                              ProtocolClass _protocol_3 = pi.getProtocol();

+                              boolean _isConjugated_2 = this.roomExt.isConjugated(pi);

+                              String _portClassName = this.roomExt.getPortClassName(_protocol_3, _isConjugated_2);

+                              _builder.append(_portClassName, "				");

+                              _builder.append("_");

+                              Message _msg_1 = h.getMsg();

+                              String _name_2 = _msg_1.getName();

+                              _builder.append(_name_2, "				");

+                              _builder.append("_receiveHandler((etPort *)&");

+                              String _path_1 = ai.getPath();

+                              String _pathName = this.roomExt.getPathName(_path_1);

+                              _builder.append(_pathName, "				");

+                              _builder.append("_const.");

+                              String _name_3 = pi.getName();

+                              _builder.append(_name_3, "				");

+                              _builder.append(".ports[");

+                              EList<InterfaceItemInstance> _peers_2 = pi.getPeers();

+                              int _indexOf_1 = _peers_2.indexOf(peer);

+                              _builder.append(_indexOf_1, "				");

+                              _builder.append("],msg,(void*)&");

+                              String _path_2 = ai.getPath();

+                              String _pathName_1 = this.roomExt.getPathName(_path_2);

+                              _builder.append(_pathName_1, "				");

+                              _builder.append(",");

+                              ActorClass _actorClass = ai.getActorClass();

+                              String _name_4 = _actorClass.getName();

+                              _builder.append(_name_4, "				");

+                              _builder.append("_receiveMessage);");

+                              _builder.newLineIfNotEmpty();

+                              _builder.append("\t\t");

+                              _builder.append("\t");

+                              _builder.append("break;");

+                              _builder.newLine();

+                            }

                           }

+                          _builder.append("\t\t");

+                          _builder.append("\t");

+                          _builder.append("default: ");

+                          ActorClass _actorClass_1 = ai.getActorClass();

+                          String _name_5 = _actorClass_1.getName();

+                          _builder.append(_name_5, "			");

+                          _builder.append("_receiveMessage((void*)&");

+                          String _path_3 = ai.getPath();

+                          String _pathName_2 = this.roomExt.getPathName(_path_3);

+                          _builder.append(_pathName_2, "			");

+                          _builder.append(",(etPort*)&");

+                          String _path_4 = ai.getPath();

+                          String _pathName_3 = this.roomExt.getPathName(_path_4);

+                          _builder.append(_pathName_3, "			");

+                          _builder.append("_const.");

+                          String _name_6 = pi.getName();

+                          _builder.append(_name_6, "			");

+                          _builder.append(".ports[");

+                          EList<InterfaceItemInstance> _peers_3 = pi.getPeers();

+                          int _indexOf_2 = _peers_3.indexOf(peer);

+                          _builder.append(_indexOf_2, "			");

+                          _builder.append("], msg);");

+                          _builder.newLineIfNotEmpty();

+                          _builder.append("\t\t");

+                          _builder.append("\t");

+                          _builder.append("break;");

+                          _builder.newLine();

+                          _builder.append("\t\t");

+                          _builder.append("\t");

+                          _builder.append("}\t\t\t\t\t\t\t\t\t\t");

+                          _builder.newLine();

+                        } else {

+                          _builder.append("\t\t");

+                          ActorClass _actorClass_2 = ai.getActorClass();

+                          String _name_7 = _actorClass_2.getName();

+                          _builder.append(_name_7, "		");

+                          _builder.append("_receiveMessage((void*)&");

+                          String _path_5 = ai.getPath();

+                          String _pathName_4 = this.roomExt.getPathName(_path_5);

+                          _builder.append(_pathName_4, "		");

+                          _builder.append(",(etPort*)&");

+                          String _path_6 = ai.getPath();

+                          String _pathName_5 = this.roomExt.getPathName(_path_6);

+                          _builder.append(_pathName_5, "		");

+                          _builder.append("_const.");

+                          String _name_8 = pi.getName();

+                          _builder.append(_name_8, "		");

+                          _builder.append(".ports[");

+                          EList<InterfaceItemInstance> _peers_4 = pi.getPeers();

+                          int _indexOf_3 = _peers_4.indexOf(peer);

+                          _builder.append(_indexOf_3, "		");

+                          _builder.append("], msg);");

+                          _builder.newLineIfNotEmpty();

                         }

-                        _builder.append("\t\t");

-                        _builder.append("\t");

-                        _builder.append("default: ");

-                        ActorClass _actorClass_1 = ai.getActorClass();

-                        String _name_5 = _actorClass_1.getName();

-                        _builder.append(_name_5, "			");

-                        _builder.append("_receiveMessage((void*)&");

-                        String _path_3 = ai.getPath();

-                        String _pathName_2 = this.roomExt.getPathName(_path_3);

-                        _builder.append(_pathName_2, "			");

-                        _builder.append(",(etPort*)&");

-                        String _path_4 = ai.getPath();

-                        String _pathName_3 = this.roomExt.getPathName(_path_4);

-                        _builder.append(_pathName_3, "			");

-                        _builder.append("_const.");

-                        String _name_6 = pi.getName();

-                        _builder.append(_name_6, "			");

-                        _builder.append(".ports[");

-                        EList<InterfaceItemInstance> _peers_3 = pi.getPeers();

-                        int _indexOf_2 = _peers_3.indexOf(peer);

-                        _builder.append(_indexOf_2, "			");

-                        _builder.append("], msg);");

-                        _builder.newLineIfNotEmpty();

-                        _builder.append("\t\t");

-                        _builder.append("\t");

-                        _builder.append("break;");

-                        _builder.newLine();

-                        _builder.append("\t\t");

-                        _builder.append("\t");

-                        _builder.append("}\t\t\t\t\t\t\t\t\t\t");

-                        _builder.newLine();

-                      } else {

-                        _builder.append("\t\t");

-                        ActorClass _actorClass_2 = ai.getActorClass();

-                        String _name_7 = _actorClass_2.getName();

-                        _builder.append(_name_7, "		");

-                        _builder.append("_receiveMessage((void*)&");

-                        String _path_5 = ai.getPath();

-                        String _pathName_4 = this.roomExt.getPathName(_path_5);

-                        _builder.append(_pathName_4, "		");

-                        _builder.append(",(etPort*)&");

-                        String _path_6 = ai.getPath();

-                        String _pathName_5 = this.roomExt.getPathName(_path_6);

-                        _builder.append(_pathName_5, "		");

-                        _builder.append("_const.");

-                        String _name_8 = pi.getName();

-                        _builder.append(_name_8, "		");

-                        _builder.append(".ports[");

-                        EList<InterfaceItemInstance> _peers_4 = pi.getPeers();

-                        int _indexOf_3 = _peers_4.indexOf(peer);

-                        _builder.append(_indexOf_3, "		");

-                        _builder.append("], msg);");

-                        _builder.newLineIfNotEmpty();

                       }

+                      _builder.append("\t\t");

+                      _builder.append("break;");

+                      _builder.newLine();

                     }

-                    _builder.append("\t\t");

-                    _builder.append("break;");

-                    _builder.newLine();

                   }

-                }

-              } else {

-                _builder.append("\t\t");

-                _builder.append("case ");

-                int _objId_1 = pi.getObjId();

-                _builder.append(_objId_1, "		");

-                _builder.append(":");

-                _builder.newLineIfNotEmpty();

-                {

-                  ProtocolClass _protocol_4 = pi.getProtocol();

-                  boolean _isConjugated_3 = this.roomExt.isConjugated(pi);

-                  boolean _handlesReceive_1 = this.roomExt.handlesReceive(_protocol_4, _isConjugated_3);

-                  if (_handlesReceive_1) {

-                    _builder.append("\t\t");

-                    _builder.append("switch (msg->evtID){");

-                    _builder.newLine();

-                    {

-                      ProtocolClass _protocol_5 = pi.getProtocol();

-                      boolean _isConjugated_4 = this.roomExt.isConjugated(pi);

-                      List<MessageHandler> _receiveHandlers_1 = this.roomExt.getReceiveHandlers(_protocol_5, _isConjugated_4);

-                      for(final MessageHandler h_1 : _receiveHandlers_1) {

-                        _builder.append("\t\t");

-                        _builder.append("case ");

-                        ProtocolClass _protocol_6 = pi.getProtocol();

-                        String _name_9 = _protocol_6.getName();

-                        _builder.append(_name_9, "		");

-                        _builder.append("_");

-                        Message _msg_2 = h_1.getMsg();

-                        String _codeName_1 = this.roomExt.getCodeName(_msg_2);

-                        _builder.append(_codeName_1, "		");

-                        _builder.append(":");

-                        _builder.newLineIfNotEmpty();

-                        _builder.append("\t\t");

-                        _builder.append("\t");

-                        ProtocolClass _protocol_7 = pi.getProtocol();

-                        boolean _isConjugated_5 = this.roomExt.isConjugated(pi);

-                        String _portClassName_1 = this.roomExt.getPortClassName(_protocol_7, _isConjugated_5);

-                        _builder.append(_portClassName_1, "			");

-                        _builder.append("_");

-                        Message _msg_3 = h_1.getMsg();

-                        String _name_10 = _msg_3.getName();

-                        _builder.append(_name_10, "			");

-                        _builder.append("_receiveHandler((etPort *)&");

-                        String _path_7 = ai.getPath();

-                        String _pathName_6 = this.roomExt.getPathName(_path_7);

-                        _builder.append(_pathName_6, "			");

-                        _builder.append("_const.");

-                        String _name_11 = pi.getName();

-                        _builder.append(_name_11, "			");

-                        _builder.append(",msg,(void*)&");

-                        String _path_8 = ai.getPath();

-                        String _pathName_7 = this.roomExt.getPathName(_path_8);

-                        _builder.append(_pathName_7, "			");

-                        _builder.append(",");

-                        ActorClass _actorClass_3 = ai.getActorClass();

-                        String _name_12 = _actorClass_3.getName();

-                        _builder.append(_name_12, "			");

-                        _builder.append("_receiveMessage);");

-                        _builder.newLineIfNotEmpty();

-                        _builder.append("\t\t");

-                        _builder.append("break;");

-                        _builder.newLine();

+                } else {

+                  _builder.append("\t\t");

+                  _builder.append("case ");

+                  int _objId_1 = pi.getObjId();

+                  _builder.append(_objId_1, "		");

+                  _builder.append(":");

+                  _builder.newLineIfNotEmpty();

+                  {

+                    ProtocolClass _protocol_4 = pi.getProtocol();

+                    boolean _isConjugated_3 = this.roomExt.isConjugated(pi);

+                    boolean _handlesReceive_1 = this.roomExt.handlesReceive(_protocol_4, _isConjugated_3);

+                    if (_handlesReceive_1) {

+                      _builder.append("\t\t");

+                      _builder.append("switch (msg->evtID){");

+                      _builder.newLine();

+                      {

+                        ProtocolClass _protocol_5 = pi.getProtocol();

+                        boolean _isConjugated_4 = this.roomExt.isConjugated(pi);

+                        List<MessageHandler> _receiveHandlers_1 = this.roomExt.getReceiveHandlers(_protocol_5, _isConjugated_4);

+                        for(final MessageHandler h_1 : _receiveHandlers_1) {

+                          _builder.append("\t\t");

+                          _builder.append("case ");

+                          ProtocolClass _protocol_6 = pi.getProtocol();

+                          String _name_9 = _protocol_6.getName();

+                          _builder.append(_name_9, "		");

+                          _builder.append("_");

+                          Message _msg_2 = h_1.getMsg();

+                          String _codeName_1 = this.roomExt.getCodeName(_msg_2);

+                          _builder.append(_codeName_1, "		");

+                          _builder.append(":");

+                          _builder.newLineIfNotEmpty();

+                          _builder.append("\t\t");

+                          _builder.append("\t");

+                          ProtocolClass _protocol_7 = pi.getProtocol();

+                          boolean _isConjugated_5 = this.roomExt.isConjugated(pi);

+                          String _portClassName_1 = this.roomExt.getPortClassName(_protocol_7, _isConjugated_5);

+                          _builder.append(_portClassName_1, "			");

+                          _builder.append("_");

+                          Message _msg_3 = h_1.getMsg();

+                          String _name_10 = _msg_3.getName();

+                          _builder.append(_name_10, "			");

+                          _builder.append("_receiveHandler((etPort *)&");

+                          String _path_7 = ai.getPath();

+                          String _pathName_6 = this.roomExt.getPathName(_path_7);

+                          _builder.append(_pathName_6, "			");

+                          _builder.append("_const.");

+                          String _name_11 = pi.getName();

+                          _builder.append(_name_11, "			");

+                          _builder.append(",msg,(void*)&");

+                          String _path_8 = ai.getPath();

+                          String _pathName_7 = this.roomExt.getPathName(_path_8);

+                          _builder.append(_pathName_7, "			");

+                          _builder.append(",");

+                          ActorClass _actorClass_3 = ai.getActorClass();

+                          String _name_12 = _actorClass_3.getName();

+                          _builder.append(_name_12, "			");

+                          _builder.append("_receiveMessage);");

+                          _builder.newLineIfNotEmpty();

+                          _builder.append("\t\t");

+                          _builder.append("break;");

+                          _builder.newLine();

+                        }

                       }

+                      _builder.append("\t\t");

+                      _builder.append("default: ");

+                      ActorClass _actorClass_4 = ai.getActorClass();

+                      String _name_13 = _actorClass_4.getName();

+                      _builder.append(_name_13, "		");

+                      _builder.append("_receiveMessage((void*)&");

+                      String _path_9 = ai.getPath();

+                      String _pathName_8 = this.roomExt.getPathName(_path_9);

+                      _builder.append(_pathName_8, "		");

+                      _builder.append(",(etPort*)&");

+                      String _path_10 = ai.getPath();

+                      String _pathName_9 = this.roomExt.getPathName(_path_10);

+                      _builder.append(_pathName_9, "		");

+                      _builder.append("_const.");

+                      String _name_14 = pi.getName();

+                      _builder.append(_name_14, "		");

+                      _builder.append(", msg);");

+                      _builder.newLineIfNotEmpty();

+                      _builder.append("\t\t");

+                      _builder.append("break;");

+                      _builder.newLine();

+                      _builder.append("\t\t");

+                      _builder.append("}");

+                      _builder.newLine();

+                    } else {

+                      _builder.append("\t\t");

+                      ActorClass _actorClass_5 = ai.getActorClass();

+                      String _name_15 = _actorClass_5.getName();

+                      _builder.append(_name_15, "		");

+                      _builder.append("_receiveMessage((void*)&");

+                      String _path_11 = ai.getPath();

+                      String _pathName_10 = this.roomExt.getPathName(_path_11);

+                      _builder.append(_pathName_10, "		");

+                      _builder.append(",(etPort*)&");

+                      String _path_12 = ai.getPath();

+                      String _pathName_11 = this.roomExt.getPathName(_path_12);

+                      _builder.append(_pathName_11, "		");

+                      _builder.append("_const.");

+                      String _name_16 = pi.getName();

+                      _builder.append(_name_16, "		");

+                      _builder.append(", msg);");

+                      _builder.newLineIfNotEmpty();

                     }

-                    _builder.append("\t\t");

-                    _builder.append("default: ");

-                    ActorClass _actorClass_4 = ai.getActorClass();

-                    String _name_13 = _actorClass_4.getName();

-                    _builder.append(_name_13, "		");

-                    _builder.append("_receiveMessage((void*)&");

-                    String _path_9 = ai.getPath();

-                    String _pathName_8 = this.roomExt.getPathName(_path_9);

-                    _builder.append(_pathName_8, "		");

-                    _builder.append(",(etPort*)&");

-                    String _path_10 = ai.getPath();

-                    String _pathName_9 = this.roomExt.getPathName(_path_10);

-                    _builder.append(_pathName_9, "		");

-                    _builder.append("_const.");

-                    String _name_14 = pi.getName();

-                    _builder.append(_name_14, "		");

-                    _builder.append(", msg);");

-                    _builder.newLineIfNotEmpty();

-                    _builder.append("\t\t");

-                    _builder.append("break;");

-                    _builder.newLine();

-                    _builder.append("\t\t");

-                    _builder.append("}");

-                    _builder.newLine();

-                  } else {

-                    _builder.append("\t\t");

-                    ActorClass _actorClass_5 = ai.getActorClass();

-                    String _name_15 = _actorClass_5.getName();

-                    _builder.append(_name_15, "		");

-                    _builder.append("_receiveMessage((void*)&");

-                    String _path_11 = ai.getPath();

-                    String _pathName_10 = this.roomExt.getPathName(_path_11);

-                    _builder.append(_pathName_10, "		");

-                    _builder.append(",(etPort*)&");

-                    String _path_12 = ai.getPath();

-                    String _pathName_11 = this.roomExt.getPathName(_path_12);

-                    _builder.append(_pathName_11, "		");

-                    _builder.append("_const.");

-                    String _name_16 = pi.getName();

-                    _builder.append(_name_16, "		");

-                    _builder.append(", msg);");

-                    _builder.newLineIfNotEmpty();

                   }

+                  _builder.append("\t\t");

+                  _builder.append("break;");

+                  _builder.newLine();

                 }

-                _builder.append("\t\t");

-                _builder.append("break;");

-                _builder.newLine();

               }

             }

           }

         }

       }

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("default:");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("etLogger_logErrorF(\"MessageService_Thread1_receiveMessage: address %d does not exist \", msg->address);");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("break;");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _xblockexpression = (_builder);

     }

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("default:");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("etLogger_logErrorF(\"MessageService_Thread1_receiveMessage: address %d does not exist \", msg->address);");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("break;");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_SYNC_EXIT");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    return _builder;

+    return _xblockexpression;

   }

   

   private CharSequence generateDatadrivenExecutes(final Root root, final SubSystemInstance ssi) {

diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
index a1a5d02f7..033adcbd2 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
@@ -29,143 +29,148 @@ public class SubSystemRunnerGen {
         String _path = this.roomExt.getPath(_subSystemClass_1);

         String _plus = (_generationTargetPath + _path);

         this.fileAccess.setOutputPath(_plus);

-        String _name = sc.getName();

-        String _plus_1 = (_name + "_Runner.c");

         SubSystemClass _subSystemClass_2 = sc.getSubSystemClass();

-        CharSequence _generateSourceFile = this.generateSourceFile(root, sc, _subSystemClass_2);

+        String _name = _subSystemClass_2.getName();

+        String _plus_1 = (_name + "_Runner.c");

+        CharSequence _generateSourceFile = this.generateSourceFile(root, sc);

         this.fileAccess.generateFile(_plus_1, _generateSourceFile);

       }

     }

   }

   

-  public CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("/**");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* @author generated by eTrice");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* this class contains the main function running component ");

-    String _name = ssi.getName();

-    _builder.append(_name, " ");

-    _builder.newLineIfNotEmpty();

-    _builder.append(" ");

-    _builder.append("* it instantiates ");

-    String _name_1 = ssi.getName();

-    _builder.append(_name_1, " ");

-    _builder.append(" and starts and ends the lifecycle");

-    _builder.newLineIfNotEmpty();

-    _builder.append(" ");

-    _builder.append("*/");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("#include \"");

-    String _name_2 = ssi.getName();

-    _builder.append(_name_2, "");

-    _builder.append(".h\"");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("#include \"debugging/etLogger.h\"");

-    _builder.newLine();

-    _builder.append("#include \"debugging/etMSCLogger.h\"");

-    _builder.newLine();

-    _builder.append("#include \"platform/etPlatform.h\"");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("/**");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* main function");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("* creates component and starts and stops the lifecycle");

-    _builder.newLine();

-    _builder.append(" ");

-    _builder.append("*/");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("int main(void) {");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etUserEntry(); /* platform specific */");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etLogger_logInfo(\"***   T H E   B E G I N   ***\");");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_OPEN(\"main\");");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("/* startup sequence  of lifecycle */");

-    _builder.newLine();

-    _builder.append("\t");

-    String _name_3 = ssi.getName();

-    _builder.append(_name_3, "	");

-    _builder.append("_init(); \t\t/* lifecycle init */");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    String _name_4 = ssi.getName();

-    _builder.append(_name_4, "	");

-    _builder.append("_start(); \t/* lifecycle start */");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etUserPreRun(); /* platform specific */");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("/* run Scheduler */");

-    _builder.newLine();

-    _builder.append("\t");

-    String _name_5 = ssi.getName();

-    _builder.append(_name_5, "	");

-    _builder.append("_run();");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etUserPostRun(); /* platform specific */");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("/* shutdown sequence of lifecycle */");

-    _builder.newLine();

-    _builder.append("\t");

-    String _name_6 = ssi.getName();

-    _builder.append(_name_6, "	");

-    _builder.append("_stop(); \t\t/* lifecycle stop */");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    String _name_7 = ssi.getName();

-    _builder.append(_name_7, "	");

-    _builder.append("_destroy(); \t/* lifecycle destroy */");

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("ET_MSC_LOGGER_CLOSE");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etLogger_logInfo(\"***   T H E   E N D   ***\");");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("etUserExit(); /* platform specific */");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("return 0;");

-    _builder.newLine();

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    return _builder;

+  public CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi) {

+    CharSequence _xblockexpression = null;

+    {

+      final SubSystemClass ssc = ssi.getSubSystemClass();

+      StringConcatenation _builder = new StringConcatenation();

+      _builder.append("/**");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* @author generated by eTrice");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* this class contains the main function running component ");

+      String _name = ssi.getName();

+      _builder.append(_name, " ");

+      _builder.newLineIfNotEmpty();

+      _builder.append(" ");

+      _builder.append("* it instantiates ");

+      String _name_1 = ssi.getName();

+      _builder.append(_name_1, " ");

+      _builder.append(" and starts and ends the lifecycle");

+      _builder.newLineIfNotEmpty();

+      _builder.append(" ");

+      _builder.append("*/");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("#include \"");

+      String _name_2 = ssc.getName();

+      _builder.append(_name_2, "");

+      _builder.append(".h\"");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("#include \"debugging/etLogger.h\"");

+      _builder.newLine();

+      _builder.append("#include \"debugging/etMSCLogger.h\"");

+      _builder.newLine();

+      _builder.append("#include \"platform/etPlatform.h\"");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("/**");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* main function");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("* creates component and starts and stops the lifecycle");

+      _builder.newLine();

+      _builder.append(" ");

+      _builder.append("*/");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("int main(void) {");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etUserEntry(); /* platform specific */");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etLogger_logInfo(\"***   T H E   B E G I N   ***\");");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_OPEN(\"main\");");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("/* startup sequence  of lifecycle */");

+      _builder.newLine();

+      _builder.append("\t");

+      String _name_3 = ssc.getName();

+      _builder.append(_name_3, "	");

+      _builder.append("_init(); \t\t/* lifecycle init */");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      String _name_4 = ssc.getName();

+      _builder.append(_name_4, "	");

+      _builder.append("_start(); \t/* lifecycle start */");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etUserPreRun(); /* platform specific */");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("/* run Scheduler */");

+      _builder.newLine();

+      _builder.append("\t");

+      String _name_5 = ssc.getName();

+      _builder.append(_name_5, "	");

+      _builder.append("_run();");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etUserPostRun(); /* platform specific */");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("/* shutdown sequence of lifecycle */");

+      _builder.newLine();

+      _builder.append("\t");

+      String _name_6 = ssc.getName();

+      _builder.append(_name_6, "	");

+      _builder.append("_stop(); \t\t/* lifecycle stop */");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      String _name_7 = ssc.getName();

+      _builder.append(_name_7, "	");

+      _builder.append("_destroy(); \t/* lifecycle destroy */");

+      _builder.newLineIfNotEmpty();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("ET_MSC_LOGGER_CLOSE");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etLogger_logInfo(\"***   T H E   E N D   ***\");");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("etUserExit(); /* platform specific */");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("return 0;");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _xblockexpression = (_builder);

+    }

+    return _xblockexpression;

   }

 }