Extended test models for extract subdiagram tests.

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/impl/ExtractSubdiagramRefactoringTest.java

@@ -28,8 +28,8 @@ public class ExtractSubdiagramRefactoringTest extends ViewBasedRefactoringTest {
 	@Test
 	public void testTwoEntryPoints() {
 		testRefactoring(
-				EXTRACT_SUBDIAGRAM + "before_twoEntryPoints.sct", 
-				EXTRACT_SUBDIAGRAM + "after_twoEntryPoints.sct", 
+				EXTRACT_SUBDIAGRAM + "before_twoEntryExitPoints.sct", 
+				EXTRACT_SUBDIAGRAM + "after_twoEntryExitPoints.sct", 
 				"Composite");
 	}
 	

test-plugins/org.yakindu.sct.refactoring.tests/testmodels/refactoring/extract_subdiagram/after_twoEntryPoints.sct

@@ -9,27 +9,30 @@
         <outgoingTransitions xmi:id="_QTY6EMdmEeGOoP2Ze98WBQ" specification="event1 # > entry_B0" target="_wr22MMdmEeGOoP2Ze98WBQ"/>
         <outgoingTransitions xmi:id="_q-EGYMmqEeGJr-muz4j25w" specification="" target="_jeUXUMmqEeGJr-muz4j25w"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_XzbkEMdmEeGOoP2Ze98WBQ" specification="" name="E" incomingTransitions="_iI41kesCEeOsdKncm9SrMw"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_XzbkEMdmEeGOoP2Ze98WBQ" specification="" name="E" incomingTransitions="_jZWiZ-vHEeOCxqVQAxvSrg _jZd3JOvHEeOCxqVQAxvSrg"/>
       <vertices xsi:type="sgraph:State" xmi:id="_wr22MMdmEeGOoP2Ze98WBQ" specification="" name="Composite" incomingTransitions="_kxXTkMmqEeGJr-muz4j25w _QTY6EMdmEeGOoP2Ze98WBQ">
-        <outgoingTransitions xmi:id="_iI41kesCEeOsdKncm9SrMw" specification=" # exit_D0 >" target="_XzbkEMdmEeGOoP2Ze98WBQ"/>
+        <outgoingTransitions xmi:id="_jZWiZ-vHEeOCxqVQAxvSrg" specification=" # exit_D0 >" target="_XzbkEMdmEeGOoP2Ze98WBQ"/>
+        <outgoingTransitions xmi:id="_jZd3JOvHEeOCxqVQAxvSrg" specification=" # exit_C1 >" target="_XzbkEMdmEeGOoP2Ze98WBQ"/>
         <regions xmi:id="_ABNPkMdnEeGOoP2Ze98WBQ" name="Inner">
           <vertices xsi:type="sgraph:State" xmi:id="_Tmj7AMdmEeGOoP2Ze98WBQ" name="D" incomingTransitions="_UaJ7IMdmEeGOoP2Ze98WBQ _U8B5IMdmEeGOoP2Ze98WBQ">
-            <outgoingTransitions xmi:id="_YboMgMdmEeGOoP2Ze98WBQ" specification="event3" target="_iIyH4OsCEeOsdKncm9SrMw"/>
+            <outgoingTransitions xmi:id="_YboMgMdmEeGOoP2Ze98WBQ" specification="event3" target="_jZRC0OvHEeOCxqVQAxvSrg"/>
           </vertices>
-          <vertices xsi:type="sgraph:State" xmi:id="_Rr0soMdmEeGOoP2Ze98WBQ" specification="" name="C" incomingTransitions="_SJMlIMdmEeGOoP2Ze98WBQ _iIa7gOsCEeOsdKncm9SrMw">
+          <vertices xsi:type="sgraph:State" xmi:id="_Rr0soMdmEeGOoP2Ze98WBQ" specification="" name="C" incomingTransitions="_SJMlIMdmEeGOoP2Ze98WBQ _jY5PYevHEeOCxqVQAxvSrg">
             <outgoingTransitions xmi:id="_UaJ7IMdmEeGOoP2Ze98WBQ" specification="" target="_Tmj7AMdmEeGOoP2Ze98WBQ"/>
+            <outgoingTransitions xmi:id="_cSyIUOvHEeOCxqVQAxvSrg" specification="event3" target="_jZYXkOvHEeOCxqVQAxvSrg"/>
           </vertices>
-          <vertices xsi:type="sgraph:State" xmi:id="_OTYKIMdmEeGOoP2Ze98WBQ" specification="" name="B" incomingTransitions="_iInIwesCEeOsdKncm9SrMw">
+          <vertices xsi:type="sgraph:State" xmi:id="_OTYKIMdmEeGOoP2Ze98WBQ" specification="" name="B" incomingTransitions="_jZGDsOvHEeOCxqVQAxvSrg">
             <outgoingTransitions xmi:id="_SJMlIMdmEeGOoP2Ze98WBQ" specification="event3" target="_Rr0soMdmEeGOoP2Ze98WBQ"/>
             <outgoingTransitions xmi:id="_U8B5IMdmEeGOoP2Ze98WBQ" specification="" target="_Tmj7AMdmEeGOoP2Ze98WBQ"/>
           </vertices>
-          <vertices xsi:type="sgraph:Entry" xmi:id="_iIaUcOsCEeOsdKncm9SrMw" name="entry_C0">
-            <outgoingTransitions xmi:id="_iIa7gOsCEeOsdKncm9SrMw" specification="" target="_Rr0soMdmEeGOoP2Ze98WBQ"/>
+          <vertices xsi:type="sgraph:Entry" xmi:id="_jY5PYOvHEeOCxqVQAxvSrg" name="entry_C0">
+            <outgoingTransitions xmi:id="_jY5PYevHEeOCxqVQAxvSrg" specification="" target="_Rr0soMdmEeGOoP2Ze98WBQ"/>
           </vertices>
-          <vertices xsi:type="sgraph:Entry" xmi:id="_iInIwOsCEeOsdKncm9SrMw" name="entry_B0">
-            <outgoingTransitions xmi:id="_iInIwesCEeOsdKncm9SrMw" specification="" target="_OTYKIMdmEeGOoP2Ze98WBQ"/>
+          <vertices xsi:type="sgraph:Entry" xmi:id="_jZFcoOvHEeOCxqVQAxvSrg" name="entry_B0">
+            <outgoingTransitions xmi:id="_jZGDsOvHEeOCxqVQAxvSrg" specification="" target="_OTYKIMdmEeGOoP2Ze98WBQ"/>
           </vertices>
-          <vertices xsi:type="sgraph:Exit" xmi:id="_iIyH4OsCEeOsdKncm9SrMw" name="exit_D0" incomingTransitions="_YboMgMdmEeGOoP2Ze98WBQ"/>
+          <vertices xsi:type="sgraph:Exit" xmi:id="_jZRC0OvHEeOCxqVQAxvSrg" name="exit_D0" incomingTransitions="_YboMgMdmEeGOoP2Ze98WBQ"/>
+          <vertices xsi:type="sgraph:Exit" xmi:id="_jZYXkOvHEeOCxqVQAxvSrg" name="exit_C1" incomingTransitions="_cSyIUOvHEeOCxqVQAxvSrg"/>
         </regions>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_jeUXUMmqEeGJr-muz4j25w" name="A2" incomingTransitions="_q-EGYMmqEeGJr-muz4j25w">
@@ -86,7 +89,7 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_XziRwMdmEeGOoP2Ze98WBQ" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_XziRwcdmEeGOoP2Ze98WBQ"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Xzi408dmEeGOoP2Ze98WBQ"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XziRwsdmEeGOoP2Ze98WBQ" x="561" y="167"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XziRwsdmEeGOoP2Ze98WBQ" x="561" y="155"/>
         </children>
         <children xmi:id="_5l-RgMdmEeGOoP2Ze98WBQ" type="SubmachineState" element="_wr22MMdmEeGOoP2Ze98WBQ">
           <children xsi:type="notation:DecorationNode" xmi:id="_5l-RhMdmEeGOoP2Ze98WBQ" type="StateName">
@@ -102,8 +105,8 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_5l-RgcdmEeGOoP2Ze98WBQ" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_5l-RgsdmEeGOoP2Ze98WBQ"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_5l-4lcdmEeGOoP2Ze98WBQ"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_iIYfQOsCEeOsdKncm9SrMw" name="isInline"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5l-Rg8dmEeGOoP2Ze98WBQ" x="213" y="149" width="138" height="71"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jY3aMOvHEeOCxqVQAxvSrg" name="isInline"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5l-Rg8dmEeGOoP2Ze98WBQ" x="189" y="153" width="118" height="57"/>
         </children>
         <children xmi:id="_jehLoMmqEeGJr-muz4j25w" type="State" element="_jeUXUMmqEeGJr-muz4j25w">
           <children xsi:type="notation:DecorationNode" xmi:id="_jehysMmqEeGJr-muz4j25w" type="StateName">
@@ -149,7 +152,7 @@
     <edges xmi:id="_QTbWUMdmEeGOoP2Ze98WBQ" type="Transition" element="_QTY6EMdmEeGOoP2Ze98WBQ" source="_NElbwcdmEeGOoP2Ze98WBQ" target="_5l-RgMdmEeGOoP2Ze98WBQ">
       <children xsi:type="notation:DecorationNode" xmi:id="_QTbWVMdmEeGOoP2Ze98WBQ" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_QTbWVcdmEeGOoP2Ze98WBQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QTbWVsdmEeGOoP2Ze98WBQ" x="-22" y="10"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QTbWVsdmEeGOoP2Ze98WBQ" x="-4" y="-28"/>
       </children>
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_QTbWUcdmEeGOoP2Ze98WBQ" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_QTbWU8dmEeGOoP2Ze98WBQ" fontName="Verdana"/>
@@ -165,7 +168,7 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_SJQPgMdmEeGOoP2Ze98WBQ" fontName="Verdana"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_SJPocsdmEeGOoP2Ze98WBQ" points="[-8, 12, 1, -83]$[-8, 91, 1, -4]"/>
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SJTS0MdmEeGOoP2Ze98WBQ" id="(0.625,0.7547169811320755)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SJTS0cdmEeGOoP2Ze98WBQ" id="(0.4,0.20754716981132076)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SJTS0cdmEeGOoP2Ze98WBQ" id="(0.2,0.09433962264150944)"/>
     </edges>
     <edges xmi:id="_UaQo0MdmEeGOoP2Ze98WBQ" type="Transition" element="_UaJ7IMdmEeGOoP2Ze98WBQ" source="_Rr-doMdmEeGOoP2Ze98WBQ" target="_TmozgMdmEeGOoP2Ze98WBQ">
       <children xsi:type="notation:DecorationNode" xmi:id="_UaQo1MdmEeGOoP2Ze98WBQ" type="TransitionExpression">
@@ -188,7 +191,7 @@
     <edges xmi:id="_kxhEkMmqEeGJr-muz4j25w" type="Transition" element="_kxXTkMmqEeGJr-muz4j25w" source="_jehLoMmqEeGJr-muz4j25w" target="_5l-RgMdmEeGOoP2Ze98WBQ">
       <children xsi:type="notation:DecorationNode" xmi:id="_kxhElMmqEeGJr-muz4j25w" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_kxhElcmqEeGJr-muz4j25w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kxhElsmqEeGJr-muz4j25w" x="-26" y="9"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kxhElsmqEeGJr-muz4j25w" x="9" y="34"/>
       </children>
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_kxhEkcmqEeGJr-muz4j25w" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_kxhEk8mqEeGJr-muz4j25w" fontName="Verdana"/>
@@ -204,17 +207,26 @@
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_q-MpQsmqEeGJr-muz4j25w" points="[-3, 24, 2, -93]$[-3, 112, 2, -5]"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_q-XBUMmqEeGJr-muz4j25w" id="(0.325,0.11320754716981132)"/>
     </edges>
-    <edges xmi:id="_iI41kusCEeOsdKncm9SrMw" type="Transition" element="_iI41kesCEeOsdKncm9SrMw" source="_5l-RgMdmEeGOoP2Ze98WBQ" target="_XzhqsMdmEeGOoP2Ze98WBQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_iI5coesCEeOsdKncm9SrMw" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_iI5cousCEeOsdKncm9SrMw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iI5co-sCEeOsdKncm9SrMw" y="10"/>
+    <edges xmi:id="_jZXJcOvHEeOCxqVQAxvSrg" type="Transition" element="_jZWiZ-vHEeOCxqVQAxvSrg" source="_5l-RgMdmEeGOoP2Ze98WBQ" target="_XzhqsMdmEeGOoP2Ze98WBQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_jZXwgOvHEeOCxqVQAxvSrg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_jZXwgevHEeOCxqVQAxvSrg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jZXwguvHEeOCxqVQAxvSrg" y="10"/>
       </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_iI41k-sCEeOsdKncm9SrMw" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_iI5coOsCEeOsdKncm9SrMw" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_iI41lOsCEeOsdKncm9SrMw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_jZXJcevHEeOCxqVQAxvSrg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_jZXJc-vHEeOCxqVQAxvSrg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_jZXJcuvHEeOCxqVQAxvSrg" points="[0, 26, -333, 14]$[0, 48, -333, 36]$[333, 48, 0, 36]$[333, 36, 0, 24]"/>
+    </edges>
+    <edges xmi:id="_jZeeMOvHEeOCxqVQAxvSrg" type="Transition" element="_jZd3JOvHEeOCxqVQAxvSrg" source="_5l-RgMdmEeGOoP2Ze98WBQ" target="_XzhqsMdmEeGOoP2Ze98WBQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_jZeeNOvHEeOCxqVQAxvSrg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_jZeeNevHEeOCxqVQAxvSrg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jZeeNuvHEeOCxqVQAxvSrg" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_jZeeMevHEeOCxqVQAxvSrg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_jZeeM-vHEeOCxqVQAxvSrg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_jZeeMuvHEeOCxqVQAxvSrg" points="[0, -26, -333, -26]$[0, -51, -333, -51]$[333, -51, 0, -51]$[333, -24, 0, -24]"/>
     </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_iIZtYOsCEeOsdKncm9SrMw" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_wr22MMdmEeGOoP2Ze98WBQ" measurementUnit="Pixel">
+  <notation:Diagram xmi:id="_jY4oUOvHEeOCxqVQAxvSrg" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_wr22MMdmEeGOoP2Ze98WBQ" measurementUnit="Pixel">
     <children xmi:id="_ABSvIMdnEeGOoP2Ze98WBQ" type="Region" element="_ABNPkMdnEeGOoP2Ze98WBQ">
       <children xsi:type="notation:DecorationNode" xmi:id="_ABTWMMdnEeGOoP2Ze98WBQ" type="RegionName">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_ABTWMcdnEeGOoP2Ze98WBQ"/>
@@ -235,7 +247,7 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_TmozgcdmEeGOoP2Ze98WBQ" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_TmozgsdmEeGOoP2Ze98WBQ"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Tmpak8dmEeGOoP2Ze98WBQ"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Tmozg8dmEeGOoP2Ze98WBQ" x="156" y="53"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Tmozg8dmEeGOoP2Ze98WBQ" x="138" y="49"/>
         </children>
         <children xmi:id="_Rr-doMdmEeGOoP2Ze98WBQ" type="State" element="_Rr0soMdmEeGOoP2Ze98WBQ">
           <children xsi:type="notation:DecorationNode" xmi:id="_Rr_EsMdmEeGOoP2Ze98WBQ" type="StateName">
@@ -251,7 +263,7 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_Rr-docdmEeGOoP2Ze98WBQ" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_Rr-dosdmEeGOoP2Ze98WBQ"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Rr_Et8dmEeGOoP2Ze98WBQ"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Rr-do8dmEeGOoP2Ze98WBQ" x="25" y="125"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Rr-do8dmEeGOoP2Ze98WBQ" x="30" y="109"/>
         </children>
         <children xmi:id="_OTjwUMdmEeGOoP2Ze98WBQ" type="State" element="_OTYKIMdmEeGOoP2Ze98WBQ">
           <children xsi:type="notation:DecorationNode" xmi:id="_OTjwVMdmEeGOoP2Ze98WBQ" type="StateName">
@@ -269,74 +281,53 @@
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OTkXZcdmEeGOoP2Ze98WBQ"/>
           <layoutConstraint xsi:type="notation:Bounds" xmi:id="_OTjwU8dmEeGOoP2Ze98WBQ" x="25" y="-18"/>
         </children>
-        <children xmi:id="_iIyH4esCEeOsdKncm9SrMw" type="Exit" element="_iIyH4OsCEeOsdKncm9SrMw">
-          <children xmi:id="_iIyu8OsCEeOsdKncm9SrMw" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_iIyu8-sCEeOsdKncm9SrMw" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_iIyu9OsCEeOsdKncm9SrMw"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_iIyu9esCEeOsdKncm9SrMw"/>
+        <children xmi:id="_jZRC0evHEeOCxqVQAxvSrg" type="Exit" element="_jZRC0OvHEeOCxqVQAxvSrg">
+          <children xmi:id="_jZRp4OvHEeOCxqVQAxvSrg" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_jZSQ8OvHEeOCxqVQAxvSrg" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_jZSQ8evHEeOCxqVQAxvSrg"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_jZSQ8uvHEeOCxqVQAxvSrg"/>
             </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_iIyu8esCEeOsdKncm9SrMw" fontName="Verdana" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iIyu8usCEeOsdKncm9SrMw"/>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_jZRp4evHEeOCxqVQAxvSrg" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jZRp4uvHEeOCxqVQAxvSrg"/>
           </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_iIyH4usCEeOsdKncm9SrMw" fontName="Verdana" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iIyH4-sCEeOsdKncm9SrMw" x="296" y="65"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_jZRC0uvHEeOCxqVQAxvSrg" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jZRC0-vHEeOCxqVQAxvSrg"/>
         </children>
-        <children xmi:id="_i1KswOsCEeOsdKncm9SrMw" type="Entry" element="_iIaUcOsCEeOsdKncm9SrMw">
-          <children xmi:id="_i1LT0OsCEeOsdKncm9SrMw" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_i1LT0-sCEeOsdKncm9SrMw" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_i1LT1OsCEeOsdKncm9SrMw"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_i1LT1esCEeOsdKncm9SrMw"/>
+        <children xmi:id="_jZYXkevHEeOCxqVQAxvSrg" type="Exit" element="_jZYXkOvHEeOCxqVQAxvSrg">
+          <children xmi:id="_jZY-oOvHEeOCxqVQAxvSrg" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_jZY-o-vHEeOCxqVQAxvSrg" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_jZY-pOvHEeOCxqVQAxvSrg"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_jZY-pevHEeOCxqVQAxvSrg"/>
             </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_i1LT0esCEeOsdKncm9SrMw" fontName="Verdana" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_i1LT0usCEeOsdKncm9SrMw"/>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_jZY-oevHEeOCxqVQAxvSrg" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jZY-ouvHEeOCxqVQAxvSrg"/>
           </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_i1KswesCEeOsdKncm9SrMw" fontName="Verdana" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_i1KswusCEeOsdKncm9SrMw" x="-33" y="141"/>
-        </children>
-        <children xmi:id="_i1L64OsCEeOsdKncm9SrMw" type="Entry" element="_iInIwOsCEeOsdKncm9SrMw">
-          <children xmi:id="_i1L64-sCEeOsdKncm9SrMw" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_i1L65usCEeOsdKncm9SrMw" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_i1L65-sCEeOsdKncm9SrMw"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_i1L66OsCEeOsdKncm9SrMw"/>
-            </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_i1L65OsCEeOsdKncm9SrMw" fontName="Verdana" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_i1L65esCEeOsdKncm9SrMw"/>
-          </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_i1L64esCEeOsdKncm9SrMw" fontName="Verdana" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_i1L64usCEeOsdKncm9SrMw" x="-33" y="-2"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_jZYXkuvHEeOCxqVQAxvSrg" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jZYXk-vHEeOCxqVQAxvSrg"/>
         </children>
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ABTWNMdnEeGOoP2Ze98WBQ"/>
       </children>
       <styles xsi:type="notation:ShapeStyle" xmi:id="_ABSvIcdnEeGOoP2Ze98WBQ" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ABSvIsdnEeGOoP2Ze98WBQ" width="432" height="297"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ABSvIsdnEeGOoP2Ze98WBQ"/>
     </children>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_iIZtYesCEeOsdKncm9SrMw"/>
-    <edges xmi:id="_iI4OgOsCEeOsdKncm9SrMw" type="Transition" element="_YboMgMdmEeGOoP2Ze98WBQ" source="_TmozgMdmEeGOoP2Ze98WBQ" target="_iIyH4esCEeOsdKncm9SrMw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_iI4OhOsCEeOsdKncm9SrMw" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_iI4OhesCEeOsdKncm9SrMw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iI41kOsCEeOsdKncm9SrMw" x="-19" y="9"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_iI4OgesCEeOsdKncm9SrMw" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_iI4Og-sCEeOsdKncm9SrMw" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_iI4OgusCEeOsdKncm9SrMw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    </edges>
-    <edges xmi:id="_i1QMUOsCEeOsdKncm9SrMw" type="Transition" element="_iInIwesCEeOsdKncm9SrMw" source="_i1L64OsCEeOsdKncm9SrMw" target="_OTjwUMdmEeGOoP2Ze98WBQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_i1QzYesCEeOsdKncm9SrMw" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_i1QzYusCEeOsdKncm9SrMw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_i1QzY-sCEeOsdKncm9SrMw" y="10"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_jY4oUevHEeOCxqVQAxvSrg"/>
+    <edges xmi:id="_jZWiYOvHEeOCxqVQAxvSrg" type="Transition" element="_YboMgMdmEeGOoP2Ze98WBQ" source="_TmozgMdmEeGOoP2Ze98WBQ" target="_jZRC0evHEeOCxqVQAxvSrg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_jZWiZOvHEeOCxqVQAxvSrg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_jZWiZevHEeOCxqVQAxvSrg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jZWiZuvHEeOCxqVQAxvSrg" y="10"/>
       </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_i1QMUesCEeOsdKncm9SrMw" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_i1QzYOsCEeOsdKncm9SrMw" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_i1QMUusCEeOsdKncm9SrMw" points="[-4, -6, 126, 184]$[-114, -166, 16, 24]"/>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_jZWiYevHEeOCxqVQAxvSrg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_jZWiY-vHEeOCxqVQAxvSrg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_jZWiYuvHEeOCxqVQAxvSrg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
     </edges>
-    <edges xmi:id="_i1SokOsCEeOsdKncm9SrMw" type="Transition" element="_iIa7gOsCEeOsdKncm9SrMw" source="_i1KswOsCEeOsdKncm9SrMw" target="_Rr-doMdmEeGOoP2Ze98WBQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_i1SolOsCEeOsdKncm9SrMw" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_i1SolesCEeOsdKncm9SrMw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_i1SolusCEeOsdKncm9SrMw" y="10"/>
+    <edges xmi:id="_jZdQEOvHEeOCxqVQAxvSrg" type="Transition" element="_cSyIUOvHEeOCxqVQAxvSrg" source="_Rr-doMdmEeGOoP2Ze98WBQ" target="_jZYXkevHEeOCxqVQAxvSrg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_jZd3IevHEeOCxqVQAxvSrg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_jZd3IuvHEeOCxqVQAxvSrg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jZd3I-vHEeOCxqVQAxvSrg" y="10"/>
       </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_i1SokesCEeOsdKncm9SrMw" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_i1Sok-sCEeOsdKncm9SrMw" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_i1SokusCEeOsdKncm9SrMw" points="[-2, -2, 2, 2]$[-1, -1, 3, 3]"/>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_jZdQEevHEeOCxqVQAxvSrg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_jZd3IOvHEeOCxqVQAxvSrg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_jZdQEuvHEeOCxqVQAxvSrg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
     </edges>
   </notation:Diagram>
 </xmi:XMI>

test-plugins/org.yakindu.sct.refactoring.tests/testmodels/refactoring/extract_subdiagram/before_twoEntryPoints.sct

@@ -9,7 +9,7 @@
         <outgoingTransitions xmi:id="_QTY6EMdmEeGOoP2Ze98WBQ" specification="event1" target="_OTYKIMdmEeGOoP2Ze98WBQ"/>
         <outgoingTransitions xmi:id="_q-EGYMmqEeGJr-muz4j25w" specification="" target="_jeUXUMmqEeGJr-muz4j25w"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_XzbkEMdmEeGOoP2Ze98WBQ" name="E" incomingTransitions="_YboMgMdmEeGOoP2Ze98WBQ"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_XzbkEMdmEeGOoP2Ze98WBQ" name="E" incomingTransitions="_YboMgMdmEeGOoP2Ze98WBQ _cSyIUOvHEeOCxqVQAxvSrg"/>
       <vertices xsi:type="sgraph:State" xmi:id="_wr22MMdmEeGOoP2Ze98WBQ" name="Composite">
         <regions xmi:id="_ABNPkMdnEeGOoP2Ze98WBQ" name="Inner">
           <vertices xsi:type="sgraph:State" xmi:id="_Tmj7AMdmEeGOoP2Ze98WBQ" name="D" incomingTransitions="_UaJ7IMdmEeGOoP2Ze98WBQ _U8B5IMdmEeGOoP2Ze98WBQ">
@@ -17,6 +17,7 @@
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_Rr0soMdmEeGOoP2Ze98WBQ" name="C" incomingTransitions="_SJMlIMdmEeGOoP2Ze98WBQ _kxXTkMmqEeGJr-muz4j25w">
             <outgoingTransitions xmi:id="_UaJ7IMdmEeGOoP2Ze98WBQ" specification="" target="_Tmj7AMdmEeGOoP2Ze98WBQ"/>
+            <outgoingTransitions xmi:id="_cSyIUOvHEeOCxqVQAxvSrg" specification="event3" target="_XzbkEMdmEeGOoP2Ze98WBQ"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_OTYKIMdmEeGOoP2Ze98WBQ" name="B" incomingTransitions="_QTY6EMdmEeGOoP2Ze98WBQ">
             <outgoingTransitions xmi:id="_SJMlIMdmEeGOoP2Ze98WBQ" specification="event3" target="_Rr0soMdmEeGOoP2Ze98WBQ"/>
@@ -266,5 +267,14 @@
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_q-MpQsmqEeGJr-muz4j25w" points="[-3, 24, 2, -93]$[-3, 112, 2, -5]"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_q-XBUMmqEeGJr-muz4j25w" id="(0.325,0.11320754716981132)"/>
     </edges>
+    <edges xmi:id="_cSz9gOvHEeOCxqVQAxvSrg" type="Transition" element="_cSyIUOvHEeOCxqVQAxvSrg" source="_Rr-doMdmEeGOoP2Ze98WBQ" target="_XzhqsMdmEeGOoP2Ze98WBQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_cSz9hOvHEeOCxqVQAxvSrg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_cS0kkOvHEeOCxqVQAxvSrg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cS0kkevHEeOCxqVQAxvSrg" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_cSz9gevHEeOCxqVQAxvSrg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_cSz9g-vHEeOCxqVQAxvSrg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cSz9guvHEeOCxqVQAxvSrg" points="[18, -3, -319, 52]$[340, -31, 3, 24]"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>