ソースを参照

Migrated TestModels to Meta Model changes

Andreas Mülder 13 年 前
コミット
3bbe7ba2c9

+ 12 - 12
TestScenarios/TestModels/InterfaceTest.sct

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0" xmlns:stext="http://www.yakindu.org/sct/statechart/SText">
-  <sgraph:Statechart xmi:id="_p-KfMAn1EeGuZq6TN7cDtg" name="InterfaceTest" expression="interface:&#xA;&#xA;in event event1&#xA;out event event2 : integer&#xA;&#xA;var var1 : boolean&#xA;var var2 : real = 2.3&#xA;var var3 : integer = 1&#xA;&#xA;interface other:&#xA;&#xA;in event event3&#xA;out event event4&#xA;&#xA;var v1 : integer = 5&#xA;&#xA;interface third:&#xA;&#xA;in event event5&#xA;out event event6 : boolean&#xA;&#xA;var v1 : real&#xA;">
+  <sgraph:Statechart xmi:id="_p-KfMAn1EeGuZq6TN7cDtg" name="InterfaceTest" specification="interface:&#xA;&#xA;in event event1&#xA;out event event2 : integer&#xA;&#xA;var var1 : boolean&#xA;var var2 : real = 2.3&#xA;var var3 : integer = 1&#xA;&#xA;interface other:&#xA;&#xA;in event event3&#xA;out event event4&#xA;&#xA;var v1 : integer = 5&#xA;&#xA;interface third:&#xA;&#xA;in event event5&#xA;out event event6 : boolean&#xA;&#xA;var v1 : real&#xA;">
     <scopes xsi:type="stext:InterfaceScope" xmi:id="_HjOEUCG3EeGI0q-nGwuxGQ">
       <declarations xsi:type="stext:EventDefinition" xmi:id="_HjOEUSG3EeGI0q-nGwuxGQ" name="event1" direction="in"/>
       <declarations xsi:type="stext:EventDefinition" xmi:id="_HjOEUiG3EeGI0q-nGwuxGQ" name="event2" direction="out" type="integer"/>
@@ -32,11 +32,11 @@
     </scopes>
     <regions xmi:id="_p-LtUgn1EeGuZq6TN7cDtg" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_p-RM4Qn1EeGuZq6TN7cDtg">
-        <outgoingTransitions xmi:id="_p-TpIwn1EeGuZq6TN7cDtg" expression="" target="_p-Rz9wn1EeGuZq6TN7cDtg"/>
+        <outgoingTransitions xmi:id="_p-TpIwn1EeGuZq6TN7cDtg" specification="" target="_p-Rz9wn1EeGuZq6TN7cDtg"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_p-Rz9wn1EeGuZq6TN7cDtg" expression="" name="state1" incomingTransitions="_p-TpIwn1EeGuZq6TN7cDtg _IduY8An2EeGuZq6TN7cDtg _aUmT4An2EeGuZq6TN7cDtg _ezdE0An2EeGuZq6TN7cDtg">
+      <vertices xsi:type="sgraph:State" xmi:id="_p-Rz9wn1EeGuZq6TN7cDtg" specification="" name="state1" incomingTransitions="_p-TpIwn1EeGuZq6TN7cDtg _IduY8An2EeGuZq6TN7cDtg _aUmT4An2EeGuZq6TN7cDtg _ezdE0An2EeGuZq6TN7cDtg">
         <scopes xmi:id="_HjPScCG3EeGI0q-nGwuxGQ"/>
-        <outgoingTransitions xmi:id="_Fp0t8An2EeGuZq6TN7cDtg" expression="event1[var2 > 0]" target="_DQwk0An2EeGuZq6TN7cDtg">
+        <outgoingTransitions xmi:id="_Fp0t8An2EeGuZq6TN7cDtg" specification="event1[var2 > 0]" target="_DQwk0An2EeGuZq6TN7cDtg">
           <trigger xsi:type="stext:ReactionTrigger" xmi:id="_HjPScSG3EeGI0q-nGwuxGQ">
             <triggers xsi:type="stext:RegularEventSpec" xmi:id="_HjPSciG3EeGI0q-nGwuxGQ" event="_HjOEUSG3EeGI0q-nGwuxGQ"/>
             <guardExpression xsi:type="stext:LogicalRelationExpression" xmi:id="_HjPScyG3EeGI0q-nGwuxGQ" operator=">">
@@ -47,7 +47,7 @@
             </guardExpression>
           </trigger>
         </outgoingTransitions>
-        <outgoingTransitions xmi:id="_Wx7eYAn2EeGuZq6TN7cDtg" expression="other.event3[var3 == 1]" target="_N8IiYAn2EeGuZq6TN7cDtg">
+        <outgoingTransitions xmi:id="_Wx7eYAn2EeGuZq6TN7cDtg" specification="other.event3[var3 == 1]" target="_N8IiYAn2EeGuZq6TN7cDtg">
           <trigger xsi:type="stext:ReactionTrigger" xmi:id="_HjUyACG3EeGI0q-nGwuxGQ">
             <triggers xsi:type="stext:RegularEventSpec" xmi:id="_HjUyASG3EeGI0q-nGwuxGQ" event="_HjOEWyG3EeGI0q-nGwuxGQ"/>
             <guardExpression xsi:type="stext:LogicalRelationExpression" xmi:id="_HjUyAiG3EeGI0q-nGwuxGQ" operator="==">
@@ -58,7 +58,7 @@
             </guardExpression>
           </trigger>
         </outgoingTransitions>
-        <outgoingTransitions xmi:id="_dQp1UAn2EeGuZq6TN7cDtg" expression="third.event5[var1 == true]" target="_b6-b0An2EeGuZq6TN7cDtg">
+        <outgoingTransitions xmi:id="_dQp1UAn2EeGuZq6TN7cDtg" specification="third.event5[var1 == true]" target="_b6-b0An2EeGuZq6TN7cDtg">
           <trigger xsi:type="stext:ReactionTrigger" xmi:id="_HjZqgCG3EeGI0q-nGwuxGQ">
             <triggers xsi:type="stext:RegularEventSpec" xmi:id="_HjZqgSG3EeGI0q-nGwuxGQ" event="_HjOrYCG3EeGI0q-nGwuxGQ"/>
             <guardExpression xsi:type="stext:LogicalRelationExpression" xmi:id="_HjZqgiG3EeGI0q-nGwuxGQ" operator="==">
@@ -70,7 +70,7 @@
           </trigger>
         </outgoingTransitions>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_DQwk0An2EeGuZq6TN7cDtg" expression="entry / raise event2 : 22;" name="state2" incomingTransitions="_Fp0t8An2EeGuZq6TN7cDtg">
+      <vertices xsi:type="sgraph:State" xmi:id="_DQwk0An2EeGuZq6TN7cDtg" specification="entry / raise event2 : 22;" name="state2" incomingTransitions="_Fp0t8An2EeGuZq6TN7cDtg">
         <scopes xmi:id="_Hjd78CG3EeGI0q-nGwuxGQ">
           <declarations xsi:type="stext:LocalReaction" xmi:id="_Hjd78SG3EeGI0q-nGwuxGQ">
             <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Hjd78iG3EeGI0q-nGwuxGQ">
