Merge "Bug 468803 - update development & documentation to luna"

17 files changed, 59 insertions, 166 deletions

diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java
index b42f9375c..5314950b4 100644
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java
+++ b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java
@@ -17,10 +17,12 @@ import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtend.lib.Property;
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.Pure;
 
 /**
  * @author hrentz
@@ -28,8 +30,22 @@ import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 @SuppressWarnings("all")
 public class ValidationHelpers {
   public static class NamedObject {
+    @Property
     private String _name;
     
+    @Property
+    private EObject _obj;
+    
+    @Property
+    private EStructuralFeature _feature;
+    
+    public NamedObject(final String name, final EObject obj, final EStructuralFeature feature) {
+      this.setName(name);
+      this.setObj(obj);
+      this.setFeature(feature);
+    }
+    
+    @Pure
     public String getName() {
       return this._name;
     }
@@ -38,8 +54,7 @@ public class ValidationHelpers {
       this._name = name;
     }
     
-    private EObject _obj;
-    
+    @Pure
     public EObject getObj() {
       return this._obj;
     }
@@ -48,8 +63,7 @@ public class ValidationHelpers {
       this._obj = obj;
     }
     
-    private EStructuralFeature _feature;
-    
+    @Pure
     public EStructuralFeature getFeature() {
       return this._feature;
     }
@@ -57,12 +71,6 @@ public class ValidationHelpers {
     public void setFeature(final EStructuralFeature feature) {
       this._feature = feature;
     }
-    
-    public NamedObject(final String name, final EObject obj, final EStructuralFeature feature) {
-      this.setName(name);
-      this.setObj(obj);
-      this.setFeature(feature);
-    }
   }
   
   public static class NamedObjectList extends ArrayList<ValidationHelpers.NamedObject> {
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
index 561233dfd..ea1e9d6de 100644
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
+++ b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
@@ -175,17 +175,13 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
         comp = _base_1;
         final HashSet<State> covered = CollectionLiterals.<State>newHashSet();
         final ArrayList<State> states = CollectionLiterals.<State>newArrayList();
-        boolean _notEquals_1 = (!Objects.equal(comp, null));
-        boolean _while = _notEquals_1;
-        while (_while) {
+        while ((!Objects.equal(comp, null))) {
           {
             StateGraph _stateMachine = comp.getStateMachine();
             this.recursivelyAddStates(_stateMachine, covered, states);
             ModelComponent _base_2 = comp.getBase();
             comp = _base_2;
           }
-          boolean _notEquals_2 = (!Objects.equal(comp, null));
-          _while = _notEquals_2;
         }
         for (final State s : states) {
           QualifiedName _statePath = this.getStatePath(s);
@@ -200,8 +196,8 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
         State _target = ((RefinedState) _eContainer_3).getTarget();
         StateGraph _subgraph = _target.getSubgraph();
         sg = _subgraph;
-        boolean _notEquals_2 = (!Objects.equal(sg, null));
-        if (_notEquals_2) {
+        boolean _notEquals_1 = (!Objects.equal(sg, null));
+        if (_notEquals_1) {
           EList<State> _states = sg.getStates();
           for (final State s_1 : _states) {
             String _name = s_1.getName();
@@ -230,20 +226,16 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
     if (_not) {
       ModelComponent _base = comp.getBase();
       comp = _base;
-      boolean _notEquals = (!Objects.equal(comp, null));
-      boolean _while = _notEquals;
-      while (_while) {
+      while ((!Objects.equal(comp, null))) {
         {
           StateGraph _stateMachine = comp.getStateMachine();
-          boolean _notEquals_1 = (!Objects.equal(_stateMachine, null));
-          if (_notEquals_1) {
+          boolean _notEquals = (!Objects.equal(_stateMachine, null));
+          if (_notEquals) {
             QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(comp);
             final int acNameSegments = _fullyQualifiedName.getSegmentCount();
             StateGraph _stateMachine_1 = comp.getStateMachine();
             final TreeIterator<EObject> iter = _stateMachine_1.eAllContents();
-            boolean _hasNext = iter.hasNext();
-            boolean _while_1 = _hasNext;
-            while (_while_1) {
+            while (iter.hasNext()) {
               {
                 final EObject obj = iter.next();
                 if ((obj instanceof Transition)) {
@@ -253,15 +245,11 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
                   scopes.add(_create);
                 }
               }
-              boolean _hasNext_1 = iter.hasNext();
-              _while_1 = _hasNext_1;
             }
           }
           ModelComponent _base_1 = comp.getBase();
           comp = _base_1;
         }
-        boolean _notEquals_1 = (!Objects.equal(comp, null));
-        _while = _notEquals_1;
       }
     }
     return new SimpleScope(IScope.NULLSCOPE, scopes);
@@ -319,27 +307,9 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
    */
   private StateGraph getStateGraph(final EObject obj) {
     EObject ctx = obj.eContainer();
-    boolean _and = false;
-    if (!(!(ctx instanceof StateGraph))) {
-      _and = false;
-    } else {
+    while (((!(ctx instanceof StateGraph)) && (!Objects.equal(ctx.eContainer(), null)))) {
       EObject _eContainer = ctx.eContainer();
-      boolean _notEquals = (!Objects.equal(_eContainer, null));
-      _and = _notEquals;
-    }
-    boolean _while = _and;
-    while (_while) {
-      EObject _eContainer_1 = ctx.eContainer();
-      ctx = _eContainer_1;
-      boolean _and_1 = false;
-      if (!(!(ctx instanceof StateGraph))) {
-        _and_1 = false;
-      } else {
-        EObject _eContainer_2 = ctx.eContainer();
-        boolean _notEquals_1 = (!Objects.equal(_eContainer_2, null));
-        _and_1 = _notEquals_1;
-      }
-      _while = _and_1;
+      ctx = _eContainer;
     }
     if ((ctx instanceof StateGraph)) {
       return ((StateGraph)ctx);
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java
index 1e0d694e9..58ffe981e 100644
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java
+++ b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java
@@ -157,9 +157,7 @@ public class FSMValidationUtilXtend {
   
   public StateGraph getStateGraph(final EObject obj) {
     EObject parent = obj.eContainer();
-    boolean _notEquals = (!Objects.equal(parent, null));
-    boolean _while = _notEquals;
-    while (_while) {
+    while ((!Objects.equal(parent, null))) {
       {
         if ((parent instanceof StateGraph)) {
           return ((StateGraph) parent);
@@ -167,8 +165,6 @@ public class FSMValidationUtilXtend {
         EObject _eContainer = parent.eContainer();
         parent = _eContainer;
       }
-      boolean _notEquals_1 = (!Objects.equal(parent, null));
-      _while = _notEquals_1;
     }
     return null;
   }
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
index efa0b248f..2c11ecbf9 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
@@ -576,8 +576,7 @@ public class CExtensions implements ILanguageExtension {
       {
         String res = "{";
         int i = 0;
-        boolean _while = (i < size);
-        while (_while) {
+        while ((i < size)) {
           {
             res = (res + dv);
             i = (i + 1);
@@ -585,7 +584,6 @@ public class CExtensions implements ILanguageExtension {
               res = (res + ",");
             }
           }
-          _while = (i < size);
         }
         _xblockexpression = (res + "}");
       }
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
index 1f7d5d2f4..ca6e0f2d6 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
@@ -2927,9 +2927,7 @@ public class NodeGen {
       final ArrayList<String> notLogged = CollectionLiterals.<String>newArrayList();
       this.logger.logInfo("  logged ports:");
       TreeIterator<EObject> iter = ssi.eAllContents();
-      boolean _hasNext = iter.hasNext();
-      boolean _while = _hasNext;
-      while (_while) {
+      while (iter.hasNext()) {
         {
           final EObject obj = iter.next();
           if ((obj instanceof PortInstance)) {
@@ -3009,8 +3007,6 @@ public class NodeGen {
             }
           }
         }
-        boolean _hasNext_1 = iter.hasNext();
-        _while = _hasNext_1;
       }
       this.logger.logInfo("  NOT logged ports:");
       for (final String nl : notLogged) {
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
index bbbf6c7d6..dce7f3793 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
@@ -511,9 +511,7 @@ public class ConfigGenAddon {
               PrimitiveType aType = ((PrimitiveType) _type_9);
               StringConcatenation _builder_1 = new StringConcatenation();
               {
-                String _attrClassConfigMinValue = this.dataConfigExt.getAttrClassConfigMinValue(ac, path);
-                String _temp = temp = _attrClassConfigMinValue;
-                boolean _notEquals = (!Objects.equal(_temp, null));
+                boolean _notEquals = (!Objects.equal((temp = this.dataConfigExt.getAttrClassConfigMinValue(ac, path)), null));
                 if (_notEquals) {
                   _builder_1.append("public static ");
                   String _minMaxType = this.getMinMaxType(aType);
@@ -528,9 +526,7 @@ public class ConfigGenAddon {
                 }
               }
               {
-                String _attrClassConfigMaxValue = this.dataConfigExt.getAttrClassConfigMaxValue(ac, path);
-                String _temp_1 = temp = _attrClassConfigMaxValue;
-                boolean _notEquals_1 = (!Objects.equal(_temp_1, null));
+                boolean _notEquals_1 = (!Objects.equal((temp = this.dataConfigExt.getAttrClassConfigMaxValue(ac, path)), null));
                 if (_notEquals_1) {
                   _builder_1.append("public static ");
                   String _minMaxType_1 = this.getMinMaxType(aType);
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
index 155c107d4..afa30d77e 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
@@ -306,8 +306,7 @@ public class CppExtensions implements ILanguageExtension {
         {
           String res = "{";
           int i = 0;
-          boolean _while = (i < size);
-          while (_while) {
+          while ((i < size)) {
             {
               res = (res + dv);
               i = (i + 1);
@@ -315,7 +314,6 @@ public class CppExtensions implements ILanguageExtension {
                 res = (res + ",");
               }
             }
-            _while = (i < size);
           }
           _xblockexpression_1 = (res + "}");
         }
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
index 17d07cb64..af3743307 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
@@ -658,9 +658,7 @@ public class DataClassGen {
   public String paramList(final DataClass _dc) {
     String result = "";
     DataClass dc = _dc;
-    boolean _notEquals = (!Objects.equal(dc, null));
-    boolean _while = _notEquals;
-    while (_while) {
+    while ((!Objects.equal(dc, null))) {
       {
         EList<Attribute> _attributes = dc.getAttributes();
         CharSequence _paramList = this.paramList(_attributes);
@@ -669,13 +667,11 @@ public class DataClassGen {
         result = _plus;
         DataClass _base = dc.getBase();
         dc = _base;
-        boolean _notEquals_1 = (!Objects.equal(dc, null));
-        if (_notEquals_1) {
+        boolean _notEquals = (!Objects.equal(dc, null));
+        if (_notEquals) {
           result = (", " + result);
         }
       }
-      boolean _notEquals_1 = (!Objects.equal(dc, null));
-      _while = _notEquals_1;
     }
     return result;
   }
@@ -701,9 +697,7 @@ public class DataClassGen {
   public String argList(final DataClass _dc) {
     String result = "";
     DataClass dc = _dc;
-    boolean _notEquals = (!Objects.equal(dc, null));
-    boolean _while = _notEquals;
-    while (_while) {
+    while ((!Objects.equal(dc, null))) {
       {
         EList<Attribute> _attributes = dc.getAttributes();
         CharSequence _argListConstructor = this.argListConstructor(_attributes);
@@ -712,13 +706,11 @@ public class DataClassGen {
         result = _plus;
         DataClass _base = dc.getBase();
         dc = _base;
-        boolean _notEquals_1 = (!Objects.equal(dc, null));
-        if (_notEquals_1) {
+        boolean _notEquals = (!Objects.equal(dc, null));
+        if (_notEquals) {
           result = (", " + result);
         }
       }
-      boolean _notEquals_1 = (!Objects.equal(dc, null));
-      _while = _notEquals_1;
     }
     return result;
   }
@@ -756,9 +748,7 @@ public class DataClassGen {
   public String deepCopy(final DataClass _dc) {
     String result = "";
     DataClass dc = _dc;
-    boolean _notEquals = (!Objects.equal(dc, null));
-    boolean _while = _notEquals;
-    while (_while) {
+    while ((!Objects.equal(dc, null))) {
       {
         EList<Attribute> _attributes = dc.getAttributes();
         CharSequence _deepCopy = this.deepCopy(_attributes);
@@ -768,8 +758,6 @@ public class DataClassGen {
         DataClass _base = dc.getBase();
         dc = _base;
       }
-      boolean _notEquals_1 = (!Objects.equal(dc, null));
-      _while = _notEquals_1;
     }
     return result;
   }
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java
index f681fab07..d39f8e863 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java
@@ -154,8 +154,7 @@ public class Initialization {
       for(final String v : values) {
         _builder.append(varName, "");
         _builder.append("[");
-        int _i = i = (i + 1);
-        _builder.append(_i, "");
+        _builder.append(i = (i + 1), "");
         _builder.append("] = ");
         _builder.append(v, "");
         _builder.append(";");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
index ea43b064e..324771c98 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
@@ -417,9 +417,7 @@ public class ConfigGenAddon {
             String temp = ((String) null);
             StringConcatenation _builder = new StringConcatenation();
             {
-              String _attrClassConfigMinValue = this.dataConfigExt.getAttrClassConfigMinValue(ac, path);
-              String _temp = temp = _attrClassConfigMinValue;
-              boolean _notEquals = (!Objects.equal(_temp, null));
+              boolean _notEquals = (!Objects.equal((temp = this.dataConfigExt.getAttrClassConfigMinValue(ac, path)), null));
               if (_notEquals) {
                 _builder.append("public static ");
                 String _minMaxType = this.getMinMaxType(((PrimitiveType)aType));
@@ -434,9 +432,7 @@ public class ConfigGenAddon {
               }
             }
             {
-              String _attrClassConfigMaxValue = this.dataConfigExt.getAttrClassConfigMaxValue(ac, path);
-              String _temp_1 = temp = _attrClassConfigMaxValue;
-              boolean _notEquals_1 = (!Objects.equal(_temp_1, null));
+              boolean _notEquals_1 = (!Objects.equal((temp = this.dataConfigExt.getAttrClassConfigMaxValue(ac, path)), null));
               if (_notEquals_1) {
                 _builder.append("public static ");
                 String _minMaxType_1 = this.getMinMaxType(((PrimitiveType)aType));
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 d1392ffd3..49d16e558 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
@@ -324,9 +324,7 @@ public class DataClassGen {
   public String paramList(final DataClass _dc) {
     String result = "";
     DataClass dc = _dc;
-    boolean _notEquals = (!Objects.equal(dc, null));
-    boolean _while = _notEquals;
-    while (_while) {
+    while ((!Objects.equal(dc, null))) {
       {
         EList<Attribute> _attributes = dc.getAttributes();
         CharSequence _paramList = this.paramList(_attributes);
@@ -335,13 +333,11 @@ public class DataClassGen {
         result = _plus;
         DataClass _base = dc.getBase();
         dc = _base;
-        boolean _notEquals_1 = (!Objects.equal(dc, null));
-        if (_notEquals_1) {
+        boolean _notEquals = (!Objects.equal(dc, null));
+        if (_notEquals) {
           result = (", " + result);
         }
       }
-      boolean _notEquals_1 = (!Objects.equal(dc, null));
-      _while = _notEquals_1;
     }
     return result;
   }
@@ -366,9 +362,7 @@ public class DataClassGen {
   public String argList(final DataClass _dc) {
     String result = "";
     DataClass dc = _dc;
-    boolean _notEquals = (!Objects.equal(dc, null));
-    boolean _while = _notEquals;
-    while (_while) {
+    while ((!Objects.equal(dc, null))) {
       {
         EList<Attribute> _attributes = dc.getAttributes();
         CharSequence _argList = this._procedureHelpers.argList(_attributes);
@@ -377,13 +371,11 @@ public class DataClassGen {
         result = _plus;
         DataClass _base = dc.getBase();
         dc = _base;
-        boolean _notEquals_1 = (!Objects.equal(dc, null));
-        if (_notEquals_1) {
+        boolean _notEquals = (!Objects.equal(dc, null));
+        if (_notEquals) {
           result = (", " + result);
         }
       }
-      boolean _notEquals_1 = (!Objects.equal(dc, null));
-      _while = _notEquals_1;
     }
     return result;
   }
@@ -391,9 +383,7 @@ public class DataClassGen {
   private String deepCopy(final DataClass _dc) {
     String result = "";
     DataClass dc = _dc;
-    boolean _notEquals = (!Objects.equal(dc, null));
-    boolean _while = _notEquals;
-    while (_while) {
+    while ((!Objects.equal(dc, null))) {
       {
         EList<Attribute> _attributes = dc.getAttributes();
         CharSequence _deepCopy = this.deepCopy(_attributes);
@@ -403,8 +393,6 @@ public class DataClassGen {
         DataClass _base = dc.getBase();
         dc = _base;
       }
-      boolean _notEquals_1 = (!Objects.equal(dc, null));
-      _while = _notEquals_1;
     }
     return result;
   }
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
index badf8c99d..ddeecaab2 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
@@ -532,8 +532,7 @@ public class JavaExtensions implements ILanguageExtension {
         {
           String res = "{";
           int i = 0;
-          boolean _while = (i < size);
-          while (_while) {
+          while ((i < size)) {
             {
               res = (res + dv);
               i = (i + 1);
@@ -541,7 +540,6 @@ public class JavaExtensions implements ILanguageExtension {
                 res = (res + ",");
               }
             }
-            _while = (i < size);
           }
           _xblockexpression_1 = (res + "}");
         }
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
index a1c6dcf89..b0d8cfacc 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
@@ -32,9 +32,7 @@ public class StateMachineGen extends GenericStateMachineGenerator {
     {
       final ArrayList<State> states = new ArrayList<State>();
       ModelComponent ac = xpac.getModelComponent();
-      boolean _notEquals = (!Objects.equal(ac, null));
-      boolean _while = _notEquals;
-      while (_while) {
+      while ((!Objects.equal(ac, null))) {
         {
           List<State> _allBaseStates = this._fSMHelpers.getAllBaseStates(ac);
           List<State> _leafStatesLast = this._fSMExtensions.getLeafStatesLast(_allBaseStates);
@@ -42,8 +40,6 @@ public class StateMachineGen extends GenericStateMachineGenerator {
           ModelComponent _base = ac.getBase();
           ac = _base;
         }
-        boolean _notEquals_1 = (!Objects.equal(ac, null));
-        _while = _notEquals_1;
       }
       StringConcatenation _builder = new StringConcatenation();
       {
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
index 505ff9316..484721872 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
@@ -589,10 +589,7 @@ public class VariableServiceGen {
     Iterables.<DataClass>addAll(result, dcs);
     final LinkedList<DataClass> visit = new LinkedList<DataClass>();
     Iterables.<DataClass>addAll(visit, dcs);
-    boolean _isEmpty = visit.isEmpty();
-    boolean _not = (!_isEmpty);
-    boolean _while = _not;
-    while (_while) {
+    while ((!visit.isEmpty())) {
       {
         DataClass dc = visit.pop();
         List<Attribute> _allAttributes = this._roomHelpers.getAllAttributes(dc);
@@ -610,9 +607,6 @@ public class VariableServiceGen {
         };
         IterableExtensions.<Attribute>forEach(_allAttributes, _function);
       }
-      boolean _isEmpty_1 = visit.isEmpty();
-      boolean _not_1 = (!_isEmpty_1);
-      _while = _not_1;
     }
     return result;
   }
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
index 53e6e9f2d..28b488abc 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
@@ -284,22 +284,16 @@ public class ProcedureHelpers {
     }
     String result = "{";
     int i = 0;
-    int _size_3 = att.getSize();
-    boolean _lessThan = (i < _size_3);
-    boolean _while = _lessThan;
-    while (_while) {
+    while ((i < att.getSize())) {
       {
         result = (result + dflt);
         i = (i + 1);
-        int _size_4 = att.getSize();
-        boolean _lessThan_1 = (i < _size_4);
-        if (_lessThan_1) {
+        int _size_3 = att.getSize();
+        boolean _lessThan = (i < _size_3);
+        if (_lessThan) {
           result = (result + ", ");
         }
       }
-      int _size_4 = att.getSize();
-      boolean _lessThan_1 = (i < _size_4);
-      _while = _lessThan_1;
     }
     return (result + "}");
   }
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
index 8ded2b1cb..7a1f8f24c 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
@@ -567,17 +567,13 @@ public class RoomExtensions extends FSMExtensions {
   public BasicEList<AbstractInstance> getAllSubInstances(final StructureInstance ssi) {
     final BasicEList<AbstractInstance> result = new BasicEList<AbstractInstance>();
     final TreeIterator<EObject> it = ssi.eAllContents();
-    boolean _hasNext = it.hasNext();
-    boolean _while = _hasNext;
-    while (_while) {
+    while (it.hasNext()) {
       {
         final EObject obj = it.next();
         if ((obj instanceof AbstractInstance)) {
           result.add(((AbstractInstance) obj));
         }
       }
-      boolean _hasNext_1 = it.hasNext();
-      _while = _hasNext_1;
     }
     return result;
   }
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
index d621fac32..fd03e85ea 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
@@ -205,31 +205,13 @@ public class TypeHelpers {
     }
     if (_and) {
       ActorClass base = actor.getActorBase();
-      boolean _and_1 = false;
-      boolean _notEquals = (!Objects.equal(base, null));
-      if (!_notEquals) {
-        _and_1 = false;
-      } else {
-        boolean _equals_1 = Objects.equal(result, null);
-        _and_1 = _equals_1;
-      }
-      boolean _while = _and_1;
-      while (_while) {
+      while (((!Objects.equal(base, null)) && Objects.equal(result, null))) {
         {
           String _attrClassConfigValue = this.dataConfigExt.getAttrClassConfigValue(base, attributePath);
           result = _attrClassConfigValue;
           ActorClass _actorBase = base.getActorBase();
           base = _actorBase;
         }
-        boolean _and_2 = false;
-        boolean _notEquals_1 = (!Objects.equal(base, null));
-        if (!_notEquals_1) {
-          _and_2 = false;
-        } else {
-          boolean _equals_2 = Objects.equal(result, null);
-          _and_2 = _equals_2;
-        }
-        _while = _and_2;
       }
     }
     return result;