Refactoring to support new type system

examples/org.yakindu.sct.generator.java.trafficlight/TrafficLightWaiting.sct

@@ -1,140 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0" xmlns:stext="http://www.yakindu.org/sct/statechart/SText">
+<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="_NPjBgBA-EeGQ0KsLDV4EFg" name="TrafficLightWaiting" specification="interface TrafficLight:&#xD;&#xA;&#x9;var red:boolean&#xD;&#xA;&#x9;var yellow:boolean&#xD;&#xA;&#x9;var green:boolean&#xD;&#xA;&#xD;&#xA;interface Pedestrian:&#xD;&#xA;&#x9;var request:boolean&#xD;&#xA;&#x9;var red:boolean&#xD;&#xA;&#x9;var green:boolean&#xD;&#xA;&#xD;&#xA;interface:&#xD;&#xA;&#x9;in event keypress1&#xD;&#xA;&#x9;in event keypress2">
-    <scopes xsi:type="stext:InterfaceScope" xmi:id="_TnWbMBzuEeGEC4raFz1JbQ" name="TrafficLight">
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_TnWbMRzuEeGEC4raFz1JbQ" name="red" type="boolean"/>
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_TnWbMhzuEeGEC4raFz1JbQ" name="yellow" type="boolean"/>
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_TnWbMxzuEeGEC4raFz1JbQ" name="green" type="boolean"/>
-    </scopes>
-    <scopes xsi:type="stext:InterfaceScope" xmi:id="_TnWbNBzuEeGEC4raFz1JbQ" name="Pedestrian">
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_TnWbNRzuEeGEC4raFz1JbQ" name="request" type="boolean"/>
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_TnWbNhzuEeGEC4raFz1JbQ" name="red" type="boolean"/>
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_TnWbNxzuEeGEC4raFz1JbQ" name="green" type="boolean"/>
-    </scopes>
-    <scopes xsi:type="stext:InterfaceScope" xmi:id="_TnWbOBzuEeGEC4raFz1JbQ">
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_TnWbORzuEeGEC4raFz1JbQ" name="keypress1" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_TnWbOhzuEeGEC4raFz1JbQ" name="keypress2" direction="in"/>
-    </scopes>
     <regions xmi:id="_NPjBgxA-EeGQ0KsLDV4EFg" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_NPjBjRA-EeGQ0KsLDV4EFg">
         <outgoingTransitions xmi:id="_NPsyhxA-EeGQ0KsLDV4EFg" target="_NPjBmBA-EeGQ0KsLDV4EFg"/>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_NPjBmBA-EeGQ0KsLDV4EFg" name="on" incomingTransitions="_NPsyhxA-EeGQ0KsLDV4EFg __OsQsBBPEeGQ0KsLDV4EFg">
-        <scopes xmi:id="_TnasoBzuEeGEC4raFz1JbQ"/>
-        <outgoingTransitions xmi:id="_XlIREBBFEeGQ0KsLDV4EFg" specification="keypress2" target="_MF4mkBBFEeGQ0KsLDV4EFg">
-          <trigger xsi:type="stext:ReactionTrigger" xmi:id="_TnbTsBzuEeGEC4raFz1JbQ">
-            <triggers xsi:type="stext:RegularEventSpec" xmi:id="_TnbTsRzuEeGEC4raFz1JbQ" event="_TnWbOhzuEeGEC4raFz1JbQ"/>
-          </trigger>
-        </outgoingTransitions>
+        <outgoingTransitions xmi:id="_XlIREBBFEeGQ0KsLDV4EFg" specification="keypress2" target="_MF4mkBBFEeGQ0KsLDV4EFg"/>
         <regions xmi:id="_vZz18BA_EeGQ0KsLDV4EFg" name="r1">
           <vertices xsi:type="sgraph:State" xmi:id="_w8meYBA_EeGQ0KsLDV4EFg" specification="entry / TrafficLight.red = false; &#xD;&#xA;&#x9;TrafficLight.yellow = false;&#xD;&#xA;&#x9;TrafficLight.green = true;&#xD;&#xA;&#x9;Pedestrian.red = true;&#xD;&#xA;&#x9;Pedestrian.green = false;&#xD;&#xA;&#x9;Pedestrian.request = false;" name="StreetGreen" incomingTransitions="_pddaABBEEeGQ0KsLDV4EFg _yYuD0BBPEeGQ0KsLDV4EFg">