@@ -85,13 +85,13 @@
             </effect>
           </declarations>
         </scopes>
-        <outgoingTransitions xmi:id="_IduY8An2EeGuZq6TN7cDtg" expression="event1" target="_p-Rz9wn1EeGuZq6TN7cDtg">
+        <outgoingTransitions xmi:id="_IduY8An2EeGuZq6TN7cDtg" specification="event1" target="_p-Rz9wn1EeGuZq6TN7cDtg">
           <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Hjg_QCG3EeGI0q-nGwuxGQ">
             <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Hjg_QSG3EeGI0q-nGwuxGQ" event="_HjOEUSG3EeGI0q-nGwuxGQ"/>
           </trigger>
         </outgoingTransitions>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_N8IiYAn2EeGuZq6TN7cDtg" expression="entry / raise other.event4;" name="state3" incomingTransitions="_Wx7eYAn2EeGuZq6TN7cDtg">
+      <vertices xsi:type="sgraph:State" xmi:id="_N8IiYAn2EeGuZq6TN7cDtg" specification="entry / raise other.event4;" name="state3" incomingTransitions="_Wx7eYAn2EeGuZq6TN7cDtg">
         <scopes xmi:id="_HjkCkCG3EeGI0q-nGwuxGQ">
           <declarations xsi:type="stext:LocalReaction" xmi:id="_HjkCkSG3EeGI0q-nGwuxGQ">
             <trigger xsi:type="stext:ReactionTrigger" xmi:id="_HjkCkiG3EeGI0q-nGwuxGQ">
@@ -102,13 +102,13 @@
             </effect>
           </declarations>
         </scopes>
-        <outgoingTransitions xmi:id="_aUmT4An2EeGuZq6TN7cDtg" expression="other.event3" target="_p-Rz9wn1EeGuZq6TN7cDtg">
+        <outgoingTransitions xmi:id="_aUmT4An2EeGuZq6TN7cDtg" specification="other.event3" target="_p-Rz9wn1EeGuZq6TN7cDtg">
           <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Hjme0CG3EeGI0q-nGwuxGQ">
             <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Hjme0SG3EeGI0q-nGwuxGQ" event="_HjOEWyG3EeGI0q-nGwuxGQ"/>
           </trigger>
         </outgoingTransitions>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_b6-b0An2EeGuZq6TN7cDtg" expression="entry / raise third.event6 : true;" name="state4" incomingTransitions="_dQp1UAn2EeGuZq6TN7cDtg">
+      <vertices xsi:type="sgraph:State" xmi:id="_b6-b0An2EeGuZq6TN7cDtg" specification="entry / raise third.event6 : true;" name="state4" incomingTransitions="_dQp1UAn2EeGuZq6TN7cDtg">
         <scopes xmi:id="_Hjo7ECG3EeGI0q-nGwuxGQ">
           <declarations xsi:type="stext:LocalReaction" xmi:id="_Hjo7ESG3EeGI0q-nGwuxGQ">
             <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Hjo7EiG3EeGI0q-nGwuxGQ">
@@ -123,7 +123,7 @@
             </effect>
           </declarations>
         </scopes>
-        <outgoingTransitions xmi:id="_ezdE0An2EeGuZq6TN7cDtg" expression="third.event5" target="_p-Rz9wn1EeGuZq6TN7cDtg">
+        <outgoingTransitions xmi:id="_ezdE0An2EeGuZq6TN7cDtg" specification="third.event5" target="_p-Rz9wn1EeGuZq6TN7cDtg">
           <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Hjr-YCG3EeGI0q-nGwuxGQ">
             <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Hjr-YSG3EeGI0q-nGwuxGQ" event="_HjOrYCG3EeGI0q-nGwuxGQ"/>
           </trigger>

+ 9 - 9
TestScenarios/TestModels/Test_DeepHistory.sct

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0" xmlns:stext="http://www.yakindu.org/sct/statechart/SText">
-  <sgraph:Statechart xmi:id="_XoS0wPZlEeCSetPXFd1ZUw" name="Test_DeepHistory" expression="interface:&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;in event event7&#xA;in event event8&#xA;in event event9&#xA;&#xA;">
+  <sgraph:Statechart xmi:id="_XoS0wPZlEeCSetPXFd1ZUw" name="Test_DeepHistory" specification="interface:&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;in event event7&#xA;in event event8&#xA;in event event9&#xA;&#xA;">
     <regions xmi:id="_XoTb0vZlEeCSetPXFd1ZUw" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_Dd7OAPimEeCPG5ImOgba0Q">
         <outgoingTransitions xmi:id="_Dd71EPimEeCPG5ImOgba0Q" target="_Dd71EfimEeCPG5ImOgba0Q"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_Dd71EfimEeCPG5ImOgba0Q" name="State1" incomingTransitions="_Dd71EPimEeCPG5ImOgba0Q _Dd71GPimEeCPG5ImOgba0Q">
-        <outgoingTransitions xmi:id="_Dd71EvimEeCPG5ImOgba0Q" expression="event1" target="_Dd71F_imEeCPG5ImOgba0Q">
+        <outgoingTransitions xmi:id="_Dd71EvimEeCPG5ImOgba0Q" specification="event1" target="_Dd71F_imEeCPG5ImOgba0Q">
         </outgoingTransitions>
         <scopes xmi:id="_sQIMAAFIEeGBE7eesluF0A"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_Dd71F_imEeCPG5ImOgba0Q" name="State2" incomingTransitions="_Dd71EvimEeCPG5ImOgba0Q">
-        <outgoingTransitions xmi:id="_Dd71GPimEeCPG5ImOgba0Q" expression="event2" target="_Dd71EfimEeCPG5ImOgba0Q">
+        <outgoingTransitions xmi:id="_Dd71GPimEeCPG5ImOgba0Q" specification="event2" target="_Dd71EfimEeCPG5ImOgba0Q">
         </outgoingTransitions>
         <scopes xmi:id="_sQNEgAFIEeGBE7eesluF0A"/>
         <regions xmi:id="_Dd71HPimEeCPG5ImOgba0Q">
           <vertices xsi:type="sgraph:State" xmi:id="_Dd71H_imEeCPG5ImOgba0Q" name="State3" incomingTransitions="_QlbEMPiwEeCmAZxZWLaQmA">
-            <outgoingTransitions xmi:id="_Dd71IPimEeCPG5ImOgba0Q" expression="event3" target="_Dd71JPimEeCPG5ImOgba0Q">
+            <outgoingTransitions xmi:id="_Dd71IPimEeCPG5ImOgba0Q" specification="event3" target="_Dd71JPimEeCPG5ImOgba0Q">
             </outgoingTransitions>
             <scopes xmi:id="_sQTLIAFIEeGBE7eesluF0A"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_Dd71JPimEeCPG5ImOgba0Q" name="State4" incomingTransitions="_Dd71IPimEeCPG5ImOgba0Q">
