1 files changed, 15 insertions, 8 deletions
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
index 270831896..5af97bc83 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
@@ -20,12 +20,14 @@ import java.util.Map;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType;
 import org.eclipse.etrice.core.fsm.fSM.DetailCode;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
 import org.eclipse.etrice.core.genmodel.etricegen.Wire;
 import org.eclipse.etrice.core.genmodel.etricegen.WiredActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass;
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions;
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Graph;
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer;
 import org.eclipse.etrice.core.room.ActorClass;
 import org.eclipse.etrice.core.room.ActorRef;
 import org.eclipse.etrice.core.room.Attribute;
@@ -481,12 +483,14 @@ public class ActorClassGen extends GenericActorClassGenerator {
         boolean _hasNonEmptyStateMachine = this._roomHelpers.hasNonEmptyStateMachine(ac);
         if (_hasNonEmptyStateMachine) {
           _builder.append("\t\t");
-          CharSequence _genStateMachineConstants = this._stateMachineGen.genStateMachineConstants(xpac);
+          GraphContainer _graphContainer = xpac.getGraphContainer();
+          CharSequence _genStateMachineConstants = this._stateMachineGen.genStateMachineConstants(_graphContainer);
           _builder.append(_genStateMachineConstants, "\t\t");
           _builder.newLineIfNotEmpty();
           _builder.newLine();
           _builder.append("\t\t");
-          CharSequence _genStateMachineMethods = this._stateMachineGen.genStateMachineMethods(xpac, false);
+          GraphContainer _graphContainer_1 = xpac.getGraphContainer();
+          CharSequence _genStateMachineMethods = this._stateMachineGen.genStateMachineMethods(_graphContainer_1, false);
           _builder.append(_genStateMachineMethods, "\t\t");
           _builder.newLineIfNotEmpty();
           {
@@ -506,8 +510,9 @@ public class ActorClassGen extends GenericActorClassGenerator {
             }
           }
         } else {
-          StateGraph _stateMachine = xpac.getStateMachine();
-          boolean _isEmpty = this._roomHelpers.isEmpty(_stateMachine);
+          GraphContainer _graphContainer_2 = xpac.getGraphContainer();
+          Graph _graph = _graphContainer_2.getGraph();
+          boolean _isEmpty = FsmGenExtensions.isEmpty(_graph);
           if (_isEmpty) {
             _builder.append("\t\t");
             _builder.append("//--------------------- no state machine");
@@ -1110,7 +1115,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
       {
         boolean _hasNonEmptyStateMachine_1 = this._roomHelpers.hasNonEmptyStateMachine(ac);
         if (_hasNonEmptyStateMachine_1) {
-          CharSequence _genStateMachineMethods = this._stateMachineGen.genStateMachineMethods(xpac, true);
+          GraphContainer _graphContainer = xpac.getGraphContainer();
+          CharSequence _genStateMachineMethods = this._stateMachineGen.genStateMachineMethods(_graphContainer, true);
           _builder.append(_genStateMachineMethods, "");
           _builder.newLineIfNotEmpty();
           {
@@ -1154,8 +1160,9 @@ public class ActorClassGen extends GenericActorClassGenerator {
             }
           }
         } else {
-          StateGraph _stateMachine = xpac.getStateMachine();
-          boolean _isEmpty = this._roomHelpers.isEmpty(_stateMachine);
+          GraphContainer _graphContainer_1 = xpac.getGraphContainer();
+          Graph _graph = _graphContainer_1.getGraph();
+          boolean _isEmpty = FsmGenExtensions.isEmpty(_graph);
           if (_isEmpty) {
             _builder.append("//--------------------- no state machine");
             _builder.newLine();