-            <scopes xmi:id="_Tne-EBzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_Tne-ERzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tne-EhzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_Tne-ExzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_Tne-FBzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tne-FRzuEeGEC4raFz1JbQ" varRef="_TnWbMRzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tne-FhzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tne-FxzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tne-GBzuEeGEC4raFz1JbQ" varRef="_TnWbMhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tne-GRzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tne-GhzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tne-GxzuEeGEC4raFz1JbQ" varRef="_TnWbMxzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tne-HBzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tne-HRzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tne-HhzuEeGEC4raFz1JbQ" varRef="_TnWbNhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tne-HxzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tne-IBzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tne-IRzuEeGEC4raFz1JbQ" varRef="_TnWbNxzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tne-IhzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tne-IxzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tne-JBzuEeGEC4raFz1JbQ" varRef="_TnWbNRzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tne-JRzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tne-JhzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_Lo2CEBBBEeGQ0KsLDV4EFg" specification="keypress1" target="_iAKe0BBAEeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tn08UBzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Tn08URzuEeGEC4raFz1JbQ" event="_TnWbORzuEeGEC4raFz1JbQ"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_Lo2CEBBBEeGQ0KsLDV4EFg" specification="keypress1" target="_iAKe0BBAEeGQ0KsLDV4EFg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_iAKe0BBAEeGQ0KsLDV4EFg" specification="exit / Pedestrian.request = false;" name="PedWaiting" incomingTransitions="_Lo2CEBBBEeGQ0KsLDV4EFg">
-            <scopes xmi:id="_Tn3_oBzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_Tn3_oRzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tn3_ohzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:ExitEvent" xmi:id="_Tn3_oxzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_Tn3_pBzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tn3_pRzuEeGEC4raFz1JbQ" varRef="_TnWbNRzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tn3_phzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tn3_pxzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_LDXEgBBDEeGQ0KsLDV4EFg" specification="after 7s" target="_SKct4BBBEeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tn7C8BzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_Tn7C8RzuEeGEC4raFz1JbQ" value="7"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_LDXEgBBDEeGQ0KsLDV4EFg" specification="after 7s" target="_SKct4BBBEeGQ0KsLDV4EFg"/>
             <regions xmi:id="_iAKe0hBAEeGQ0KsLDV4EFg" name="r1">
               <vertices xsi:type="sgraph:State" xmi:id="_mjm00BBAEeGQ0KsLDV4EFg" specification="entry / &#xD;&#xA;Pedestrian.request = true;" name="waitOn" incomingTransitions="_wTHnEBBAEeGQ0KsLDV4EFg _OXpxsBBBEeGQ0KsLDV4EFg">
-                <scopes xmi:id="_Tn7qABzuEeGEC4raFz1JbQ">
-                  <declarations xsi:type="stext:LocalReaction" xmi:id="_Tn7qARzuEeGEC4raFz1JbQ">
-                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tn7qAhzuEeGEC4raFz1JbQ">
-                      <triggers xsi:type="stext:EntryEvent" xmi:id="_Tn7qAxzuEeGEC4raFz1JbQ"/>
-                    </trigger>
-                    <effect xsi:type="stext:ReactionEffect" xmi:id="_Tn7qBBzuEeGEC4raFz1JbQ">
-                      <actions xsi:type="stext:Assignment" xmi:id="_Tn7qBRzuEeGEC4raFz1JbQ" varRef="_TnWbNRzuEeGEC4raFz1JbQ">
-                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tn7qBhzuEeGEC4raFz1JbQ">
-                          <value xsi:type="stext:BoolLiteral" xmi:id="_Tn7qBxzuEeGEC4raFz1JbQ" value="true"/>
-                        </expression>
-                      </actions>
-                    </effect>
-                  </declarations>
-                </scopes>
-                <outgoingTransitions xmi:id="_6LZ60BBAEeGQ0KsLDV4EFg" specification="after 500ms" target="_n6DDUBBAEeGQ0KsLDV4EFg">
-                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tn-tUBzuEeGEC4raFz1JbQ">
-                    <triggers xsi:type="stext:TimeEventSpec" xmi:id="_Tn-tURzuEeGEC4raFz1JbQ" value="500" unit="ms"/>
-                  </trigger>
-                </outgoingTransitions>
+                <outgoingTransitions xmi:id="_6LZ60BBAEeGQ0KsLDV4EFg" specification="after 500ms" target="_n6DDUBBAEeGQ0KsLDV4EFg"/>
               </vertices>
               <vertices xsi:type="sgraph:State" xmi:id="_n6DDUBBAEeGQ0KsLDV4EFg" specification="entry / &#xD;&#xA;Pedestrian.request = false;" name="waitOff" incomingTransitions="_6LZ60BBAEeGQ0KsLDV4EFg">