-            <outgoingTransitions xmi:id="_Dd71JfimEeCPG5ImOgba0Q" expression="event4" target="_Dd8cPPimEeCPG5ImOgba0Q">
+            <outgoingTransitions xmi:id="_Dd71JfimEeCPG5ImOgba0Q" specification="event4" target="_Dd8cPPimEeCPG5ImOgba0Q">
             </outgoingTransitions>
             <scopes xmi:id="_sQVnYAFIEeGBE7eesluF0A"/>
             <regions xmi:id="_Dd8cIvimEeCPG5ImOgba0Q">
@@ -29,22 +29,22 @@
                 <outgoingTransitions xmi:id="_Dd8cJPimEeCPG5ImOgba0Q" target="_Dd8cJfimEeCPG5ImOgba0Q"/>
               </vertices>
               <vertices xsi:type="sgraph:State" xmi:id="_Dd8cJfimEeCPG5ImOgba0Q" name="State6" incomingTransitions="_Dd8cJPimEeCPG5ImOgba0Q _Dd8cK_imEeCPG5ImOgba0Q">
-                <outgoingTransitions xmi:id="_Dd8cJvimEeCPG5ImOgba0Q" expression="event5" target="_Dd8cKvimEeCPG5ImOgba0Q">
+                <outgoingTransitions xmi:id="_Dd8cJvimEeCPG5ImOgba0Q" specification="event5" target="_Dd8cKvimEeCPG5ImOgba0Q">
                 </outgoingTransitions>
                 <scopes xmi:id="_sQbG8AFIEeGBE7eesluF0A"/>
               </vertices>
               <vertices xsi:type="sgraph:State" xmi:id="_Dd8cKvimEeCPG5ImOgba0Q" name="State7" incomingTransitions="_Dd8cJvimEeCPG5ImOgba0Q">
-                <outgoingTransitions xmi:id="_Dd8cK_imEeCPG5ImOgba0Q" expression="event6" target="_Dd8cJfimEeCPG5ImOgba0Q">
+                <outgoingTransitions xmi:id="_Dd8cK_imEeCPG5ImOgba0Q" specification="event6" target="_Dd8cJfimEeCPG5ImOgba0Q">
                 </outgoingTransitions>
                 <scopes xmi:id="_sQexUAFIEeGBE7eesluF0A"/>
                 <regions xmi:id="_Dd8cL_imEeCPG5ImOgba0Q">
                   <vertices xsi:type="sgraph:State" xmi:id="_Dd8cMPimEeCPG5ImOgba0Q" name="State8" incomingTransitions="_Dd8cNvimEeCPG5ImOgba0Q _TyjukPiwEeCmAZxZWLaQmA">
-                    <outgoingTransitions xmi:id="_Dd8cMfimEeCPG5ImOgba0Q" expression="event7" target="_Dd8cNfimEeCPG5ImOgba0Q">
+                    <outgoingTransitions xmi:id="_Dd8cMfimEeCPG5ImOgba0Q" specification="event7" target="_Dd8cNfimEeCPG5ImOgba0Q">
                     </outgoingTransitions>
                     <scopes xmi:id="_sQh0oAFIEeGBE7eesluF0A"/>
                   </vertices>
                   <vertices xsi:type="sgraph:State" xmi:id="_Dd8cNfimEeCPG5ImOgba0Q" name="State9" incomingTransitions="_Dd8cMfimEeCPG5ImOgba0Q">
-                    <outgoingTransitions xmi:id="_Dd8cNvimEeCPG5ImOgba0Q" expression="event8" target="_Dd8cMPimEeCPG5ImOgba0Q">
+                    <outgoingTransitions xmi:id="_Dd8cNvimEeCPG5ImOgba0Q" specification="event8" target="_Dd8cMPimEeCPG5ImOgba0Q">
                     </outgoingTransitions>
                     <scopes xmi:id="_sQlfAAFIEeGBE7eesluF0A"/>
                   </vertices>

+ 5 - 5
TestScenarios/TestModels/Test_Expression.sct

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_wXk3MAuIEeGVgpgRVT1uXw" name="Test_Expression" expression="interface:&#xA;in event event1 : integer&#xA;out event event2 : real&#xA;var var1 : integer = 6&#xA;var var2 : integer = 123&#xA;var var3 : real = 19.4&#xA;var var4 : real = 43.3&#xA;var var5 : boolean = false&#xA;&#xA;interface other:&#xA;var var1 : boolean&#xA;var var2 : real&#xA;var var3 : integer&#xA;&#xA;&#xA;">
+  <sgraph:Statechart xmi:id="_wXk3MAuIEeGVgpgRVT1uXw" name="Test_Expression" specification="interface:&#xA;in event event1 : integer&#xA;out event event2 : real&#xA;var var1 : integer = 6&#xA;var var2 : integer = 123&#xA;var var3 : real = 19.4&#xA;var var4 : real = 43.3&#xA;var var5 : boolean = false&#xA;&#xA;interface other:&#xA;var var1 : boolean&#xA;var var2 : real&#xA;var var3 : integer&#xA;&#xA;&#xA;">
     <regions xmi:id="_wXmFUguIEeGVgpgRVT1uXw" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_wXpIoQuIEeGVgpgRVT1uXw">
         <outgoingTransitions xmi:id="_wXrk4wuIEeGVgpgRVT1uXw" target="_wXqWwAuIEeGVgpgRVT1uXw"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_wXqWwAuIEeGVgpgRVT1uXw" expression="entry / var3 += var2 * var3;&#xA;exit / var2 = 1;&#xA;exit / var4 = 22.3;" name="state1" incomingTransitions="_wXrk4wuIEeGVgpgRVT1uXw _foN2kAuLEeGVgpgRVT1uXw">
-        <outgoingTransitions xmi:id="_ep-FoAuLEeGVgpgRVT1uXw" expression="event1[ (other.var1 == true ) || (var5 == false) ] / other.var1 = false;" target="_dUv_IAuLEeGVgpgRVT1uXw"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_wXqWwAuIEeGVgpgRVT1uXw" specification="entry / var3 += var2 * var3;&#xA;exit / var2 = 1;&#xA;exit / var4 = 22.3;" name="state1" incomingTransitions="_wXrk4wuIEeGVgpgRVT1uXw _foN2kAuLEeGVgpgRVT1uXw">
+        <outgoingTransitions xmi:id="_ep-FoAuLEeGVgpgRVT1uXw" specification="event1[ (other.var1 == true ) || (var5 == false) ] / other.var1 = false;" target="_dUv_IAuLEeGVgpgRVT1uXw"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_dUv_IAuLEeGVgpgRVT1uXw" expression="entry / var3 /= 5;&#xA;entry / var1 += 1;&#xA;oncycle / var1 += 1;" name="state2" incomingTransitions="_ep-FoAuLEeGVgpgRVT1uXw">
-        <outgoingTransitions xmi:id="_foN2kAuLEeGVgpgRVT1uXw" expression="event1[var3 > 0] / var5 = true;" target="_wXqWwAuIEeGVgpgRVT1uXw"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_dUv_IAuLEeGVgpgRVT1uXw" specification="entry / var3 /= 5;&#xA;entry / var1 += 1;&#xA;oncycle / var1 += 1;" name="state2" incomingTransitions="_ep-FoAuLEeGVgpgRVT1uXw">
+        <outgoingTransitions xmi:id="_foN2kAuLEeGVgpgRVT1uXw" specification="event1[var3 > 0] / var5 = true;" target="_wXqWwAuIEeGVgpgRVT1uXw"/>
       </vertices>
     </regions>
   </sgraph:Statechart>

