added test for logical and expression (Bug YAKHMI-912)

test-plugins/org.yakindu.sct.test.models/.classpath

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

test-plugins/org.yakindu.sct.test.models/.project

@@ -6,22 +6,22 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

test-plugins/org.yakindu.sct.test.models/.settings/org.eclipse.core.resources.prefs

@@ -11,6 +11,7 @@ encoding//testmodels/SCTUnit/GuardedExit.sct=UTF-8
 encoding//testmodels/SCTUnit/HistoryWithoutInitialStep.sct=UTF-8
 encoding//testmodels/SCTUnit/InEventLifeCycle.sct=UTF-8
 encoding//testmodels/SCTUnit/InternalEventLifeCycle.sct=UTF-8
+encoding//testmodels/SCTUnit/LogicalAnd.sct=UTF-8
 encoding//testmodels/SCTUnit/OutEventLifeCycle.sct=UTF-8
 encoding//testmodels/SCTUnit/PerformanceTest.sct=UTF-8
 encoding//testmodels/SCTUnit/STextKeywordsInStatesAndRegions.sct=UTF-8

test-plugins/org.yakindu.sct.test.models/build.properties

@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               testmodels/
+               testmodels/,\
+               tests/

test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/AlwaysOncycle.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="_z1asQJ6iEeGR-6jhjFPx5A" specification="interface:&#xD;&#xA;var value:integer&#xD;&#xA;var v2 : boolean&#xD;&#xA;&#xD;&#xA;" name="AlwaysOncycle">
-    <regions xmi:id="_z1asQ56iEeGR-6jhjFPx5A" name="main region">
-      <vertices xsi:type="sgraph:Entry" xmi:id="_z1j2OZ6iEeGR-6jhjFPx5A">
-        <outgoingTransitions xmi:id="_z1tnQJ6iEeGR-6jhjFPx5A" target="_z1tnMZ6iEeGR-6jhjFPx5A"/>
-      </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_z1tnMZ6iEeGR-6jhjFPx5A" specification="entry /value = 0&#xD;&#xA;always /value +=1&#xD;&#xA;exit/ value=0" name="StateA" incomingTransitions="_z1tnQJ6iEeGR-6jhjFPx5A _vK2vsJ6kEeGaJ9hFM1hQaQ">
-        <outgoingTransitions xmi:id="_U6t5MJ6jEeGR-6jhjFPx5A" specification="[value == 5]" target="_UkOEwJ6jEeGR-6jhjFPx5A"/>
-      </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_UkOEwJ6jEeGR-6jhjFPx5A" specification="oncycle /value+=1" name="StateB" incomingTransitions="_U6t5MJ6jEeGR-6jhjFPx5A">
-        <outgoingTransitions xmi:id="_vK2vsJ6kEeGaJ9hFM1hQaQ" specification="[value==5]" target="_z1tnMZ6iEeGR-6jhjFPx5A"/>
-      </vertices>
-    </regions>
-  </sgraph:Statechart>
-  <notation:Diagram xmi:id="_z1asQZ6iEeGR-6jhjFPx5A" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_z1asQJ6iEeGR-6jhjFPx5A" measurementUnit="Pixel">
-    <children xmi:id="_z1j2MJ6iEeGR-6jhjFPx5A" type="Region" element="_z1asQ56iEeGR-6jhjFPx5A">
-      <children xsi:type="notation:DecorationNode" xmi:id="_z1j2M56iEeGR-6jhjFPx5A" type="RegionName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2NJ6iEeGR-6jhjFPx5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1j2NZ6iEeGR-6jhjFPx5A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_z1j2Np6iEeGR-6jhjFPx5A" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
-        <children xmi:id="_z1j2Op6iEeGR-6jhjFPx5A" type="Entry" element="_z1j2OZ6iEeGR-6jhjFPx5A">
-          <children xmi:id="_z1j2PZ6iEeGR-6jhjFPx5A" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_z1j2QJ6iEeGR-6jhjFPx5A" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2QZ6iEeGR-6jhjFPx5A"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_z1j2Qp6iEeGR-6jhjFPx5A"/>
-            </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2Pp6iEeGR-6jhjFPx5A" fontName="Verdana" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1j2P56iEeGR-6jhjFPx5A"/>
-          </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2O56iEeGR-6jhjFPx5A" fontName="Verdana" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnMJ6iEeGR-6jhjFPx5A" x="64" y="19"/>
-        </children>
-        <children xmi:id="_z1tnM56iEeGR-6jhjFPx5A" type="State" element="_z1tnMZ6iEeGR-6jhjFPx5A">
-          <children xsi:type="notation:DecorationNode" xmi:id="_z1tnN56iEeGR-6jhjFPx5A" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnOJ6iEeGR-6jhjFPx5A"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_z1tnOZ6iEeGR-6jhjFPx5A"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_z1tnOp6iEeGR-6jhjFPx5A" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_z1tnO56iEeGR-6jhjFPx5A" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnPJ6iEeGR-6jhjFPx5A"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_z1tnPZ6iEeGR-6jhjFPx5A" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnNJ6iEeGR-6jhjFPx5A" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_z1tnNZ6iEeGR-6jhjFPx5A"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_z1tnPp6iEeGR-6jhjFPx5A"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnP56iEeGR-6jhjFPx5A" x="9" y="84"/>
-        </children>
-        <children xmi:id="_UkqwsJ6jEeGR-6jhjFPx5A" type="State" element="_UkOEwJ6jEeGR-6jhjFPx5A">
-          <children xsi:type="notation:DecorationNode" xmi:id="_UkqwtJ6jEeGR-6jhjFPx5A" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_UkqwtZ6jEeGR-6jhjFPx5A"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_Ukqwtp6jEeGR-6jhjFPx5A"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_Ukqwt56jEeGR-6jhjFPx5A" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_UkqwuJ6jEeGR-6jhjFPx5A" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UkqwuZ6jEeGR-6jhjFPx5A"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_Ukqwup6jEeGR-6jhjFPx5A" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_UkqwsZ6jEeGR-6jhjFPx5A" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_Ukqwsp6jEeGR-6jhjFPx5A"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ukqwu56jEeGR-6jhjFPx5A"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ukqws56jEeGR-6jhjFPx5A" x="239" y="69" width="116" height="132"/>
-        </children>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1j2N56iEeGR-6jhjFPx5A"/>
-      </children>
-      <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2MZ6iEeGR-6jhjFPx5A" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1j2OJ6iEeGR-6jhjFPx5A" x="215" y="10" width="400" height="400"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_z1tnSJ6iEeGR-6jhjFPx5A" type="StatechartText" fontName="Verdana" lineColor="4210752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_z1tnSp6iEeGR-6jhjFPx5A" type="StatechartName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnS56iEeGR-6jhjFPx5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1tnTJ6iEeGR-6jhjFPx5A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_z1tnTZ6iEeGR-6jhjFPx5A" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnTp6iEeGR-6jhjFPx5A"/>
-      </children>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z13YMJ6iEeGR-6jhjFPx5A" x="10" y="10" width="200" height="400"/>
-    </children>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_z1asQp6iEeGR-6jhjFPx5A"/>
-    <edges xmi:id="_z1tnQZ6iEeGR-6jhjFPx5A" type="Transition" element="_z1tnQJ6iEeGR-6jhjFPx5A" source="_z1j2Op6iEeGR-6jhjFPx5A" target="_z1tnM56iEeGR-6jhjFPx5A">
-      <children xsi:type="notation:DecorationNode" xmi:id="_z1tnRZ6iEeGR-6jhjFPx5A" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnRp6iEeGR-6jhjFPx5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1tnR56iEeGR-6jhjFPx5A" y="10"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_z1tnQp6iEeGR-6jhjFPx5A" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_z1tnRJ6iEeGR-6jhjFPx5A" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z1tnQ56iEeGR-6jhjFPx5A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    </edges>
-    <edges xmi:id="_U7BbMJ6jEeGR-6jhjFPx5A" type="Transition" element="_U6t5MJ6jEeGR-6jhjFPx5A" source="_z1tnM56iEeGR-6jhjFPx5A" target="_UkqwsJ6jEeGR-6jhjFPx5A">
-      <children xsi:type="notation:DecorationNode" xmi:id="_U7BbNJ6jEeGR-6jhjFPx5A" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_U7BbNZ6jEeGR-6jhjFPx5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_U7BbNp6jEeGR-6jhjFPx5A" y="10"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_U7BbMZ6jEeGR-6jhjFPx5A" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_U7BbM56jEeGR-6jhjFPx5A" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_U7BbMp6jEeGR-6jhjFPx5A" points="[13, 1, -104, -8]$[118, 36, 1, 27]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_U7dgEJ6jEeGR-6jhjFPx5A" id="(0.9057971014492754,0.49333333333333335)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_U7dgEZ6jEeGR-6jhjFPx5A" id="(0.1323529411764706,0.48214285714285715)"/>
-    </edges>
-    <edges xmi:id="_vLAgsJ6kEeGaJ9hFM1hQaQ" type="Transition" element="_vK2vsJ6kEeGaJ9hFM1hQaQ" source="_UkqwsJ6jEeGR-6jhjFPx5A" target="_z1tnM56iEeGR-6jhjFPx5A">
-      <children xsi:type="notation:DecorationNode" xmi:id="_vLJqoJ6kEeGaJ9hFM1hQaQ" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_vLJqoZ6kEeGaJ9hFM1hQaQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_vLJqop6kEeGaJ9hFM1hQaQ" y="10"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_vLAgsZ6kEeGaJ9hFM1hQaQ" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_vLAgs56kEeGaJ9hFM1hQaQ" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vLAgsp6kEeGaJ9hFM1hQaQ" points="[-1, 1, 118, 1]$[-114, -15, 5, -15]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vLdMoJ6kEeGaJ9hFM1hQaQ" id="(0.008620689655172414,0.25757575757575757)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vLdMoZ6kEeGaJ9hFM1hQaQ" id="(0.8985507246376812,0.1797752808988764)"/>
-    </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="_z1asQJ6iEeGR-6jhjFPx5A" specification="interface:&#xD;&#xA;var value:integer&#xD;&#xA;var v2 : boolean&#xD;&#xA;" name="AlwaysOncycle">
+    <regions xmi:id="_z1asQ56iEeGR-6jhjFPx5A" name="main region">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_z1j2OZ6iEeGR-6jhjFPx5A">
+        <outgoingTransitions xmi:id="_z1tnQJ6iEeGR-6jhjFPx5A" target="_z1tnMZ6iEeGR-6jhjFPx5A"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_z1tnMZ6iEeGR-6jhjFPx5A" specification="entry /value = 0&#xD;&#xA;always /value +=1&#xD;&#xA;exit/ value=0" name="StateA" incomingTransitions="_z1tnQJ6iEeGR-6jhjFPx5A _vK2vsJ6kEeGaJ9hFM1hQaQ">
+        <outgoingTransitions xmi:id="_U6t5MJ6jEeGR-6jhjFPx5A" specification="[value == 5]" target="_UkOEwJ6jEeGR-6jhjFPx5A"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_UkOEwJ6jEeGR-6jhjFPx5A" specification="oncycle /value+=1" name="StateB" incomingTransitions="_U6t5MJ6jEeGR-6jhjFPx5A">
+        <outgoingTransitions xmi:id="_vK2vsJ6kEeGaJ9hFM1hQaQ" specification="[value==5]" target="_z1tnMZ6iEeGR-6jhjFPx5A"/>
+      </vertices>
+    </regions>
+  </sgraph:Statechart>
+  <notation:Diagram xmi:id="_z1asQZ6iEeGR-6jhjFPx5A" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_z1asQJ6iEeGR-6jhjFPx5A" measurementUnit="Pixel">
+    <children xmi:id="_z1j2MJ6iEeGR-6jhjFPx5A" type="Region" element="_z1asQ56iEeGR-6jhjFPx5A">
+      <children xsi:type="notation:DecorationNode" xmi:id="_z1j2M56iEeGR-6jhjFPx5A" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2NJ6iEeGR-6jhjFPx5A"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1j2NZ6iEeGR-6jhjFPx5A"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_z1j2Np6iEeGR-6jhjFPx5A" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_z1j2Op6iEeGR-6jhjFPx5A" type="Entry" element="_z1j2OZ6iEeGR-6jhjFPx5A">
+          <children xmi:id="_z1j2PZ6iEeGR-6jhjFPx5A" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_z1j2QJ6iEeGR-6jhjFPx5A" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2QZ6iEeGR-6jhjFPx5A"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_z1j2Qp6iEeGR-6jhjFPx5A"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2Pp6iEeGR-6jhjFPx5A" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1j2P56iEeGR-6jhjFPx5A"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2O56iEeGR-6jhjFPx5A" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnMJ6iEeGR-6jhjFPx5A" x="64" y="19"/>
+        </children>
+        <children xmi:id="_z1tnM56iEeGR-6jhjFPx5A" type="State" element="_z1tnMZ6iEeGR-6jhjFPx5A">
+          <children xsi:type="notation:DecorationNode" xmi:id="_z1tnN56iEeGR-6jhjFPx5A" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnOJ6iEeGR-6jhjFPx5A"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_z1tnOZ6iEeGR-6jhjFPx5A"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_z1tnOp6iEeGR-6jhjFPx5A" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_z1tnO56iEeGR-6jhjFPx5A" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnPJ6iEeGR-6jhjFPx5A"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_z1tnPZ6iEeGR-6jhjFPx5A" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnNJ6iEeGR-6jhjFPx5A" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_z1tnNZ6iEeGR-6jhjFPx5A"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_z1tnPp6iEeGR-6jhjFPx5A"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnP56iEeGR-6jhjFPx5A" x="9" y="84"/>
+        </children>
+        <children xmi:id="_UkqwsJ6jEeGR-6jhjFPx5A" type="State" element="_UkOEwJ6jEeGR-6jhjFPx5A">
+          <children xsi:type="notation:DecorationNode" xmi:id="_UkqwtJ6jEeGR-6jhjFPx5A" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_UkqwtZ6jEeGR-6jhjFPx5A"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_Ukqwtp6jEeGR-6jhjFPx5A"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_Ukqwt56jEeGR-6jhjFPx5A" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_UkqwuJ6jEeGR-6jhjFPx5A" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UkqwuZ6jEeGR-6jhjFPx5A"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_Ukqwup6jEeGR-6jhjFPx5A" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_UkqwsZ6jEeGR-6jhjFPx5A" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_Ukqwsp6jEeGR-6jhjFPx5A"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ukqwu56jEeGR-6jhjFPx5A"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ukqws56jEeGR-6jhjFPx5A" x="239" y="69" width="116" height="132"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1j2N56iEeGR-6jhjFPx5A"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_z1j2MZ6iEeGR-6jhjFPx5A" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1j2OJ6iEeGR-6jhjFPx5A" x="216" y="10" width="400" height="400"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_z1tnSJ6iEeGR-6jhjFPx5A" type="StatechartText" fontName="Verdana" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_z1tnSp6iEeGR-6jhjFPx5A" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnS56iEeGR-6jhjFPx5A"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1tnTJ6iEeGR-6jhjFPx5A"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_z1tnTZ6iEeGR-6jhjFPx5A" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z1tnTp6iEeGR-6jhjFPx5A"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z13YMJ6iEeGR-6jhjFPx5A" x="10" y="10" width="200" height="400"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_z1asQp6iEeGR-6jhjFPx5A"/>
+    <edges xmi:id="_z1tnQZ6iEeGR-6jhjFPx5A" type="Transition" element="_z1tnQJ6iEeGR-6jhjFPx5A" source="_z1j2Op6iEeGR-6jhjFPx5A" target="_z1tnM56iEeGR-6jhjFPx5A">
+      <children xsi:type="notation:DecorationNode" xmi:id="_z1tnRZ6iEeGR-6jhjFPx5A" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_z1tnRp6iEeGR-6jhjFPx5A"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1tnR56iEeGR-6jhjFPx5A" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_z1tnQp6iEeGR-6jhjFPx5A" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_z1tnRJ6iEeGR-6jhjFPx5A" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z1tnQ56iEeGR-6jhjFPx5A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_U7BbMJ6jEeGR-6jhjFPx5A" type="Transition" element="_U6t5MJ6jEeGR-6jhjFPx5A" source="_z1tnM56iEeGR-6jhjFPx5A" target="_UkqwsJ6jEeGR-6jhjFPx5A">
+      <children xsi:type="notation:DecorationNode" xmi:id="_U7BbNJ6jEeGR-6jhjFPx5A" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_U7BbNZ6jEeGR-6jhjFPx5A"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_U7BbNp6jEeGR-6jhjFPx5A" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_U7BbMZ6jEeGR-6jhjFPx5A" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_U7BbM56jEeGR-6jhjFPx5A" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_U7BbMp6jEeGR-6jhjFPx5A" points="[13, 1, -104, -8]$[118, 36, 1, 27]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_U7dgEJ6jEeGR-6jhjFPx5A" id="(0.9057971014492754,0.49333333333333335)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_U7dgEZ6jEeGR-6jhjFPx5A" id="(0.1323529411764706,0.48214285714285715)"/>
+    </edges>
+    <edges xmi:id="_vLAgsJ6kEeGaJ9hFM1hQaQ" type="Transition" element="_vK2vsJ6kEeGaJ9hFM1hQaQ" source="_UkqwsJ6jEeGR-6jhjFPx5A" target="_z1tnM56iEeGR-6jhjFPx5A">
+      <children xsi:type="notation:DecorationNode" xmi:id="_vLJqoJ6kEeGaJ9hFM1hQaQ" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_vLJqoZ6kEeGaJ9hFM1hQaQ"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_vLJqop6kEeGaJ9hFM1hQaQ" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_vLAgsZ6kEeGaJ9hFM1hQaQ" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_vLAgs56kEeGaJ9hFM1hQaQ" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vLAgsp6kEeGaJ9hFM1hQaQ" points="[-1, 1, 118, 1]$[-114, -15, 5, -15]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vLdMoJ6kEeGaJ9hFM1hQaQ" id="(0.008620689655172414,0.25757575757575757)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vLdMoZ6kEeGaJ9hFM1hQaQ" id="(0.8985507246376812,0.1797752808988764)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>