-                <scopes xmi:id="_Tn_UYBzuEeGEC4raFz1JbQ">
-                  <declarations xsi:type="stext:LocalReaction" xmi:id="_Tn_UYRzuEeGEC4raFz1JbQ">
-                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tn_UYhzuEeGEC4raFz1JbQ">
-                      <triggers xsi:type="stext:EntryEvent" xmi:id="_Tn_UYxzuEeGEC4raFz1JbQ"/>
-                    </trigger>
-                    <effect xsi:type="stext:ReactionEffect" xmi:id="_Tn_UZBzuEeGEC4raFz1JbQ">
-                      <actions xsi:type="stext:Assignment" xmi:id="_Tn_UZRzuEeGEC4raFz1JbQ" varRef="_TnWbNRzuEeGEC4raFz1JbQ">
-                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tn_UZhzuEeGEC4raFz1JbQ">
-                          <value xsi:type="stext:BoolLiteral" xmi:id="_Tn_UZxzuEeGEC4raFz1JbQ"/>
-                        </expression>
-                      </actions>
-                    </effect>
-                  </declarations>
-                </scopes>
-                <outgoingTransitions xmi:id="_OXpxsBBBEeGQ0KsLDV4EFg" specification="after 500ms" target="_mjm00BBAEeGQ0KsLDV4EFg">
-                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_ToCXsBzuEeGEC4raFz1JbQ">
-                    <triggers xsi:type="stext:TimeEventSpec" xmi:id="_ToCXsRzuEeGEC4raFz1JbQ" value="500" unit="ms"/>
-                  </trigger>
-                </outgoingTransitions>
+                <outgoingTransitions xmi:id="_OXpxsBBBEeGQ0KsLDV4EFg" specification="after 500ms" target="_mjm00BBAEeGQ0KsLDV4EFg"/>
               </vertices>
               <vertices xsi:type="sgraph:Entry" xmi:id="_pqXxcBBAEeGQ0KsLDV4EFg">
                 <outgoingTransitions xmi:id="_wTHnEBBAEeGQ0KsLDV4EFg" target="_mjm00BBAEeGQ0KsLDV4EFg"/>
@@ -142,149 +26,19 @@
             </regions>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_SKct4BBBEeGQ0KsLDV4EFg" specification="entry / TrafficLight.red = false;&#xD;&#xA;&#x9;TrafficLight.yellow = true;&#xD;&#xA;&#x9;TrafficLight.green = false;" name="StreetAttention" incomingTransitions="_LDXEgBBDEeGQ0KsLDV4EFg">