+ 28 - 28
TestScenarios/TestModels/Test_Hierarchy.sct

@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_Mv_1gPZlEeCSetPXFd1ZUw" name="Test_Hierarchy" expression="interface:&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;in event event7&#xA;in event event8&#xA;in event event9&#xA;in event event10&#xA;in event event11&#xA;in event event12&#xA;in event event13&#xA;in event event14&#xA;in event event15&#xA;in event event16&#xA;var s1 : integer = 0&#xA;var s2 : integer&#xA;">
+  <sgraph:Statechart xmi:id="_Mv_1gPZlEeCSetPXFd1ZUw" name="Test_Hierarchy" specification="interface:&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;in event event7&#xA;in event event8&#xA;in event event9&#xA;in event event10&#xA;in event event11&#xA;in event event12&#xA;in event event13&#xA;in event event14&#xA;in event event15&#xA;in event event16&#xA;var s1 : integer = 0&#xA;var s2 : integer&#xA;">
     <regions xmi:id="_MwAckvZlEeCSetPXFd1ZUw" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_MwBDpvZlEeCSetPXFd1ZUw">
         <outgoingTransitions xmi:id="_MwHxU_ZlEeCSetPXFd1ZUw" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_MwBqt_ZlEeCSetPXFd1ZUw" expression="entry / s1=1;&#xA;exit / s1-=1;" name="State1" incomingTransitions="_MwHxU_ZlEeCSetPXFd1ZUw _gDLuUPiSEeC4at_AzcYiGg _PeCEgPiTEeC4at_AzcYiGg _R5300PiTEeC4at_AzcYiGg _VBno4PiTEeC4at_AzcYiGg">
-        <outgoingTransitions xmi:id="_ys3bsPiREeC4at_AzcYiGg" expression="event1" target="_vau8kPiREeC4at_AzcYiGg"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_MwBqt_ZlEeCSetPXFd1ZUw" specification="entry / s1=1;&#xA;exit / s1-=1;" name="State1" incomingTransitions="_MwHxU_ZlEeCSetPXFd1ZUw _gDLuUPiSEeC4at_AzcYiGg _PeCEgPiTEeC4at_AzcYiGg _R5300PiTEeC4at_AzcYiGg _VBno4PiTEeC4at_AzcYiGg">
+        <outgoingTransitions xmi:id="_ys3bsPiREeC4at_AzcYiGg" specification="event1" target="_vau8kPiREeC4at_AzcYiGg"/>
         <regions xmi:id="_w_O_wPiSEeC4at_AzcYiGg" name="Region1">
-          <vertices xsi:type="sgraph:State" xmi:id="_yYbAQPiSEeC4at_AzcYiGg" expression="entry / s1+=1;&#xA;exit / s1-=1;" name="State9" incomingTransitions="_1vGoMPiSEeC4at_AzcYiGg _9XYoMPiSEeC4at_AzcYiGg _YoMG8PiTEeC4at_AzcYiGg">
-            <outgoingTransitions xmi:id="_7lpk0PiSEeC4at_AzcYiGg" expression="event9" target="_3mSzUPiSEeC4at_AzcYiGg"/>
+          <vertices xsi:type="sgraph:State" xmi:id="_yYbAQPiSEeC4at_AzcYiGg" specification="entry / s1+=1;&#xA;exit / s1-=1;" name="State9" incomingTransitions="_1vGoMPiSEeC4at_AzcYiGg _9XYoMPiSEeC4at_AzcYiGg _YoMG8PiTEeC4at_AzcYiGg">
+            <outgoingTransitions xmi:id="_7lpk0PiSEeC4at_AzcYiGg" specification="event9" target="_3mSzUPiSEeC4at_AzcYiGg"/>
           </vertices>
           <vertices xsi:type="sgraph:Entry" xmi:id="_0XCpEPiSEeC4at_AzcYiGg">
-            <outgoingTransitions xmi:id="_1vGoMPiSEeC4at_AzcYiGg" expression="" target="_yYbAQPiSEeC4at_AzcYiGg"/>
+            <outgoingTransitions xmi:id="_1vGoMPiSEeC4at_AzcYiGg" specification="" target="_yYbAQPiSEeC4at_AzcYiGg"/>
           </vertices>
-          <vertices xsi:type="sgraph:State" xmi:id="_3mSzUPiSEeC4at_AzcYiGg" expression="entry / s1+=1;&#xA;exit / s1-=1;" name="State10" incomingTransitions="_7lpk0PiSEeC4at_AzcYiGg _jHEgoPiTEeC4at_AzcYiGg _qCKqgPiTEeC4at_AzcYiGg">
-            <outgoingTransitions xmi:id="_9XYoMPiSEeC4at_AzcYiGg" expression="event10" target="_yYbAQPiSEeC4at_AzcYiGg"/>
+          <vertices xsi:type="sgraph:State" xmi:id="_3mSzUPiSEeC4at_AzcYiGg" specification="entry / s1+=1;&#xA;exit / s1-=1;" name="State10" incomingTransitions="_7lpk0PiSEeC4at_AzcYiGg _jHEgoPiTEeC4at_AzcYiGg _qCKqgPiTEeC4at_AzcYiGg">
+            <outgoingTransitions xmi:id="_9XYoMPiSEeC4at_AzcYiGg" specification="event10" target="_yYbAQPiSEeC4at_AzcYiGg"/>
           </vertices>
         </regions>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_vau8kPiREeC4at_AzcYiGg" expression="entry / s2 = 1;&#xA;exit / s2-=1;" name="State2" incomingTransitions="_ys3bsPiREeC4at_AzcYiGg">
-        <outgoingTransitions xmi:id="_gDLuUPiSEeC4at_AzcYiGg" expression="event6" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_vau8kPiREeC4at_AzcYiGg" specification="entry / s2 = 1;&#xA;exit / s2-=1;" name="State2" incomingTransitions="_ys3bsPiREeC4at_AzcYiGg">
+        <outgoingTransitions xmi:id="_gDLuUPiSEeC4at_AzcYiGg" specification="event6" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
         <regions xmi:id="_x3yN0PiREeC4at_AzcYiGg" name="Region2">