test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/ExitState.sct

@@ -13,12 +13,12 @@
           <vertices xsi:type="sgraph:Exit" xmi:id="_1ZKH6XlUEeKGpYVvL6kHXw" name="f" incomingTransitions="_5IGe0HlUEeKGpYVvL6kHXw"/>
           <vertices xsi:type="sgraph:Exit" xmi:id="_1v9eUHlUEeKGpYVvL6kHXw" name="g" incomingTransitions="_6dzGcHlUEeKGpYVvL6kHXw"/>
           <vertices xsi:type="sgraph:Entry" xmi:id="_i527AHlUEeKGpYVvL6kHXw">
-            <outgoingTransitions xmi:id="_0q1nkPBsEeK1RISRsLq72w" specification="" target="_dL538PBsEeK1RISRsLq72w"/>
+            <outgoingTransitions xmi:id="_0q1nkPBsEeK1RISRsLq72w" specification="" target="_PsSk8CA_EeO5Bsh-9TRWYA"/>
           </vertices>
-          <vertices xsi:type="sgraph:State" xmi:id="_dL538PBsEeK1RISRsLq72w" name="B" incomingTransitions="_0q1nkPBsEeK1RISRsLq72w">
-            <outgoingTransitions xmi:id="_vPTNsHlUEeKGpYVvL6kHXw" specification="e" target="_sDs0YHlUEeKGpYVvL6kHXw"/>
-            <outgoingTransitions xmi:id="_5IGe0HlUEeKGpYVvL6kHXw" specification="f" target="_1ZKH6XlUEeKGpYVvL6kHXw"/>
+          <vertices xsi:type="sgraph:State" xmi:id="_PsSk8CA_EeO5Bsh-9TRWYA" name="B" incomingTransitions="_0q1nkPBsEeK1RISRsLq72w">
             <outgoingTransitions xmi:id="_6dzGcHlUEeKGpYVvL6kHXw" specification="g" target="_1v9eUHlUEeKGpYVvL6kHXw"/>