-            <scopes xmi:id="_ToC-wBzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_ToC-wRzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_ToC-whzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_ToC-wxzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_ToC-xBzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToC-xRzuEeGEC4raFz1JbQ" varRef="_TnWbMRzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToC-xhzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToC-xxzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToC-yBzuEeGEC4raFz1JbQ" varRef="_TnWbMhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToC-yRzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToC-yhzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToC-yxzuEeGEC4raFz1JbQ" varRef="_TnWbMxzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToC-zBzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToC-zRzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_fS31UBBEEeGQ0KsLDV4EFg" specification="after 2s" target="_fO-pQBBDEeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_ToJscBzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_ToJscRzuEeGEC4raFz1JbQ" value="2"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_fS31UBBEEeGQ0KsLDV4EFg" specification="after 2s" target="_fO-pQBBDEeGQ0KsLDV4EFg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_fO-pQBBDEeGQ0KsLDV4EFg" specification="entry / TrafficLight.red = true;&#xD;&#xA;TrafficLight.yellow = false;&#xD;&#xA;TrafficLight.green = false;" name="StreetRed" incomingTransitions="_fS31UBBEEeGQ0KsLDV4EFg">
-            <scopes xmi:id="_ToKTgBzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_ToKTgRzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_ToKTghzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_ToKTgxzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_ToKThBzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToKThRzuEeGEC4raFz1JbQ" varRef="_TnWbMRzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToKThhzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToKThxzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToKTiBzuEeGEC4raFz1JbQ" varRef="_TnWbMhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToKTiRzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToKTihzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToKTixzuEeGEC4raFz1JbQ" varRef="_TnWbMxzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToKTjBzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToKTjRzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_g7TywBBEEeGQ0KsLDV4EFg" specification="after 2s" target="_12GAEBBDEeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_ToRoQBzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_ToRoQRzuEeGEC4raFz1JbQ" value="2"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_g7TywBBEEeGQ0KsLDV4EFg" specification="after 2s" target="_12GAEBBDEeGQ0KsLDV4EFg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_12GAEBBDEeGQ0KsLDV4EFg" specification="entry / Pedestrian.red = false;&#xD;&#xA;Pedestrian.green = true;" name="PedestrianGreen" incomingTransitions="_g7TywBBEEeGQ0KsLDV4EFg">
-            <scopes xmi:id="_ToRoQhzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_ToRoQxzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_ToRoRBzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_ToRoRRzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_ToRoRhzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToSPUBzuEeGEC4raFz1JbQ" varRef="_TnWbNhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToSPURzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToSPUhzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_ToSPUxzuEeGEC4raFz1JbQ" varRef="_TnWbNxzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_ToSPVBzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_ToSPVRzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_iZox8BBEEeGQ0KsLDV4EFg" specification="after 7s" target="_K-JX7RBEEeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_ToayMBzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_ToayMRzuEeGEC4raFz1JbQ" value="7"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_iZox8BBEEeGQ0KsLDV4EFg" specification="after 7s" target="_K-JX7RBEEeGQ0KsLDV4EFg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_K-JX7RBEEeGQ0KsLDV4EFg" specification="entry / Pedestrian.red = true;&#xD;&#xA;Pedestrian.green = false;" name="PedestrianRed" incomingTransitions="_iZox8BBEEeGQ0KsLDV4EFg">
-            <scopes xmi:id="_TobZQBzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_TobZQRzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_TobZQhzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_TobZQxzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_TobZRBzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_TobZRRzuEeGEC4raFz1JbQ" varRef="_TnWbNhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_TobZRhzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_TobZRxzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_TocAUBzuEeGEC4raFz1JbQ" varRef="_TnWbNxzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_TocAURzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_TocAUhzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_nVCU8BBEEeGQ0KsLDV4EFg" specification="after 5s" target="_TfjYTRBEEeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tog40BzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_Tog40RzuEeGEC4raFz1JbQ" value="5"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_nVCU8BBEEeGQ0KsLDV4EFg" specification="after 5s" target="_TfjYTRBEEeGQ0KsLDV4EFg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_TfjYTRBEEeGQ0KsLDV4EFg" specification="entry / TrafficLight.red = true;&#xD;&#xA;&#x9;TrafficLight.yellow = true;&#xD;&#xA;&#x9;TrafficLight.green = false;" name="StreetPrepare" incomingTransitions="_nVCU8BBEEeGQ0KsLDV4EFg">
-            <scopes xmi:id="_Tohf4BzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_Tohf4RzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Tohf4hzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_Tohf4xzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_Tohf5BzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tohf5RzuEeGEC4raFz1JbQ" varRef="_TnWbMRzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tohf5hzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tohf5xzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tohf6BzuEeGEC4raFz1JbQ" varRef="_TnWbMhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tohf6RzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tohf6hzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                  <actions xsi:type="stext:Assignment" xmi:id="_Tohf6xzuEeGEC4raFz1JbQ" varRef="_TnWbMxzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Tohf7BzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_Tohf7RzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_pddaABBEEeGQ0KsLDV4EFg" specification="after 2s" target="_w8meYBA_EeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_TooNkBzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_TooNkRzuEeGEC4raFz1JbQ" value="2"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_pddaABBEEeGQ0KsLDV4EFg" specification="after 2s" target="_w8meYBA_EeGQ0KsLDV4EFg"/>
           </vertices>
           <vertices xsi:type="sgraph:Entry" xmi:id="_xz0nABBPEeGQ0KsLDV4EFg">
             <outgoingTransitions xmi:id="_yYuD0BBPEeGQ0KsLDV4EFg" target="_w8meYBA_EeGQ0KsLDV4EFg"/>