-          <vertices xsi:type="sgraph:State" xmi:id="_08_EMPiREeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;" name="State3" incomingTransitions="_3t66wPiREeC4at_AzcYiGg _kRfh0PiSEeC4at_AzcYiGg">
-            <outgoingTransitions xmi:id="_8XIhkPiREeC4at_AzcYiGg" expression="event2" target="_5TvCAPiREeC4at_AzcYiGg"/>
-            <outgoingTransitions xmi:id="_PeCEgPiTEeC4at_AzcYiGg" expression="event11" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
-            <outgoingTransitions xmi:id="_YoMG8PiTEeC4at_AzcYiGg" expression="event14" target="_yYbAQPiSEeC4at_AzcYiGg"/>
+          <vertices xsi:type="sgraph:State" xmi:id="_08_EMPiREeC4at_AzcYiGg" specification="entry / s2+=1;&#xA;exit / s2-=1;" name="State3" incomingTransitions="_3t66wPiREeC4at_AzcYiGg _kRfh0PiSEeC4at_AzcYiGg">
+            <outgoingTransitions xmi:id="_8XIhkPiREeC4at_AzcYiGg" specification="event2" target="_5TvCAPiREeC4at_AzcYiGg"/>
+            <outgoingTransitions xmi:id="_PeCEgPiTEeC4at_AzcYiGg" specification="event11" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
+            <outgoingTransitions xmi:id="_YoMG8PiTEeC4at_AzcYiGg" specification="event14" target="_yYbAQPiSEeC4at_AzcYiGg"/>
           </vertices>
           <vertices xsi:type="sgraph:Entry" xmi:id="_3CQHkPiREeC4at_AzcYiGg">
             <outgoingTransitions xmi:id="_3t66wPiREeC4at_AzcYiGg" target="_08_EMPiREeC4at_AzcYiGg"/>
           </vertices>
-          <vertices xsi:type="sgraph:State" xmi:id="_5TvCAPiREeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;" name="State4" incomingTransitions="_8XIhkPiREeC4at_AzcYiGg">
-            <outgoingTransitions xmi:id="_kRfh0PiSEeC4at_AzcYiGg" expression="event7" target="_08_EMPiREeC4at_AzcYiGg"/>
+          <vertices xsi:type="sgraph:State" xmi:id="_5TvCAPiREeC4at_AzcYiGg" specification="entry / s2+=1;&#xA;exit / s2-=1;" name="State4" incomingTransitions="_8XIhkPiREeC4at_AzcYiGg">
+            <outgoingTransitions xmi:id="_kRfh0PiSEeC4at_AzcYiGg" specification="event7" target="_08_EMPiREeC4at_AzcYiGg"/>
             <regions xmi:id="_-v5IsPiREeC4at_AzcYiGg" name="Region4">
-              <vertices xsi:type="sgraph:State" xmi:id="__P10EPiREeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;" name="State5" incomingTransitions="_GZpvYPiSEeC4at_AzcYiGg _nOwkMPiSEeC4at_AzcYiGg">
-                <outgoingTransitions xmi:id="_JU70wPiSEeC4at_AzcYiGg" expression="event3" target="_DCp-YPiSEeC4at_AzcYiGg"/>
-                <outgoingTransitions xmi:id="_R5300PiTEeC4at_AzcYiGg" expression="event12" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
-                <outgoingTransitions xmi:id="_jHEgoPiTEeC4at_AzcYiGg" expression="event15" target="_3mSzUPiSEeC4at_AzcYiGg"/>
+              <vertices xsi:type="sgraph:State" xmi:id="__P10EPiREeC4at_AzcYiGg" specification="entry / s2+=1;&#xA;exit / s2-=1;" name="State5" incomingTransitions="_GZpvYPiSEeC4at_AzcYiGg _nOwkMPiSEeC4at_AzcYiGg">
+                <outgoingTransitions xmi:id="_JU70wPiSEeC4at_AzcYiGg" specification="event3" target="_DCp-YPiSEeC4at_AzcYiGg"/>
+                <outgoingTransitions xmi:id="_R5300PiTEeC4at_AzcYiGg" specification="event12" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
+                <outgoingTransitions xmi:id="_jHEgoPiTEeC4at_AzcYiGg" specification="event15" target="_3mSzUPiSEeC4at_AzcYiGg"/>
               </vertices>
-              <vertices xsi:type="sgraph:State" xmi:id="_DCp-YPiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;" name="State6" incomingTransitions="_JU70wPiSEeC4at_AzcYiGg">
-                <outgoingTransitions xmi:id="_nOwkMPiSEeC4at_AzcYiGg" expression="event8" target="__P10EPiREeC4at_AzcYiGg"/>
+              <vertices xsi:type="sgraph:State" xmi:id="_DCp-YPiSEeC4at_AzcYiGg" specification="entry / s2+=1;&#xA;exit / s2-=1;" name="State6" incomingTransitions="_JU70wPiSEeC4at_AzcYiGg">
+                <outgoingTransitions xmi:id="_nOwkMPiSEeC4at_AzcYiGg" specification="event8" target="__P10EPiREeC4at_AzcYiGg"/>
                 <regions xmi:id="_HPB4MPiSEeC4at_AzcYiGg" name="Region6">
-                  <vertices xsi:type="sgraph:State" xmi:id="_NwkSkPiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;" name="State7" incomingTransitions="_SEyg0PiSEeC4at_AzcYiGg _VsUBIPiSEeC4at_AzcYiGg">
-                    <outgoingTransitions xmi:id="_TM8bsPiSEeC4at_AzcYiGg" expression="event4" target="_PLn7UPiSEeC4at_AzcYiGg"/>
+                  <vertices xsi:type="sgraph:State" xmi:id="_NwkSkPiSEeC4at_AzcYiGg" specification="entry / s2+=1;&#xA;exit / s2-=1;" name="State7" incomingTransitions="_SEyg0PiSEeC4at_AzcYiGg _VsUBIPiSEeC4at_AzcYiGg">
+                    <outgoingTransitions xmi:id="_TM8bsPiSEeC4at_AzcYiGg" specification="event4" target="_PLn7UPiSEeC4at_AzcYiGg"/>
                   </vertices>
-                  <vertices xsi:type="sgraph:State" xmi:id="_PLn7UPiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;" name="State8" incomingTransitions="_TM8bsPiSEeC4at_AzcYiGg">
-                    <outgoingTransitions xmi:id="_VsUBIPiSEeC4at_AzcYiGg" expression="event5" target="_NwkSkPiSEeC4at_AzcYiGg"/>
-                    <outgoingTransitions xmi:id="_VBno4PiTEeC4at_AzcYiGg" expression="event13" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
-                    <outgoingTransitions xmi:id="_qCKqgPiTEeC4at_AzcYiGg" expression="event16" target="_3mSzUPiSEeC4at_AzcYiGg"/>
+                  <vertices xsi:type="sgraph:State" xmi:id="_PLn7UPiSEeC4at_AzcYiGg" specification="entry / s2+=1;&#xA;exit / s2-=1;" name="State8" incomingTransitions="_TM8bsPiSEeC4at_AzcYiGg">
+                    <outgoingTransitions xmi:id="_VsUBIPiSEeC4at_AzcYiGg" specification="event5" target="_NwkSkPiSEeC4at_AzcYiGg"/>
+                    <outgoingTransitions xmi:id="_VBno4PiTEeC4at_AzcYiGg" specification="event13" target="_MwBqt_ZlEeCSetPXFd1ZUw"/>
+                    <outgoingTransitions xmi:id="_qCKqgPiTEeC4at_AzcYiGg" specification="event16" target="_3mSzUPiSEeC4at_AzcYiGg"/>
                   </vertices>
                   <vertices xsi:type="sgraph:Entry" xmi:id="_RSYMcPiSEeC4at_AzcYiGg">
                     <outgoingTransitions xmi:id="_SEyg0PiSEeC4at_AzcYiGg" target="_NwkSkPiSEeC4at_AzcYiGg"/>