+            <outgoingTransitions xmi:id="_5IGe0HlUEeKGpYVvL6kHXw" specification="f" target="_1ZKH6XlUEeKGpYVvL6kHXw"/>
+            <outgoingTransitions xmi:id="_vPTNsHlUEeKGpYVvL6kHXw" specification="e" target="_sDs0YHlUEeKGpYVvL6kHXw"/>
           </vertices>
         </regions>
       </vertices>
@@ -84,7 +84,7 @@
                     <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1ZKH5nlUEeKGpYVvL6kHXw" x="19" y="4"/>
                   </children>
                   <styles xsi:type="notation:ShapeStyle" xmi:id="_1ZKH53lUEeKGpYVvL6kHXw" fontName="Verdana" lineColor="4210752"/>
-                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1ZKH6HlUEeKGpYVvL6kHXw" x="171" y="22"/>
+                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1ZKH6HlUEeKGpYVvL6kHXw" x="171" y="33"/>
                 </children>
                 <children xmi:id="_1v83QXlUEeKGpYVvL6kHXw" type="Exit" element="_1v9eUHlUEeKGpYVvL6kHXw">
                   <children xmi:id="_1v83QnlUEeKGpYVvL6kHXw" type="BorderItemLabelContainer">
@@ -96,7 +96,7 @@
                     <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1v83R3lUEeKGpYVvL6kHXw" x="19" y="2"/>
                   </children>
                   <styles xsi:type="notation:ShapeStyle" xmi:id="_1v83SHlUEeKGpYVvL6kHXw" fontName="Verdana" lineColor="4210752"/>