@@ -292,90 +46,16 @@
         </regions>
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_MF4mkBBFEeGQ0KsLDV4EFg" specification="entry / TrafficLight.red = false;&#xD;&#xA;&#x9;TrafficLight.green = false;&#xD;&#xA;&#x9;TrafficLight.yellow = false;&#xD;&#xA;&#x9;Pedestrian.red = false;&#xD;&#xA;&#x9;Pedestrian.green = false;" name="off" incomingTransitions="_XlIREBBFEeGQ0KsLDV4EFg">
-        <scopes xmi:id="_TopbsBzuEeGEC4raFz1JbQ">
-          <declarations xsi:type="stext:LocalReaction" xmi:id="_TopbsRzuEeGEC4raFz1JbQ">
-            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_TopbshzuEeGEC4raFz1JbQ">
-              <triggers xsi:type="stext:EntryEvent" xmi:id="_TopbsxzuEeGEC4raFz1JbQ"/>
-            </trigger>
-            <effect xsi:type="stext:ReactionEffect" xmi:id="_TopbtBzuEeGEC4raFz1JbQ">
-              <actions xsi:type="stext:Assignment" xmi:id="_TopbtRzuEeGEC4raFz1JbQ" varRef="_TnWbMRzuEeGEC4raFz1JbQ">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_TopbthzuEeGEC4raFz1JbQ">
-                  <value xsi:type="stext:BoolLiteral" xmi:id="_TopbtxzuEeGEC4raFz1JbQ"/>
-                </expression>
-              </actions>
-              <actions xsi:type="stext:Assignment" xmi:id="_TopbuBzuEeGEC4raFz1JbQ" varRef="_TnWbMxzuEeGEC4raFz1JbQ">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_TopbuRzuEeGEC4raFz1JbQ">
-                  <value xsi:type="stext:BoolLiteral" xmi:id="_TopbuhzuEeGEC4raFz1JbQ"/>
-                </expression>
-              </actions>
-              <actions xsi:type="stext:Assignment" xmi:id="_TopbuxzuEeGEC4raFz1JbQ" varRef="_TnWbMhzuEeGEC4raFz1JbQ">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_TopbvBzuEeGEC4raFz1JbQ">
-                  <value xsi:type="stext:BoolLiteral" xmi:id="_TopbvRzuEeGEC4raFz1JbQ"/>
-                </expression>
-              </actions>
-              <actions xsi:type="stext:Assignment" xmi:id="_TopbvhzuEeGEC4raFz1JbQ" varRef="_TnWbNhzuEeGEC4raFz1JbQ">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_TopbvxzuEeGEC4raFz1JbQ">
-                  <value xsi:type="stext:BoolLiteral" xmi:id="_TopbwBzuEeGEC4raFz1JbQ"/>
-                </expression>
-              </actions>
-              <actions xsi:type="stext:Assignment" xmi:id="_TopbwRzuEeGEC4raFz1JbQ" varRef="_TnWbNxzuEeGEC4raFz1JbQ">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_TopbwhzuEeGEC4raFz1JbQ">
-                  <value xsi:type="stext:BoolLiteral" xmi:id="_TopbwxzuEeGEC4raFz1JbQ"/>
-                </expression>
-              </actions>
-            </effect>
-          </declarations>
-        </scopes>
-        <outgoingTransitions xmi:id="__OsQsBBPEeGQ0KsLDV4EFg" specification="keypress2" target="_NPjBmBA-EeGQ0KsLDV4EFg">
-          <trigger xsi:type="stext:ReactionTrigger" xmi:id="_To1o8BzuEeGEC4raFz1JbQ">
-            <triggers xsi:type="stext:RegularEventSpec" xmi:id="_To1o8RzuEeGEC4raFz1JbQ" event="_TnWbOhzuEeGEC4raFz1JbQ"/>
-          </trigger>
-        </outgoingTransitions>
+        <outgoingTransitions xmi:id="__OsQsBBPEeGQ0KsLDV4EFg" specification="keypress2" target="_NPjBmBA-EeGQ0KsLDV4EFg"/>
         <regions xmi:id="_xHG2gBBFEeGQ0KsLDV4EFg" name="r1">
           <vertices xsi:type="sgraph:State" xmi:id="_BVnsgBBGEeGQ0KsLDV4EFg" specification="entry / &#xA;&#x9;TrafficLight.yellow = true;&#xA;" name="YellowOn" incomingTransitions="_EwURwBBGEeGQ0KsLDV4EFg _S4HWoBzuEeGEC4raFz1JbQ">