+ 5 - 5
TestScenarios/TestModels/Test_LocalActions.sct

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_TGkp8PZNEeCz_6s_8P8IEA" name="Test_LocalActions" expression="interface:&#xA;in event Event1&#xA;in event Event2&#xA;in event Event3&#xA;in event Event4&#xA;var i : integer&#xA;var j : integer&#xA;var c : integer">
+  <sgraph:Statechart xmi:id="_TGkp8PZNEeCz_6s_8P8IEA" name="Test_LocalActions" specification="interface:&#xA;in event Event1&#xA;in event Event2&#xA;in event Event3&#xA;in event Event4&#xA;var i : integer&#xA;var j : integer&#xA;var c : integer">
     <regions xmi:id="_TGkp8_ZNEeCz_6s_8P8IEA" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_TGmfIfZNEeCz_6s_8P8IEA">
         <outgoingTransitions xmi:id="_TGoUUfZNEeCz_6s_8P8IEA" target="_TGnGNvZNEeCz_6s_8P8IEA"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_TGnGNvZNEeCz_6s_8P8IEA" expression="entry / i=1;&#xA;exit / i=0;&#xA;oncycle / i=2;&#xA;Event2 / i=3;&#xA;every 100ms / c+=1;&#xA;" name="State1" incomingTransitions="_TGoUUfZNEeCz_6s_8P8IEA _2LQeQPZZEeCSetPXFd1ZUw">
-        <outgoingTransitions xmi:id="_6OQEgPZXEeC2DLnZHHznig" expression="Event1" target="_5VX7wPZXEeC2DLnZHHznig"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_TGnGNvZNEeCz_6s_8P8IEA" specification="entry / i=1;&#xA;exit / i=0;&#xA;oncycle / i=2;&#xA;Event2 / i=3;&#xA;every 100ms / c+=1;&#xA;" name="State1" incomingTransitions="_TGoUUfZNEeCz_6s_8P8IEA _2LQeQPZZEeCSetPXFd1ZUw">
+        <outgoingTransitions xmi:id="_6OQEgPZXEeC2DLnZHHznig" specification="Event1" target="_5VX7wPZXEeC2DLnZHHznig"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_5VX7wPZXEeC2DLnZHHznig" expression="entry / j=1;&#xA;exit / j=0;&#xA;Event2, Event4 / j=2;&#xA;after 200ms/j=3;" name="State2" incomingTransitions="_6OQEgPZXEeC2DLnZHHznig">
-        <outgoingTransitions xmi:id="_2LQeQPZZEeCSetPXFd1ZUw" expression="Event3" target="_TGnGNvZNEeCz_6s_8P8IEA"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_5VX7wPZXEeC2DLnZHHznig" specification="entry / j=1;&#xA;exit / j=0;&#xA;Event2, Event4 / j=2;&#xA;after 200ms/j=3;" name="State2" incomingTransitions="_6OQEgPZXEeC2DLnZHHznig">
+        <outgoingTransitions xmi:id="_2LQeQPZZEeCSetPXFd1ZUw" specification="Event3" target="_TGnGNvZNEeCz_6s_8P8IEA"/>
       </vertices>
     </regions>
   </sgraph:Statechart>

+ 9 - 9
TestScenarios/TestModels/Test_ParallelRegions.sct

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_dtyMUPZlEeCSetPXFd1ZUw" name="Test_ParallelRegions" expression="interface:&#xA;&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;&#xA;">
+  <sgraph:Statechart xmi:id="_dtyMUPZlEeCSetPXFd1ZUw" name="Test_ParallelRegions" specification="interface:&#xA;&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;&#xA;">
     <regions xmi:id="_dtyzYvZlEeCSetPXFd1ZUw" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_dt0BhPZlEeCSetPXFd1ZUw">
-        <outgoingTransitions xmi:id="_dt2dyfZlEeCSetPXFd1ZUw" expression="" target="_dt1PovZlEeCSetPXFd1ZUw"/>
+        <outgoingTransitions xmi:id="_dt2dyfZlEeCSetPXFd1ZUw" specification="" target="_dt1PovZlEeCSetPXFd1ZUw"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_dt1PovZlEeCSetPXFd1ZUw" name="State1" incomingTransitions="_dt2dyfZlEeCSetPXFd1ZUw">
-        <outgoingTransitions xmi:id="_l-UpUPiNEeCdY7qI3rL1gA" expression="event1" target="_jGVvkPiNEeCdY7qI3rL1gA"/>
+        <outgoingTransitions xmi:id="_l-UpUPiNEeCdY7qI3rL1gA" specification="event1" target="_jGVvkPiNEeCdY7qI3rL1gA"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_jGVvkPiNEeCdY7qI3rL1gA" name="State2" incomingTransitions="_l-UpUPiNEeCdY7qI3rL1gA">
         <regions xmi:id="_syj9QPiNEeCdY7qI3rL1gA" name="Region1">
           <vertices xsi:type="sgraph:State" xmi:id="_3z8nEPiNEeCdY7qI3rL1gA" name="State3" incomingTransitions="_K-qvgPiOEeCdY7qI3rL1gA">
-            <outgoingTransitions xmi:id="_PGReEPiOEeCdY7qI3rL1gA" expression="event2" target="_I7OREPiOEeCdY7qI3rL1gA"/>
+            <outgoingTransitions xmi:id="_PGReEPiOEeCdY7qI3rL1gA" specification="event2" target="_I7OREPiOEeCdY7qI3rL1gA"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_I7OREPiOEeCdY7qI3rL1gA" name="State4" incomingTransitions="_PGReEPiOEeCdY7qI3rL1gA">
             <regions xmi:id="_TLNTIPiOEeCdY7qI3rL1gA" name="Region2">
               <vertices xsi:type="sgraph:State" xmi:id="_VAk5UPiOEeCdY7qI3rL1gA" name="State5" incomingTransitions="_bKalYPiOEeCdY7qI3rL1gA _eOCucPiOEeCdY7qI3rL1gA">
-                <outgoingTransitions xmi:id="_cSIbYPiOEeCdY7qI3rL1gA" expression="event3" target="_Wan1cPiOEeCdY7qI3rL1gA"/>
+                <outgoingTransitions xmi:id="_cSIbYPiOEeCdY7qI3rL1gA" specification="event3" target="_Wan1cPiOEeCdY7qI3rL1gA"/>
               </vertices>
               <vertices xsi:type="sgraph:State" xmi:id="_Wan1cPiOEeCdY7qI3rL1gA" name="State6" incomingTransitions="_cSIbYPiOEeCdY7qI3rL1gA">