-                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1v83SXlUEeKGpYVvL6kHXw" x="171" y="50"/>
+                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1v83SXlUEeKGpYVvL6kHXw" x="171" y="66"/>
                 </children>
                 <children xmi:id="_i54JIHlUEeKGpYVvL6kHXw" type="Entry" element="_i527AHlUEeKGpYVvL6kHXw">
                   <children xmi:id="_i54JI3lUEeKGpYVvL6kHXw" type="BorderItemLabelContainer">
@@ -110,21 +110,21 @@
                   <styles xsi:type="notation:ShapeStyle" xmi:id="_i54JIXlUEeKGpYVvL6kHXw" fontName="Verdana" lineColor="4210752"/>
                   <layoutConstraint xsi:type="notation:Bounds" xmi:id="_i54JInlUEeKGpYVvL6kHXw" x="11" y="-2"/>
                 </children>
-                <children xmi:id="_dL-wcPBsEeK1RISRsLq72w" type="State" element="_dL538PBsEeK1RISRsLq72w">
-                  <children xsi:type="notation:DecorationNode" xmi:id="_dL_-kPBsEeK1RISRsLq72w" type="StateName">
-                    <styles xsi:type="notation:ShapeStyle" xmi:id="_dL_-kfBsEeK1RISRsLq72w"/>
-                    <layoutConstraint xsi:type="notation:Location" xmi:id="_dL_-kvBsEeK1RISRsLq72w"/>
+                <children xmi:id="_PsYEgCA_EeO5Bsh-9TRWYA" type="State" element="_PsSk8CA_EeO5Bsh-9TRWYA">
+                  <children xsi:type="notation:DecorationNode" xmi:id="_PsYEhCA_EeO5Bsh-9TRWYA" type="StateName">
+                    <styles xsi:type="notation:ShapeStyle" xmi:id="_PsYEhSA_EeO5Bsh-9TRWYA"/>
+                    <layoutConstraint xsi:type="notation:Location" xmi:id="_PsYEhiA_EeO5Bsh-9TRWYA"/>
                   </children>
-                  <children xsi:type="notation:Compartment" xmi:id="_dL_-k_BsEeK1RISRsLq72w" type="StateTextCompartment">
-                    <children xsi:type="notation:Shape" xmi:id="_dMAloPBsEeK1RISRsLq72w" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
-                      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dMAlofBsEeK1RISRsLq72w"/>
+                  <children xsi:type="notation:Compartment" xmi:id="_PsYrkCA_EeO5Bsh-9TRWYA" type="StateTextCompartment">
+                    <children xsi:type="notation:Shape" xmi:id="_PsYrkSA_EeO5Bsh-9TRWYA" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+                      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PsYrkiA_EeO5Bsh-9TRWYA"/>
                     </children>
                   </children>
-                  <children xsi:type="notation:Compartment" xmi:id="_dMAlovBsEeK1RISRsLq72w" type="StateFigureCompartment"/>
-                  <styles xsi:type="notation:ShapeStyle" xmi:id="_dL-wcfBsEeK1RISRsLq72w" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
-                  <styles xsi:type="notation:FontStyle" xmi:id="_dL-wcvBsEeK1RISRsLq72w"/>
-                  <styles xsi:type="notation:BooleanValueStyle" xmi:id="_dMAlo_BsEeK1RISRsLq72w" name="isHorizontal" booleanValue="true"/>
-                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dL-wc_BsEeK1RISRsLq72w" x="54" y="-2"/>
+                  <children xsi:type="notation:Compartment" xmi:id="_PsZSoCA_EeO5Bsh-9TRWYA" type="StateFigureCompartment"/>
+                  <styles xsi:type="notation:ShapeStyle" xmi:id="_PsYEgSA_EeO5Bsh-9TRWYA" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+                  <styles xsi:type="notation:FontStyle" xmi:id="_PsYEgiA_EeO5Bsh-9TRWYA"/>
+                  <styles xsi:type="notation:BooleanValueStyle" xmi:id="_PsZSoSA_EeO5Bsh-9TRWYA" name="isHorizontal" booleanValue="true"/>
+                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PsYEgyA_EeO5Bsh-9TRWYA" x="43" y="17"/>
                 </children>
                 <layoutConstraint xsi:type="notation:Bounds" xmi:id="_clL38XlUEeKGpYVvL6kHXw"/>
               </children>
@@ -135,7 +135,7 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_ZJiQd3lUEeKGpYVvL6kHXw" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_ZJiQeHlUEeKGpYVvL6kHXw"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ZJjekXlUEeKGpYVvL6kHXw" name="isHorizontal" booleanValue="true"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZJjeknlUEeKGpYVvL6kHXw" x="37" y="79" width="247" height="177"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZJjeknlUEeKGpYVvL6kHXw" x="37" y="79" width="236" height="177"/>
         </children>
         <children xmi:id="_BE9nsHlVEeKGpYVvL6kHXw" type="State" element="_BE8ZkHlVEeKGpYVvL6kHXw">
           <children xsi:type="notation:DecorationNode" xmi:id="_BE9ntHlVEeKGpYVvL6kHXw" type="StateName">
