[integration.tests, modellib, ui.runtime] updated

5 files changed, 28 insertions, 28 deletions

diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.zip
index 2fe2588b2..27486c7b6 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index 01ccf73d5..e65972340 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
index 323fc096f..66e1f88b6 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
@@ -69,11 +69,11 @@ public class CPUser extends ActorClassBase {
 

 	

 	/* state IDs */

-	public static final int STATE_state0 = 2;

-	public static final int STATE_state1_state0 = 3;

-	public static final int STATE_testOk = 4;

-	public static final int STATE_testFalse = 5;

-	public static final int STATE_state1 = 6;

+	public static final int STATE_state1 = 2;

+	public static final int STATE_state0 = 3;

+	public static final int STATE_state1_state0 = 4;

+	public static final int STATE_testOk = 5;

+	public static final int STATE_testFalse = 6;

 	

 	/* transition chains */

 	public static final int CHAIN_TRANS_INITIAL_TO__cp0 = 1;

@@ -87,11 +87,11 @@ public class CPUser extends ActorClassBase {
 	public static final int TRIG_TestPort1__msg1 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg1;

 	

 	// state names

-	protected static final String stateStrings[] = {"<no state>","<top>","state0",

+	protected static final String stateStrings[] = {"<no state>","<top>","state1",

+	"state0",

 	"state1_state0",

 	"testOk",

-	"testFalse",

-	"state1"

+	"testFalse"

 	};

 	

 	// history

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
index 5b14d8686..5d8424300 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
@@ -69,13 +69,13 @@ public class HandlerUser extends ActorClassBase {
 

 	

 	/* state IDs */

-	public static final int STATE_state0_state1_state7 = 2;

-	public static final int STATE_state0_state2 = 3;

-	public static final int STATE_testOk = 4;

-	public static final int STATE_testFalse = 5;

-	public static final int STATE_state1 = 6;

-	public static final int STATE_state0 = 7;

-	public static final int STATE_state0_state1 = 8;

+	public static final int STATE_state0 = 2;

+	public static final int STATE_state0_state1 = 3;

+	public static final int STATE_state0_state1_state7 = 4;

+	public static final int STATE_state0_state2 = 5;

+	public static final int STATE_testOk = 6;

+	public static final int STATE_testFalse = 7;

+	public static final int STATE_state1 = 8;

 	

 	/* transition chains */

 	public static final int CHAIN_TRANS_INITIAL_TO__state0_tp2 = 1;

@@ -106,13 +106,13 @@ public class HandlerUser extends ActorClassBase {
 	public static final int TRIG_TestPort1__msg6 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg6;

 	

 	// state names

-	protected static final String stateStrings[] = {"<no state>","<top>","state0_state1_state7",

+	protected static final String stateStrings[] = {"<no state>","<top>","state0",

+	"state0_state1",

+	"state0_state1_state7",

 	"state0_state2",

 	"testOk",

 	"testFalse",

-	"state1",

-	"state0",

-	"state0_state1"

+	"state1"

 	};

 	

 	// history

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
index 3e07bfa36..133f70e25 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
@@ -60,12 +60,12 @@ public class a_HFSM extends ActorClassBase {
 

 	

 	/* state IDs */

-	public static final int STATE_State1 = 2;

-	public static final int STATE_State2_State1 = 3;

-	public static final int STATE_State2_State2 = 4;

-	public static final int STATE_State3 = 5;

-	public static final int STATE_State4 = 6;

-	public static final int STATE_State2 = 7;

+	public static final int STATE_State2 = 2;

+	public static final int STATE_State1 = 3;

+	public static final int STATE_State2_State1 = 4;

+	public static final int STATE_State2_State2 = 5;

+	public static final int STATE_State3 = 6;

+	public static final int STATE_State4 = 7;

 	

 	/* transition chains */

 	public static final int CHAIN_State2_TRANS_State1_TO_State2_BY_m2fct = 1;

@@ -93,12 +93,12 @@ public class a_HFSM extends ActorClassBase {
 	public static final int TRIG_fct__reset = IFITEM_fct + EVT_SHIFT*p_HFSM.IN_reset;

 	

 	// state names

-	protected static final String stateStrings[] = {"<no state>","<top>","State1",

+	protected static final String stateStrings[] = {"<no state>","<top>","State2",

+	"State1",

 	"State2_State1",

 	"State2_State2",

 	"State3",

-	"State4",

-	"State2"

+	"State4"

 	};

 	

 	// history