-            <scopes xmi:id="_To4sQBzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_To4sQRzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_To4sQhzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_To4sQxzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_To4sRBzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_To4sRRzuEeGEC4raFz1JbQ" varRef="_TnWbMhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_To4sRhzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_To4sRxzuEeGEC4raFz1JbQ" value="true"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_P6yC0BzuEeGEC4raFz1JbQ" specification="after 500ms" target="_B6YqMBzuEeGEC4raFz1JbQ">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_To7vkBzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_To7vkRzuEeGEC4raFz1JbQ" value="500" unit="ms"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_P6yC0BzuEeGEC4raFz1JbQ" specification="after 500ms" target="_B6YqMBzuEeGEC4raFz1JbQ"/>
           </vertices>
           <vertices xsi:type="sgraph:Entry" xmi:id="_EUWHcBBGEeGQ0KsLDV4EFg">
             <outgoingTransitions xmi:id="_EwURwBBGEeGQ0KsLDV4EFg" target="_BVnsgBBGEeGQ0KsLDV4EFg"/>
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_B6YqMBzuEeGEC4raFz1JbQ" specification="entry /&#xA;&#x9;TrafficLight.yellow = false;" name="YellowOff" incomingTransitions="_P6yC0BzuEeGEC4raFz1JbQ">
-            <scopes xmi:id="_To7vkhzuEeGEC4raFz1JbQ">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_To7vkxzuEeGEC4raFz1JbQ">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_To7vlBzuEeGEC4raFz1JbQ">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_To7vlRzuEeGEC4raFz1JbQ"/>
-                </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_To7vlhzuEeGEC4raFz1JbQ">
-                  <actions xsi:type="stext:Assignment" xmi:id="_To7vlxzuEeGEC4raFz1JbQ" varRef="_TnWbMhzuEeGEC4raFz1JbQ">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_To7vmBzuEeGEC4raFz1JbQ">
-                      <value xsi:type="stext:BoolLiteral" xmi:id="_To7vmRzuEeGEC4raFz1JbQ"/>
-                    </expression>
-                  </actions>
-                </effect>
-              </declarations>
-            </scopes>
-            <outgoingTransitions xmi:id="_S4HWoBzuEeGEC4raFz1JbQ" specification="after 500ms" target="_BVnsgBBGEeGQ0KsLDV4EFg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_To-y4BzuEeGEC4raFz1JbQ">
-                <triggers xsi:type="stext:TimeEventSpec" xmi:id="_To-y4RzuEeGEC4raFz1JbQ" value="500" unit="ms"/>
-              </trigger>
-            </outgoingTransitions>
+            <outgoingTransitions xmi:id="_S4HWoBzuEeGEC4raFz1JbQ" specification="after 500ms" target="_BVnsgBBGEeGQ0KsLDV4EFg"/>
           </vertices>
         </regions>
       </vertices>