@@ -151,7 +151,7 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_BE9nsXlVEeKGpYVvL6kHXw" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_BE9nsnlVEeKGpYVvL6kHXw"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BE-Ow3lVEeKGpYVvL6kHXw" name="isHorizontal" booleanValue="true"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BE9ns3lVEeKGpYVvL6kHXw" x="421" y="103" width="40" height="48"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BE9ns3lVEeKGpYVvL6kHXw" x="467" y="103" width="40" height="53"/>
         </children>
         <children xmi:id="_Eb2D8HlVEeKGpYVvL6kHXw" type="State" element="_Eb010HlVEeKGpYVvL6kHXw">
           <children xsi:type="notation:DecorationNode" xmi:id="_Eb2rAHlVEeKGpYVvL6kHXw" type="StateName">
@@ -167,12 +167,12 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_Eb2D8XlVEeKGpYVvL6kHXw" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_Eb2D8nlVEeKGpYVvL6kHXw"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Eb2rB3lVEeKGpYVvL6kHXw" name="isHorizontal" booleanValue="true"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Eb2D83lVEeKGpYVvL6kHXw" x="421" y="171" width="40" height="48"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Eb2D83lVEeKGpYVvL6kHXw" x="467" y="171" width="40" height="53"/>
         </children>
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZJhCVHlUEeKGpYVvL6kHXw"/>
       </children>
       <styles xsi:type="notation:ShapeStyle" xmi:id="_ZJemEXlUEeKGpYVvL6kHXw" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZJhpYHlUEeKGpYVvL6kHXw" x="216" y="10" width="593" height="302"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZJhpYHlUEeKGpYVvL6kHXw" x="216" y="10" width="529" height="302"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_ZJkss3lUEeKGpYVvL6kHXw" type="StatechartText" fontName="Verdana" lineColor="4210752">
       <children xsi:type="notation:DecorationNode" xmi:id="_ZJkstXlUEeKGpYVvL6kHXw" type="StatechartName">
@@ -194,7 +194,7 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_ZJkFo3lUEeKGpYVvL6kHXw" fontName="Verdana"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZJkFonlUEeKGpYVvL6kHXw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
     </edges>
-    <edges xmi:id="_vPUb0HlUEeKGpYVvL6kHXw" type="Transition" element="_vPTNsHlUEeKGpYVvL6kHXw" source="_dL-wcPBsEeK1RISRsLq72w" target="_sDsNUHlUEeKGpYVvL6kHXw">
+    <edges xmi:id="_vPUb0HlUEeKGpYVvL6kHXw" type="Transition" element="_vPTNsHlUEeKGpYVvL6kHXw" source="_PsYEgCA_EeO5Bsh-9TRWYA" target="_sDsNUHlUEeKGpYVvL6kHXw">
       <children xsi:type="notation:DecorationNode" xmi:id="_vPUb1HlUEeKGpYVvL6kHXw" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_vPUb1XlUEeKGpYVvL6kHXw"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_vPVC4HlUEeKGpYVvL6kHXw" y="10"/>
@@ -202,8 +202,9 @@
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_vPUb0XlUEeKGpYVvL6kHXw" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_vPUb03lUEeKGpYVvL6kHXw" fontName="Verdana"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vPUb0nlUEeKGpYVvL6kHXw" points="[18, -4, -112, 23]$[137, -24, 7, 3]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_RluLwCA_EeO5Bsh-9TRWYA" id="(0.8064516129032258,0.39622641509433965)"/>
     </edges>
-    <edges xmi:id="_5IHs8HlUEeKGpYVvL6kHXw" type="Transition" element="_5IGe0HlUEeKGpYVvL6kHXw" source="_dL-wcPBsEeK1RISRsLq72w" target="_1ZKH4HlUEeKGpYVvL6kHXw">
+    <edges xmi:id="_5IHs8HlUEeKGpYVvL6kHXw" type="Transition" element="_5IGe0HlUEeKGpYVvL6kHXw" source="_PsYEgCA_EeO5Bsh-9TRWYA" target="_1ZKH4HlUEeKGpYVvL6kHXw">
       <children xsi:type="notation:DecorationNode" xmi:id="_5IHs9HlUEeKGpYVvL6kHXw" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_5IHs9XlUEeKGpYVvL6kHXw"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_5IHs9nlUEeKGpYVvL6kHXw" y="10"/>