-                <outgoingTransitions xmi:id="_eOCucPiOEeCdY7qI3rL1gA" expression="event4" target="_VAk5UPiOEeCdY7qI3rL1gA"/>
+                <outgoingTransitions xmi:id="_eOCucPiOEeCdY7qI3rL1gA" specification="event4" target="_VAk5UPiOEeCdY7qI3rL1gA"/>
               </vertices>
               <vertices xsi:type="sgraph:Entry" xmi:id="_aOE48PiOEeCdY7qI3rL1gA">
                 <outgoingTransitions xmi:id="_bKalYPiOEeCdY7qI3rL1gA" target="_VAk5UPiOEeCdY7qI3rL1gA"/>
@@ -28,7 +28,7 @@
             <regions xmi:id="_DvXhIPiXEeC4at_AzcYiGg" name="Region4">
               <vertices xsi:type="sgraph:State" xmi:id="_Fcth0PiZEeC4at_AzcYiGg" name="State9" incomingTransitions="_RSOh0PiaEeC4at_AzcYiGg"/>
               <vertices xsi:type="sgraph:Entry" xmi:id="_QLrwgPiaEeC4at_AzcYiGg">
-                <outgoingTransitions xmi:id="_RSOh0PiaEeC4at_AzcYiGg" expression="" target="_Fcth0PiZEeC4at_AzcYiGg"/>
+                <outgoingTransitions xmi:id="_RSOh0PiaEeC4at_AzcYiGg" specification="" target="_Fcth0PiZEeC4at_AzcYiGg"/>
               </vertices>
             </regions>
           </vertices>
@@ -41,10 +41,10 @@
             <outgoingTransitions xmi:id="_scwP4PiOEeCdY7qI3rL1gA" target="_jxK_0PiOEeCdY7qI3rL1gA"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_jxK_0PiOEeCdY7qI3rL1gA" name="State7" incomingTransitions="_scwP4PiOEeCdY7qI3rL1gA _1T-IMPiOEeCdY7qI3rL1gA">
-            <outgoingTransitions xmi:id="_xv5kgPiOEeCdY7qI3rL1gA" expression="event5, event3" target="_wBkacPiOEeCdY7qI3rL1gA"/>
+            <outgoingTransitions xmi:id="_xv5kgPiOEeCdY7qI3rL1gA" specification="event5, event3" target="_wBkacPiOEeCdY7qI3rL1gA"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_wBkacPiOEeCdY7qI3rL1gA" name="State8" incomingTransitions="_xv5kgPiOEeCdY7qI3rL1gA">
-            <outgoingTransitions xmi:id="_1T-IMPiOEeCdY7qI3rL1gA" expression="event6" target="_jxK_0PiOEeCdY7qI3rL1gA"/>
+            <outgoingTransitions xmi:id="_1T-IMPiOEeCdY7qI3rL1gA" specification="event6" target="_jxK_0PiOEeCdY7qI3rL1gA"/>
           </vertices>
         </regions>
       </vertices>

+ 10 - 10
TestScenarios/TestModels/Test_ShallowHistory.sct

@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_S0vmMPZlEeCSetPXFd1ZUw" name="Test_ShallowHistory" expression="interface:&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;in event event7&#xA;in event event8&#xA;">
+  <sgraph:Statechart xmi:id="_S0vmMPZlEeCSetPXFd1ZUw" name="Test_ShallowHistory" specification="interface:&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;in event event7&#xA;in event event8&#xA;">
     <regions xmi:id="_S0wNQvZlEeCSetPXFd1ZUw" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_S0w0VvZlEeCSetPXFd1ZUw">
         <outgoingTransitions xmi:id="_S0zQk_ZlEeCSetPXFd1ZUw" target="_S0yCcfZlEeCSetPXFd1ZUw"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_S0yCcfZlEeCSetPXFd1ZUw" name="State1" incomingTransitions="_S0zQk_ZlEeCSetPXFd1ZUw _euHxIPiYEeC4at_AzcYiGg">
-        <outgoingTransitions xmi:id="_dD98cPiYEeC4at_AzcYiGg" expression="event1" target="_aHsYkPiYEeC4at_AzcYiGg"/>
+        <outgoingTransitions xmi:id="_dD98cPiYEeC4at_AzcYiGg" specification="event1" target="_aHsYkPiYEeC4at_AzcYiGg"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_aHsYkPiYEeC4at_AzcYiGg" name="State2" incomingTransitions="_dD98cPiYEeC4at_AzcYiGg">
-        <outgoingTransitions xmi:id="_euHxIPiYEeC4at_AzcYiGg" expression="event2" target="_S0yCcfZlEeCSetPXFd1ZUw"/>
+        <outgoingTransitions xmi:id="_euHxIPiYEeC4at_AzcYiGg" specification="event2" target="_S0yCcfZlEeCSetPXFd1ZUw"/>
         <regions xmi:id="_qbNqYPiYEeC4at_AzcYiGg">
           <vertices xsi:type="sgraph:Entry" xmi:id="_qxmxIPiYEeC4at_AzcYiGg" kind="SHALLOW_HISTORY">
             <outgoingTransitions xmi:id="_xD6csPiYEeC4at_AzcYiGg" target="_tZdkMPiYEeC4at_AzcYiGg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_tZdkMPiYEeC4at_AzcYiGg" name="State3" incomingTransitions="_xD6csPiYEeC4at_AzcYiGg">
-            <outgoingTransitions xmi:id="_yUM_4PiYEeC4at_AzcYiGg" expression="event3" target="_umzhEPiYEeC4at_AzcYiGg"/>
+            <outgoingTransitions xmi:id="_yUM_4PiYEeC4at_AzcYiGg" specification="event3" target="_umzhEPiYEeC4at_AzcYiGg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_umzhEPiYEeC4at_AzcYiGg" name="State4" incomingTransitions="_yUM_4PiYEeC4at_AzcYiGg">
-            <outgoingTransitions xmi:id="_1j6dIPiYEeC4at_AzcYiGg" expression="event4" target="_vcfL4PiYEeC4at_AzcYiGg"/>
+            <outgoingTransitions xmi:id="_1j6dIPiYEeC4at_AzcYiGg" specification="event4" target="_vcfL4PiYEeC4at_AzcYiGg"/>
             <regions xmi:id="_2HyUUPiaEeC4at_AzcYiGg">
               <vertices xsi:type="sgraph:Entry" xmi:id="_22hCkPiaEeC4at_AzcYiGg">
                 <outgoingTransitions xmi:id="_-HGUQPiaEeC4at_AzcYiGg" target="_3WtlkPiaEeC4at_AzcYiGg"/>
               </vertices>
               <vertices xsi:type="sgraph:State" xmi:id="_3WtlkPiaEeC4at_AzcYiGg" name="State6" incomingTransitions="_-HGUQPiaEeC4at_AzcYiGg _BveJIPibEeC4at_AzcYiGg">
