소스 검색

Added new model elements into LocalAction state machine and Transition state machine

jos.itemis@gmail.com 13 년 전
부모
커밋
c170a5799d
4개의 변경된 파일133개의 추가작업 그리고 144개의 파일을 삭제
  1. 1 1
      TestScenarios/CMakeLists.txt
  2. 1 1
      TestScenarios/GenModelC.sgen
  3. 115 115
      TestScenarios/TestModels/Test_LocalActions.sct
  4. 16 27
      TestScenarios/TestModels/Test_Transition.sct

+ 1 - 1
TestScenarios/CMakeLists.txt

@@ -4,7 +4,7 @@ enable_testing()
 
 if (CMAKE_COMPILER_IS_GNUCC)
 #add_definitions( -Wall -O0 -g)
-SET(CMAKE_C_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+SET(CMAKE_C_FLAGS "-g -O2 -Wall -fprofile-arcs -ftest-coverage")
  
 #SET(CMAKE_SHARED_LINKER_FLAGS="-fprofile-arcs -ftest-coverage")
 #SET(CMAKE_EXE_LINKER_FLAGS "-fprofile-arcs -ftest-coverage")

+ 1 - 1
TestScenarios/GenModelC.sgen

@@ -114,7 +114,7 @@ GeneratorModel for yakindu::c {
  #
  # Contributors:
  #     committers of YAKINDU - initial API and implementation
- "
+ " 
 		}
 	}
 	statechart Test_ParallelRegions {

+ 115 - 115
TestScenarios/TestModels/Test_LocalActions.sct

@@ -1,115 +1,115 @@
-<?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" 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" 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" 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>
-  <notation:Diagram xmi:id="_TGkp8fZNEeCz_6s_8P8IEA" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_TGkp8PZNEeCz_6s_8P8IEA" measurementUnit="Pixel">
-    <children xmi:id="_TGkp9PZNEeCz_6s_8P8IEA" type="Region" element="_TGkp8_ZNEeCz_6s_8P8IEA">
-      <children xsi:type="notation:DecorationNode" xmi:id="_TGlRAfZNEeCz_6s_8P8IEA" type="RegionName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_TGlRAvZNEeCz_6s_8P8IEA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TGlRA_ZNEeCz_6s_8P8IEA"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_TGl4EPZNEeCz_6s_8P8IEA" type="RegionCompartment" fontName="Arial" fontHeight="10" lineColor="4210752">
-        <children xmi:id="_TGmfIvZNEeCz_6s_8P8IEA" type="Entry" element="_TGmfIfZNEeCz_6s_8P8IEA">
-          <children xmi:id="_TGmfJfZNEeCz_6s_8P8IEA" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_TGnGMvZNEeCz_6s_8P8IEA" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_TGnGM_ZNEeCz_6s_8P8IEA"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_TGnGNPZNEeCz_6s_8P8IEA"/>
-            </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_TGnGMPZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGnGMfZNEeCz_6s_8P8IEA"/>
-          </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_TGmfI_ZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGnGNfZNEeCz_6s_8P8IEA" x="17" y="2"/>
-        </children>
-        <children xmi:id="_TGnGOPZNEeCz_6s_8P8IEA" type="State" element="_TGnGNvZNEeCz_6s_8P8IEA">
-          <children xsi:type="notation:DecorationNode" xmi:id="_TGntQPZNEeCz_6s_8P8IEA" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_TGntQfZNEeCz_6s_8P8IEA"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_TGntQvZNEeCz_6s_8P8IEA"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_TGntQ_ZNEeCz_6s_8P8IEA" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_TGntRPZNEeCz_6s_8P8IEA" type="StateTextCompartmentExpression" fontName="Arial" fontHeight="10" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGntRfZNEeCz_6s_8P8IEA"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_TGntRvZNEeCz_6s_8P8IEA" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_TGnGOfZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_TGnGOvZNEeCz_6s_8P8IEA"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TGntR_ZNEeCz_6s_8P8IEA"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGoUUPZNEeCz_6s_8P8IEA" x="24" y="37" width="333" height="149"/>
-        </children>
-        <children xmi:id="_5VcNMPZXEeC2DLnZHHznig" type="State" element="_5VX7wPZXEeC2DLnZHHznig">
-          <children xsi:type="notation:DecorationNode" xmi:id="_5VvIIPZXEeC2DLnZHHznig" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_5VvIIfZXEeC2DLnZHHznig"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_5VvIIvZXEeC2DLnZHHznig"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_5VvvMPZXEeC2DLnZHHznig" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_5VvvMfZXEeC2DLnZHHznig" type="StateTextCompartmentExpression" fontName="Arial" fontHeight="10" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5VvvMvZXEeC2DLnZHHznig"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_5VwWQPZXEeC2DLnZHHznig" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_5VcNMfZXEeC2DLnZHHznig" fontName="Arial" fontHeight="10" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_5VcNMvZXEeC2DLnZHHznig"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_5VwWQfZXEeC2DLnZHHznig"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5VcNM_ZXEeC2DLnZHHznig" x="31" y="242" width="350" height="165"/>
-        </children>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGl4EfZNEeCz_6s_8P8IEA"/>
-      </children>
-      <styles xsi:type="notation:ShapeStyle" xmi:id="_TGkp9fZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGmfIPZNEeCz_6s_8P8IEA" x="220" y="10" width="445" height="471"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_TGo7YPZNEeCz_6s_8P8IEA" type="StatechartText" fontName="Arial" fontHeight="10" lineColor="4210752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_TGo7YvZNEeCz_6s_8P8IEA" type="StatechartName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_TGo7Y_ZNEeCz_6s_8P8IEA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TGo7ZPZNEeCz_6s_8P8IEA"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_TGo7ZfZNEeCz_6s_8P8IEA" type="StatechartTextExpression" fontName="Arial" fontHeight="10" lineColor="4210752">
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGo7ZvZNEeCz_6s_8P8IEA"/>
-      </children>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGo7Z_ZNEeCz_6s_8P8IEA" x="10" y="10" width="200" height="400"/>
-    </children>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_TGkp8vZNEeCz_6s_8P8IEA"/>
-    <edges xmi:id="_TGoUUvZNEeCz_6s_8P8IEA" type="Transition" element="_TGoUUfZNEeCz_6s_8P8IEA" source="_TGmfIvZNEeCz_6s_8P8IEA" target="_TGnGOPZNEeCz_6s_8P8IEA">
-      <children xsi:type="notation:DecorationNode" xmi:id="_TGoUVvZNEeCz_6s_8P8IEA" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_TGoUV_ZNEeCz_6s_8P8IEA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TGoUWPZNEeCz_6s_8P8IEA" y="40"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_TGoUU_ZNEeCz_6s_8P8IEA" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_TGoUVfZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TGoUVPZNEeCz_6s_8P8IEA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    </edges>
-    <edges xmi:id="_6OSgwPZXEeC2DLnZHHznig" type="Transition" element="_6OQEgPZXEeC2DLnZHHznig" source="_TGnGOPZNEeCz_6s_8P8IEA" target="_5VcNMPZXEeC2DLnZHHznig">
-      <children xsi:type="notation:DecorationNode" xmi:id="_6OTH0fZXEeC2DLnZHHznig" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_6OTH0vZXEeC2DLnZHHznig"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_6OTH0_ZXEeC2DLnZHHznig" x="12" y="-26"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_6OSgwfZXEeC2DLnZHHznig" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_6OTH0PZXEeC2DLnZHHznig" fontName="Arial" fontHeight="10"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_6OSgwvZXEeC2DLnZHHznig" points="[1, 75, 0, -90]$[-13, 150, -14, -15]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ufcpIPZZEeCSetPXFd1ZUw" id="(0.14114114114114115,0.9664429530201343)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6O_rYPZXEeC2DLnZHHznig" id="(0.23728813559322035,0.23076923076923078)"/>
-    </edges>
-    <edges xmi:id="_2LThkPZZEeCSetPXFd1ZUw" type="Transition" element="_2LQeQPZZEeCSetPXFd1ZUw" source="_5VcNMPZXEeC2DLnZHHznig" target="_TGnGOPZNEeCz_6s_8P8IEA">
-      <children xsi:type="notation:DecorationNode" xmi:id="_2LVWwPZZEeCSetPXFd1ZUw" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_2LVWwfZZEeCSetPXFd1ZUw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_2LVWwvZZEeCSetPXFd1ZUw" x="-18" y="37"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_2LThkfZZEeCSetPXFd1ZUw" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_2LUIoPZZEeCSetPXFd1ZUw" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2LThkvZZEeCSetPXFd1ZUw" points="[-21, -33, 65, 107]$[-14, -129, 72, 11]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Md_MPZZEeCSetPXFd1ZUw" id="(0.8942857142857142,0.2)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Md_MfZZEeCSetPXFd1ZUw" id="(0.7837837837837838,0.5973154362416108)"/>
-    </edges>
-  </notation:Diagram>
-</xmi:XMI>
+<?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" 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" 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" 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>
+  <notation:Diagram xmi:id="_TGkp8fZNEeCz_6s_8P8IEA" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_TGkp8PZNEeCz_6s_8P8IEA" measurementUnit="Pixel">
+    <children xmi:id="_TGkp9PZNEeCz_6s_8P8IEA" type="Region" element="_TGkp8_ZNEeCz_6s_8P8IEA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_TGlRAfZNEeCz_6s_8P8IEA" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_TGlRAvZNEeCz_6s_8P8IEA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TGlRA_ZNEeCz_6s_8P8IEA"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_TGl4EPZNEeCz_6s_8P8IEA" type="RegionCompartment" fontName="Arial" fontHeight="10" lineColor="4210752">
+        <children xmi:id="_TGmfIvZNEeCz_6s_8P8IEA" type="Entry" element="_TGmfIfZNEeCz_6s_8P8IEA">
+          <children xmi:id="_TGmfJfZNEeCz_6s_8P8IEA" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_TGnGMvZNEeCz_6s_8P8IEA" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_TGnGM_ZNEeCz_6s_8P8IEA"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_TGnGNPZNEeCz_6s_8P8IEA"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_TGnGMPZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGnGMfZNEeCz_6s_8P8IEA"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_TGmfI_ZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGnGNfZNEeCz_6s_8P8IEA" x="17" y="2"/>
+        </children>
+        <children xmi:id="_TGnGOPZNEeCz_6s_8P8IEA" type="State" element="_TGnGNvZNEeCz_6s_8P8IEA">
+          <children xsi:type="notation:DecorationNode" xmi:id="_TGntQPZNEeCz_6s_8P8IEA" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_TGntQfZNEeCz_6s_8P8IEA"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_TGntQvZNEeCz_6s_8P8IEA"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_TGntQ_ZNEeCz_6s_8P8IEA" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_TGntRPZNEeCz_6s_8P8IEA" type="StateTextCompartmentExpression" fontName="Arial" fontHeight="10" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGntRfZNEeCz_6s_8P8IEA"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_TGntRvZNEeCz_6s_8P8IEA" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_TGnGOfZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_TGnGOvZNEeCz_6s_8P8IEA"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TGntR_ZNEeCz_6s_8P8IEA"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGoUUPZNEeCz_6s_8P8IEA" x="24" y="37" width="333" height="149"/>
+        </children>
+        <children xmi:id="_5VcNMPZXEeC2DLnZHHznig" type="State" element="_5VX7wPZXEeC2DLnZHHznig">
+          <children xsi:type="notation:DecorationNode" xmi:id="_5VvIIPZXEeC2DLnZHHznig" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_5VvIIfZXEeC2DLnZHHznig"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_5VvIIvZXEeC2DLnZHHznig"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_5VvvMPZXEeC2DLnZHHznig" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_5VvvMfZXEeC2DLnZHHznig" type="StateTextCompartmentExpression" fontName="Arial" fontHeight="10" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5VvvMvZXEeC2DLnZHHznig"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_5VwWQPZXEeC2DLnZHHznig" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_5VcNMfZXEeC2DLnZHHznig" fontName="Arial" fontHeight="10" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_5VcNMvZXEeC2DLnZHHznig"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_5VwWQfZXEeC2DLnZHHznig"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5VcNM_ZXEeC2DLnZHHznig" x="31" y="242" width="350" height="165"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGl4EfZNEeCz_6s_8P8IEA"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_TGkp9fZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGmfIPZNEeCz_6s_8P8IEA" x="220" y="10" width="445" height="471"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_TGo7YPZNEeCz_6s_8P8IEA" type="StatechartText" fontName="Arial" fontHeight="10" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_TGo7YvZNEeCz_6s_8P8IEA" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_TGo7Y_ZNEeCz_6s_8P8IEA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TGo7ZPZNEeCz_6s_8P8IEA"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_TGo7ZfZNEeCz_6s_8P8IEA" type="StatechartTextExpression" fontName="Arial" fontHeight="10" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGo7ZvZNEeCz_6s_8P8IEA"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TGo7Z_ZNEeCz_6s_8P8IEA" x="10" y="10" width="103" height="400"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_TGkp8vZNEeCz_6s_8P8IEA"/>
+    <edges xmi:id="_TGoUUvZNEeCz_6s_8P8IEA" type="Transition" element="_TGoUUfZNEeCz_6s_8P8IEA" source="_TGmfIvZNEeCz_6s_8P8IEA" target="_TGnGOPZNEeCz_6s_8P8IEA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_TGoUVvZNEeCz_6s_8P8IEA" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_TGoUV_ZNEeCz_6s_8P8IEA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TGoUWPZNEeCz_6s_8P8IEA" y="40"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_TGoUU_ZNEeCz_6s_8P8IEA" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_TGoUVfZNEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TGoUVPZNEeCz_6s_8P8IEA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_6OSgwPZXEeC2DLnZHHznig" type="Transition" element="_6OQEgPZXEeC2DLnZHHznig" source="_TGnGOPZNEeCz_6s_8P8IEA" target="_5VcNMPZXEeC2DLnZHHznig">
+      <children xsi:type="notation:DecorationNode" xmi:id="_6OTH0fZXEeC2DLnZHHznig" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_6OTH0vZXEeC2DLnZHHznig"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_6OTH0_ZXEeC2DLnZHHznig" x="12" y="-26"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_6OSgwfZXEeC2DLnZHHznig" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_6OTH0PZXEeC2DLnZHHznig" fontName="Arial" fontHeight="10"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_6OSgwvZXEeC2DLnZHHznig" points="[1, 75, 0, -90]$[-13, 150, -14, -15]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ufcpIPZZEeCSetPXFd1ZUw" id="(0.14114114114114115,0.9664429530201343)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6O_rYPZXEeC2DLnZHHznig" id="(0.23728813559322035,0.23076923076923078)"/>
+    </edges>
+    <edges xmi:id="_2LThkPZZEeCSetPXFd1ZUw" type="Transition" element="_2LQeQPZZEeCSetPXFd1ZUw" source="_5VcNMPZXEeC2DLnZHHznig" target="_TGnGOPZNEeCz_6s_8P8IEA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_2LVWwPZZEeCSetPXFd1ZUw" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_2LVWwfZZEeCSetPXFd1ZUw"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_2LVWwvZZEeCSetPXFd1ZUw" x="-18" y="37"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_2LThkfZZEeCSetPXFd1ZUw" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_2LUIoPZZEeCSetPXFd1ZUw" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2LThkvZZEeCSetPXFd1ZUw" points="[-21, -33, 65, 107]$[-14, -129, 72, 11]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Md_MPZZEeCSetPXFd1ZUw" id="(0.8942857142857142,0.2)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Md_MfZZEeCSetPXFd1ZUw" id="(0.7837837837837838,0.5973154362416108)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>

+ 16 - 27
TestScenarios/TestModels/Test_Transition.sct

@@ -1,22 +1,22 @@
 <?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" 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;">
+  <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;in event event4&#xA;out event event5&#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;">
     <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">
+      <vertices xsi:type="sgraph:State" xmi:id="_yPZqgPZKEeCz_6s_8P8IEA" name="State1" incomingTransitions="_yPtMgPZKEeCz_6s_8P8IEA _5O3jwDhFEeG0q_bV_Jrhfw">
         <outgoingTransitions xmi:id="_N1VrwPZLEeCz_6s_8P8IEA" specification="A.event1, A.event2[valueof(A.event1) &lt; 0] / i=2;" 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[valueof(A.event1) > 5] / i=1;" 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"/>
+      <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 _6xGJUPZLEeCz_6s_8P8IEA _KgZTwPZMEeCz_6s_8P8IEA _oEIZgAu4EeGmY4-cgZfupg">
+        <outgoingTransitions xmi:id="_5O3jwDhFEeG0q_bV_Jrhfw" specification="event6" target="_yPZqgPZKEeCz_6s_8P8IEA"/>
+      </vertices>
     </regions>
   </sgraph:Statechart>
   <notation:Diagram xmi:id="_yMFQwPZKEeCz_6s_8P8IEA" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_yJVewfZKEeCz_6s_8P8IEA" measurementUnit="Pixel">
@@ -140,28 +140,6 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kHbNwPZLEeCz_6s_8P8IEA" id="(0.9183673469387755,0.47112462006079026)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kHbNwfZLEeCz_6s_8P8IEA" id="(0.12244897959183673,0.47112462006079026)"/>
     </edges>
-    <edges xmi:id="_q6WTEPZLEeCz_6s_8P8IEA" type="Transition" element="_q6VE8PZLEeCz_6s_8P8IEA" source="_yPlQsPZKEeCz_6s_8P8IEA" target="_6jN60PZKEeCz_6s_8P8IEA">
-      <children xsi:type="notation:DecorationNode" xmi:id="_q6WTFPZLEeCz_6s_8P8IEA" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_q6WTFfZLEeCz_6s_8P8IEA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_q6WTFvZLEeCz_6s_8P8IEA" x="-6" y="-10"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_q6WTEfZLEeCz_6s_8P8IEA" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_q6WTE_ZLEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_q6WTEvZLEeCz_6s_8P8IEA" points="[11, 1, -260, -25]$[272, 85, 1, 59]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_q7dGUPZLEeCz_6s_8P8IEA" id="(0.8163265306122449,0.5592705167173252)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9EQpUPZMEeCz_6s_8P8IEA" id="(0.12244897959183673,0.5623100303951368)"/>
-    </edges>
-    <edges xmi:id="_0zSHEPZLEeCz_6s_8P8IEA" type="Transition" element="_0zRgAPZLEeCz_6s_8P8IEA" source="_yPlQsPZKEeCz_6s_8P8IEA" target="_6jN60PZKEeCz_6s_8P8IEA">
-      <children xsi:type="notation:DecorationNode" xmi:id="_0zSuIfZLEeCz_6s_8P8IEA" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_0zSuIvZLEeCz_6s_8P8IEA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0zSuI_ZLEeCz_6s_8P8IEA" x="-6" y="-7"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_0zSHEfZLEeCz_6s_8P8IEA" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_0zSuIPZLEeCz_6s_8P8IEA" fontName="Arial" fontHeight="10"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_0zSHEvZLEeCz_6s_8P8IEA" points="[19, 5, -256, 0]$[273, 57, -2, 52]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_00N7MPZLEeCz_6s_8P8IEA" id="(0.8367346938775511,0.6565349544072948)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_00N7MfZLEeCz_6s_8P8IEA" id="(0.16326530612244897,0.6443768996960486)"/>
-    </edges>
     <edges xmi:id="_6xHXcPZLEeCz_6s_8P8IEA" type="Transition" element="_6xGJUPZLEeCz_6s_8P8IEA" source="_yPlQsPZKEeCz_6s_8P8IEA" target="_6jN60PZKEeCz_6s_8P8IEA">
       <children xsi:type="notation:DecorationNode" xmi:id="_6xHXdPZLEeCz_6s_8P8IEA" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_6xHXdfZLEeCz_6s_8P8IEA"/>
@@ -195,5 +173,16 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oE4AYAu4EeGmY4-cgZfupg" id="(0.82,0.10638297872340426)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oE4AYQu4EeGmY4-cgZfupg" id="(0.24,0.10638297872340426)"/>
     </edges>
+    <edges xmi:id="_5O_fkDhFEeG0q_bV_Jrhfw" type="Transition" element="_5O3jwDhFEeG0q_bV_Jrhfw" source="_6jN60PZKEeCz_6s_8P8IEA" target="_yPlQsPZKEeCz_6s_8P8IEA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_5PSagDhFEeG0q_bV_Jrhfw" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_5PSagThFEeG0q_bV_Jrhfw"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5PSagjhFEeG0q_bV_Jrhfw" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_5O_fkThFEeG0q_bV_Jrhfw" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_5PAGoDhFEeG0q_bV_Jrhfw" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_5O_fkjhFEeG0q_bV_Jrhfw" points="[-20, -8, 452, 0]$[-470, 20, 2, 28]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_5PU2wDhFEeG0q_bV_Jrhfw" id="(0.47619047619047616,0.939209726443769)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_5PVd0DhFEeG0q_bV_Jrhfw" id="(0.7619047619047619,0.9148936170212766)"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>