@@ -211,8 +212,9 @@
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_5IHs8XlUEeKGpYVvL6kHXw" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_5IHs83lUEeKGpYVvL6kHXw" fontName="Verdana"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_5IHs8nlUEeKGpYVvL6kHXw" points="[18, 3, -112, -16]$[122, 19, -8, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Q8mWQCA_EeO5Bsh-9TRWYA" id="(0.8548387096774194,0.33962264150943394)"/>
     </edges>
-    <edges xmi:id="_6dztgHlUEeKGpYVvL6kHXw" type="Transition" element="_6dzGcHlUEeKGpYVvL6kHXw" source="_dL-wcPBsEeK1RISRsLq72w" target="_1v83QXlUEeKGpYVvL6kHXw">
+    <edges xmi:id="_6dztgHlUEeKGpYVvL6kHXw" type="Transition" element="_6dzGcHlUEeKGpYVvL6kHXw" source="_PsYEgCA_EeO5Bsh-9TRWYA" target="_1v83QXlUEeKGpYVvL6kHXw">
       <children xsi:type="notation:DecorationNode" xmi:id="_6d0UkHlUEeKGpYVvL6kHXw" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_6d0UkXlUEeKGpYVvL6kHXw"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_6d0UknlUEeKGpYVvL6kHXw" y="10"/>
@@ -220,7 +222,7 @@
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_6dztgXlUEeKGpYVvL6kHXw" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_6dztg3lUEeKGpYVvL6kHXw" fontName="Verdana"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_6dztgnlUEeKGpYVvL6kHXw" points="[18, 9, -112, -56]$[133, 72, 3, 7]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_gB7p4PBsEeK1RISRsLq72w" id="(0.625,0.7636363636363637)"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_gB7p4PBsEeK1RISRsLq72w" id="(0.8870967741935484,0.5849056603773585)"/>
     </edges>
     <edges xmi:id="_CDJHMHlVEeKGpYVvL6kHXw" type="Transition" element="_CDH5EHlVEeKGpYVvL6kHXw" source="_ZJiQdnlUEeKGpYVvL6kHXw" target="_BE9nsHlVEeKGpYVvL6kHXw">
       <children xsi:type="notation:DecorationNode" xmi:id="_CDJuQHlVEeKGpYVvL6kHXw" type="TransitionExpression">
@@ -243,7 +245,7 @@
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_FncUYXlVEeKGpYVvL6kHXw" points="[9, -5, -144, -3]$[158, -28, 5, -26]"/>
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_K-Y4QPBkEeKyMOgSbPoVNg" id="(0.9635627530364372,0.6497175141242938)"/>
     </edges>
-    <edges xmi:id="_0q3cwPBsEeK1RISRsLq72w" type="Transition" element="_0q1nkPBsEeK1RISRsLq72w" source="_i54JIHlUEeKGpYVvL6kHXw" target="_dL-wcPBsEeK1RISRsLq72w">
+    <edges xmi:id="_0q3cwPBsEeK1RISRsLq72w" type="Transition" element="_0q1nkPBsEeK1RISRsLq72w" source="_i54JIHlUEeKGpYVvL6kHXw" target="_PsYEgCA_EeO5Bsh-9TRWYA">
       <children xsi:type="notation:DecorationNode" xmi:id="_0q4D0PBsEeK1RISRsLq72w" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_0q4D0fBsEeK1RISRsLq72w"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_0q4D0vBsEeK1RISRsLq72w" y="10"/>
@@ -251,6 +253,7 @@
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_0q3cwfBsEeK1RISRsLq72w" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_0q3cw_BsEeK1RISRsLq72w" fontName="Verdana"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_0q3cwvBsEeK1RISRsLq72w" points="[7, 3, -46, -15]$[46, 43, -7, 25]"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SI_38CA_EeO5Bsh-9TRWYA" id="(0.08064516129032258,0.3018867924528302)"/>
     </edges>
   </notation:Diagram>
 </xmi:XMI>

test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/HistoryWithoutInitialStep.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">
-  <sgraph:Statechart xmi:id="_PSA8cDA8EeKkkaVMi1n7-A" specification="&#xA;interface:&#xA;&#xA;&#x9;in event e1&#xA;&#x9;in event e2&#xA;&#x9;" name="HistoryWithoutInitialStep">
+  <sgraph:Statechart xmi:id="_PSA8cDA8EeKkkaVMi1n7-A" specification="&#xA;interface:&#xA;&#xA;&#x9;in event e1&#xA;&#x9;in event e2&#xA;" name="HistoryWithoutInitialStep">
     <regions xmi:id="_PSCKkjA8EeKkkaVMi1n7-A" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_PSIRMjA8EeKkkaVMi1n7-A">
         <outgoingTransitions xmi:id="_PSKtcTA8EeKkkaVMi1n7-A" target="_PSJfUDA8EeKkkaVMi1n7-A"/>

test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/IntegerExpressions.sct

@@ -77,7 +77,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_OTbYi77WEeGmQI_7e4ED3g"/>
       </children>
       <styles xsi:type="notation:ShapeStyle" xmi:id="_OTbYhb7WEeGmQI_7e4ED3g" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_OTbYjL7WEeGmQI_7e4ED3g" x="260" y="10" width="546" height="636"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_OTbYjL7WEeGmQI_7e4ED3g" x="264" y="10" width="546" height="636"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_OTbYr77WEeGmQI_7e4ED3g" type="StatechartText" fontName="Verdana" lineColor="4210752">
       <children xsi:type="notation:DecorationNode" xmi:id="_OTbYsb7WEeGmQI_7e4ED3g" type="StatechartName">

test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/LogicalAnd.sct

@@ -0,0 +1,97 @@
+<?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="_W3v4UCA6EeO5Bsh-9TRWYA" specification="&#xA;interface: &#xA;&#xA;&#x9;var x : integer = 1&#xA;&#x9;var b : boolean = false&#xA;&#x9;&#xA;&#x9;" name="LogicalAnd">
+    <regions xmi:id="_W3wfYiA6EeO5Bsh-9TRWYA" name="main region">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_W3zisCA6EeO5Bsh-9TRWYA">
+        <outgoingTransitions xmi:id="_W31X4yA6EeO5Bsh-9TRWYA" target="_W30JxCA6EeO5Bsh-9TRWYA"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_W30JxCA6EeO5Bsh-9TRWYA" specification="" name="A" incomingTransitions="_W31X4yA6EeO5Bsh-9TRWYA _7zD4ECA7EeO5Bsh-9TRWYA">
+        <outgoingTransitions xmi:id="_7zD4ECA7EeO5Bsh-9TRWYA" specification="[x==1] / b = ( (x+=1) == 2 &amp;&amp; (x*= 2)  == 4 )" target="_W30JxCA6EeO5Bsh-9TRWYA"/>
+      </vertices>
+    </regions>
+  </sgraph:Statechart>
+  <notation:Diagram xmi:id="_W3wfYCA6EeO5Bsh-9TRWYA" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_W3v4UCA6EeO5Bsh-9TRWYA" measurementUnit="Pixel">
+    <children xmi:id="_W3xtgCA6EeO5Bsh-9TRWYA" type="Region" element="_W3wfYiA6EeO5Bsh-9TRWYA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_W3y7oCA6EeO5Bsh-9TRWYA" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_W3y7oSA6EeO5Bsh-9TRWYA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W3y7oiA6EeO5Bsh-9TRWYA"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_W3y7oyA6EeO5Bsh-9TRWYA" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_W3zisSA6EeO5Bsh-9TRWYA" type="Entry" element="_W3zisCA6EeO5Bsh-9TRWYA">
+          <children xmi:id="_W3zitCA6EeO5Bsh-9TRWYA" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_W30JwCA6EeO5Bsh-9TRWYA" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_W30JwSA6EeO5Bsh-9TRWYA"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_W30JwiA6EeO5Bsh-9TRWYA"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_W3zitSA6EeO5Bsh-9TRWYA" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W3zitiA6EeO5Bsh-9TRWYA"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_W3zisiA6EeO5Bsh-9TRWYA" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W30JwyA6EeO5Bsh-9TRWYA" x="71" y="57"/>
+        </children>
+        <children xmi:id="_W30JxiA6EeO5Bsh-9TRWYA" type="State" element="_W30JxCA6EeO5Bsh-9TRWYA">
+          <children xsi:type="notation:DecorationNode" xmi:id="_W30w0CA6EeO5Bsh-9TRWYA" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_W30w0SA6EeO5Bsh-9TRWYA"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_W30w0iA6EeO5Bsh-9TRWYA"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_W30w0yA6EeO5Bsh-9TRWYA" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_W30w1CA6EeO5Bsh-9TRWYA" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W30w1SA6EeO5Bsh-9TRWYA"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_W31X4CA6EeO5Bsh-9TRWYA" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_W30JxyA6EeO5Bsh-9TRWYA" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_W30JyCA6EeO5Bsh-9TRWYA"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_W31X4SA6EeO5Bsh-9TRWYA" name="isHorizontal" booleanValue="true"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W31X4iA6EeO5Bsh-9TRWYA" x="61" y="109"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__SWe4CA6EeO5Bsh-9TRWYA" type="Note" fontName="Verdana" description="makes sure that the and expression if evaluated in the right order (was an error in c &amp; c++ generator)" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
+          <children xsi:type="notation:BasicDecorationNode" xmi:id="__SXtACA6EeO5Bsh-9TRWYA" type="DiagramName">
+            <element xsi:nil="true"/>
+          </children>
+          <children xsi:type="notation:BasicDecorationNode" xmi:id="__SXtASA6EeO5Bsh-9TRWYA" type="Description">
+            <element xsi:nil="true"/>
+          </children>
+          <styles xsi:type="notation:TextStyle" xmi:id="__SWe4SA6EeO5Bsh-9TRWYA"/>
+          <styles xsi:type="notation:LineTypeStyle" xmi:id="__SWe4iA6EeO5Bsh-9TRWYA"/>
+          <element xsi:nil="true"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="__SWe4yA6EeO5Bsh-9TRWYA" x="9" y="245" width="346" height="35"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W3y7pCA6EeO5Bsh-9TRWYA"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_W3xtgSA6EeO5Bsh-9TRWYA" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W3y7pSA6EeO5Bsh-9TRWYA" x="220" y="10" width="400" height="400"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_W33NEyA6EeO5Bsh-9TRWYA" type="StatechartText" fontName="Verdana" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_W33NFSA6EeO5Bsh-9TRWYA" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_W33NFiA6EeO5Bsh-9TRWYA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W330ICA6EeO5Bsh-9TRWYA"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_W330ISA6EeO5Bsh-9TRWYA" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W330IiA6EeO5Bsh-9TRWYA"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W330IyA6EeO5Bsh-9TRWYA" x="10" y="10" width="200" height="400"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_W3wfYSA6EeO5Bsh-9TRWYA"/>
+    <edges xmi:id="_W32mACA6EeO5Bsh-9TRWYA" type="Transition" element="_W31X4yA6EeO5Bsh-9TRWYA" source="_W3zisSA6EeO5Bsh-9TRWYA" target="_W30JxiA6EeO5Bsh-9TRWYA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_W33NECA6EeO5Bsh-9TRWYA" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_W33NESA6EeO5Bsh-9TRWYA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W33NEiA6EeO5Bsh-9TRWYA" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_W32mASA6EeO5Bsh-9TRWYA" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_W32mAyA6EeO5Bsh-9TRWYA" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_W32mAiA6EeO5Bsh-9TRWYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_7zFtQCA7EeO5Bsh-9TRWYA" type="Transition" element="_7zD4ECA7EeO5Bsh-9TRWYA" source="_W30JxiA6EeO5Bsh-9TRWYA" target="_W30JxiA6EeO5Bsh-9TRWYA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_7zGUUCA7EeO5Bsh-9TRWYA" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_7zGUUSA7EeO5Bsh-9TRWYA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7zGUUiA7EeO5Bsh-9TRWYA" x="22" y="12"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_7zFtQSA7EeO5Bsh-9TRWYA" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_7zFtQyA7EeO5Bsh-9TRWYA" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7zFtQiA7EeO5Bsh-9TRWYA" points="[9, 0, 9, 9]$[76, 0, 76, 9]$[76, 41, 76, 50]$[8, 41, 8, 50]$[8, 9, 8, 18]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7zIwkCA7EeO5Bsh-9TRWYA" id="(0.7459016393442623,0.8301886792452831)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7zIwkSA7EeO5Bsh-9TRWYA" id="(0.7581967213114754,0.6415094339622641)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>

test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/Parenthesis.sct

@@ -1,72 +1,72 @@
-<?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="_C7hgcAJTEeKgI6gPkT8J7A" specification="interface: &#xD;&#xA;var erg : integer&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;" name="Parenthesis">
-    <regions xmi:id="_C7jVoAJTEeKgI6gPkT8J7A" name="mainRegion">
-      <vertices xsi:type="sgraph:Entry" xmi:id="_C7oOIQJTEeKgI6gPkT8J7A">
-        <outgoingTransitions xmi:id="_C7qqZQJTEeKgI6gPkT8J7A" target="_C7pcQQJTEeKgI6gPkT8J7A"/>
-      </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_C7pcQQJTEeKgI6gPkT8J7A" specification="entry /&#xD;&#xA;erg =  4* (3 -1)&#xD;&#xA;" name="A" incomingTransitions="_C7qqZQJTEeKgI6gPkT8J7A"/>
-    </regions>
-  </sgraph:Statechart>
-  <notation:Diagram xmi:id="_C7iukAJTEeKgI6gPkT8J7A" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_C7hgcAJTEeKgI6gPkT8J7A" measurementUnit="Pixel">
-    <children xmi:id="_C7lx4AJTEeKgI6gPkT8J7A" type="Region" element="_C7jVoAJTEeKgI6gPkT8J7A">
-      <children xsi:type="notation:DecorationNode" xmi:id="_C7nnEAJTEeKgI6gPkT8J7A" type="RegionName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_C7nnEQJTEeKgI6gPkT8J7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_C7nnEgJTEeKgI6gPkT8J7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_C7nnEwJTEeKgI6gPkT8J7A" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
-        <children xmi:id="_C7oOIgJTEeKgI6gPkT8J7A" type="Entry" element="_C7oOIQJTEeKgI6gPkT8J7A">
-          <children xmi:id="_C7o1MAJTEeKgI6gPkT8J7A" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_C7o1MwJTEeKgI6gPkT8J7A" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_C7o1NAJTEeKgI6gPkT8J7A"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_C7o1NQJTEeKgI6gPkT8J7A"/>
-            </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_C7o1MQJTEeKgI6gPkT8J7A" fontName="Verdana" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7o1MgJTEeKgI6gPkT8J7A"/>
-          </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_C7oOIwJTEeKgI6gPkT8J7A" fontName="Verdana" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7pcQAJTEeKgI6gPkT8J7A" x="119" y="39"/>
-        </children>
-        <children xmi:id="_C7pcQwJTEeKgI6gPkT8J7A" type="State" element="_C7pcQQJTEeKgI6gPkT8J7A">
-          <children xsi:type="notation:DecorationNode" xmi:id="_C7qDUAJTEeKgI6gPkT8J7A" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_C7qDUQJTEeKgI6gPkT8J7A"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_C7qDUgJTEeKgI6gPkT8J7A"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_C7qDUwJTEeKgI6gPkT8J7A" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_C7qqYAJTEeKgI6gPkT8J7A" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7qqYQJTEeKgI6gPkT8J7A"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_C7qqYgJTEeKgI6gPkT8J7A" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_C7pcRAJTEeKgI6gPkT8J7A" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_C7pcRQJTEeKgI6gPkT8J7A"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_C7qqYwJTEeKgI6gPkT8J7A"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7qqZAJTEeKgI6gPkT8J7A" x="4" y="74" width="201" height="76"/>
-        </children>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7nnFAJTEeKgI6gPkT8J7A"/>
-      </children>
-      <styles xsi:type="notation:ShapeStyle" xmi:id="_C7lx4QJTEeKgI6gPkT8J7A" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7oOIAJTEeKgI6gPkT8J7A" x="220" y="10" width="331" height="206"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_C7sfkAJTEeKgI6gPkT8J7A" type="StatechartText" fontName="Verdana" lineColor="4210752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_C7sfkgJTEeKgI6gPkT8J7A" type="StatechartName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_C7sfkwJTEeKgI6gPkT8J7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_C7sflAJTEeKgI6gPkT8J7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_C7tGoAJTEeKgI6gPkT8J7A" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7tGoQJTEeKgI6gPkT8J7A"/>
-      </children>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7tGogJTEeKgI6gPkT8J7A" x="10" y="10" width="200" height="206"/>
-    </children>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_C7iukQJTEeKgI6gPkT8J7A"/>
-    <edges xmi:id="_C7r4gAJTEeKgI6gPkT8J7A" type="Transition" element="_C7qqZQJTEeKgI6gPkT8J7A" source="_C7oOIgJTEeKgI6gPkT8J7A" target="_C7pcQwJTEeKgI6gPkT8J7A">
-      <children xsi:type="notation:DecorationNode" xmi:id="_C7r4hAJTEeKgI6gPkT8J7A" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_C7r4hQJTEeKgI6gPkT8J7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_C7r4hgJTEeKgI6gPkT8J7A" y="10"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_C7r4gQJTEeKgI6gPkT8J7A" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_C7r4gwJTEeKgI6gPkT8J7A" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_C7r4ggJTEeKgI6gPkT8J7A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    </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="_C7hgcAJTEeKgI6gPkT8J7A" specification="interface: &#xD;&#xA;var erg : integer&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;" name="Parenthesis">
+    <regions xmi:id="_C7jVoAJTEeKgI6gPkT8J7A" name="mainRegion">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_C7oOIQJTEeKgI6gPkT8J7A">
+        <outgoingTransitions xmi:id="_C7qqZQJTEeKgI6gPkT8J7A" target="_C7pcQQJTEeKgI6gPkT8J7A"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_C7pcQQJTEeKgI6gPkT8J7A" specification="entry /&#xD;&#xA;erg =  4* (3 -1)&#xD;&#xA;" name="A" incomingTransitions="_C7qqZQJTEeKgI6gPkT8J7A"/>
+    </regions>
+  </sgraph:Statechart>
+  <notation:Diagram xmi:id="_C7iukAJTEeKgI6gPkT8J7A" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_C7hgcAJTEeKgI6gPkT8J7A" measurementUnit="Pixel">
+    <children xmi:id="_C7lx4AJTEeKgI6gPkT8J7A" type="Region" element="_C7jVoAJTEeKgI6gPkT8J7A">
+      <children xsi:type="notation:DecorationNode" xmi:id="_C7nnEAJTEeKgI6gPkT8J7A" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_C7nnEQJTEeKgI6gPkT8J7A"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_C7nnEgJTEeKgI6gPkT8J7A"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_C7nnEwJTEeKgI6gPkT8J7A" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_C7oOIgJTEeKgI6gPkT8J7A" type="Entry" element="_C7oOIQJTEeKgI6gPkT8J7A">
+          <children xmi:id="_C7o1MAJTEeKgI6gPkT8J7A" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_C7o1MwJTEeKgI6gPkT8J7A" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_C7o1NAJTEeKgI6gPkT8J7A"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_C7o1NQJTEeKgI6gPkT8J7A"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_C7o1MQJTEeKgI6gPkT8J7A" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7o1MgJTEeKgI6gPkT8J7A"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_C7oOIwJTEeKgI6gPkT8J7A" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7pcQAJTEeKgI6gPkT8J7A" x="119" y="39"/>
+        </children>
+        <children xmi:id="_C7pcQwJTEeKgI6gPkT8J7A" type="State" element="_C7pcQQJTEeKgI6gPkT8J7A">
+          <children xsi:type="notation:DecorationNode" xmi:id="_C7qDUAJTEeKgI6gPkT8J7A" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_C7qDUQJTEeKgI6gPkT8J7A"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_C7qDUgJTEeKgI6gPkT8J7A"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_C7qDUwJTEeKgI6gPkT8J7A" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_C7qqYAJTEeKgI6gPkT8J7A" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7qqYQJTEeKgI6gPkT8J7A"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_C7qqYgJTEeKgI6gPkT8J7A" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_C7pcRAJTEeKgI6gPkT8J7A" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_C7pcRQJTEeKgI6gPkT8J7A"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_C7qqYwJTEeKgI6gPkT8J7A"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7qqZAJTEeKgI6gPkT8J7A" x="4" y="74" width="201" height="76"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7nnFAJTEeKgI6gPkT8J7A"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_C7lx4QJTEeKgI6gPkT8J7A" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7oOIAJTEeKgI6gPkT8J7A" x="220" y="10" width="331" height="206"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_C7sfkAJTEeKgI6gPkT8J7A" type="StatechartText" fontName="Verdana" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_C7sfkgJTEeKgI6gPkT8J7A" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_C7sfkwJTEeKgI6gPkT8J7A"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_C7sflAJTEeKgI6gPkT8J7A"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_C7tGoAJTEeKgI6gPkT8J7A" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7tGoQJTEeKgI6gPkT8J7A"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_C7tGogJTEeKgI6gPkT8J7A" x="10" y="10" width="200" height="206"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_C7iukQJTEeKgI6gPkT8J7A"/>
+    <edges xmi:id="_C7r4gAJTEeKgI6gPkT8J7A" type="Transition" element="_C7qqZQJTEeKgI6gPkT8J7A" source="_C7oOIgJTEeKgI6gPkT8J7A" target="_C7pcQwJTEeKgI6gPkT8J7A">
+      <children xsi:type="notation:DecorationNode" xmi:id="_C7r4hAJTEeKgI6gPkT8J7A" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_C7r4hQJTEeKgI6gPkT8J7A"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_C7r4hgJTEeKgI6gPkT8J7A" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_C7r4gQJTEeKgI6gPkT8J7A" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_C7r4gwJTEeKgI6gPkT8J7A" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_C7r4ggJTEeKgI6gPkT8J7A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>

test-plugins/org.yakindu.sct.test.models/tests/AllTests.sctunit

@@ -8,6 +8,7 @@ testsuite AllTests {
 	Guard, GuardedEntry, GuardedExit, 
 	HistoryWithoutInitialStep,
 	InEventLifeCycle, IntegerExpressions, InternalEventLifeCycle,
+	LogicalAndTests,
 	NamedInterfaceAccess,
 	OutEventLifeCycle,
 	Parenthesis, PriorityValues,

test-plugins/org.yakindu.sct.test.models/tests/AlwaysOncycle.sctunit

@@ -1,5 +1,5 @@
 testgroup AlwaysOncycle for statechart AlwaysOncycle {
-	
+
 	 test alwaysOncycleTest {
 	 	
 	 	enter

test-plugins/org.yakindu.sct.test.models/tests/LogicalAnd.sctunit

@@ -0,0 +1,12 @@
+
+testgroup LogicalAndTests for statechart LogicalAnd {
+	
+	test operandEvaluationOrder {
+		
+		enter
+		cycle
+		
+		assert x == 4 && b "logical and expression was executed in wrong order..."	
+	}
+
+}