Bug 511330 - [core.genmodel.fsm] introduce simplified generator model

for state machines

* bug fix in ui.behavior tests

Change-Id: I0ee471ae6b0e7502ba2dbf63f9ec46b33d0610e6

23 files changed, 448 insertions, 427 deletions

diff --git a/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room b/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room
index 4a828dc3b..945725c5e 100644
--- a/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room
+++ b/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room
@@ -61,7 +61,7 @@ RoomModel room.basic.service.tcp {
 					}
 					action {
 						"/* send payload to connection */"
-						"setErrorCode(etWriteServerSocket(server, data->connectionId, data->length, data->data));"
+						"setErrorCode(etWriteServerSocket(server, transitionData->connectionId, transitionData->length, transitionData->data));"
 						"if(hasError())"
 						"\tcontrolPort.error();"
 					}
@@ -84,7 +84,7 @@ RoomModel room.basic.service.tcp {
 					}
 					action {
 						"/* start accept thread */"
-						"setErrorCode(etStartListening(server, data->TcpPort));"
+						"setErrorCode(etStartListening(server, transitionData->TcpPort));"
 					}
 				}
 				Transition tr4: cp cp1 -> connected {
@@ -187,7 +187,7 @@ RoomModel room.basic.service.tcp {
 					}
 					action {
 						"/* connect to server */"
-						"setErrorCode(etConnectServer(client, data->IPAddr, data->TcpPort));"
+						"setErrorCode(etConnectServer(client, transitionData->IPAddr, transitionData->TcpPort));"
 					}
 				}
 				Transition tr1: connected -> unconnected {
@@ -219,7 +219,7 @@ RoomModel room.basic.service.tcp {
 						<dataPackage: payloadPort>
 					}
 					action {
-						"setErrorCode(etWriteSocket(client, data->length, data->data));"
+						"setErrorCode(etWriteSocket(client, transitionData->length, transitionData->data));"
 						"if(hasError())"
 						"\tcontrolPort.error();"
 					}
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/readme.txt b/runtime/org.eclipse.etrice.modellib.c/src-gen/readme.txt
new file mode 100644
index 000000000..1dc2b35ab
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/readme.txt
@@ -0,0 +1,4 @@
+This directory is an eTrice code generation target.
+It will be erased every time the generator is executed.
+
+DO NOT PLACE OTHER FILES HERE!
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/pinterrupt/PInterrupt.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/pinterrupt/PInterrupt.h
index 602d5601a..340b8068e 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/pinterrupt/PInterrupt.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/pinterrupt/PInterrupt.h
@@ -12,6 +12,7 @@
 #include "modelbase/etPort.h"
 
 
+/* include all referenced room classes */
 
 
 /* message IDs */
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.c b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.c
index b72cf1235..09613fadf 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.c
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.c
@@ -90,9 +90,9 @@ static void entry_initError(ATcpClient* self) {
 static void action_TRANS_INITIAL_TO__cp1(ATcpClient* self) {
     printf("Client Init!\n");
 }
-static void action_TRANS_tr0_FROM_unconnected_TO_cp0_BY_connectcontrolPort(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpControl* data) {
+static void action_TRANS_tr0_FROM_unconnected_TO_cp0_BY_connectcontrolPort(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpControl* transitionData) {
     /* connect to server */
-    setErrorCode(etConnectServer(client, data->IPAddr, data->TcpPort));
+    setErrorCode(etConnectServer(client, transitionData->IPAddr, transitionData->TcpPort));
 }
 static void action_TRANS_tr1_FROM_connected_TO_unconnected_BY_disconnectcontrolPort(ATcpClient* self, const InterfaceItemBase* ifitem) {
     /* close read thread */
@@ -100,14 +100,14 @@ static void action_TRANS_tr1_FROM_connected_TO_unconnected_BY_disconnectcontrolP
     
     controlPort_disconnected();
 }
-static void action_TRANS_tr2_FROM_cp0_TO_connected(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpControl* data) {
+static void action_TRANS_tr2_FROM_cp0_TO_connected(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpControl* transitionData) {
     controlPort_connected();
 }
-static void action_TRANS_tr7_FROM_cp0_TO_unconnected_COND_tr7(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpControl* data) {
+static void action_TRANS_tr7_FROM_cp0_TO_unconnected_COND_tr7(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpControl* transitionData) {
     controlPort_error();
 }
-static void action_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr3(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpPayload* data) {
-    setErrorCode(etWriteSocket(client, data->length, data->data));
+static void action_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr3(ATcpClient* self, const InterfaceItemBase* ifitem, DTcpPayload* transitionData) {
+    setErrorCode(etWriteSocket(client, transitionData->length, transitionData->data));
     if(hasError())
     	controlPort_error();
 }
@@ -122,10 +122,6 @@ static void action_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPo
 static void exitTo(ATcpClient* self, etInt16 current__et, etInt16 to) {
 	while (current__et!=to) {
 		switch (current__et) {
-			case STATE_unconnected:
-				self->history[STATE_TOP] = STATE_unconnected;
-				current__et = STATE_TOP;
-				break;
 			case STATE_connected:
 				self->history[STATE_TOP] = STATE_connected;
 				current__et = STATE_TOP;
@@ -134,6 +130,10 @@ static void exitTo(ATcpClient* self, etInt16 current__et, etInt16 to) {
 				self->history[STATE_TOP] = STATE_initError;
 				current__et = STATE_TOP;
 				break;
+			case STATE_unconnected:
+				self->history[STATE_TOP] = STATE_unconnected;
+				current__et = STATE_TOP;
+				break;
 			default:
 				/* should not occur */
 				break;
@@ -160,13 +160,13 @@ static etInt16 executeTransitionChain(ATcpClient* self, int chain__et, const Int
 		}
 		case CHAIN_TRANS_tr0_FROM_unconnected_TO_cp0_BY_connectcontrolPort:
 		{
-			DTcpControl* data = ((DTcpControl*) generic_data__et);
-			action_TRANS_tr0_FROM_unconnected_TO_cp0_BY_connectcontrolPort(self, ifitem, data);
+			DTcpControl* transitionData = ((DTcpControl*) generic_data__et);
+			action_TRANS_tr0_FROM_unconnected_TO_cp0_BY_connectcontrolPort(self, ifitem, transitionData);
 			if (hasError()) {
-			action_TRANS_tr7_FROM_cp0_TO_unconnected_COND_tr7(self, ifitem, data);
+			action_TRANS_tr7_FROM_cp0_TO_unconnected_COND_tr7(self, ifitem, transitionData);
 			return STATE_unconnected;}
 			else {
-			action_TRANS_tr2_FROM_cp0_TO_connected(self, ifitem, data);
+			action_TRANS_tr2_FROM_cp0_TO_connected(self, ifitem, transitionData);
 			return STATE_connected;}
 		}
 		case CHAIN_TRANS_tr1_FROM_connected_TO_unconnected_BY_disconnectcontrolPort:
@@ -176,13 +176,13 @@ static etInt16 executeTransitionChain(ATcpClient* self, int chain__et, const Int
 		}
 		case CHAIN_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr3:
 		{
-			DTcpPayload* data = ((DTcpPayload*) generic_data__et);
-			action_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr3(self, ifitem, data);
+			DTcpPayload* transitionData = ((DTcpPayload*) generic_data__et);
+			action_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr3(self, ifitem, transitionData);
 			return STATE_connected;
 		}
 		case CHAIN_TRANS_tr6_FROM_initError_TO_initError_BY_connectcontrolPort_tr6:
 		{
-			DTcpControl* data = ((DTcpControl*) generic_data__et);
+			DTcpControl* transitionData = ((DTcpControl*) generic_data__et);
 			return STATE_initError;
 		}
 			default:
@@ -205,9 +205,6 @@ static etInt16 enterHistory(ATcpClient* self, etInt16 state__et) {
 	}
 	while (ET_TRUE) {
 		switch (state__et) {
-			case STATE_unconnected:
-				/* in leaf state: return state id */
-				return STATE_unconnected;
 			case STATE_connected:
 				/* in leaf state: return state id */
 				return STATE_connected;
@@ -215,6 +212,9 @@ static etInt16 enterHistory(ATcpClient* self, etInt16 state__et) {
 				if (!(skip_entry__et)) entry_initError(self);
 				/* in leaf state: return state id */
 				return STATE_initError;
+			case STATE_unconnected:
+				/* in leaf state: return state id */
+				return STATE_unconnected;
 			case STATE_TOP:
 				state__et = self->history[STATE_TOP];
 				break;
@@ -243,54 +243,54 @@ static void ATcpClient_receiveEventInternal(ATcpClient* self, InterfaceItemBase*
 
 	if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 		switch (getState(self)) {
-		    case STATE_unconnected:
-		        switch(trigger__et) {
-		                case TRIG_controlPort__connect:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr0_FROM_unconnected_TO_cp0_BY_connectcontrolPort;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                default:
-		                    /* should not occur */
-		                    break;
-		        }
-		        break;
-		    case STATE_connected:
-		        switch(trigger__et) {
-		                case TRIG_controlPort__disconnect:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr1_FROM_connected_TO_unconnected_BY_disconnectcontrolPort;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                case TRIG_payloadPort__dataPackage:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr3;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                default:
-		                    /* should not occur */
-		                    break;
-		        }
-		        break;
-		    case STATE_initError:
-		        switch(trigger__et) {
-		                case TRIG_controlPort__connect:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr6_FROM_initError_TO_initError_BY_connectcontrolPort_tr6;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                default:
-		                    /* should not occur */
-		                    break;
-		        }
-		        break;
-		    default:
-		        /* should not occur */
-		        break;
+			case STATE_connected:
+				switch(trigger__et) {
+					case TRIG_controlPort__disconnect:
+						{
+							chain__et = CHAIN_TRANS_tr1_FROM_connected_TO_unconnected_BY_disconnectcontrolPort;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					case TRIG_payloadPort__dataPackage:
+						{
+							chain__et = CHAIN_TRANS_tr3_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr3;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			case STATE_initError:
+				switch(trigger__et) {
+					case TRIG_controlPort__connect:
+						{
+							chain__et = CHAIN_TRANS_tr6_FROM_initError_TO_initError_BY_connectcontrolPort_tr6;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			case STATE_unconnected:
+				switch(trigger__et) {
+					case TRIG_controlPort__connect:
+						{
+							chain__et = CHAIN_TRANS_tr0_FROM_unconnected_TO_cp0_BY_connectcontrolPort;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			default:
+				/* should not occur */
+				break;
 		}
 	}
 	if (chain__et != NOT_CAUGHT) {
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.h
index 3f6962c52..366a447b0 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpClient.h
@@ -11,6 +11,7 @@
 #include "etDatatypes.h"
 #include "messaging/etMessage.h"
 
+/* include all referenced room classes */
 #include "room/basic/service/tcp/DTcpPayload.h"
 #include "room/basic/service/tcp/PTcpControl.h"
 #include "room/basic/service/tcp/PTcpPayload.h"
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.c b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.c
index 17d9dc398..3fdc8eda4 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.c
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.c
@@ -87,9 +87,9 @@ static void entry_initError(ATcpServer* self) {
 }
 
 /* Action Codes */
-static void action_TRANS_tr5_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr5(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpPayload* data) {
+static void action_TRANS_tr5_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr5(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpPayload* transitionData) {
     /* send payload to connection */
-    setErrorCode(etWriteServerSocket(server, data->connectionId, data->length, data->data));
+    setErrorCode(etWriteServerSocket(server, transitionData->connectionId, transitionData->length, transitionData->data));
     if(hasError())
     	controlPort_error();
 }
@@ -100,14 +100,14 @@ static void action_TRANS_tr6_FROM_connected_TO_unconnected_BY_disconnectcontrolP
     
     controlPort_disconnected();
 }
-static void action_TRANS_tr7_FROM_unconnected_TO_cp1_BY_connectcontrolPort(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpControl* data) {
+static void action_TRANS_tr7_FROM_unconnected_TO_cp1_BY_connectcontrolPort(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpControl* transitionData) {
     /* start accept thread */
-    setErrorCode(etStartListening(server, data->TcpPort));
+    setErrorCode(etStartListening(server, transitionData->TcpPort));
 }
-static void action_TRANS_tr4_FROM_cp1_TO_connected(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpControl* data) {
+static void action_TRANS_tr4_FROM_cp1_TO_connected(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpControl* transitionData) {
     controlPort_connected();
 }
-static void action_TRANS_tr8_FROM_cp1_TO_unconnected_COND_tr8(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpControl* data) {
+static void action_TRANS_tr8_FROM_cp1_TO_unconnected_COND_tr8(ATcpServer* self, const InterfaceItemBase* ifitem, DTcpControl* transitionData) {
     controlPort_error();
 }
 
@@ -125,14 +125,14 @@ static void exitTo(ATcpServer* self, etInt16 current__et, etInt16 to) {
 				self->history[STATE_TOP] = STATE_connected;
 				current__et = STATE_TOP;
 				break;
-			case STATE_unconnected:
-				self->history[STATE_TOP] = STATE_unconnected;
-				current__et = STATE_TOP;
-				break;
 			case STATE_initError:
 				self->history[STATE_TOP] = STATE_initError;
 				current__et = STATE_TOP;
 				break;
+			case STATE_unconnected:
+				self->history[STATE_TOP] = STATE_unconnected;
+				current__et = STATE_TOP;
+				break;
 			default:
 				/* should not occur */
 				break;
@@ -156,10 +156,15 @@ static etInt16 executeTransitionChain(ATcpServer* self, int chain__et, const Int
 			else {
 			return STATE_unconnected;}
 		}
+		case CHAIN_TRANS_tr2_FROM_initError_TO_initError_BY_connectcontrolPort_tr2:
+		{
+			DTcpControl* transitionData = ((DTcpControl*) generic_data__et);
+			return STATE_initError;
+		}
 		case CHAIN_TRANS_tr5_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr5:
 		{
-			DTcpPayload* data = ((DTcpPayload*) generic_data__et);
-			action_TRANS_tr5_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr5(self, ifitem, data);
+			DTcpPayload* transitionData = ((DTcpPayload*) generic_data__et);
+			action_TRANS_tr5_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr5(self, ifitem, transitionData);
 			return STATE_connected;
 		}
 		case CHAIN_TRANS_tr6_FROM_connected_TO_unconnected_BY_disconnectcontrolPort:
@@ -169,20 +174,15 @@ static etInt16 executeTransitionChain(ATcpServer* self, int chain__et, const Int
 		}
 		case CHAIN_TRANS_tr7_FROM_unconnected_TO_cp1_BY_connectcontrolPort:
 		{
-			DTcpControl* data = ((DTcpControl*) generic_data__et);
-			action_TRANS_tr7_FROM_unconnected_TO_cp1_BY_connectcontrolPort(self, ifitem, data);
+			DTcpControl* transitionData = ((DTcpControl*) generic_data__et);
+			action_TRANS_tr7_FROM_unconnected_TO_cp1_BY_connectcontrolPort(self, ifitem, transitionData);
 			if (hasError()) {
-			action_TRANS_tr8_FROM_cp1_TO_unconnected_COND_tr8(self, ifitem, data);
+			action_TRANS_tr8_FROM_cp1_TO_unconnected_COND_tr8(self, ifitem, transitionData);
 			return STATE_unconnected;}
 			else {
-			action_TRANS_tr4_FROM_cp1_TO_connected(self, ifitem, data);
+			action_TRANS_tr4_FROM_cp1_TO_connected(self, ifitem, transitionData);
 			return STATE_connected;}
 		}
-		case CHAIN_TRANS_tr2_FROM_initError_TO_initError_BY_connectcontrolPort_tr2:
-		{
-			DTcpControl* data = ((DTcpControl*) generic_data__et);
-			return STATE_initError;
-		}
 			default:
 				/* should not occur */
 				break;
@@ -206,13 +206,13 @@ static etInt16 enterHistory(ATcpServer* self, etInt16 state__et) {
 			case STATE_connected:
 				/* in leaf state: return state id */
 				return STATE_connected;
-			case STATE_unconnected:
-				/* in leaf state: return state id */
-				return STATE_unconnected;
 			case STATE_initError:
 				if (!(skip_entry__et)) entry_initError(self);
 				/* in leaf state: return state id */
 				return STATE_initError;
+			case STATE_unconnected:
+				/* in leaf state: return state id */
+				return STATE_unconnected;
 			case STATE_TOP:
 				state__et = self->history[STATE_TOP];
 				break;
@@ -241,54 +241,54 @@ static void ATcpServer_receiveEventInternal(ATcpServer* self, InterfaceItemBase*
 
 	if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 		switch (getState(self)) {
-		    case STATE_connected:
-		        switch(trigger__et) {
-		                case TRIG_payloadPort__dataPackage:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr5_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr5;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                case TRIG_controlPort__disconnect:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr6_FROM_connected_TO_unconnected_BY_disconnectcontrolPort;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                default:
-		                    /* should not occur */
-		                    break;
-		        }
-		        break;
-		    case STATE_unconnected:
-		        switch(trigger__et) {
-		                case TRIG_controlPort__connect:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr7_FROM_unconnected_TO_cp1_BY_connectcontrolPort;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                default:
-		                    /* should not occur */
-		                    break;
-		        }
-		        break;
-		    case STATE_initError:
-		        switch(trigger__et) {
-		                case TRIG_controlPort__connect:
-		                    {
-		                        chain__et = CHAIN_TRANS_tr2_FROM_initError_TO_initError_BY_connectcontrolPort_tr2;
-		                        catching_state__et = STATE_TOP;
-		                    }
-		                break;
-		                default:
-		                    /* should not occur */
-		                    break;
-		        }
-		        break;
-		    default:
-		        /* should not occur */
-		        break;
+			case STATE_connected:
+				switch(trigger__et) {
+					case TRIG_controlPort__disconnect:
+						{
+							chain__et = CHAIN_TRANS_tr6_FROM_connected_TO_unconnected_BY_disconnectcontrolPort;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					case TRIG_payloadPort__dataPackage:
+						{
+							chain__et = CHAIN_TRANS_tr5_FROM_connected_TO_connected_BY_dataPackagepayloadPort_tr5;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			case STATE_initError:
+				switch(trigger__et) {
+					case TRIG_controlPort__connect:
+						{
+							chain__et = CHAIN_TRANS_tr2_FROM_initError_TO_initError_BY_connectcontrolPort_tr2;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			case STATE_unconnected:
+				switch(trigger__et) {
+					case TRIG_controlPort__connect:
+						{
+							chain__et = CHAIN_TRANS_tr7_FROM_unconnected_TO_cp1_BY_connectcontrolPort;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			default:
+				/* should not occur */
+				break;
 		}
 	}
 	if (chain__et != NOT_CAUGHT) {
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.h
index 2bff8d75e..a83b955a0 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/ATcpServer.h
@@ -11,6 +11,7 @@
 #include "etDatatypes.h"
 #include "messaging/etMessage.h"
 
+/* include all referenced room classes */
 #include "room/basic/service/tcp/DTcpPayload.h"
 #include "room/basic/service/tcp/PTcpControl.h"
 #include "room/basic/service/tcp/PTcpPayload.h"
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpControl.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpControl.h
index 0d1c71664..ed7edcdd0 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpControl.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpControl.h
@@ -10,6 +10,7 @@
 
 #include "etDatatypes.h"
 
+/* include all referenced room classes */
 
 		
 typedef struct {
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpPayload.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpPayload.h
index 23aa03dd3..99fc0cf07 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpPayload.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/DTcpPayload.h
@@ -10,6 +10,7 @@
 
 #include "etDatatypes.h"
 
+/* include all referenced room classes */
 
 		
 typedef struct {
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpControl.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpControl.h
index 2809a5f03..d0e781960 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpControl.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpControl.h
@@ -12,6 +12,7 @@
 #include "modelbase/etPort.h"
 
 
+/* include all referenced room classes */
 #include "room/basic/service/tcp/DTcpControl.h"
 
 
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpPayload.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpPayload.h
index b27deac85..9a30653ab 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpPayload.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/tcp/PTcpPayload.h
@@ -12,6 +12,7 @@
 #include "modelbase/etPort.h"
 
 
+/* include all referenced room classes */
 #include "room/basic/service/tcp/DTcpPayload.h"
 
 
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c
index c2f7f4acd..0a7cc630c 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c
@@ -102,12 +102,12 @@ static void action_TRANS_INITIAL_TO__Operational(ATimingService* self) {
     	tcbs[i].next=&tcbs[i+1];
     	}
 }
-static void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(ATimingService* self, const InterfaceItemBase* ifitem, uint32 time) {
+static void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(ATimingService* self, const InterfaceItemBase* ifitem, uint32 transitionData) {
     etTimerControlBlock* timer = getTcb();
     etTime t;
     if (timer!= 0){
-    	t.sec=time/1000;
-    	t.nSec=(time%1000)*1000000L;
+    	t.sec=transitionData/1000;
+    	t.nSec=(transitionData%1000)*1000000L;
     	timer->pTime.sec = 0;
     	timer->pTime.nSec = 0;
     	timer->portIdx=((etReplSubPort*)ifitem)->index;
@@ -116,12 +116,12 @@ static void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttime
     	putTcbToUsedList(timer);
     	}
 }
-static void action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(ATimingService* self, const InterfaceItemBase* ifitem, uint32 time) {
+static void action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(ATimingService* self, const InterfaceItemBase* ifitem, uint32 transitionData) {
     etTimerControlBlock* timer = getTcb();
     etTime t;
     if (timer!= 0){
-    	t.sec=time/1000;
-    	t.nSec=(time%1000)*1000000L;
+    	t.sec=transitionData/1000;
+    	t.nSec=(transitionData%1000)*1000000L;
     	timer->pTime = t;
     	timer->portIdx=((etReplSubPort*)ifitem)->index;
     	getTimeFromTarget(&(timer->expTime));
@@ -170,14 +170,14 @@ static etInt16 executeTransitionChain(ATimingService* self, int chain__et, const
 		}
 		case CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1:
 		{
-			uint32 time = *((uint32*) generic_data__et);
-			action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(self, ifitem, time);
+			uint32 transitionData = *((uint32*) generic_data__et);
+			action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(self, ifitem, transitionData);
 			return STATE_Operational;
 		}
 		case CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3:
 		{
-			uint32 time = *((uint32*) generic_data__et);
-			action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(self, ifitem, time);
+			uint32 transitionData = *((uint32*) generic_data__et);
+			action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(self, ifitem, transitionData);
 			return STATE_Operational;
 		}
 		case CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4:
@@ -237,37 +237,37 @@ static void ATimingService_receiveEventInternal(ATimingService* self, InterfaceI
 
 	if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 		switch (getState(self)) {
-		    case STATE_Operational:
-		        switch(trigger__et) {
-		            case POLLING:
-		                do_Operational(self);
-		                break;
-		            case TRIG_timer__startTimeout:
-		                {
-		                    chain__et = CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1;
-		                    catching_state__et = STATE_TOP;
-		                }
-		            break;
-		            case TRIG_timer__startTimer:
-		                {
-		                    chain__et = CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3;
-		                    catching_state__et = STATE_TOP;
-		                }
-		            break;
-		            case TRIG_timer__kill:
-		                {
-		                    chain__et = CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
-		                    catching_state__et = STATE_TOP;
-		                }
-		            break;
-		            default:
-		                /* should not occur */
-		                break;
-		        }
-		        break;
-		    default:
-		        /* should not occur */
-		        break;
+			case STATE_Operational:
+				switch(trigger__et) {
+					case POLLING:
+						do_Operational(self);
+						break;
+					case TRIG_timer__kill:
+						{
+							chain__et = CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					case TRIG_timer__startTimeout:
+						{
+							chain__et = CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					case TRIG_timer__startTimer:
+						{
+							chain__et = CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			default:
+				/* should not occur */
+				break;
 		}
 	}
 	if (chain__et != NOT_CAUGHT) {
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h
index 36e86ddc9..6a4b62231 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h
@@ -11,6 +11,7 @@
 #include "etDatatypes.h"
 #include "messaging/etMessage.h"
 
+/* include all referenced room classes */
 #include "room/basic/service/timing/PTimer.h"
 
 /*--------------------- begin user code ---------------------*/
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h
index 585239128..faeea093e 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h
@@ -16,6 +16,7 @@
 #define ET_TIMER_PERIODIC	0x02
 /*--------------------- end user code ---------------------*/
 
+/* include all referenced room classes */
 
 
 /* message IDs */
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/src-gen/readme.txt b/runtime/org.eclipse.etrice.modellib.cpp/src-gen/readme.txt
new file mode 100644
index 000000000..1dc2b35ab
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib.cpp/src-gen/readme.txt
@@ -0,0 +1,4 @@
+This directory is an eTrice code generation target.
+It will be erased every time the generator is executed.
+
+DO NOT PLACE OTHER FILES HERE!
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.cpp b/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.cpp
index 8639764df..db590f23b 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.cpp
+++ b/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.cpp
@@ -212,12 +212,12 @@ void ATimingService::action_TRANS_INITIAL_TO__Operational() {
     	tcbs[i].next = &tcbs[i + 1];
     }
 }
-void ATimingService::action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(const InterfaceItemBase* ifitem, uint32 time) {
+void ATimingService::action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(const InterfaceItemBase* ifitem, uint32 transitionData) {
     etTimerControlBlock* timer = getTcb();
     etTime t;
     if (timer != 0) {
-    	t.sec = time / 1000;
-    	t.nSec = (time % 1000) * 1000000L;
+    	t.sec = transitionData / 1000;
+    	t.nSec = (transitionData % 1000) * 1000000L;
     	timer->pTime.sec = 0;
     	timer->pTime.nSec = 0;
     	timer->portIdx = ifitem->getIdx();
@@ -226,12 +226,12 @@ void ATimingService::action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTi
     	putTcbToUsedList(timer);
     }
 }
-void ATimingService::action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(const InterfaceItemBase* ifitem, uint32 time) {
+void ATimingService::action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(const InterfaceItemBase* ifitem, uint32 transitionData) {
     etTimerControlBlock* timer = getTcb();
     etTime t;
     if (timer != 0) {
-    	t.sec = time / 1000;
-    	t.nSec = (time % 1000) * 1000000L;
+    	t.sec = transitionData / 1000;
+    	t.nSec = (transitionData % 1000) * 1000000L;
     	timer->pTime = t;
     	timer->portIdx = ifitem->getIdx();
     	getTimeFromTarget(&(timer->expTime));
@@ -280,14 +280,14 @@ etInt16 ATimingService::executeTransitionChain(int chain__et, const InterfaceIte
 		}
 		case ATimingService::CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1:
 		{
-			uint32 time = *(static_cast<uint32*>(generic_data__et));
-			action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(ifitem, time);
+			uint32 transitionData = *(static_cast<uint32*>(generic_data__et));
+			action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(ifitem, transitionData);
 			return STATE_Operational;
 		}
 		case ATimingService::CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3:
 		{
-			uint32 time = *(static_cast<uint32*>(generic_data__et));
-			action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(ifitem, time);
+			uint32 transitionData = *(static_cast<uint32*>(generic_data__et));
+			action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(ifitem, transitionData);
 			return STATE_Operational;
 		}
 		case ATimingService::CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4:
@@ -346,37 +346,37 @@ void ATimingService::receiveEventInternal(InterfaceItemBase* ifitem, int localId
 
 	if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 		switch (getState()) {
-		    case STATE_Operational:
-		        switch(trigger__et) {
-		            case POLLING:
-		                do_Operational();
-		                break;
-		            case TRIG_timer__startTimeout:
-		                {
-		                    chain__et = ATimingService::CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1;
-		                    catching_state__et = STATE_TOP;
-		                }
-		            break;
-		            case TRIG_timer__startTimer:
-		                {
-		                    chain__et = ATimingService::CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3;
-		                    catching_state__et = STATE_TOP;
-		                }
-		            break;
-		            case TRIG_timer__kill:
-		                {
-		                    chain__et = ATimingService::CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
-		                    catching_state__et = STATE_TOP;
-		                }
-		            break;
-		            default:
-		                /* should not occur */
-		                break;
-		        }
-		        break;
-		    default:
-		        /* should not occur */
-		        break;
+			case STATE_Operational:
+				switch(trigger__et) {
+					case POLLING:
+						do_Operational();
+						break;
+					case TRIG_timer__kill:
+						{
+							chain__et = ATimingService::CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					case TRIG_timer__startTimeout:
+						{
+							chain__et = ATimingService::CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					case TRIG_timer__startTimer:
+						{
+							chain__et = ATimingService::CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3;
+							catching_state__et = STATE_TOP;
+						}
+					break;
+					default:
+						/* should not occur */
+						break;
+				}
+				break;
+			default:
+				/* should not occur */
+				break;
 		}
 	}
 	if (chain__et != NOT_CAUGHT) {
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.h b/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.h
index d351dd0aa..8b75c3ea4 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.h
+++ b/runtime/org.eclipse.etrice.modellib.cpp/src-gen/room/basic/service/timing/ATimingService.h
@@ -119,8 +119,8 @@ class ATimingService : public etRuntime::ActorClassBase {
 		
 		/* Action Codes */
 		virtual void action_TRANS_INITIAL_TO__Operational();
-		virtual void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(const InterfaceItemBase* ifitem, uint32 time);
-		virtual void action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(const InterfaceItemBase* ifitem, uint32 time);
+		virtual void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_startTimeouttimer_tr1(const InterfaceItemBase* ifitem, uint32 transitionData);
+		virtual void action_TRANS_tr3_FROM_Operational_TO_Operational_BY_startTimertimer_tr3(const InterfaceItemBase* ifitem, uint32 transitionData);
 		virtual void action_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4(const InterfaceItemBase* ifitem);
 		
 		/* State Switch Methods */
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room b/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room
index 51a868f60..ec36490f3 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room
+++ b/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room
@@ -35,7 +35,7 @@ RoomModel room.basic.service.logging {
 					action {
 						"Date d=new Date(tStart);"
 						"try{"
-						"file=new FileOutputStream(fileName);"
+						"file=new FileOutputStream(transitionData);"
 						"p=new PrintStream(file);"
 						"p.println(\"Log opened at \"+ d.toString());"
 						"p.println(\"--------------------------------------------------\");"
@@ -59,11 +59,11 @@ RoomModel room.basic.service.logging {
 						<internalLog: log>
 					}
 					action {
-						"p.println(\"Timestamp: \" + Long.toString(data.timeStamp-tStart) + \"ms\");"
-						"p.println(\"SenderInstance: \"+ data.sender);"
-						"p.println(\"UserString: \" + data.userString);"
+						"p.println(\"Timestamp: \" + Long.toString(transitionData.timeStamp-tStart) + \"ms\");"
+						"p.println(\"SenderInstance: \"+ transitionData.sender);"
+						"p.println(\"UserString: \" + transitionData.userString);"
 						"p.println(\"--------------------------------------------------\");"
-						"System.out.printf(data.userString);"
+						"System.out.printf(transitionData.userString);"
 					}
 				}
 				State closed
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/readme.txt b/runtime/org.eclipse.etrice.modellib.java/src-gen/readme.txt
new file mode 100644
index 000000000..1dc2b35ab
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/readme.txt
@@ -0,0 +1,4 @@
+This directory is an eTrice code generation target.
+It will be erased every time the generator is executed.
+
+DO NOT PLACE OTHER FILES HERE!
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java
index 427ed97bb..0690a7f6e 100644
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java
+++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java
@@ -124,10 +124,10 @@ public class ALogService extends ActorClassBase {
 	/* Entry and Exit Codes */
 	
 	/* Action Codes */
-	protected void action_TRANS_open_FROM_closed_TO_opened_BY_openlog(InterfaceItemBase ifitem, String fileName) {
+	protected void action_TRANS_open_FROM_closed_TO_opened_BY_openlog(InterfaceItemBase ifitem, String transitionData) {
 	    Date d=new Date(tStart);
 	    try{
-	    file=new FileOutputStream(fileName);
+	    file=new FileOutputStream(transitionData);
 	    p=new PrintStream(file);
 	    p.println("Log opened at "+ d.toString());
 	    p.println("--------------------------------------------------");
@@ -140,12 +140,12 @@ public class ALogService extends ActorClassBase {
 	    p.close();
 	    p=null;
 	}
-	protected void action_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1(InterfaceItemBase ifitem, InternalLogData data) {
-	    p.println("Timestamp: " + Long.toString(data.timeStamp-tStart) + "ms");
-	    p.println("SenderInstance: "+ data.sender);
-	    p.println("UserString: " + data.userString);
+	protected void action_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1(InterfaceItemBase ifitem, InternalLogData transitionData) {
+	    p.println("Timestamp: " + Long.toString(transitionData.timeStamp-tStart) + "ms");
+	    p.println("SenderInstance: "+ transitionData.sender);
+	    p.println("UserString: " + transitionData.userString);
 	    p.println("--------------------------------------------------");
-	    System.out.printf(data.userString);
+	    System.out.printf(transitionData.userString);
 	}
 	
 	/* State Switch Methods */
@@ -188,8 +188,8 @@ public class ALogService extends ActorClassBase {
 			}
 			case ALogService.CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog:
 			{
-				String fileName = (String) generic_data__et;
-				action_TRANS_open_FROM_closed_TO_opened_BY_openlog(ifitem, fileName);
+				String transitionData = (String) generic_data__et;
+				action_TRANS_open_FROM_closed_TO_opened_BY_openlog(ifitem, transitionData);
 				return STATE_opened;
 			}
 			case ALogService.CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog:
@@ -199,8 +199,8 @@ public class ALogService extends ActorClassBase {
 			}
 			case ALogService.CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1:
 			{
-				InternalLogData data = (InternalLogData) generic_data__et;
-				action_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1(ifitem, data);
+				InternalLogData transitionData = (InternalLogData) generic_data__et;
+				action_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1(ifitem, transitionData);
 				return STATE_opened;
 			}
 				default:
@@ -253,41 +253,41 @@ public class ALogService extends ActorClassBase {
 	
 		if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 			switch (getState()) {
-			    case STATE_closed:
-			        switch(trigger__et) {
-			                case TRIG_log__open:
-			                    {
-			                        chain__et = ALogService.CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                default:
-			                    /* should not occur */
-			                    break;
-			        }
-			        break;
-			    case STATE_opened:
-			        switch(trigger__et) {
-			                case TRIG_log__close:
-			                    {
-			                        chain__et = ALogService.CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                case TRIG_log__internalLog:
-			                    {
-			                        chain__et = ALogService.CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                default:
-			                    /* should not occur */
-			                    break;
-			        }
-			        break;
-			    default:
-			        /* should not occur */
-			        break;
+				case STATE_closed:
+					switch(trigger__et) {
+						case TRIG_log__open:
+							{
+								chain__et = ALogService.CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						default:
+							/* should not occur */
+							break;
+					}
+					break;
+				case STATE_opened:
+					switch(trigger__et) {
+						case TRIG_log__close:
+							{
+								chain__et = ALogService.CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						case TRIG_log__internalLog:
+							{
+								chain__et = ALogService.CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						default:
+							/* should not occur */
+							break;
+					}
+					break;
+				default:
+					/* should not occur */
+					break;
 			}
 		}
 		if (chain__et != NOT_CAUGHT) {
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java
index 212e2e702..554c8eabf 100644
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java
+++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java
@@ -170,10 +170,10 @@ public class ATcpClient extends ActorClassBase {
 	protected void action_TRANS_INITIAL_TO__closed() {
 	    System.out.println("Client Init !");
 	}
-	protected void action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(InterfaceItemBase ifitem, DTcpControl data) {
+	protected void action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(InterfaceItemBase ifitem, DTcpControl transitionData) {
 	    lastError=0;
 	    try{
-	    socket = new Socket(data.IPAddr,data.TcpPort);
+	    socket = new Socket(transitionData.IPAddr,transitionData.TcpPort);
 	    (new ClientRxThread(PayloadPort, socket)).start();
 	    out = socket.getOutputStream();
 	    }catch(IOException e){
@@ -190,10 +190,10 @@ public class ATcpClient extends ActorClassBase {
 	    System.err.println(e.toString());
 	    }
 	}
-	protected void action_TRANS_tr2_FROM_cp0_TO_opened(InterfaceItemBase ifitem, DTcpControl data) {
+	protected void action_TRANS_tr2_FROM_cp0_TO_opened(InterfaceItemBase ifitem, DTcpControl transitionData) {
 	    ControlPort.established();
 	}
-	protected void action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(InterfaceItemBase ifitem, DTcpControl data) {
+	protected void action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(InterfaceItemBase ifitem, DTcpControl transitionData) {
 	    ControlPort.error();
 	    try{
 	    socket.close();
@@ -201,9 +201,9 @@ public class ATcpClient extends ActorClassBase {
 	    System.err.println(e.toString());
 	    }
 	}
-	protected void action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(InterfaceItemBase ifitem, DTcpPayload data) {
+	protected void action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(InterfaceItemBase ifitem, DTcpPayload transitionData) {
 	    try{
-	    	out.write(data.getData(),0,data.length);
+	    	out.write(transitionData.getData(),0,transitionData.length);
 	    	}catch(IOException e){
 	    		System.err.println(e.toString());
 	    	}
@@ -223,14 +223,14 @@ public class ATcpClient extends ActorClassBase {
 					this.history[STATE_TOP] = STATE_closed;
 					current__et = STATE_TOP;
 					break;
-				case STATE_opened:
-					this.history[STATE_TOP] = STATE_opened;
-					current__et = STATE_TOP;
-					break;
 				case STATE_error:
 					this.history[STATE_TOP] = STATE_error;
 					current__et = STATE_TOP;
 					break;
+				case STATE_opened:
+					this.history[STATE_TOP] = STATE_opened;
+					current__et = STATE_TOP;
+					break;
 				default:
 					/* should not occur */
 					break;
@@ -254,13 +254,13 @@ public class ATcpClient extends ActorClassBase {
 			}
 			case ATcpClient.CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort:
 			{
-				DTcpControl data = (DTcpControl) generic_data__et;
-				action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(ifitem, data);
+				DTcpControl transitionData = (DTcpControl) generic_data__et;
+				action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(ifitem, transitionData);
 				if (lastError!=0) {
-				action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(ifitem, data);
+				action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(ifitem, transitionData);
 				return STATE_error;}
 				else {
-				action_TRANS_tr2_FROM_cp0_TO_opened(ifitem, data);
+				action_TRANS_tr2_FROM_cp0_TO_opened(ifitem, transitionData);
 				return STATE_opened;}
 			}
 			case ATcpClient.CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort:
@@ -270,8 +270,8 @@ public class ATcpClient extends ActorClassBase {
 			}
 			case ATcpClient.CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3:
 			{
-				DTcpPayload data = (DTcpPayload) generic_data__et;
-				action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, data);
+				DTcpPayload transitionData = (DTcpPayload) generic_data__et;
+				action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, transitionData);
 				return STATE_opened;
 			}
 				default:
@@ -295,12 +295,12 @@ public class ATcpClient extends ActorClassBase {
 				case STATE_closed:
 					/* in leaf state: return state id */
 					return STATE_closed;
-				case STATE_opened:
-					/* in leaf state: return state id */
-					return STATE_opened;
 				case STATE_error:
 					/* in leaf state: return state id */
 					return STATE_error;
+				case STATE_opened:
+					/* in leaf state: return state id */
+					return STATE_opened;
 				case STATE_TOP:
 					state__et = this.history[STATE_TOP];
 					break;
@@ -327,43 +327,43 @@ public class ATcpClient extends ActorClassBase {
 	
 		if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 			switch (getState()) {
-			    case STATE_closed:
-			        switch(trigger__et) {
-			                case TRIG_ControlPort__open:
-			                    {
-			                        chain__et = ATcpClient.CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                default:
-			                    /* should not occur */
-			                    break;
-			        }
-			        break;
-			    case STATE_opened:
-			        switch(trigger__et) {
-			                case TRIG_ControlPort__close:
-			                    {
-			                        chain__et = ATcpClient.CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                case TRIG_PayloadPort__send:
-			                    {
-			                        chain__et = ATcpClient.CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                default:
-			                    /* should not occur */
-			                    break;
-			        }
-			        break;
-			    case STATE_error:
-			        break;
-			    default:
-			        /* should not occur */
-			        break;
+				case STATE_closed:
+					switch(trigger__et) {
+						case TRIG_ControlPort__open:
+							{
+								chain__et = ATcpClient.CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						default:
+							/* should not occur */
+							break;
+					}
+					break;
+				case STATE_error:
+					break;
+				case STATE_opened:
+					switch(trigger__et) {
+						case TRIG_ControlPort__close:
+							{
+								chain__et = ATcpClient.CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						case TRIG_PayloadPort__send:
+							{
+								chain__et = ATcpClient.CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						default:
+							/* should not occur */
+							break;
+					}
+					break;
+				default:
+					/* should not occur */
+					break;
 			}
 		}
 		if (chain__et != NOT_CAUGHT) {
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java
index a5f807a7b..abaae95bb 100644
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java
+++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java
@@ -210,10 +210,10 @@ public class ATcpServer extends ActorClassBase {
 	/* Entry and Exit Codes */
 	
 	/* Action Codes */
-	protected void action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(InterfaceItemBase ifitem, DTcpControl data) {
+	protected void action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(InterfaceItemBase ifitem, DTcpControl transitionData) {
 	    lastError=0;
 	    try{
-	    socket = new ServerSocket(data.TcpPort);
+	    socket = new ServerSocket(transitionData.TcpPort);
 	    (new ServerAcceptThread(PayloadPort, socket, this)).start();
 	    }catch(IOException e){
 	    System.err.println(e.toString());
@@ -229,10 +229,10 @@ public class ATcpServer extends ActorClassBase {
 	    	System.err.println(e.toString());
 	    }
 	}
-	protected void action_TRANS_tr2_FROM_cp0_TO_opened(InterfaceItemBase ifitem, DTcpControl data) {
+	protected void action_TRANS_tr2_FROM_cp0_TO_opened(InterfaceItemBase ifitem, DTcpControl transitionData) {
 	    ControlPort.established();
 	}
-	protected void action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(InterfaceItemBase ifitem, DTcpControl data) {
+	protected void action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(InterfaceItemBase ifitem, DTcpControl transitionData) {
 	    ControlPort.error();
 	    try{
 	    socket.close();
@@ -240,9 +240,9 @@ public class ATcpServer extends ActorClassBase {
 	    System.err.println(e.toString());
 	    }
 	}
-	protected void action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(InterfaceItemBase ifitem, DTcpPayload data) {
+	protected void action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(InterfaceItemBase ifitem, DTcpPayload transitionData) {
 	    try{
-	    outStreams.get(data.getConnectionId()).write(data.getData(),0,data.length);
+	    outStreams.get(transitionData.getConnectionId()).write(transitionData.getData(),0,transitionData.length);
 	    }catch(IOException e){
 	    System.err.println(e.toString());
 	    }
@@ -262,14 +262,14 @@ public class ATcpServer extends ActorClassBase {
 					this.history[STATE_TOP] = STATE_closed;
 					current__et = STATE_TOP;
 					break;
-				case STATE_opened:
-					this.history[STATE_TOP] = STATE_opened;
-					current__et = STATE_TOP;
-					break;
 				case STATE_error:
 					this.history[STATE_TOP] = STATE_error;
 					current__et = STATE_TOP;
 					break;
+				case STATE_opened:
+					this.history[STATE_TOP] = STATE_opened;
+					current__et = STATE_TOP;
+					break;
 				default:
 					/* should not occur */
 					break;
@@ -292,13 +292,13 @@ public class ATcpServer extends ActorClassBase {
 			}
 			case ATcpServer.CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort:
 			{
-				DTcpControl data = (DTcpControl) generic_data__et;
-				action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(ifitem, data);
+				DTcpControl transitionData = (DTcpControl) generic_data__et;
+				action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(ifitem, transitionData);
 				if (lastError!=0) {
-				action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(ifitem, data);
+				action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(ifitem, transitionData);
 				return STATE_error;}
 				else {
-				action_TRANS_tr2_FROM_cp0_TO_opened(ifitem, data);
+				action_TRANS_tr2_FROM_cp0_TO_opened(ifitem, transitionData);
 				return STATE_opened;}
 			}
 			case ATcpServer.CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort:
@@ -308,8 +308,8 @@ public class ATcpServer extends ActorClassBase {
 			}
 			case ATcpServer.CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3:
 			{
-				DTcpPayload data = (DTcpPayload) generic_data__et;
-				action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, data);
+				DTcpPayload transitionData = (DTcpPayload) generic_data__et;
+				action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, transitionData);
 				return STATE_opened;
 			}
 				default:
@@ -333,12 +333,12 @@ public class ATcpServer extends ActorClassBase {
 				case STATE_closed:
 					/* in leaf state: return state id */
 					return STATE_closed;
-				case STATE_opened:
-					/* in leaf state: return state id */
-					return STATE_opened;
 				case STATE_error:
 					/* in leaf state: return state id */
 					return STATE_error;
+				case STATE_opened:
+					/* in leaf state: return state id */
+					return STATE_opened;
 				case STATE_TOP:
 					state__et = this.history[STATE_TOP];
 					break;
@@ -365,43 +365,43 @@ public class ATcpServer extends ActorClassBase {
 	
 		if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 			switch (getState()) {
-			    case STATE_closed:
-			        switch(trigger__et) {
-			                case TRIG_ControlPort__open:
-			                    {
-			                        chain__et = ATcpServer.CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                default:
-			                    /* should not occur */
-			                    break;
-			        }
-			        break;
-			    case STATE_opened:
-			        switch(trigger__et) {
-			                case TRIG_ControlPort__close:
-			                    {
-			                        chain__et = ATcpServer.CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                case TRIG_PayloadPort__send:
-			                    {
-			                        chain__et = ATcpServer.CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                default:
-			                    /* should not occur */
-			                    break;
-			        }
-			        break;
-			    case STATE_error:
-			        break;
-			    default:
-			        /* should not occur */
-			        break;
+				case STATE_closed:
+					switch(trigger__et) {
+						case TRIG_ControlPort__open:
+							{
+								chain__et = ATcpServer.CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						default:
+							/* should not occur */
+							break;
+					}
+					break;
+				case STATE_error:
+					break;
+				case STATE_opened:
+					switch(trigger__et) {
+						case TRIG_ControlPort__close:
+							{
+								chain__et = ATcpServer.CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						case TRIG_PayloadPort__send:
+							{
+								chain__et = ATcpServer.CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						default:
+							/* should not occur */
+							break;
+					}
+					break;
+				default:
+					/* should not occur */
+					break;
 			}
 		}
 		if (chain__et != NOT_CAUGHT) {
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java
index 89ca94411..879caea9c 100644
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java
+++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java
@@ -122,18 +122,18 @@ public class ATimingService extends ActorClassBase {
 	protected void action_TRANS_INITIAL_TO__Operational() {
 	    timerService = new Timer();
 	}
-	protected void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1(InterfaceItemBase ifitem, TimerData td) {
+	protected void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1(InterfaceItemBase ifitem, TimerData transitionData) {
 	    // start timer
 	    taskCount++;
 	    if (taskCount>PURGE_LIMIT) timerService.purge();
-	    int t = td.getTime();
+	    int t = transitionData.getTime();
 	    timerService.scheduleAtFixedRate(((PTimerPort)ifitem).getTask(),t,t);
 	}
-	protected void action_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3(InterfaceItemBase ifitem, TimerData td) {
+	protected void action_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3(InterfaceItemBase ifitem, TimerData transitionData) {
 	    // start timeout
 	    taskCount++;
 	    if (taskCount>PURGE_LIMIT) timerService.purge();
-	    timerService.schedule(((PTimerPort)ifitem).getTask(), ((TimerData)td).getTime());
+	    timerService.schedule(((PTimerPort)ifitem).getTask(), transitionData.getTime());
 	}
 	protected void action_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4(InterfaceItemBase ifitem) {
 	    // nothing to do to kill timer (handled by timer)
@@ -176,14 +176,14 @@ public class ATimingService extends ActorClassBase {
 			}
 			case ATimingService.CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1:
 			{
-				TimerData td = (TimerData) generic_data__et;
-				action_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1(ifitem, td);
+				TimerData transitionData = (TimerData) generic_data__et;
+				action_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1(ifitem, transitionData);
 				return STATE_Operational;
 			}
 			case ATimingService.CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3:
 			{
-				TimerData td = (TimerData) generic_data__et;
-				action_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3(ifitem, td);
+				TimerData transitionData = (TimerData) generic_data__et;
+				action_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3(ifitem, transitionData);
 				return STATE_Operational;
 			}
 			case ATimingService.CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4:
@@ -242,34 +242,34 @@ public class ATimingService extends ActorClassBase {
 	
 		if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
 			switch (getState()) {
-			    case STATE_Operational:
-			        switch(trigger__et) {
-			                case TRIG_timer__internalStartTimer:
-			                    {
-			                        chain__et = ATimingService.CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                case TRIG_timer__internalStartTimeout:
-			                    {
-			                        chain__et = ATimingService.CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                case TRIG_timer__kill:
-			                    {
-			                        chain__et = ATimingService.CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
-			                        catching_state__et = STATE_TOP;
-			                    }
-			                break;
-			                default:
-			                    /* should not occur */
-			                    break;
-			        }
-			        break;
-			    default:
-			        /* should not occur */
-			        break;
+				case STATE_Operational:
+					switch(trigger__et) {
+						case TRIG_timer__internalStartTimeout:
+							{
+								chain__et = ATimingService.CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						case TRIG_timer__internalStartTimer:
+							{
+								chain__et = ATimingService.CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						case TRIG_timer__kill:
+							{
+								chain__et = ATimingService.CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
+								catching_state__et = STATE_TOP;
+							}
+						break;
+						default:
+							/* should not occur */
+							break;
+					}
+					break;
+				default:
+					/* should not occur */
+					break;
 			}
 		}
 		if (chain__et != NOT_CAUGHT) {