-                <outgoingTransitions xmi:id="__CvdIPiaEeC4at_AzcYiGg" expression="event5" target="_46dQQPiaEeC4at_AzcYiGg"/>
+                <outgoingTransitions xmi:id="__CvdIPiaEeC4at_AzcYiGg" specification="event5" target="_46dQQPiaEeC4at_AzcYiGg"/>
               </vertices>
               <vertices xsi:type="sgraph:State" xmi:id="_46dQQPiaEeC4at_AzcYiGg" name="State7" incomingTransitions="__CvdIPiaEeC4at_AzcYiGg">
-                <outgoingTransitions xmi:id="_BveJIPibEeC4at_AzcYiGg" expression="event6" target="_3WtlkPiaEeC4at_AzcYiGg"/>
+                <outgoingTransitions xmi:id="_BveJIPibEeC4at_AzcYiGg" specification="event6" target="_3WtlkPiaEeC4at_AzcYiGg"/>
                 <regions xmi:id="_Hjbr0PibEeC4at_AzcYiGg">
                   <vertices xsi:type="sgraph:State" xmi:id="_R2fQAPibEeC4at_AzcYiGg" name="State8" incomingTransitions="_h07CoPibEeC4at_AzcYiGg _nMoHIPibEeC4at_AzcYiGg">
-                    <outgoingTransitions xmi:id="_ZKN8UPibEeC4at_AzcYiGg" expression="event7" target="_Tl6mQPibEeC4at_AzcYiGg"/>
+                    <outgoingTransitions xmi:id="_ZKN8UPibEeC4at_AzcYiGg" specification="event7" target="_Tl6mQPibEeC4at_AzcYiGg"/>
                   </vertices>
                   <vertices xsi:type="sgraph:State" xmi:id="_Tl6mQPibEeC4at_AzcYiGg" name="State9" incomingTransitions="_ZKN8UPibEeC4at_AzcYiGg">
-                    <outgoingTransitions xmi:id="_nMoHIPibEeC4at_AzcYiGg" expression="event8" target="_R2fQAPibEeC4at_AzcYiGg"/>
+                    <outgoingTransitions xmi:id="_nMoHIPibEeC4at_AzcYiGg" specification="event8" target="_R2fQAPibEeC4at_AzcYiGg"/>
                   </vertices>
                   <vertices xsi:type="sgraph:Entry" xmi:id="_grXZkPibEeC4at_AzcYiGg" kind="SHALLOW_HISTORY">
-                    <outgoingTransitions xmi:id="_h07CoPibEeC4at_AzcYiGg" expression="" target="_R2fQAPibEeC4at_AzcYiGg"/>
+                    <outgoingTransitions xmi:id="_h07CoPibEeC4at_AzcYiGg" specification="" target="_R2fQAPibEeC4at_AzcYiGg"/>
                   </vertices>
                 </regions>
               </vertices>

+ 10 - 10
TestScenarios/TestModels/Test_Transition.sct

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_yJVewfZKEeCz_6s_8P8IEA" name="Test_Transition" expression="interface A:&#xA;in event event1 : integer = 1&#xA;in event event2&#xA;in event event3&#xA;out event event4&#xA;&#xA;interface:&#xA;in event event5 : boolean&#xA;in event event6&#xA;out event event7&#xA;var i : integer&#xA;var j : real&#xA;&#xA;internal:&#xA;event event10:integer=0&#xA;">
+  <sgraph:Statechart xmi:id="_yJVewfZKEeCz_6s_8P8IEA" name="Test_Transition" specification="interface A:&#xA;in event event1 : integer = 1&#xA;in event event2&#xA;in event event3&#xA;out event event4&#xA;&#xA;interface:&#xA;in event event5 : boolean&#xA;in event event6&#xA;out event event7&#xA;var i : integer&#xA;var j : real&#xA;&#xA;internal:&#xA;event event10:integer=0&#xA;">
     <regions xmi:id="_yMGe4PZKEeCz_6s_8P8IEA" name="">
       <vertices xsi:type="sgraph:Entry" xmi:id="_yPWAIPZKEeCz_6s_8P8IEA">
         <outgoingTransitions xmi:id="_yPtMgPZKEeCz_6s_8P8IEA" target="_yPZqgPZKEeCz_6s_8P8IEA"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_yPZqgPZKEeCz_6s_8P8IEA" name="State1" incomingTransitions="_yPtMgPZKEeCz_6s_8P8IEA">
-        <outgoingTransitions xmi:id="_N1VrwPZLEeCz_6s_8P8IEA" expression="A.event1, A.event2" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_RSDqQPZLEeCz_6s_8P8IEA" expression="[i==5]" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_dxK2UPZLEeCz_6s_8P8IEA" expression="A.event3[j&lt;20]" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_kGjEAPZLEeCz_6s_8P8IEA" expression="A.event3,A.event4[j>30]" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_q6VE8PZLEeCz_6s_8P8IEA" expression="event6/i=15;" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_0zRgAPZLEeCz_6s_8P8IEA" expression="event7/j=i*9;" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_6xGJUPZLEeCz_6s_8P8IEA" expression="after 10s" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_KgZTwPZMEeCz_6s_8P8IEA" expression="after 100ms" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
-        <outgoingTransitions xmi:id="_oEIZgAu4EeGmY4-cgZfupg" expression="A.event1" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_N1VrwPZLEeCz_6s_8P8IEA" specification="A.event1, A.event2" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_RSDqQPZLEeCz_6s_8P8IEA" specification="[i==5]" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_dxK2UPZLEeCz_6s_8P8IEA" specification="A.event3[j&lt;20]" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_kGjEAPZLEeCz_6s_8P8IEA" specification="A.event3,A.event4[j>30]" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_q6VE8PZLEeCz_6s_8P8IEA" specification="event6/i=15;" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_0zRgAPZLEeCz_6s_8P8IEA" specification="event7/j=i*9;" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_6xGJUPZLEeCz_6s_8P8IEA" specification="after 10s" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_KgZTwPZMEeCz_6s_8P8IEA" specification="after 100ms" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
+        <outgoingTransitions xmi:id="_oEIZgAu4EeGmY4-cgZfupg" specification="A.event1" target="_6jMFoPZKEeCz_6s_8P8IEA"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_6jMFoPZKEeCz_6s_8P8IEA" name="State2" incomingTransitions="_N1VrwPZLEeCz_6s_8P8IEA _RSDqQPZLEeCz_6s_8P8IEA _dxK2UPZLEeCz_6s_8P8IEA _kGjEAPZLEeCz_6s_8P8IEA _q6VE8PZLEeCz_6s_8P8IEA _0zRgAPZLEeCz_6s_8P8IEA _6xGJUPZLEeCz_6s_8P8IEA _KgZTwPZMEeCz_6s_8P8IEA _oEIZgAu4EeGmY4-cgZfupg"/>
     </regions>