1 files changed, 14 insertions, 16 deletions

diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
index 18bd28340..a187baa53 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
@@ -31,13 +31,13 @@ public class DataClassGen {
   private JavaIoFileSystemAccess fileAccess;

   

   @Inject

-  private JavaExtensions stdExt;

+  private JavaExtensions _javaExtensions;

   

   @Inject

-  private RoomExtensions roomExt;

+  private RoomExtensions _roomExtensions;

   

   @Inject

-  private ProcedureHelpers helpers;

+  private ProcedureHelpers _procedureHelpers;

   

   @Inject

   private ILogger logger;

@@ -46,10 +46,10 @@ public class DataClassGen {
     EList<DataClass> _usedDataClasses = root.getUsedDataClasses();

     for (final DataClass dc : _usedDataClasses) {

       {

-        String _generationTargetPath = this.roomExt.getGenerationTargetPath(dc);

-        String _path = this.roomExt.getPath(dc);

+        String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(dc);

+        String _path = this._roomExtensions.getPath(dc);

         String path = (_generationTargetPath + _path);

-        String file = this.stdExt.getJavaFileName(dc);

+        String file = this._javaExtensions.getJavaFileName(dc);

         String _plus = ("generating DataClass implementation \'" + file);

         String _plus_1 = (_plus + "\' in \'");

         String _plus_2 = (_plus_1 + path);

@@ -76,7 +76,7 @@ public class DataClassGen {
       final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);

       StringConcatenation _builder = new StringConcatenation();

       _builder.append("package ");

-      String _package = this.roomExt.getPackage(dc);

+      String _package = this._roomExtensions.getPackage(dc);

       _builder.append(_package, "");

       _builder.append(";");

       _builder.newLineIfNotEmpty();

@@ -93,8 +93,7 @@ public class DataClassGen {
         }

       }

       _builder.newLine();

-      DetailCode _userCode1 = dc.getUserCode1();

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

+      CharSequence _userCode = this._procedureHelpers.userCode(dc, 1);

       _builder.append(_userCode, "");

       _builder.newLineIfNotEmpty();

       _builder.newLine();

@@ -117,15 +116,14 @@ public class DataClassGen {
       _builder.append("\t");

       _builder.newLine();

       _builder.append("\t");

-      DetailCode _userCode2 = dc.getUserCode2();

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

+      CharSequence _userCode_1 = this._procedureHelpers.userCode(dc, 2);

       _builder.append(_userCode_1, "	");

       _builder.newLineIfNotEmpty();

       _builder.append("\t");

       _builder.newLine();

       _builder.append("\t");

       EList<Attribute> _attributes = dc.getAttributes();

-      CharSequence _attributes_1 = this.helpers.attributes(_attributes);

+      CharSequence _attributes_1 = this._procedureHelpers.attributes(_attributes);

       _builder.append(_attributes_1, "	");

       _builder.newLineIfNotEmpty();

       _builder.append("\t");

@@ -133,7 +131,7 @@ public class DataClassGen {
       _builder.append("\t");

       EList<Attribute> _attributes_2 = dc.getAttributes();

       String _name_3 = dc.getName();

-      CharSequence _attributeSettersGettersImplementation = this.helpers.attributeSettersGettersImplementation(_attributes_2, _name_3);

+      CharSequence _attributeSettersGettersImplementation = this._procedureHelpers.attributeSettersGettersImplementation(_attributes_2, _name_3);

       _builder.append(_attributeSettersGettersImplementation, "	");

       _builder.newLineIfNotEmpty();

       _builder.append("\t");

@@ -141,7 +139,7 @@ public class DataClassGen {
       _builder.append("\t");

       EList<StandardOperation> _operations_1 = dc.getOperations();

       String _name_4 = dc.getName();

-      CharSequence _operationsImplementation = this.helpers.operationsImplementation(_operations_1, _name_4);

+      CharSequence _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations_1, _name_4);

       _builder.append(_operationsImplementation, "	");

       _builder.newLineIfNotEmpty();

       _builder.append("\t");

@@ -162,7 +160,7 @@ public class DataClassGen {
       _builder.newLine();

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

       EList<Attribute> _attributes_3 = dc.getAttributes();

-      CharSequence _attributeInitialization = this.helpers.attributeInitialization(_attributes_3, true);

+      CharSequence _attributeInitialization = this._procedureHelpers.attributeInitialization(_attributes_3, true);

       _builder.append(_attributeInitialization, "		");

       _builder.newLineIfNotEmpty();

       {

@@ -332,7 +330,7 @@ public class DataClassGen {
     while (_while) {

       {

         EList<Attribute> _attributes = dc.getAttributes();

-        CharSequence _argList = this.helpers.argList(_attributes);

+        CharSequence _argList = this._procedureHelpers.argList(_attributes);

         String _string = _argList.toString();

         String _plus = (_string + result);

         result = _plus;