1 files changed, 12 insertions, 44 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.java
index 91a78a189..5572b8b88 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.java
@@ -14,13 +14,11 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.util.Collection;
 import java.util.List;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.etmap.util.ETMapUtil;
 import org.eclipse.etrice.core.etphys.eTPhys.NodeRef;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
 import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
-import org.eclipse.etrice.core.genmodel.etricegen.SystemInstance;
 import org.eclipse.etrice.core.room.SubSystemClass;
 import org.eclipse.etrice.generator.base.IGeneratorFileIo;
 import org.eclipse.etrice.generator.generic.RoomExtensions;
@@ -85,36 +83,25 @@ public class NodeRunnerGen {
       _builder.append("*");
       _builder.newLine();
       _builder.append(" ");
-      _builder.append("* this class contains the main function running component ");
-      String _name = ssc.getName();
-      _builder.append(_name, " ");
-      _builder.newLineIfNotEmpty();
+      _builder.append("* this class contains the main function running component �ssc.name�");
+      _builder.newLine();
       _builder.append(" ");
-      _builder.append("* it instantiates ");
-      String _name_1 = ssc.getName();
-      _builder.append(_name_1, " ");
-      _builder.append(" and starts and ends the lifecycle");
-      _builder.newLineIfNotEmpty();
+      _builder.append("* it instantiates �ssc.name� and starts and ends the lifecycle");
+      _builder.newLine();
       _builder.append(" ");
       _builder.append("*/");
       _builder.newLine();
       _builder.newLine();
-      _builder.append("package ");
-      String _package = this.roomExt.getPackage(cc);
-      _builder.append(_package, "");
-      _builder.append(";");
-      _builder.newLineIfNotEmpty();
+      _builder.append("package �cc.getPackage()�;");
+      _builder.newLine();
       _builder.newLine();
       _builder.append("import org.eclipse.etrice.runtime.java.modelbase.RTSystem;");
       _builder.newLine();
       _builder.append("import org.eclipse.etrice.runtime.java.modelbase.SubSystemRunnerBase;");
       _builder.newLine();
       _builder.newLine();
-      _builder.append("class ");
-      String _plus = (clsname + "Runner");
-      _builder.append(_plus, "");
-      _builder.append(" extends SubSystemRunnerBase {");
-      _builder.newLineIfNotEmpty();
+      _builder.append("class �clsname+\"Runner\"� extends SubSystemRunnerBase {");
+      _builder.newLine();
       _builder.newLine();
       _builder.append("\t");
       _builder.append("/**");
@@ -135,30 +122,11 @@ public class NodeRunnerGen {
       _builder.append("// instantiate the main component");
       _builder.newLine();
       _builder.append("\t\t");
-      _builder.append("RTSystem sys = ");
-      {
-        EObject _eContainer = ssc.eContainer();
-        if ((_eContainer instanceof SystemInstance)) {
-          _builder.append("new RTSystem(\"");
-          EObject _eContainer_1 = ssc.eContainer();
-          String _name_2 = ((SystemInstance) _eContainer_1).getName();
-          _builder.append(_name_2, "		");
-          _builder.append("\")");
-        } else {
-          _builder.append("null");
-        }
-      }
-      _builder.append(";");
-      _builder.newLineIfNotEmpty();
+      _builder.append("RTSystem sys = �IF ssc.eContainer instanceof SystemInstance�new RTSystem(\"�(ssc.eContainer as SystemInstance).name�\")�ELSE�null�ENDIF�;");
+      _builder.newLine();
       _builder.append("\t\t");
-      _builder.append(clsname, "		");
-      _builder.append(" main_component = new ");
-      _builder.append(clsname, "		");
-      _builder.append("(sys, \"");
-      String _name_3 = ssc.getName();
-      _builder.append(_name_3, "		");
-      _builder.append("\");");
-      _builder.newLineIfNotEmpty();
+      _builder.append("�clsname� main_component = new �clsname�(sys, \"�ssc.name�\");");
+      _builder.newLine();
       _builder.append("\t\t");
       _builder.newLine();
       _builder.append("\t\t");