From 38d76b6f2d9f91766205424495a222c54cdc5ef6 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Tue, 19 Jun 2018 16:17:52 +0200
Subject: [PATCH] Update on multi string management in events

---
 .idea/misc.xml                                |    2 +-
 modeling/DIPLODOCUS/SmartCardProtocol.xml     | 4760 ++++++++---------
 src/main/java/ui/TMLComponentDesignPanel.java |  169 +-
 src/main/java/ui/tmlad/TMLADSendEvent.java    |  155 +-
 .../TMLComponentTaskDiagramPanel.java         |  399 +-
 5 files changed, 2740 insertions(+), 2745 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 51e5191ed4..b755d8ca46 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index f62990aa99..b805dbd7b1 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -4,24 +4,24 @@
 
 <Modeling type="TML Component Design" nameTab="AppC" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="2724" minY="0" maxY="916" channels="true" events="true" requests="true" zoom="1.0000000000000018" >
-<CONNECTOR type="126" id="187" >
+<CONNECTOR type="126" id="1" >
 <cdparam x="535" y="347" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="556" y="347" id="355" />
-<P2  x="547" y="382" id="402" />
+<P1  x="556" y="347" id="169" />
+<P2  x="547" y="382" id="216" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="189" >
+<CONNECTOR type="126" id="3" >
 <cdparam x="820" y="398" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="1025" y="497" id="249" />
-<P2  x="761" y="574" id="370" />
+<P1  x="1025" y="497" id="63" />
+<P2  x="761" y="574" id="184" />
 <Point x="887" y="577" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="188" >
-<father id="189" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2" >
+<father id="3" num="0" />
 <cdparam x="887" y="577" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -29,209 +29,209 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="126" id="190" >
+<CONNECTOR type="126" id="4" >
 <cdparam x="568" y="323" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="710" y="403" id="372" />
-<P2  x="693" y="347" id="333" />
+<P1  x="710" y="403" id="186" />
+<P2  x="693" y="347" id="147" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="191" >
+<CONNECTOR type="126" id="5" >
 <cdparam x="522" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="521" y="382" id="397" />
-<P2  x="466" y="335" id="236" />
+<P1  x="521" y="382" id="211" />
+<P2  x="466" y="335" id="50" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="192" >
+<CONNECTOR type="126" id="6" >
 <cdparam x="409" y="124" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="401" y="83" id="238" />
-<P2  x="593" y="84" id="357" />
+<P1  x="401" y="83" id="52" />
+<P2  x="593" y="84" id="171" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="193" >
+<CONNECTOR type="126" id="7" >
 <cdparam x="656" y="426" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="552" id="376" />
-<P2  x="969" y="495" id="263" />
+<P1  x="816" y="552" id="190" />
+<P2  x="969" y="495" id="77" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="194" >
+<CONNECTOR type="126" id="8" >
 <cdparam x="656" y="400" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="519" id="378" />
-<P2  x="921" y="476" id="261" />
+<P1  x="816" y="519" id="192" />
+<P2  x="921" y="476" id="75" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="195" >
+<CONNECTOR type="126" id="9" >
 <cdparam x="602" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="751" y="406" id="386" />
-<P2  x="829" y="375" id="291" />
+<P1  x="751" y="406" id="200" />
+<P2  x="829" y="375" id="105" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="196" >
+<CONNECTOR type="126" id="10" >
 <cdparam x="689" y="292" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="855" y="375" id="295" />
-<P2  x="921" y="362" id="271" />
+<P1  x="855" y="375" id="109" />
+<P2  x="921" y="362" id="85" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="197" >
+<CONNECTOR type="126" id="11" >
 <cdparam x="656" y="377" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="491" id="382" />
-<P2  x="921" y="453" id="269" />
+<P1  x="816" y="491" id="196" />
+<P2  x="921" y="453" id="83" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="198" >
+<CONNECTOR type="126" id="12" >
 <cdparam x="656" y="351" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="458" id="380" />
-<P2  x="921" y="426" id="267" />
+<P1  x="816" y="458" id="194" />
+<P2  x="921" y="426" id="81" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="199" >
+<CONNECTOR type="126" id="13" >
 <cdparam x="741" y="296" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="921" y="397" id="265" />
-<P2  x="816" y="429" id="384" />
+<P1  x="921" y="397" id="79" />
+<P2  x="816" y="429" id="198" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="200" >
+<CONNECTOR type="126" id="14" >
 <cdparam x="735" y="260" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="918" y="330" id="273" />
-<P2  x="747" y="282" id="345" />
+<P1  x="918" y="330" id="87" />
+<P2  x="747" y="282" id="159" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="201" >
+<CONNECTOR type="126" id="15" >
 <cdparam x="641" y="230" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="747" y="248" id="343" />
-<P2  x="918" y="291" id="275" />
+<P1  x="747" y="248" id="157" />
+<P2  x="918" y="291" id="89" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="202" >
+<CONNECTOR type="126" id="16" >
 <cdparam x="641" y="195" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="747" y="203" id="341" />
-<P2  x="918" y="248" id="277" />
+<P1  x="747" y="203" id="155" />
+<P2  x="918" y="248" id="91" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="203" >
+<CONNECTOR type="126" id="17" >
 <cdparam x="740" y="353" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="829" y="375" id="290" />
-<P2  x="747" y="314" id="339" />
+<P1  x="829" y="375" id="104" />
+<P2  x="747" y="314" id="153" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="204" >
+<CONNECTOR type="126" id="18" >
 <cdparam x="460" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="521" y="303" id="349" />
-<P2  x="466" y="303" id="230" />
+<P1  x="521" y="303" id="163" />
+<P2  x="466" y="303" id="44" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="205" >
+<CONNECTOR type="126" id="19" >
 <cdparam x="387" y="129" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="464" y="126" id="226" />
-<P2  x="524" y="126" id="337" />
+<P1  x="464" y="126" id="40" />
+<P2  x="524" y="126" id="151" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="206" >
+<CONNECTOR type="126" id="20" >
 <cdparam x="389" y="200" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="466" y="215" id="232" />
-<P2  x="521" y="215" id="351" />
+<P1  x="466" y="215" id="46" />
+<P2  x="521" y="215" id="165" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="207" >
+<CONNECTOR type="126" id="21" >
 <cdparam x="460" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="521" y="260" id="353" />
-<P2  x="466" y="260" id="234" />
+<P1  x="521" y="260" id="167" />
+<P2  x="466" y="260" id="48" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="208" >
+<CONNECTOR type="126" id="22" >
 <cdparam x="389" y="163" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="466" y="169" id="228" />
-<P2  x="521" y="169" id="347" />
+<P1  x="466" y="169" id="42" />
+<P2  x="521" y="169" id="161" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="209" >
+<CONNECTOR type="126" id="23" >
 <cdparam x="967" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="918" y="198" id="279" />
-<P2  x="747" y="124" id="359" />
+<P1  x="918" y="198" id="93" />
+<P2  x="747" y="124" id="173" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="210" >
+<CONNECTOR type="126" id="24" >
 <cdparam x="1028" y="535" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="630" y="345" id="335" />
-<P2  x="669" y="406" id="374" />
+<P1  x="630" y="345" id="149" />
+<P2  x="669" y="406" id="188" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="211" >
+<CONNECTOR type="126" id="25" >
 <cdparam x="1308" y="303" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1222" y="378" id="313" />
-<P2  x="1178" y="380" id="259" />
+<P1  x="1222" y="378" id="127" />
+<P2  x="1178" y="380" id="73" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="212" >
+<CONNECTOR type="126" id="26" >
 <cdparam x="1172" y="437" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1178" y="415" id="257" />
-<P2  x="1222" y="413" id="311" />
+<P1  x="1178" y="415" id="71" />
+<P2  x="1222" y="413" id="125" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="215" >
+<CONNECTOR type="126" id="29" >
 <cdparam x="1041" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1178" y="208" id="255" />
-<P2  x="1178" y="276" id="253" />
+<P1  x="1178" y="208" id="69" />
+<P2  x="1178" y="276" id="67" />
 <Point x="1227" y="207" />
 <Point x="1227" y="247" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="213" >
-<father id="215" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="27" >
+<father id="29" num="0" />
 <cdparam x="1227" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="214" >
-<father id="215" num="1" />
+<SUBCOMPONENT type="-1" id="28" >
+<father id="29" num="1" />
 <cdparam x="1227" y="247" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -239,48 +239,48 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="126" id="216" >
+<CONNECTOR type="126" id="30" >
 <cdparam x="877" y="343" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1178" y="454" id="251" />
-<P2  x="1222" y="441" id="309" />
+<P1  x="1178" y="454" id="65" />
+<P2  x="1222" y="441" id="123" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="1205" id="225" >
+<COMPONENT type="1205" id="39" >
 <cdparam x="1155" y="486" />
 <sizeparam width="205" height="105" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="2725" minY="0" maxY="917" />
 <infoparam name="Record component" value="TCP_CTRL" />
-<TGConnectingPoint num="0" id="217" />
-<TGConnectingPoint num="1" id="218" />
-<TGConnectingPoint num="2" id="219" />
-<TGConnectingPoint num="3" id="220" />
-<TGConnectingPoint num="4" id="221" />
-<TGConnectingPoint num="5" id="222" />
-<TGConnectingPoint num="6" id="223" />
-<TGConnectingPoint num="7" id="224" />
+<TGConnectingPoint num="0" id="31" />
+<TGConnectingPoint num="1" id="32" />
+<TGConnectingPoint num="2" id="33" />
+<TGConnectingPoint num="3" id="34" />
+<TGConnectingPoint num="4" id="35" />
+<TGConnectingPoint num="5" id="36" />
+<TGConnectingPoint num="6" id="37" />
+<TGConnectingPoint num="7" id="38" />
 <extraparam>
 <Attribute access="2" id="a" value="" type="0" typeOther="" />
 <Attribute access="2" id="state" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1202" id="248" >
+<COMPONENT type="1202" id="62" >
 <cdparam x="163" y="96" />
 <sizeparam width="290" height="276" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="2725" minY="0" maxY="917" />
 <infoparam name="TGComponent" value="InterfaceDevice" />
-<TGConnectingPoint num="0" id="240" />
-<TGConnectingPoint num="1" id="241" />
-<TGConnectingPoint num="2" id="242" />
-<TGConnectingPoint num="3" id="243" />
-<TGConnectingPoint num="4" id="244" />
-<TGConnectingPoint num="5" id="245" />
-<TGConnectingPoint num="6" id="246" />
-<TGConnectingPoint num="7" id="247" />
+<TGConnectingPoint num="0" id="54" />
+<TGConnectingPoint num="1" id="55" />
+<TGConnectingPoint num="2" id="56" />
+<TGConnectingPoint num="3" id="57" />
+<TGConnectingPoint num="4" id="58" />
+<TGConnectingPoint num="5" id="59" />
+<TGConnectingPoint num="6" id="60" />
+<TGConnectingPoint num="7" id="61" />
 <extraparam>
 <Data isAttacker="No" />
 <Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
@@ -290,14 +290,14 @@
 <Attribute access="2" id="b" value="" type="4" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="227" >
-<father id="248" num="0" />
+<SUBCOMPONENT type="1203" id="41" >
+<father id="62" num="0" />
 <cdparam x="443" y="116" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
 <infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="226" />
+<TGConnectingPoint num="0" id="40" />
 <extraparam>
 <Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -307,14 +307,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="229" >
-<father id="248" num="1" />
+<SUBCOMPONENT type="1203" id="43" >
+<father id="62" num="1" />
 <cdparam x="440" y="156" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
 <infoparam name="TGComponent" value="Event data_Ready" />
-<TGConnectingPoint num="0" id="228" />
+<TGConnectingPoint num="0" id="42" />
 <extraparam>
 <Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
@@ -324,14 +324,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="231" >
-<father id="248" num="2" />
+<SUBCOMPONENT type="1203" id="45" >
+<father id="62" num="2" />
 <cdparam x="440" y="290" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
 <infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="230" />
+<TGConnectingPoint num="0" id="44" />
 <extraparam>
 <Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -341,15 +341,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="233" >
-<father id="248" num="3" />
-<reference id="184" />
+<SUBCOMPONENT type="1203" id="47" >
+<father id="62" num="3" />
 <cdparam x="440" y="202" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
 <infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="232" />
+<TGConnectingPoint num="0" id="46" />
 <extraparam>
 <Prop commName="fromDtoSC" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -359,15 +358,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="235" >
-<father id="248" num="4" />
-<reference id="184" />
+<SUBCOMPONENT type="1203" id="49" >
+<father id="62" num="4" />
 <cdparam x="440" y="247" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
 <infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="234" />
+<TGConnectingPoint num="0" id="48" />
 <extraparam>
 <Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -377,14 +375,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="237" >
-<father id="248" num="5" />
+<SUBCOMPONENT type="1203" id="51" >
+<father id="62" num="5" />
 <cdparam x="440" y="322" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
 <infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="236" />
+<TGConnectingPoint num="0" id="50" />
 <extraparam>
 <Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -394,17 +392,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="239" >
-<father id="248" num="6" />
-<reference id="184" />
+<SUBCOMPONENT type="1203" id="53" >
+<father id="62" num="6" />
 <cdparam x="388" y="83" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
 <infoparam name="TGComponent" value="Event reset, pTS, end" />
-<TGConnectingPoint num="0" id="238" />
+<TGConnectingPoint num="0" id="52" />
 <extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -413,58 +410,58 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1200" id="424" >
+<COMPONENT type="1200" id="238" >
 <cdparam x="534" y="93" />
 <sizeparam width="935" height="530" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="2725" minY="0" maxY="917" />
 <infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="416" />
-<TGConnectingPoint num="1" id="417" />
-<TGConnectingPoint num="2" id="418" />
-<TGConnectingPoint num="3" id="419" />
-<TGConnectingPoint num="4" id="420" />
-<TGConnectingPoint num="5" id="421" />
-<TGConnectingPoint num="6" id="422" />
-<TGConnectingPoint num="7" id="423" />
+<TGConnectingPoint num="0" id="230" />
+<TGConnectingPoint num="1" id="231" />
+<TGConnectingPoint num="2" id="232" />
+<TGConnectingPoint num="3" id="233" />
+<TGConnectingPoint num="4" id="234" />
+<TGConnectingPoint num="5" id="235" />
+<TGConnectingPoint num="6" id="236" />
+<TGConnectingPoint num="7" id="237" />
 <extraparam>
 <info hiddeni="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1200" id="332" >
-<father id="424" num="0" />
+<SUBCOMPONENT type="1200" id="146" >
+<father id="238" num="0" />
 <cdparam x="842" y="133" />
 <sizeparam width="570" height="485" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
 <infoparam name="TGComponent" value="TCPIP Entities" />
-<TGConnectingPoint num="0" id="324" />
-<TGConnectingPoint num="1" id="325" />
-<TGConnectingPoint num="2" id="326" />
-<TGConnectingPoint num="3" id="327" />
-<TGConnectingPoint num="4" id="328" />
-<TGConnectingPoint num="5" id="329" />
-<TGConnectingPoint num="6" id="330" />
-<TGConnectingPoint num="7" id="331" />
+<TGConnectingPoint num="0" id="138" />
+<TGConnectingPoint num="1" id="139" />
+<TGConnectingPoint num="2" id="140" />
+<TGConnectingPoint num="3" id="141" />
+<TGConnectingPoint num="4" id="142" />
+<TGConnectingPoint num="5" id="143" />
+<TGConnectingPoint num="6" id="144" />
+<TGConnectingPoint num="7" id="145" />
 <extraparam>
 <info hiddeni="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="289" >
-<father id="332" num="0" />
+<SUBCOMPONENT type="1202" id="103" >
+<father id="146" num="0" />
 <cdparam x="931" y="167" />
 <sizeparam width="236" height="317" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
 <infoparam name="TGComponent" value="TCPIP" />
-<TGConnectingPoint num="0" id="281" />
-<TGConnectingPoint num="1" id="282" />
-<TGConnectingPoint num="2" id="283" />
-<TGConnectingPoint num="3" id="284" />
-<TGConnectingPoint num="4" id="285" />
-<TGConnectingPoint num="5" id="286" />
-<TGConnectingPoint num="6" id="287" />
-<TGConnectingPoint num="7" id="288" />
+<TGConnectingPoint num="0" id="95" />
+<TGConnectingPoint num="1" id="96" />
+<TGConnectingPoint num="2" id="97" />
+<TGConnectingPoint num="3" id="98" />
+<TGConnectingPoint num="4" id="99" />
+<TGConnectingPoint num="5" id="100" />
+<TGConnectingPoint num="6" id="101" />
+<TGConnectingPoint num="7" id="102" />
 <extraparam>
 <Data isAttacker="No" />
 <Attribute access="2" id="wind" value="64" type="0" typeOther="" />
@@ -476,14 +473,14 @@
 <Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="250" >
-<father id="289" num="0" />
+<SUBCOMPONENT type="1203" id="64" >
+<father id="103" num="0" />
 <cdparam x="1012" y="471" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
 <infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="249" />
+<TGConnectingPoint num="0" id="63" />
 <extraparam>
 <Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -493,14 +490,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="252" >
-<father id="289" num="1" />
+<SUBCOMPONENT type="1203" id="66" >
+<father id="103" num="1" />
 <cdparam x="1157" y="444" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="251" />
+<TGConnectingPoint num="0" id="65" />
 <extraparam>
 <Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -510,14 +507,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="254" >
-<father id="289" num="2" />
+<SUBCOMPONENT type="1203" id="68" >
+<father id="103" num="2" />
 <cdparam x="1157" y="266" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="253" />
+<TGConnectingPoint num="0" id="67" />
 <extraparam>
 <Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -527,14 +524,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="256" >
-<father id="289" num="3" />
+<SUBCOMPONENT type="1203" id="70" >
+<father id="103" num="3" />
 <cdparam x="1157" y="198" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="255" />
+<TGConnectingPoint num="0" id="69" />
 <extraparam>
 <Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -544,14 +541,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="258" >
-<father id="289" num="4" />
+<SUBCOMPONENT type="1203" id="72" >
+<father id="103" num="4" />
 <cdparam x="1157" y="405" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="257" />
+<TGConnectingPoint num="0" id="71" />
 <extraparam>
 <Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -561,14 +558,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="260" >
-<father id="289" num="5" />
+<SUBCOMPONENT type="1203" id="74" >
+<father id="103" num="5" />
 <cdparam x="1157" y="370" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="259" />
+<TGConnectingPoint num="0" id="73" />
 <extraparam>
 <Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -578,14 +575,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="262" >
-<father id="289" num="6" />
+<SUBCOMPONENT type="1203" id="76" >
+<father id="103" num="6" />
 <cdparam x="921" y="466" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="261" />
+<TGConnectingPoint num="0" id="75" />
 <extraparam>
 <Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -595,14 +592,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="264" >
-<father id="289" num="7" />
+<SUBCOMPONENT type="1203" id="78" >
+<father id="103" num="7" />
 <cdparam x="959" y="474" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="263" />
+<TGConnectingPoint num="0" id="77" />
 <extraparam>
 <Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -612,14 +609,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="266" >
-<father id="289" num="8" />
+<SUBCOMPONENT type="1203" id="80" >
+<father id="103" num="8" />
 <cdparam x="921" y="387" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="265" />
+<TGConnectingPoint num="0" id="79" />
 <extraparam>
 <Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -629,14 +626,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="268" >
-<father id="289" num="9" />
+<SUBCOMPONENT type="1203" id="82" >
+<father id="103" num="9" />
 <cdparam x="921" y="416" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="267" />
+<TGConnectingPoint num="0" id="81" />
 <extraparam>
 <Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -646,14 +643,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="270" >
-<father id="289" num="10" />
+<SUBCOMPONENT type="1203" id="84" >
+<father id="103" num="10" />
 <cdparam x="921" y="443" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="269" />
+<TGConnectingPoint num="0" id="83" />
 <extraparam>
 <Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -663,14 +660,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="272" >
-<father id="289" num="11" />
+<SUBCOMPONENT type="1203" id="86" >
+<father id="103" num="11" />
 <cdparam x="921" y="352" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
 <infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="271" />
+<TGConnectingPoint num="0" id="85" />
 <extraparam>
 <Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -680,14 +677,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="274" >
-<father id="289" num="12" />
+<SUBCOMPONENT type="1203" id="88" >
+<father id="103" num="12" />
 <cdparam x="918" y="317" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
 <infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="273" />
+<TGConnectingPoint num="0" id="87" />
 <extraparam>
 <Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -697,14 +694,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="276" >
-<father id="289" num="13" />
+<SUBCOMPONENT type="1203" id="90" >
+<father id="103" num="13" />
 <cdparam x="918" y="278" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
 <infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="275" />
+<TGConnectingPoint num="0" id="89" />
 <extraparam>
 <Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -714,14 +711,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="278" >
-<father id="289" num="14" />
+<SUBCOMPONENT type="1203" id="92" >
+<father id="103" num="14" />
 <cdparam x="918" y="235" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
 <infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="277" />
+<TGConnectingPoint num="0" id="91" />
 <extraparam>
 <Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -731,14 +728,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="280" >
-<father id="289" num="15" />
+<SUBCOMPONENT type="1203" id="94" >
+<father id="103" num="15" />
 <cdparam x="918" y="185" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
 <infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="279" />
+<TGConnectingPoint num="0" id="93" />
 <extraparam>
 <Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -748,60 +745,60 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="308" >
-<father id="332" num="1" />
+<SUBCOMPONENT type="1201" id="122" >
+<father id="146" num="1" />
 <cdparam x="829" y="362" />
 <sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
 <infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="290" />
-<TGConnectingPoint num="1" id="291" />
-<TGConnectingPoint num="2" id="292" />
-<TGConnectingPoint num="3" id="293" />
-<TGConnectingPoint num="4" id="294" />
-<TGConnectingPoint num="5" id="295" />
-<TGConnectingPoint num="6" id="296" />
-<TGConnectingPoint num="7" id="297" />
-<TGConnectingPoint num="8" id="298" />
-<TGConnectingPoint num="9" id="299" />
-<TGConnectingPoint num="10" id="300" />
-<TGConnectingPoint num="11" id="301" />
-<TGConnectingPoint num="12" id="302" />
-<TGConnectingPoint num="13" id="303" />
-<TGConnectingPoint num="14" id="304" />
-<TGConnectingPoint num="15" id="305" />
-<TGConnectingPoint num="16" id="306" />
-<TGConnectingPoint num="17" id="307" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="323" >
-<father id="332" num="2" />
+<TGConnectingPoint num="0" id="104" />
+<TGConnectingPoint num="1" id="105" />
+<TGConnectingPoint num="2" id="106" />
+<TGConnectingPoint num="3" id="107" />
+<TGConnectingPoint num="4" id="108" />
+<TGConnectingPoint num="5" id="109" />
+<TGConnectingPoint num="6" id="110" />
+<TGConnectingPoint num="7" id="111" />
+<TGConnectingPoint num="8" id="112" />
+<TGConnectingPoint num="9" id="113" />
+<TGConnectingPoint num="10" id="114" />
+<TGConnectingPoint num="11" id="115" />
+<TGConnectingPoint num="12" id="116" />
+<TGConnectingPoint num="13" id="117" />
+<TGConnectingPoint num="14" id="118" />
+<TGConnectingPoint num="15" id="119" />
+<TGConnectingPoint num="16" id="120" />
+<TGConnectingPoint num="17" id="121" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="137" >
+<father id="146" num="2" />
 <cdparam x="1232" y="328" />
 <sizeparam width="140" height="141" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
 <infoparam name="TGComponent" value="Timer" />
-<TGConnectingPoint num="0" id="315" />
-<TGConnectingPoint num="1" id="316" />
-<TGConnectingPoint num="2" id="317" />
-<TGConnectingPoint num="3" id="318" />
-<TGConnectingPoint num="4" id="319" />
-<TGConnectingPoint num="5" id="320" />
-<TGConnectingPoint num="6" id="321" />
-<TGConnectingPoint num="7" id="322" />
+<TGConnectingPoint num="0" id="129" />
+<TGConnectingPoint num="1" id="130" />
+<TGConnectingPoint num="2" id="131" />
+<TGConnectingPoint num="3" id="132" />
+<TGConnectingPoint num="4" id="133" />
+<TGConnectingPoint num="5" id="134" />
+<TGConnectingPoint num="6" id="135" />
+<TGConnectingPoint num="7" id="136" />
 <extraparam>
 <Data isAttacker="No" />
 <Attribute access="2" id="x" value="0" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="310" >
-<father id="323" num="0" />
+<SUBCOMPONENT type="1203" id="124" >
+<father id="137" num="0" />
 <cdparam x="1222" y="431" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
 <infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="309" />
+<TGConnectingPoint num="0" id="123" />
 <extraparam>
 <Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -811,14 +808,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="312" >
-<father id="323" num="1" />
+<SUBCOMPONENT type="1203" id="126" >
+<father id="137" num="1" />
 <cdparam x="1222" y="403" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
 <infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="311" />
+<TGConnectingPoint num="0" id="125" />
 <extraparam>
 <Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -828,14 +825,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="314" >
-<father id="323" num="2" />
+<SUBCOMPONENT type="1203" id="128" >
+<father id="137" num="2" />
 <cdparam x="1222" y="368" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
 <infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="313" />
+<TGConnectingPoint num="0" id="127" />
 <extraparam>
 <Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -845,21 +842,21 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="369" >
-<father id="424" num="1" />
+<SUBCOMPONENT type="1202" id="183" >
+<father id="238" num="1" />
 <cdparam x="534" y="97" />
 <sizeparam width="200" height="237" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
 <infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="361" />
-<TGConnectingPoint num="1" id="362" />
-<TGConnectingPoint num="2" id="363" />
-<TGConnectingPoint num="3" id="364" />
-<TGConnectingPoint num="4" id="365" />
-<TGConnectingPoint num="5" id="366" />
-<TGConnectingPoint num="6" id="367" />
-<TGConnectingPoint num="7" id="368" />
+<TGConnectingPoint num="0" id="175" />
+<TGConnectingPoint num="1" id="176" />
+<TGConnectingPoint num="2" id="177" />
+<TGConnectingPoint num="3" id="178" />
+<TGConnectingPoint num="4" id="179" />
+<TGConnectingPoint num="5" id="180" />
+<TGConnectingPoint num="6" id="181" />
+<TGConnectingPoint num="7" id="182" />
 <extraparam>
 <Data isAttacker="No" />
 <Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
@@ -872,14 +869,14 @@
 <Attribute access="2" id="t" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="334" >
-<father id="369" num="0" />
+<SUBCOMPONENT type="1203" id="148" >
+<father id="183" num="0" />
 <cdparam x="680" y="321" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="333" />
+<TGConnectingPoint num="0" id="147" />
 <extraparam>
 <Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -889,14 +886,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="336" >
-<father id="369" num="1" />
+<SUBCOMPONENT type="1203" id="150" >
+<father id="183" num="1" />
 <cdparam x="620" y="324" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
 <infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="335" />
+<TGConnectingPoint num="0" id="149" />
 <extraparam>
 <Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -906,14 +903,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="338" >
-<father id="369" num="2" />
+<SUBCOMPONENT type="1203" id="152" >
+<father id="183" num="2" />
 <cdparam x="524" y="116" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
 <infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="337" />
+<TGConnectingPoint num="0" id="151" />
 <extraparam>
 <Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -923,14 +920,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="340" >
-<father id="369" num="3" />
+<SUBCOMPONENT type="1203" id="154" >
+<father id="183" num="3" />
 <cdparam x="721" y="301" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="339" />
+<TGConnectingPoint num="0" id="153" />
 <extraparam>
 <Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -940,14 +937,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="342" >
-<father id="369" num="4" />
+<SUBCOMPONENT type="1203" id="156" >
+<father id="183" num="4" />
 <cdparam x="721" y="190" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="341" />
+<TGConnectingPoint num="0" id="155" />
 <extraparam>
 <Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -957,14 +954,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="344" >
-<father id="369" num="5" />
+<SUBCOMPONENT type="1203" id="158" >
+<father id="183" num="5" />
 <cdparam x="721" y="235" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="343" />
+<TGConnectingPoint num="0" id="157" />
 <extraparam>
 <Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -974,14 +971,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="346" >
-<father id="369" num="6" />
+<SUBCOMPONENT type="1203" id="160" >
+<father id="183" num="6" />
 <cdparam x="721" y="269" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="345" />
+<TGConnectingPoint num="0" id="159" />
 <extraparam>
 <Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -991,14 +988,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="348" >
-<father id="369" num="7" />
+<SUBCOMPONENT type="1203" id="162" >
+<father id="183" num="7" />
 <cdparam x="521" y="156" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Event data_Ready" />
-<TGConnectingPoint num="0" id="347" />
+<TGConnectingPoint num="0" id="161" />
 <extraparam>
 <Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
@@ -1008,14 +1005,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="350" >
-<father id="369" num="8" />
+<SUBCOMPONENT type="1203" id="164" >
+<father id="183" num="8" />
 <cdparam x="521" y="290" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="349" />
+<TGConnectingPoint num="0" id="163" />
 <extraparam>
 <Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1025,15 +1022,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="352" >
-<father id="369" num="9" />
-<reference id="184" />
+<SUBCOMPONENT type="1203" id="166" >
+<father id="183" num="9" />
 <cdparam x="521" y="202" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="351" />
+<TGConnectingPoint num="0" id="165" />
 <extraparam>
 <Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1043,15 +1039,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="354" >
-<father id="369" num="10" />
-<reference id="184" />
+<SUBCOMPONENT type="1203" id="168" >
+<father id="183" num="10" />
 <cdparam x="521" y="247" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="353" />
+<TGConnectingPoint num="0" id="167" />
 <extraparam>
 <Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1061,14 +1056,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="356" >
-<father id="369" num="11" />
+<SUBCOMPONENT type="1203" id="170" >
+<father id="183" num="11" />
 <cdparam x="543" y="321" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="355" />
+<TGConnectingPoint num="0" id="169" />
 <extraparam>
 <Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1078,15 +1073,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="358" >
-<father id="369" num="12" />
-<reference id="184" />
+<SUBCOMPONENT type="1203" id="172" >
+<father id="183" num="12" />
 <cdparam x="580" y="84" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Event reset, pTS, end" />
-<TGConnectingPoint num="0" id="357" />
+<TGConnectingPoint num="0" id="171" />
 <extraparam>
 <Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1096,14 +1090,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="360" >
-<father id="369" num="13" />
+<SUBCOMPONENT type="1203" id="174" >
+<father id="183" num="13" />
 <cdparam x="721" y="111" />
 <sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
 <infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="359" />
+<TGConnectingPoint num="0" id="173" />
 <extraparam>
 <Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1113,33 +1107,33 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="396" >
-<father id="424" num="2" />
+<SUBCOMPONENT type="1202" id="210" >
+<father id="238" num="2" />
 <cdparam x="565" y="416" />
 <sizeparam width="240" height="145" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
 <infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="388" />
-<TGConnectingPoint num="1" id="389" />
-<TGConnectingPoint num="2" id="390" />
-<TGConnectingPoint num="3" id="391" />
-<TGConnectingPoint num="4" id="392" />
-<TGConnectingPoint num="5" id="393" />
-<TGConnectingPoint num="6" id="394" />
-<TGConnectingPoint num="7" id="395" />
+<TGConnectingPoint num="0" id="202" />
+<TGConnectingPoint num="1" id="203" />
+<TGConnectingPoint num="2" id="204" />
+<TGConnectingPoint num="3" id="205" />
+<TGConnectingPoint num="4" id="206" />
+<TGConnectingPoint num="5" id="207" />
+<TGConnectingPoint num="6" id="208" />
+<TGConnectingPoint num="7" id="209" />
 <extraparam>
 <Data isAttacker="No" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="371" >
-<father id="396" num="0" />
+<SUBCOMPONENT type="1203" id="185" >
+<father id="210" num="0" />
 <cdparam x="748" y="548" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
 <infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="370" />
+<TGConnectingPoint num="0" id="184" />
 <extraparam>
 <Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1149,14 +1143,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="373" >
-<father id="396" num="1" />
+<SUBCOMPONENT type="1203" id="187" >
+<father id="210" num="1" />
 <cdparam x="697" y="403" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
 <infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="372" />
+<TGConnectingPoint num="0" id="186" />
 <extraparam>
 <Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1166,14 +1160,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="375" >
-<father id="396" num="2" />
+<SUBCOMPONENT type="1203" id="189" >
+<father id="210" num="2" />
 <cdparam x="659" y="406" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
 <infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="374" />
+<TGConnectingPoint num="0" id="188" />
 <extraparam>
 <Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1183,14 +1177,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="377" >
-<father id="396" num="3" />
+<SUBCOMPONENT type="1203" id="191" >
+<father id="210" num="3" />
 <cdparam x="795" y="542" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
 <infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="376" />
+<TGConnectingPoint num="0" id="190" />
 <extraparam>
 <Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1200,14 +1194,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="379" >
-<father id="396" num="4" />
+<SUBCOMPONENT type="1203" id="193" >
+<father id="210" num="4" />
 <cdparam x="795" y="509" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
 <infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="378" />
+<TGConnectingPoint num="0" id="192" />
 <extraparam>
 <Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1217,14 +1211,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="381" >
-<father id="396" num="5" />
+<SUBCOMPONENT type="1203" id="195" >
+<father id="210" num="5" />
 <cdparam x="795" y="448" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
 <infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="380" />
+<TGConnectingPoint num="0" id="194" />
 <extraparam>
 <Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1234,14 +1228,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="383" >
-<father id="396" num="6" />
+<SUBCOMPONENT type="1203" id="197" >
+<father id="210" num="6" />
 <cdparam x="795" y="481" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
 <infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="382" />
+<TGConnectingPoint num="0" id="196" />
 <extraparam>
 <Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1251,14 +1245,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="385" >
-<father id="396" num="7" />
+<SUBCOMPONENT type="1203" id="199" >
+<father id="210" num="7" />
 <cdparam x="795" y="419" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
 <infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="384" />
+<TGConnectingPoint num="0" id="198" />
 <extraparam>
 <Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1268,14 +1262,14 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="387" >
-<father id="396" num="8" />
+<SUBCOMPONENT type="1203" id="201" >
+<father id="210" num="8" />
 <cdparam x="741" y="406" />
 <sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
 <infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="386" />
+<TGConnectingPoint num="0" id="200" />
 <extraparam>
 <Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
@@ -1285,248 +1279,248 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="415" >
-<father id="424" num="3" />
+<SUBCOMPONENT type="1201" id="229" >
+<father id="238" num="3" />
 <cdparam x="521" y="369" />
 <sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
 <infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="397" />
-<TGConnectingPoint num="1" id="398" />
-<TGConnectingPoint num="2" id="399" />
-<TGConnectingPoint num="3" id="400" />
-<TGConnectingPoint num="4" id="401" />
-<TGConnectingPoint num="5" id="402" />
-<TGConnectingPoint num="6" id="403" />
-<TGConnectingPoint num="7" id="404" />
-<TGConnectingPoint num="8" id="405" />
-<TGConnectingPoint num="9" id="406" />
-<TGConnectingPoint num="10" id="407" />
-<TGConnectingPoint num="11" id="408" />
-<TGConnectingPoint num="12" id="409" />
-<TGConnectingPoint num="13" id="410" />
-<TGConnectingPoint num="14" id="411" />
-<TGConnectingPoint num="15" id="412" />
-<TGConnectingPoint num="16" id="413" />
-<TGConnectingPoint num="17" id="414" />
+<TGConnectingPoint num="0" id="211" />
+<TGConnectingPoint num="1" id="212" />
+<TGConnectingPoint num="2" id="213" />
+<TGConnectingPoint num="3" id="214" />
+<TGConnectingPoint num="4" id="215" />
+<TGConnectingPoint num="5" id="216" />
+<TGConnectingPoint num="6" id="217" />
+<TGConnectingPoint num="7" id="218" />
+<TGConnectingPoint num="8" id="219" />
+<TGConnectingPoint num="9" id="220" />
+<TGConnectingPoint num="10" id="221" />
+<TGConnectingPoint num="11" id="222" />
+<TGConnectingPoint num="12" id="223" />
+<TGConnectingPoint num="13" id="224" />
+<TGConnectingPoint num="14" id="225" />
+<TGConnectingPoint num="15" id="226" />
+<TGConnectingPoint num="16" id="227" />
+<TGConnectingPoint num="17" id="228" />
 </SUBCOMPONENT>
 
 
 </TMLComponentTaskDiagramPanel>
 
 <TMLActivityDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1008" id="427" >
-<cdparam x="320" y="433" />
-<sizeparam width="40" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="241" >
+<cdparam x="318" y="433" />
+<sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="end()" />
-<TGConnectingPoint num="0" id="425" />
-<TGConnectingPoint num="1" id="426" />
+<TGConnectingPoint num="0" id="239" />
+<TGConnectingPoint num="1" id="240" />
 <latencyCheck />
 <extraparam>
 <Data eventName="end" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="435" >
+<COMPONENT type="1012" id="249" >
 <cdparam x="546" y="376" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="431" />
-<TGConnectingPoint num="1" id="432" />
-<TGConnectingPoint num="2" id="433" />
-<TGConnectingPoint num="3" id="434" />
+<TGConnectingPoint num="0" id="245" />
+<TGConnectingPoint num="1" id="246" />
+<TGConnectingPoint num="2" id="247" />
+<TGConnectingPoint num="3" id="248" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="428" >
-<father id="435" num="0" />
+<SUBCOMPONENT type="-1" id="242" >
+<father id="249" num="0" />
 <cdparam x="521" y="386" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="429" >
-<father id="435" num="1" />
+<SUBCOMPONENT type="-1" id="243" >
+<father id="249" num="1" />
 <cdparam x="581" y="386" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="430" >
-<father id="435" num="2" />
+<SUBCOMPONENT type="-1" id="244" >
+<father id="249" num="2" />
 <cdparam x="566" y="421" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="443" >
+<COMPONENT type="1012" id="257" >
 <cdparam x="644" y="517" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="439" />
-<TGConnectingPoint num="1" id="440" />
-<TGConnectingPoint num="2" id="441" />
-<TGConnectingPoint num="3" id="442" />
+<TGConnectingPoint num="0" id="253" />
+<TGConnectingPoint num="1" id="254" />
+<TGConnectingPoint num="2" id="255" />
+<TGConnectingPoint num="3" id="256" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="436" >
-<father id="443" num="0" />
+<SUBCOMPONENT type="-1" id="250" >
+<father id="257" num="0" />
 <cdparam x="599" y="527" />
-<sizeparam width="51" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="52" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ x==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="437" >
-<father id="443" num="1" />
+<SUBCOMPONENT type="-1" id="251" >
+<father id="257" num="1" />
 <cdparam x="679" y="527" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="438" >
-<father id="443" num="2" />
+<SUBCOMPONENT type="-1" id="252" >
+<father id="257" num="2" />
 <cdparam x="664" y="562" />
-<sizeparam width="41" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="42" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
 <infoparam name="guard 3" value="[ x&gt;0 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1000" id="445" >
+<COMPONENT type="1000" id="259" >
 <cdparam x="222" y="58" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="444" />
+<TGConnectingPoint num="0" id="258" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="448" >
-<cdparam x="192" y="137" />
-<sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="262" >
+<cdparam x="188" y="137" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send request" value="activation()" />
-<TGConnectingPoint num="0" id="446" />
-<TGConnectingPoint num="1" id="447" />
+<TGConnectingPoint num="0" id="260" />
+<TGConnectingPoint num="1" id="261" />
 <extraparam>
 <Data requestName="activation" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="451" >
-<cdparam x="205" y="237" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="265" >
+<cdparam x="202" y="237" />
+<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="reset()" />
-<TGConnectingPoint num="0" id="449" />
-<TGConnectingPoint num="1" id="450" />
+<TGConnectingPoint num="0" id="263" />
+<TGConnectingPoint num="1" id="264" />
 <latencyCheck />
 <extraparam>
 <Data eventName="reset" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="454" >
-<cdparam x="173" y="288" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="268" >
+<cdparam x="168" y="288" />
+<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="answerToReset() " />
-<TGConnectingPoint num="0" id="452" />
-<TGConnectingPoint num="1" id="453" />
+<TGConnectingPoint num="0" id="266" />
+<TGConnectingPoint num="1" id="267" />
 <extraparam>
 <Data eventName="answerToReset" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="457" >
-<cdparam x="208" y="337" />
-<sizeparam width="40" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="271" >
+<cdparam x="207" y="337" />
+<sizeparam width="43" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="pTS()" />
-<TGConnectingPoint num="0" id="455" />
-<TGConnectingPoint num="1" id="456" />
+<TGConnectingPoint num="0" id="269" />
+<TGConnectingPoint num="1" id="270" />
 <extraparam>
 <Data eventName="pTS" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="460" >
-<cdparam x="390" y="152" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="274" >
+<cdparam x="387" y="152" />
+<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="pTSConfirm() " />
-<TGConnectingPoint num="0" id="458" />
-<TGConnectingPoint num="1" id="459" />
+<TGConnectingPoint num="0" id="272" />
+<TGConnectingPoint num="1" id="273" />
 <breakpoint />
 <extraparam>
 <Data eventName="pTSConfirm" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="477" >
+<COMPONENT type="301" id="291" >
 <cdparam x="453" y="214" />
-<sizeparam width="105" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="114" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="data exchange
 " />
-<TGConnectingPoint num="0" id="461" />
-<TGConnectingPoint num="1" id="462" />
-<TGConnectingPoint num="2" id="463" />
-<TGConnectingPoint num="3" id="464" />
-<TGConnectingPoint num="4" id="465" />
-<TGConnectingPoint num="5" id="466" />
-<TGConnectingPoint num="6" id="467" />
-<TGConnectingPoint num="7" id="468" />
-<TGConnectingPoint num="8" id="469" />
-<TGConnectingPoint num="9" id="470" />
-<TGConnectingPoint num="10" id="471" />
-<TGConnectingPoint num="11" id="472" />
-<TGConnectingPoint num="12" id="473" />
-<TGConnectingPoint num="13" id="474" />
-<TGConnectingPoint num="14" id="475" />
-<TGConnectingPoint num="15" id="476" />
+<TGConnectingPoint num="0" id="275" />
+<TGConnectingPoint num="1" id="276" />
+<TGConnectingPoint num="2" id="277" />
+<TGConnectingPoint num="3" id="278" />
+<TGConnectingPoint num="4" id="279" />
+<TGConnectingPoint num="5" id="280" />
+<TGConnectingPoint num="6" id="281" />
+<TGConnectingPoint num="7" id="282" />
+<TGConnectingPoint num="8" id="283" />
+<TGConnectingPoint num="9" id="284" />
+<TGConnectingPoint num="10" id="285" />
+<TGConnectingPoint num="11" id="286" />
+<TGConnectingPoint num="12" id="287" />
+<TGConnectingPoint num="13" id="288" />
+<TGConnectingPoint num="14" id="289" />
+<TGConnectingPoint num="15" id="290" />
 <extraparam>
 <Line value="data exchange" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="480" >
-<cdparam x="433" y="448" />
-<sizeparam width="87" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="294" >
+<cdparam x="429" y="448" />
+<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="fromDtoSC(1)" />
-<TGConnectingPoint num="0" id="478" />
-<TGConnectingPoint num="1" id="479" />
+<TGConnectingPoint num="0" id="292" />
+<TGConnectingPoint num="1" id="293" />
 <extraparam>
 <Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="483" >
-<cdparam x="422" y="507" />
-<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="297" >
+<cdparam x="419" y="507" />
+<sizeparam width="115" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="data_Ready(x, b)" />
-<TGConnectingPoint num="0" id="481" />
-<TGConnectingPoint num="1" id="482" />
+<TGConnectingPoint num="0" id="295" />
+<TGConnectingPoint num="1" id="296" />
 <latencyCheck />
 <extraparam>
 <Data eventName="data_Ready" nbOfParams="5" />
@@ -1535,165 +1529,165 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="485" >
+<COMPONENT type="1001" id="299" >
 <cdparam x="466" y="570" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="484" />
+<TGConnectingPoint num="0" id="298" />
 </COMPONENT>
 
-<COMPONENT type="1017" id="488" >
-<cdparam x="593" y="447" />
-<sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1017" id="302" >
+<cdparam x="588" y="447" />
+<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="notified event" value="x=?data_Ready_SC()" />
-<TGConnectingPoint num="0" id="486" />
-<TGConnectingPoint num="1" id="487" />
+<TGConnectingPoint num="0" id="300" />
+<TGConnectingPoint num="1" id="301" />
 <extraparam>
 <Data eventName="data_Ready_SC" variable="x" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="490" >
+<COMPONENT type="1001" id="304" >
 <cdparam x="569" y="577" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="489" />
+<TGConnectingPoint num="0" id="303" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="493" >
-<cdparam x="614" y="700" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="307" >
+<cdparam x="610" y="700" />
+<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="fromSCtoD(1) " />
-<TGConnectingPoint num="0" id="491" />
-<TGConnectingPoint num="1" id="492" />
+<TGConnectingPoint num="0" id="305" />
+<TGConnectingPoint num="1" id="306" />
 <extraparam>
 <Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="496" >
-<cdparam x="604" y="619" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="310" >
+<cdparam x="600" y="619" />
+<sizeparam width="119" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="data_Ready_SC() " />
-<TGConnectingPoint num="0" id="494" />
-<TGConnectingPoint num="1" id="495" />
+<TGConnectingPoint num="0" id="308" />
+<TGConnectingPoint num="1" id="309" />
 <accessibility />
 <extraparam>
 <Data eventName="data_Ready_SC" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="498" >
+<COMPONENT type="1001" id="312" >
 <cdparam x="649" y="774" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="497" />
+<TGConnectingPoint num="0" id="311" />
 </COMPONENT>
 
-<COMPONENT type="1014" id="502" >
-<cdparam x="307" y="287" />
-<sizeparam width="254" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1014" id="316" >
+<cdparam x="300" y="287" />
+<sizeparam width="268" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for loop" value="for(i=0;i&lt;nbOfComputedPackets;i = i +1)" />
-<TGConnectingPoint num="0" id="499" />
-<TGConnectingPoint num="1" id="500" />
-<TGConnectingPoint num="2" id="501" />
+<TGConnectingPoint num="0" id="313" />
+<TGConnectingPoint num="1" id="314" />
+<TGConnectingPoint num="2" id="315" />
 <extraparam>
 <Data init="i=0" condition="i&lt;nbOfComputedPackets" increment="i = i +1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="504" >
+<COMPONENT type="1001" id="318" >
 <cdparam x="330" y="477" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="503" />
+<TGConnectingPoint num="0" id="317" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="505" >
+<CONNECTOR type="115" id="319" >
 <cdparam x="434" y="177" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="434" y="177" id="459" />
-<P2  x="434" y="282" id="499" />
+<P1  x="434" y="177" id="273" />
+<P2  x="434" y="282" id="313" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="506" >
+<CONNECTOR type="115" id="320" >
 <cdparam x="340" y="458" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="340" y="458" id="426" />
-<P2  x="340" y="472" id="503" />
+<P1  x="340" y="458" id="240" />
+<P2  x="340" y="472" id="317" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="507" >
+<CONNECTOR type="115" id="321" >
 <cdparam x="434" y="312" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="434" y="312" id="501" />
-<P2  x="340" y="428" id="425" />
+<P1  x="434" y="312" id="315" />
+<P2  x="340" y="428" id="239" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="508" >
+<CONNECTOR type="115" id="322" >
 <cdparam x="561" y="301" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="561" y="301" id="500" />
-<P2  x="561" y="366" id="431" />
+<P1  x="568" y="301" id="314" />
+<P2  x="561" y="366" id="245" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="513" >
+<CONNECTOR type="115" id="327" >
 <cdparam x="78" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="228" y="362" id="456" />
-<P2  x="434" y="147" id="458" />
+<P1  x="228" y="362" id="270" />
+<P2  x="434" y="147" id="272" />
 <Point x="228" y="382" />
 <Point x="228" y="382" />
 <Point x="286" y="376" />
 <Point x="285" y="127" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="509" >
-<father id="513" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="323" >
+<father id="327" num="0" />
 <cdparam x="228" y="382" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="510" >
-<father id="513" num="1" />
+<SUBCOMPONENT type="-1" id="324" >
+<father id="327" num="1" />
 <cdparam x="228" y="382" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="511" >
-<father id="513" num="2" />
+<SUBCOMPONENT type="-1" id="325" >
+<father id="327" num="2" />
 <cdparam x="286" y="376" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="512" >
-<father id="513" num="3" />
+<SUBCOMPONENT type="-1" id="326" >
+<father id="327" num="3" />
 <cdparam x="285" y="127" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1701,125 +1695,125 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="514" >
+<CONNECTOR type="115" id="328" >
 <cdparam x="228" y="57" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to send request" value="null" />
-<P1  x="229" y="78" id="444" />
-<P2  x="228" y="132" id="446" />
+<P1  x="229" y="78" id="258" />
+<P2  x="228" y="132" id="260" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="515" >
+<CONNECTOR type="115" id="329" >
 <cdparam x="228" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to send event" value="null" />
-<P1  x="228" y="162" id="447" />
-<P2  x="228" y="232" id="449" />
+<P1  x="228" y="162" id="261" />
+<P2  x="228" y="232" id="263" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="516" >
+<CONNECTOR type="115" id="330" >
 <cdparam x="228" y="284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="228" y="313" id="453" />
-<P2  x="228" y="332" id="455" />
+<P1  x="228" y="313" id="267" />
+<P2  x="228" y="332" id="269" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="517" >
+<CONNECTOR type="115" id="331" >
 <cdparam x="528" y="391" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to write channel" value="null" />
-<P1  x="521" y="391" id="432" />
-<P2  x="476" y="443" id="478" />
+<P1  x="521" y="391" id="246" />
+<P2  x="476" y="443" id="292" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="518" >
+<CONNECTOR type="115" id="332" >
 <cdparam x="476" y="473" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="476" y="473" id="479" />
-<P2  x="476" y="502" id="481" />
+<P1  x="476" y="473" id="293" />
+<P2  x="476" y="502" id="295" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="519" >
+<CONNECTOR type="115" id="333" >
 <cdparam x="471" y="529" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="476" y="532" id="482" />
-<P2  x="476" y="565" id="484" />
+<P1  x="476" y="532" id="296" />
+<P2  x="476" y="565" id="298" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="520" >
+<CONNECTOR type="115" id="334" >
 <cdparam x="619" y="532" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="619" y="532" id="440" />
-<P2  x="579" y="572" id="489" />
+<P1  x="619" y="532" id="254" />
+<P2  x="579" y="572" id="303" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="521" >
+<CONNECTOR type="115" id="335" >
 <cdparam x="580" y="405" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to notified event" value="null" />
-<P1  x="601" y="391" id="433" />
-<P2  x="659" y="442" id="486" />
+<P1  x="601" y="391" id="247" />
+<P2  x="659" y="442" id="300" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="522" >
+<CONNECTOR type="115" id="336" >
 <cdparam x="659" y="472" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from notified event to choice" value="null" />
-<P1  x="659" y="472" id="487" />
-<P2  x="659" y="507" id="439" />
+<P1  x="659" y="472" id="301" />
+<P2  x="659" y="507" id="253" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="523" >
+<CONNECTOR type="115" id="337" >
 <cdparam x="659" y="572" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="659" y="572" id="442" />
-<P2  x="659" y="614" id="494" />
+<P1  x="659" y="572" id="256" />
+<P2  x="659" y="614" id="308" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="524" >
+<CONNECTOR type="115" id="338" >
 <cdparam x="670" y="644" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="659" y="644" id="495" />
-<P2  x="659" y="695" id="491" />
+<P1  x="659" y="644" id="309" />
+<P2  x="659" y="695" id="305" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="525" >
+<CONNECTOR type="115" id="339" >
 <cdparam x="659" y="725" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to stop state" value="null" />
-<P1  x="659" y="725" id="492" />
-<P2  x="659" y="769" id="497" />
+<P1  x="659" y="725" id="306" />
+<P2  x="659" y="769" id="311" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="526" >
+<CONNECTOR type="115" id="340" >
 <cdparam x="228" y="262" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="228" y="262" id="450" />
-<P2  x="228" y="283" id="452" />
+<P1  x="228" y="262" id="264" />
+<P2  x="228" y="283" id="266" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="530" >
+<COMPONENT type="1013" id="344" >
 <cdparam x="505" y="259" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="528" />
-<TGConnectingPoint num="1" id="529" />
+<TGConnectingPoint num="0" id="342" />
+<TGConnectingPoint num="1" id="343" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="527" >
-<father id="530" num="0" />
+<SUBCOMPONENT type="-1" id="341" >
+<father id="344" num="0" />
 <cdparam x="520" y="279" />
 <sizeparam width="16" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1827,61 +1821,61 @@
 <infoparam name="value of the delay" value="10" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1010" id="533" >
+<COMPONENT type="1010" id="347" >
 <cdparam x="479" y="129" />
 <sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="opened() " />
-<TGConnectingPoint num="0" id="531" />
-<TGConnectingPoint num="1" id="532" />
+<TGConnectingPoint num="0" id="345" />
+<TGConnectingPoint num="1" id="346" />
 <extraparam>
 <Data eventName="opened" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="536" >
+<COMPONENT type="1008" id="350" >
 <cdparam x="449" y="192" />
 <sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="connectionOpened()" />
-<TGConnectingPoint num="0" id="534" />
-<TGConnectingPoint num="1" id="535" />
+<TGConnectingPoint num="0" id="348" />
+<TGConnectingPoint num="1" id="349" />
 <extraparam>
 <Data eventName="connectionOpened" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="544" >
+<COMPONENT type="1012" id="358" >
 <cdparam x="495" y="514" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="540" />
-<TGConnectingPoint num="1" id="541" />
-<TGConnectingPoint num="2" id="542" />
-<TGConnectingPoint num="3" id="543" />
+<TGConnectingPoint num="0" id="354" />
+<TGConnectingPoint num="1" id="355" />
+<TGConnectingPoint num="2" id="356" />
+<TGConnectingPoint num="3" id="357" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="537" >
-<father id="544" num="0" />
+<SUBCOMPONENT type="-1" id="351" >
+<father id="358" num="0" />
 <cdparam x="470" y="524" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="538" >
-<father id="544" num="1" />
+<SUBCOMPONENT type="-1" id="352" >
+<father id="358" num="1" />
 <cdparam x="530" y="524" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="539" >
-<father id="544" num="2" />
+<SUBCOMPONENT type="-1" id="353" >
+<father id="358" num="2" />
 <cdparam x="515" y="559" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1889,288 +1883,288 @@
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1000" id="546" >
+<COMPONENT type="1000" id="360" >
 <cdparam x="498" y="33" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="545" />
+<TGConnectingPoint num="0" id="359" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="549" >
+<COMPONENT type="1008" id="363" >
 <cdparam x="482" y="71" />
 <sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="open()" />
-<TGConnectingPoint num="0" id="547" />
-<TGConnectingPoint num="1" id="548" />
+<TGConnectingPoint num="0" id="361" />
+<TGConnectingPoint num="1" id="362" />
 <extraparam>
 <Data eventName="open" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="552" >
+<COMPONENT type="1006" id="366" >
 <cdparam x="469" y="353" />
 <sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="fromAtoT(1)" />
-<TGConnectingPoint num="0" id="550" />
-<TGConnectingPoint num="1" id="551" />
+<TGConnectingPoint num="0" id="364" />
+<TGConnectingPoint num="1" id="365" />
 <extraparam>
 <Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="555" >
+<COMPONENT type="1008" id="369" >
 <cdparam x="471" y="399" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="send_TCP()" />
-<TGConnectingPoint num="0" id="553" />
-<TGConnectingPoint num="1" id="554" />
+<TGConnectingPoint num="0" id="367" />
+<TGConnectingPoint num="1" id="368" />
 <accessibility />
 <extraparam>
 <Data eventName="send_TCP" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="557" >
+<COMPONENT type="1001" id="371" >
 <cdparam x="577" y="648" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="556" />
+<TGConnectingPoint num="0" id="370" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="560" >
+<COMPONENT type="1008" id="374" >
 <cdparam x="563" y="589" />
 <sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="abort()" />
-<TGConnectingPoint num="0" id="558" />
-<TGConnectingPoint num="1" id="559" />
+<TGConnectingPoint num="0" id="372" />
+<TGConnectingPoint num="1" id="373" />
 <extraparam>
 <Data eventName="abort" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="563" >
+<COMPONENT type="1008" id="377" >
 <cdparam x="410" y="597" />
 <sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="close()" />
-<TGConnectingPoint num="0" id="561" />
-<TGConnectingPoint num="1" id="562" />
+<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="1" id="376" />
 <extraparam>
 <Data eventName="close" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="565" >
+<COMPONENT type="1001" id="379" >
 <cdparam x="423" y="646" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="564" />
+<TGConnectingPoint num="0" id="378" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="566" >
+<CONNECTOR type="115" id="380" >
 <cdparam x="510" y="294" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="510" y="294" id="529" />
-<P2  x="509" y="348" id="550" />
+<P1  x="510" y="294" id="343" />
+<P2  x="509" y="348" id="364" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="567" >
+<CONNECTOR type="115" id="381" >
 <cdparam x="508" y="424" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="508" y="424" id="554" />
-<P2  x="510" y="504" id="540" />
+<P1  x="508" y="424" id="368" />
+<P2  x="510" y="504" id="354" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="568" >
+<CONNECTOR type="115" id="382" >
 <cdparam x="512" y="154" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="512" y="154" id="532" />
-<P2  x="511" y="187" id="534" />
+<P1  x="512" y="154" id="346" />
+<P2  x="511" y="187" id="348" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="569" >
+<CONNECTOR type="115" id="383" >
 <cdparam x="594" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="511" y="217" id="535" />
-<P2  x="510" y="254" id="528" />
+<P1  x="511" y="217" id="349" />
+<P2  x="510" y="254" id="342" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="570" >
+<CONNECTOR type="115" id="384" >
 <cdparam x="506" y="36" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to send event" value="null" />
-<P1  x="505" y="53" id="545" />
-<P2  x="505" y="66" id="547" />
+<P1  x="505" y="53" id="359" />
+<P2  x="505" y="66" id="361" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="571" >
+<CONNECTOR type="115" id="385" >
 <cdparam x="508" y="154" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="505" y="96" id="548" />
-<P2  x="512" y="124" id="531" />
+<P1  x="505" y="96" id="362" />
+<P2  x="512" y="124" id="345" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="572" >
+<CONNECTOR type="115" id="386" >
 <cdparam x="509" y="397" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="509" y="378" id="551" />
-<P2  x="508" y="394" id="553" />
+<P1  x="509" y="378" id="365" />
+<P2  x="508" y="394" id="367" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="573" >
+<CONNECTOR type="115" id="387" >
 <cdparam x="587" y="614" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="587" y="614" id="559" />
-<P2  x="587" y="643" id="556" />
+<P1  x="587" y="614" id="373" />
+<P2  x="587" y="643" id="370" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="574" >
+<CONNECTOR type="115" id="388" >
 <cdparam x="471" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to send event" value="null" />
-<P1  x="470" y="529" id="541" />
-<P2  x="433" y="592" id="561" />
+<P1  x="470" y="529" id="355" />
+<P2  x="433" y="592" id="375" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="575" >
+<CONNECTOR type="115" id="389" >
 <cdparam x="433" y="622" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="433" y="622" id="562" />
-<P2  x="433" y="641" id="564" />
+<P1  x="433" y="622" id="376" />
+<P2  x="433" y="641" id="378" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="576" >
+<CONNECTOR type="115" id="390" >
 <cdparam x="551" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to send event" value="null" />
-<P1  x="550" y="529" id="542" />
-<P2  x="587" y="584" id="558" />
+<P1  x="550" y="529" id="356" />
+<P2  x="587" y="584" id="372" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="578" >
+<COMPONENT type="1001" id="392" >
 <cdparam x="430" y="408" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="577" />
+<TGConnectingPoint num="0" id="391" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="581" >
+<COMPONENT type="1010" id="395" >
 <cdparam x="418" y="364" />
 <sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="end() " />
-<TGConnectingPoint num="0" id="579" />
-<TGConnectingPoint num="1" id="580" />
+<TGConnectingPoint num="0" id="393" />
+<TGConnectingPoint num="1" id="394" />
 <extraparam>
 <Data eventName="end" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="584" >
+<COMPONENT type="1010" id="398" >
 <cdparam x="238" y="201" />
 <sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="connectionOpened() " />
-<TGConnectingPoint num="0" id="582" />
-<TGConnectingPoint num="1" id="583" />
+<TGConnectingPoint num="0" id="396" />
+<TGConnectingPoint num="1" id="397" />
 <extraparam>
 <Data eventName="connectionOpened" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="586" >
+<COMPONENT type="1000" id="400" >
 <cdparam x="159" y="66" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="585" />
+<TGConnectingPoint num="0" id="399" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="589" >
+<COMPONENT type="1010" id="403" >
 <cdparam x="141" y="129" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="reset() " />
-<TGConnectingPoint num="0" id="587" />
-<TGConnectingPoint num="1" id="588" />
+<TGConnectingPoint num="0" id="401" />
+<TGConnectingPoint num="1" id="402" />
 <extraparam>
 <Data eventName="reset" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="592" >
+<COMPONENT type="1008" id="406" >
 <cdparam x="113" y="182" />
 <sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="answerToReset()" />
-<TGConnectingPoint num="0" id="590" />
-<TGConnectingPoint num="1" id="591" />
+<TGConnectingPoint num="0" id="404" />
+<TGConnectingPoint num="1" id="405" />
 <extraparam>
 <Data eventName="answerToReset" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="595" >
+<COMPONENT type="1010" id="409" >
 <cdparam x="144" y="237" />
 <sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="pTS() " />
-<TGConnectingPoint num="0" id="593" />
-<TGConnectingPoint num="1" id="594" />
+<TGConnectingPoint num="0" id="407" />
+<TGConnectingPoint num="1" id="408" />
 <extraparam>
 <Data eventName="pTS" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="598" >
+<COMPONENT type="1008" id="412" >
 <cdparam x="124" y="308" />
 <sizeparam width="85" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="pTSConfirm()" />
-<TGConnectingPoint num="0" id="596" />
-<TGConnectingPoint num="1" id="597" />
+<TGConnectingPoint num="0" id="410" />
+<TGConnectingPoint num="1" id="411" />
 <extraparam>
 <Data eventName="pTSConfirm" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="615" >
+<COMPONENT type="301" id="429" >
 <cdparam x="376" y="98" />
 <sizeparam width="233" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2179,22 +2173,22 @@
 are used to communicate between 
 the smart card and the terminal
 " />
-<TGConnectingPoint num="0" id="599" />
-<TGConnectingPoint num="1" id="600" />
-<TGConnectingPoint num="2" id="601" />
-<TGConnectingPoint num="3" id="602" />
-<TGConnectingPoint num="4" id="603" />
-<TGConnectingPoint num="5" id="604" />
-<TGConnectingPoint num="6" id="605" />
-<TGConnectingPoint num="7" id="606" />
-<TGConnectingPoint num="8" id="607" />
-<TGConnectingPoint num="9" id="608" />
-<TGConnectingPoint num="10" id="609" />
-<TGConnectingPoint num="11" id="610" />
-<TGConnectingPoint num="12" id="611" />
-<TGConnectingPoint num="13" id="612" />
-<TGConnectingPoint num="14" id="613" />
-<TGConnectingPoint num="15" id="614" />
+<TGConnectingPoint num="0" id="413" />
+<TGConnectingPoint num="1" id="414" />
+<TGConnectingPoint num="2" id="415" />
+<TGConnectingPoint num="3" id="416" />
+<TGConnectingPoint num="4" id="417" />
+<TGConnectingPoint num="5" id="418" />
+<TGConnectingPoint num="6" id="419" />
+<TGConnectingPoint num="7" id="420" />
+<TGConnectingPoint num="8" id="421" />
+<TGConnectingPoint num="9" id="422" />
+<TGConnectingPoint num="10" id="423" />
+<TGConnectingPoint num="11" id="424" />
+<TGConnectingPoint num="12" id="425" />
+<TGConnectingPoint num="13" id="426" />
+<TGConnectingPoint num="14" id="427" />
+<TGConnectingPoint num="15" id="428" />
 <extraparam>
 <Line value="The first two layers of the OSI model " />
 <Line value="are used to communicate between " />
@@ -2202,150 +2196,150 @@ the smart card and the terminal
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="618" >
+<COMPONENT type="1007" id="432" >
 <cdparam x="254" y="97" />
 <sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send request" value="start_TCP_IP()" />
-<TGConnectingPoint num="0" id="616" />
-<TGConnectingPoint num="1" id="617" />
+<TGConnectingPoint num="0" id="430" />
+<TGConnectingPoint num="1" id="431" />
 <extraparam>
 <Data requestName="start_TCP_IP" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="621" >
+<COMPONENT type="1007" id="435" >
 <cdparam x="241" y="148" />
 <sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send request" value="start_Application()" />
-<TGConnectingPoint num="0" id="619" />
-<TGConnectingPoint num="1" id="620" />
+<TGConnectingPoint num="0" id="433" />
+<TGConnectingPoint num="1" id="434" />
 <breakpoint />
 <extraparam>
 <Data requestName="start_Application" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="623" >
+<COMPONENT type="1001" id="437" >
 <cdparam x="581" y="550" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="622" />
+<TGConnectingPoint num="0" id="436" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="626" >
+<COMPONENT type="1008" id="440" >
 <cdparam x="240" y="471" />
 <sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="data_Ready_SC()" />
-<TGConnectingPoint num="0" id="624" />
-<TGConnectingPoint num="1" id="625" />
+<TGConnectingPoint num="0" id="438" />
+<TGConnectingPoint num="1" id="439" />
 <extraparam>
 <Data eventName="data_Ready_SC" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="628" >
+<COMPONENT type="1001" id="442" >
 <cdparam x="283" y="547" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="627" />
+<TGConnectingPoint num="0" id="441" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="631" >
+<COMPONENT type="1009" id="445" >
 <cdparam x="252" y="429" />
 <sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="fromTtoP(1) " />
-<TGConnectingPoint num="0" id="629" />
-<TGConnectingPoint num="1" id="630" />
+<TGConnectingPoint num="0" id="443" />
+<TGConnectingPoint num="1" id="444" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="634" >
+<COMPONENT type="1010" id="448" >
 <cdparam x="268" y="385" />
 <sizeparam width="50" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="send() " />
-<TGConnectingPoint num="0" id="632" />
-<TGConnectingPoint num="1" id="633" />
+<TGConnectingPoint num="0" id="446" />
+<TGConnectingPoint num="1" id="447" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="637" >
+<COMPONENT type="1006" id="451" >
 <cdparam x="250" y="513" />
 <sizeparam width="87" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="fromSCtoD(1)" />
-<TGConnectingPoint num="0" id="635" />
-<TGConnectingPoint num="1" id="636" />
+<TGConnectingPoint num="0" id="449" />
+<TGConnectingPoint num="1" id="450" />
 <extraparam>
 <Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="640" >
+<COMPONENT type="1008" id="454" >
 <cdparam x="562" y="472" />
 <sizeparam width="59" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="receive()" />
-<TGConnectingPoint num="0" id="638" />
-<TGConnectingPoint num="1" id="639" />
+<TGConnectingPoint num="0" id="452" />
+<TGConnectingPoint num="1" id="453" />
 <extraparam>
 <Data eventName="receive" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="643" >
+<COMPONENT type="1009" id="457" >
 <cdparam x="546" y="433" />
 <sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="fromDtoSC(1) " />
-<TGConnectingPoint num="0" id="641" />
-<TGConnectingPoint num="1" id="642" />
+<TGConnectingPoint num="0" id="455" />
+<TGConnectingPoint num="1" id="456" />
 <extraparam>
 <Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="646" >
+<COMPONENT type="1006" id="460" >
 <cdparam x="552" y="509" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="fromPtoT(1)" />
-<TGConnectingPoint num="0" id="644" />
-<TGConnectingPoint num="1" id="645" />
+<TGConnectingPoint num="0" id="458" />
+<TGConnectingPoint num="1" id="459" />
 <extraparam>
 <Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="649" >
+<COMPONENT type="1010" id="463" >
 <cdparam x="536" y="390" />
 <sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="data_Ready(t, b) " />
-<TGConnectingPoint num="0" id="647" />
-<TGConnectingPoint num="1" id="648" />
+<TGConnectingPoint num="0" id="461" />
+<TGConnectingPoint num="1" id="462" />
 <breakpoint />
 <extraparam>
 <Data eventName="data_Ready" nbOfParams="5" />
@@ -2354,92 +2348,92 @@ the smart card and the terminal
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1014" id="653" >
+<COMPONENT type="1014" id="467" >
 <cdparam x="236" y="261" />
 <sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for loop" value="for(j=0;x==0;j = j)" />
-<TGConnectingPoint num="0" id="650" />
-<TGConnectingPoint num="1" id="651" />
-<TGConnectingPoint num="2" id="652" />
+<TGConnectingPoint num="0" id="464" />
+<TGConnectingPoint num="1" id="465" />
+<TGConnectingPoint num="2" id="466" />
 <extraparam>
 <Data init="j=0" condition="x==0" increment="j = j" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="655" >
+<COMPONENT type="1001" id="469" >
 <cdparam x="275" y="309" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="654" />
+<TGConnectingPoint num="0" id="468" />
 </COMPONENT>
 
-<COMPONENT type="1018" id="666" >
+<COMPONENT type="1018" id="480" >
 <cdparam x="424" y="285" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="656" />
-<TGConnectingPoint num="1" id="657" />
-<TGConnectingPoint num="2" id="658" />
-<TGConnectingPoint num="3" id="659" />
-<TGConnectingPoint num="4" id="660" />
-<TGConnectingPoint num="5" id="661" />
-<TGConnectingPoint num="6" id="662" />
-<TGConnectingPoint num="7" id="663" />
-<TGConnectingPoint num="8" id="664" />
-<TGConnectingPoint num="9" id="665" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="667" >
+<TGConnectingPoint num="0" id="470" />
+<TGConnectingPoint num="1" id="471" />
+<TGConnectingPoint num="2" id="472" />
+<TGConnectingPoint num="3" id="473" />
+<TGConnectingPoint num="4" id="474" />
+<TGConnectingPoint num="5" id="475" />
+<TGConnectingPoint num="6" id="476" />
+<TGConnectingPoint num="7" id="477" />
+<TGConnectingPoint num="8" id="478" />
+<TGConnectingPoint num="9" id="479" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="481" >
 <cdparam x="302" y="227" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="302" y="226" id="583" />
-<P2  x="298" y="256" id="650" />
+<P1  x="302" y="226" id="397" />
+<P2  x="298" y="256" id="464" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="672" >
+<CONNECTOR type="115" id="486" >
 <cdparam x="111" y="331" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send request" value="null" />
-<P1  x="166" y="333" id="597" />
-<P2  x="298" y="92" id="616" />
+<P1  x="166" y="333" id="411" />
+<P2  x="298" y="92" id="430" />
 <Point x="166" y="353" />
 <Point x="225" y="353" />
 <Point x="225" y="72" />
 <Point x="278" y="72" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="668" >
-<father id="672" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="482" >
+<father id="486" num="0" />
 <cdparam x="166" y="353" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="669" >
-<father id="672" num="1" />
+<SUBCOMPONENT type="-1" id="483" >
+<father id="486" num="1" />
 <cdparam x="225" y="353" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="670" >
-<father id="672" num="2" />
+<SUBCOMPONENT type="-1" id="484" >
+<father id="486" num="2" />
 <cdparam x="225" y="72" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="671" >
-<father id="672" num="3" />
+<SUBCOMPONENT type="-1" id="485" >
+<father id="486" num="3" />
 <cdparam x="278" y="72" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2447,199 +2441,199 @@ the smart card and the terminal
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="673" >
+<CONNECTOR type="115" id="487" >
 <cdparam x="166" y="64" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to wait event" value="null" />
-<P1  x="166" y="86" id="585" />
-<P2  x="166" y="124" id="587" />
+<P1  x="166" y="86" id="399" />
+<P2  x="166" y="124" id="401" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="674" >
+<CONNECTOR type="115" id="488" >
 <cdparam x="166" y="154" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="166" y="154" id="588" />
-<P2  x="166" y="177" id="590" />
+<P1  x="166" y="154" id="402" />
+<P2  x="166" y="177" id="404" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="675" >
+<CONNECTOR type="115" id="489" >
 <cdparam x="312" y="133" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to send request" value="null" />
-<P1  x="298" y="122" id="617" />
-<P2  x="298" y="143" id="619" />
+<P1  x="298" y="122" id="431" />
+<P2  x="298" y="143" id="433" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="676" >
+<CONNECTOR type="115" id="490" >
 <cdparam x="286" y="421" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="293" y="410" id="633" />
-<P2  x="293" y="424" id="629" />
+<P1  x="293" y="410" id="447" />
+<P2  x="293" y="424" id="443" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="677" >
+<CONNECTOR type="115" id="491" >
 <cdparam x="286" y="486" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to send event" value="null" />
-<P1  x="293" y="454" id="630" />
-<P2  x="293" y="466" id="624" />
+<P1  x="293" y="454" id="444" />
+<P2  x="293" y="466" id="438" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="678" >
+<CONNECTOR type="115" id="492" >
 <cdparam x="286" y="538" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="293" y="496" id="625" />
-<P2  x="293" y="508" id="635" />
+<P1  x="293" y="496" id="439" />
+<P2  x="293" y="508" id="449" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="679" >
+<CONNECTOR type="115" id="493" >
 <cdparam x="286" y="594" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="293" y="538" id="636" />
-<P2  x="293" y="542" id="627" />
+<P1  x="293" y="538" id="450" />
+<P2  x="293" y="542" id="441" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="680" >
+<CONNECTOR type="115" id="494" >
 <cdparam x="607" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to send event" value="null" />
-<P1  x="591" y="458" id="642" />
-<P2  x="591" y="467" id="638" />
+<P1  x="591" y="458" id="456" />
+<P2  x="591" y="467" id="452" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="681" >
+<CONNECTOR type="115" id="495" >
 <cdparam x="606" y="524" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="591" y="497" id="639" />
-<P2  x="591" y="504" id="644" />
+<P1  x="591" y="497" id="453" />
+<P2  x="591" y="504" id="458" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="682" >
+<CONNECTOR type="115" id="496" >
 <cdparam x="609" y="427" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="591" y="415" id="648" />
-<P2  x="591" y="428" id="641" />
+<P1  x="591" y="415" id="462" />
+<P2  x="591" y="428" id="455" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="683" >
+<CONNECTOR type="115" id="497" >
 <cdparam x="606" y="586" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="591" y="534" id="645" />
-<P2  x="591" y="545" id="622" />
+<P1  x="591" y="534" id="459" />
+<P2  x="591" y="545" id="436" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="684" >
+<CONNECTOR type="115" id="498" >
 <cdparam x="298" y="173" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to for loop" value="null" />
-<P1  x="298" y="173" id="620" />
-<P2  x="302" y="196" id="582" />
+<P1  x="298" y="173" id="434" />
+<P2  x="302" y="196" id="396" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="685" >
+<CONNECTOR type="115" id="499" >
 <cdparam x="328" y="291" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to stop state" value="null" />
-<P1  x="298" y="286" id="652" />
-<P2  x="285" y="304" id="654" />
+<P1  x="298" y="286" id="466" />
+<P2  x="285" y="304" id="468" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="686" >
+<CONNECTOR type="115" id="500" >
 <cdparam x="385" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="399" y="300" id="657" />
-<P2  x="293" y="380" id="632" />
+<P1  x="399" y="300" id="471" />
+<P2  x="293" y="380" id="446" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="687" >
+<CONNECTOR type="115" id="501" >
 <cdparam x="533" y="462" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="479" y="300" id="658" />
-<P2  x="591" y="385" id="647" />
+<P1  x="479" y="300" id="472" />
+<P2  x="591" y="385" id="461" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="688" >
+<CONNECTOR type="115" id="502" >
 <cdparam x="391" y="341" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to select" value="null" />
-<P1  x="361" y="275" id="651" />
-<P2  x="439" y="275" id="656" />
+<P1  x="361" y="275" id="465" />
+<P2  x="439" y="275" id="470" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="689" >
+<CONNECTOR type="115" id="503" >
 <cdparam x="164" y="262" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="166" y="262" id="594" />
-<P2  x="166" y="303" id="596" />
+<P1  x="166" y="262" id="408" />
+<P2  x="166" y="303" id="410" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="690" >
+<CONNECTOR type="115" id="504" >
 <cdparam x="166" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="166" y="207" id="591" />
-<P2  x="166" y="232" id="593" />
+<P1  x="166" y="207" id="405" />
+<P2  x="166" y="232" id="407" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="691" >
+<CONNECTOR type="115" id="505" >
 <cdparam x="439" y="340" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="439" y="340" id="659" />
-<P2  x="440" y="359" id="579" />
+<P1  x="439" y="340" id="473" />
+<P2  x="440" y="359" id="393" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="692" >
+<CONNECTOR type="115" id="506" >
 <cdparam x="440" y="389" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="440" y="389" id="580" />
-<P2  x="440" y="403" id="577" />
+<P1  x="440" y="389" id="394" />
+<P2  x="440" y="403" id="391" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1012" id="700" >
+<COMPONENT type="1012" id="514" >
 <cdparam x="509" y="222" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="696" />
-<TGConnectingPoint num="1" id="697" />
-<TGConnectingPoint num="2" id="698" />
-<TGConnectingPoint num="3" id="699" />
+<TGConnectingPoint num="0" id="510" />
+<TGConnectingPoint num="1" id="511" />
+<TGConnectingPoint num="2" id="512" />
+<TGConnectingPoint num="3" id="513" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="693" >
-<father id="700" num="0" />
+<SUBCOMPONENT type="-1" id="507" >
+<father id="514" num="0" />
 <cdparam x="464" y="232" />
 <sizeparam width="51" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ x==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="694" >
-<father id="700" num="1" />
+<SUBCOMPONENT type="-1" id="508" >
+<father id="514" num="1" />
 <cdparam x="544" y="234" />
 <sizeparam width="41" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ x&gt;0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="695" >
-<father id="700" num="2" />
+<SUBCOMPONENT type="-1" id="509" >
+<father id="514" num="2" />
 <cdparam x="529" y="267" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2647,166 +2641,166 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1000" id="702" >
+<COMPONENT type="1000" id="516" >
 <cdparam x="489" y="26" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="701" />
+<TGConnectingPoint num="0" id="515" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="704" >
+<COMPONENT type="1001" id="518" >
 <cdparam x="417" y="407" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="703" />
+<TGConnectingPoint num="0" id="517" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="707" >
+<COMPONENT type="1008" id="521" >
 <cdparam x="396" y="339" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="timeOut()" />
-<TGConnectingPoint num="0" id="705" />
-<TGConnectingPoint num="1" id="706" />
+<TGConnectingPoint num="0" id="519" />
+<TGConnectingPoint num="1" id="520" />
 <extraparam>
 <Data eventName="timeOut" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="710" >
+<COMPONENT type="1010" id="524" >
 <cdparam x="599" y="300" />
 <sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="stop() " />
-<TGConnectingPoint num="0" id="708" />
-<TGConnectingPoint num="1" id="709" />
+<TGConnectingPoint num="0" id="522" />
+<TGConnectingPoint num="1" id="523" />
 <extraparam>
 <Data eventName="stop" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="712" >
+<COMPONENT type="1001" id="526" >
 <cdparam x="612" y="365" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="711" />
+<TGConnectingPoint num="0" id="525" />
 </COMPONENT>
 
-<COMPONENT type="1017" id="715" >
+<COMPONENT type="1017" id="529" >
 <cdparam x="491" y="157" />
 <sizeparam width="70" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="notified event" value="x=?stop()" />
-<TGConnectingPoint num="0" id="713" />
-<TGConnectingPoint num="1" id="714" />
+<TGConnectingPoint num="0" id="527" />
+<TGConnectingPoint num="1" id="528" />
 <extraparam>
 <Data eventName="stop" variable="x" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="716" >
+<CONNECTOR type="115" id="530" >
 <cdparam x="496" y="46" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="496" y="46" id="701" />
-<P2  x="526" y="152" id="713" />
+<P1  x="496" y="46" id="515" />
+<P2  x="526" y="152" id="527" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="717" >
+<CONNECTOR type="115" id="531" >
 <cdparam x="484" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="484" y="237" id="697" />
-<P2  x="427" y="334" id="705" />
+<P1  x="484" y="237" id="511" />
+<P2  x="427" y="334" id="519" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="718" >
+<CONNECTOR type="115" id="532" >
 <cdparam x="427" y="364" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="427" y="364" id="706" />
-<P2  x="427" y="402" id="703" />
+<P1  x="427" y="364" id="520" />
+<P2  x="427" y="402" id="517" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="719" >
+<CONNECTOR type="115" id="533" >
 <cdparam x="622" y="325" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to stop state" value="null" />
-<P1  x="622" y="325" id="709" />
-<P2  x="622" y="360" id="711" />
+<P1  x="622" y="325" id="523" />
+<P2  x="622" y="360" id="525" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="720" >
+<CONNECTOR type="115" id="534" >
 <cdparam x="524" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from notified event to choice" value="null" />
-<P1  x="526" y="182" id="714" />
-<P2  x="524" y="212" id="696" />
+<P1  x="526" y="182" id="528" />
+<P2  x="524" y="212" id="510" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="721" >
+<CONNECTOR type="115" id="535" >
 <cdparam x="564" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="564" y="237" id="698" />
-<P2  x="622" y="295" id="708" />
+<P1  x="564" y="237" id="512" />
+<P2  x="622" y="295" id="522" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" >
-<COMPONENT type="1008" id="724" >
+<COMPONENT type="1008" id="538" >
 <cdparam x="159" y="424" />
 <sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="opened()" />
-<TGConnectingPoint num="0" id="722" />
-<TGConnectingPoint num="1" id="723" />
+<TGConnectingPoint num="0" id="536" />
+<TGConnectingPoint num="1" id="537" />
 <extraparam>
 <Data eventName="opened" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="732" >
+<COMPONENT type="1012" id="546" >
 <cdparam x="2086" y="1378" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="728" />
-<TGConnectingPoint num="1" id="729" />
-<TGConnectingPoint num="2" id="730" />
-<TGConnectingPoint num="3" id="731" />
+<TGConnectingPoint num="0" id="542" />
+<TGConnectingPoint num="1" id="543" />
+<TGConnectingPoint num="2" id="544" />
+<TGConnectingPoint num="3" id="545" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="725" >
-<father id="732" num="0" />
+<SUBCOMPONENT type="-1" id="539" >
+<father id="546" num="0" />
 <cdparam x="2061" y="1388" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="726" >
-<father id="732" num="1" />
+<SUBCOMPONENT type="-1" id="540" >
+<father id="546" num="1" />
 <cdparam x="2121" y="1388" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="727" >
-<father id="732" num="2" />
+<SUBCOMPONENT type="-1" id="541" >
+<father id="546" num="2" />
 <cdparam x="2106" y="1426" />
 <sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2814,35 +2808,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==10 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="740" >
+<COMPONENT type="1012" id="554" >
 <cdparam x="2262" y="951" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="736" />
-<TGConnectingPoint num="1" id="737" />
-<TGConnectingPoint num="2" id="738" />
-<TGConnectingPoint num="3" id="739" />
+<TGConnectingPoint num="0" id="550" />
+<TGConnectingPoint num="1" id="551" />
+<TGConnectingPoint num="2" id="552" />
+<TGConnectingPoint num="3" id="553" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="733" >
-<father id="740" num="0" />
+<SUBCOMPONENT type="-1" id="547" >
+<father id="554" num="0" />
 <cdparam x="2212" y="961" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==1 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="734" >
-<father id="740" num="1" />
+<SUBCOMPONENT type="-1" id="548" >
+<father id="554" num="1" />
 <cdparam x="2301" y="975" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ tcpctrl.state ==3 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="735" >
-<father id="740" num="2" />
+<SUBCOMPONENT type="-1" id="549" >
+<father id="554" num="2" />
 <cdparam x="2282" y="996" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2850,35 +2844,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ else ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="748" >
+<COMPONENT type="1012" id="562" >
 <cdparam x="1981" y="1346" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="744" />
-<TGConnectingPoint num="1" id="745" />
-<TGConnectingPoint num="2" id="746" />
-<TGConnectingPoint num="3" id="747" />
+<TGConnectingPoint num="0" id="558" />
+<TGConnectingPoint num="1" id="559" />
+<TGConnectingPoint num="2" id="560" />
+<TGConnectingPoint num="3" id="561" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="741" >
-<father id="748" num="0" />
+<SUBCOMPONENT type="-1" id="555" >
+<father id="562" num="0" />
 <cdparam x="1934" y="1356" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==5 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="742" >
-<father id="748" num="1" />
+<SUBCOMPONENT type="-1" id="556" >
+<father id="562" num="1" />
 <cdparam x="2016" y="1356" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="743" >
-<father id="748" num="2" />
+<SUBCOMPONENT type="-1" id="557" >
+<father id="562" num="2" />
 <cdparam x="2001" y="1391" />
 <sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2886,35 +2880,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state == 7 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="756" >
+<COMPONENT type="1012" id="570" >
 <cdparam x="1811" y="1269" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="752" />
-<TGConnectingPoint num="1" id="753" />
-<TGConnectingPoint num="2" id="754" />
-<TGConnectingPoint num="3" id="755" />
+<TGConnectingPoint num="0" id="566" />
+<TGConnectingPoint num="1" id="567" />
+<TGConnectingPoint num="2" id="568" />
+<TGConnectingPoint num="3" id="569" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="749" >
-<father id="756" num="0" />
+<SUBCOMPONENT type="-1" id="563" >
+<father id="570" num="0" />
 <cdparam x="1762" y="1279" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="750" >
-<father id="756" num="1" />
+<SUBCOMPONENT type="-1" id="564" >
+<father id="570" num="1" />
 <cdparam x="1846" y="1279" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="751" >
-<father id="756" num="2" />
+<SUBCOMPONENT type="-1" id="565" >
+<father id="570" num="2" />
 <cdparam x="1831" y="1314" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2922,35 +2916,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==2 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="764" >
+<COMPONENT type="1012" id="578" >
 <cdparam x="1713" y="1141" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="760" />
-<TGConnectingPoint num="1" id="761" />
-<TGConnectingPoint num="2" id="762" />
-<TGConnectingPoint num="3" id="763" />
+<TGConnectingPoint num="0" id="574" />
+<TGConnectingPoint num="1" id="575" />
+<TGConnectingPoint num="2" id="576" />
+<TGConnectingPoint num="3" id="577" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="757" >
-<father id="764" num="0" />
+<SUBCOMPONENT type="-1" id="571" >
+<father id="578" num="0" />
 <cdparam x="1688" y="1151" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="758" >
-<father id="764" num="1" />
+<SUBCOMPONENT type="-1" id="572" >
+<father id="578" num="1" />
 <cdparam x="1748" y="1151" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="759" >
-<father id="764" num="2" />
+<SUBCOMPONENT type="-1" id="573" >
+<father id="578" num="2" />
 <cdparam x="1733" y="1186" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2958,17 +2952,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="768" >
+<COMPONENT type="1013" id="582" >
 <cdparam x="1524" y="1254" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="766" />
-<TGConnectingPoint num="1" id="767" />
+<TGConnectingPoint num="0" id="580" />
+<TGConnectingPoint num="1" id="581" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="765" >
-<father id="768" num="0" />
+<SUBCOMPONENT type="-1" id="579" >
+<father id="582" num="0" />
 <cdparam x="1539" y="1274" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2976,17 +2970,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="772" >
+<COMPONENT type="1013" id="586" >
 <cdparam x="1524" y="1064" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="770" />
-<TGConnectingPoint num="1" id="771" />
+<TGConnectingPoint num="0" id="584" />
+<TGConnectingPoint num="1" id="585" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="769" >
-<father id="772" num="0" />
+<SUBCOMPONENT type="-1" id="583" >
+<father id="586" num="0" />
 <cdparam x="1538" y="1088" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2994,35 +2988,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="780" >
+<COMPONENT type="1012" id="594" >
 <cdparam x="1592" y="1006" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="776" />
-<TGConnectingPoint num="1" id="777" />
-<TGConnectingPoint num="2" id="778" />
-<TGConnectingPoint num="3" id="779" />
+<TGConnectingPoint num="0" id="590" />
+<TGConnectingPoint num="1" id="591" />
+<TGConnectingPoint num="2" id="592" />
+<TGConnectingPoint num="3" id="593" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="773" >
-<father id="780" num="0" />
+<SUBCOMPONENT type="-1" id="587" >
+<father id="594" num="0" />
 <cdparam x="1542" y="1016" />
 <sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state  == 4 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="774" >
-<father id="780" num="1" />
+<SUBCOMPONENT type="-1" id="588" >
+<father id="594" num="1" />
 <cdparam x="1627" y="1016" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="775" >
-<father id="780" num="2" />
+<SUBCOMPONENT type="-1" id="589" >
+<father id="594" num="2" />
 <cdparam x="1612" y="1051" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3030,35 +3024,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="788" >
+<COMPONENT type="1012" id="602" >
 <cdparam x="1713" y="875" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="784" />
-<TGConnectingPoint num="1" id="785" />
-<TGConnectingPoint num="2" id="786" />
-<TGConnectingPoint num="3" id="787" />
+<TGConnectingPoint num="0" id="598" />
+<TGConnectingPoint num="1" id="599" />
+<TGConnectingPoint num="2" id="600" />
+<TGConnectingPoint num="3" id="601" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="781" >
-<father id="788" num="0" />
+<SUBCOMPONENT type="-1" id="595" >
+<father id="602" num="0" />
 <cdparam x="1688" y="885" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="782" >
-<father id="788" num="1" />
+<SUBCOMPONENT type="-1" id="596" >
+<father id="602" num="1" />
 <cdparam x="1748" y="885" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="783" >
-<father id="788" num="2" />
+<SUBCOMPONENT type="-1" id="597" >
+<father id="602" num="2" />
 <cdparam x="1733" y="920" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3066,17 +3060,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="792" >
+<COMPONENT type="1013" id="606" >
 <cdparam x="1636" y="1235" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="790" />
-<TGConnectingPoint num="1" id="791" />
+<TGConnectingPoint num="0" id="604" />
+<TGConnectingPoint num="1" id="605" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="789" >
-<father id="792" num="0" />
+<SUBCOMPONENT type="-1" id="603" >
+<father id="606" num="0" />
 <cdparam x="1655" y="1254" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3084,17 +3078,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="796" >
+<COMPONENT type="1013" id="610" >
 <cdparam x="2232" y="1059" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="794" />
-<TGConnectingPoint num="1" id="795" />
+<TGConnectingPoint num="0" id="608" />
+<TGConnectingPoint num="1" id="609" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="793" >
-<father id="796" num="0" />
+<SUBCOMPONENT type="-1" id="607" >
+<father id="610" num="0" />
 <cdparam x="2219" y="1083" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3102,17 +3096,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="800" >
+<COMPONENT type="1013" id="614" >
 <cdparam x="2312" y="1024" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="798" />
-<TGConnectingPoint num="1" id="799" />
+<TGConnectingPoint num="0" id="612" />
+<TGConnectingPoint num="1" id="613" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="797" >
-<father id="800" num="0" />
+<SUBCOMPONENT type="-1" id="611" >
+<father id="614" num="0" />
 <cdparam x="2288" y="1044" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3120,35 +3114,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="808" >
+<COMPONENT type="1012" id="622" >
 <cdparam x="1193" y="1020" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="804" />
-<TGConnectingPoint num="1" id="805" />
-<TGConnectingPoint num="2" id="806" />
-<TGConnectingPoint num="3" id="807" />
+<TGConnectingPoint num="0" id="618" />
+<TGConnectingPoint num="1" id="619" />
+<TGConnectingPoint num="2" id="620" />
+<TGConnectingPoint num="3" id="621" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="801" >
-<father id="808" num="0" />
+<SUBCOMPONENT type="-1" id="615" >
+<father id="622" num="0" />
 <cdparam x="1168" y="1030" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="802" >
-<father id="808" num="1" />
+<SUBCOMPONENT type="-1" id="616" >
+<father id="622" num="1" />
 <cdparam x="1228" y="1030" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="803" >
-<father id="808" num="2" />
+<SUBCOMPONENT type="-1" id="617" >
+<father id="622" num="2" />
 <cdparam x="1213" y="1065" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3156,17 +3150,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==6 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="812" >
+<COMPONENT type="1013" id="626" >
 <cdparam x="1203" y="1107" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="810" />
-<TGConnectingPoint num="1" id="811" />
+<TGConnectingPoint num="0" id="624" />
+<TGConnectingPoint num="1" id="625" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="809" >
-<father id="812" num="0" />
+<SUBCOMPONENT type="-1" id="623" >
+<father id="626" num="0" />
 <cdparam x="1218" y="1127" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3174,35 +3168,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="820" >
+<COMPONENT type="1012" id="634" >
 <cdparam x="557" y="712" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="816" />
-<TGConnectingPoint num="1" id="817" />
-<TGConnectingPoint num="2" id="818" />
-<TGConnectingPoint num="3" id="819" />
+<TGConnectingPoint num="0" id="630" />
+<TGConnectingPoint num="1" id="631" />
+<TGConnectingPoint num="2" id="632" />
+<TGConnectingPoint num="3" id="633" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="813" >
-<father id="820" num="0" />
+<SUBCOMPONENT type="-1" id="627" >
+<father id="634" num="0" />
 <cdparam x="482" y="747" />
 <sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state == 1 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="814" >
-<father id="820" num="1" />
+<SUBCOMPONENT type="-1" id="628" >
+<father id="634" num="1" />
 <cdparam x="592" y="722" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="815" >
-<father id="820" num="2" />
+<SUBCOMPONENT type="-1" id="629" >
+<father id="634" num="2" />
 <cdparam x="577" y="757" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3210,17 +3204,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="824" >
+<COMPONENT type="1013" id="638" >
 <cdparam x="717" y="694" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="822" />
-<TGConnectingPoint num="1" id="823" />
+<TGConnectingPoint num="0" id="636" />
+<TGConnectingPoint num="1" id="637" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="821" >
-<father id="824" num="0" />
+<SUBCOMPONENT type="-1" id="635" >
+<father id="638" num="0" />
 <cdparam x="732" y="714" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3228,17 +3222,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="828" >
+<COMPONENT type="1013" id="642" >
 <cdparam x="938" y="1025" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="826" />
-<TGConnectingPoint num="1" id="827" />
+<TGConnectingPoint num="0" id="640" />
+<TGConnectingPoint num="1" id="641" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="825" >
-<father id="828" num="0" />
+<SUBCOMPONENT type="-1" id="639" >
+<father id="642" num="0" />
 <cdparam x="953" y="1045" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3246,35 +3240,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="836" >
+<COMPONENT type="1012" id="650" >
 <cdparam x="1034" y="939" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="832" />
-<TGConnectingPoint num="1" id="833" />
-<TGConnectingPoint num="2" id="834" />
-<TGConnectingPoint num="3" id="835" />
+<TGConnectingPoint num="0" id="646" />
+<TGConnectingPoint num="1" id="647" />
+<TGConnectingPoint num="2" id="648" />
+<TGConnectingPoint num="3" id="649" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="829" >
-<father id="836" num="0" />
+<SUBCOMPONENT type="-1" id="643" >
+<father id="650" num="0" />
 <cdparam x="959" y="974" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="830" >
-<father id="836" num="1" />
+<SUBCOMPONENT type="-1" id="644" >
+<father id="650" num="1" />
 <cdparam x="1070" y="949" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="831" >
-<father id="836" num="2" />
+<SUBCOMPONENT type="-1" id="645" >
+<father id="650" num="2" />
 <cdparam x="1054" y="984" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3282,17 +3276,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state == 5]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="840" >
+<COMPONENT type="1013" id="654" >
 <cdparam x="795" y="1009" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="838" />
-<TGConnectingPoint num="1" id="839" />
+<TGConnectingPoint num="0" id="652" />
+<TGConnectingPoint num="1" id="653" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="837" >
-<father id="840" num="0" />
+<SUBCOMPONENT type="-1" id="651" >
+<father id="654" num="0" />
 <cdparam x="818" y="1031" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3300,35 +3294,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="848" >
+<COMPONENT type="1012" id="662" >
 <cdparam x="828" y="869" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="844" />
-<TGConnectingPoint num="1" id="845" />
-<TGConnectingPoint num="2" id="846" />
-<TGConnectingPoint num="3" id="847" />
+<TGConnectingPoint num="0" id="658" />
+<TGConnectingPoint num="1" id="659" />
+<TGConnectingPoint num="2" id="660" />
+<TGConnectingPoint num="3" id="661" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="841" >
-<father id="848" num="0" />
+<SUBCOMPONENT type="-1" id="655" >
+<father id="662" num="0" />
 <cdparam x="753" y="885" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="842" >
-<father id="848" num="1" />
+<SUBCOMPONENT type="-1" id="656" >
+<father id="662" num="1" />
 <cdparam x="863" y="879" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="843" >
-<father id="848" num="2" />
+<SUBCOMPONENT type="-1" id="657" >
+<father id="662" num="2" />
 <cdparam x="848" y="914" />
 <sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3336,17 +3330,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state==0 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="852" >
+<COMPONENT type="1013" id="666" >
 <cdparam x="341" y="764" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="850" />
-<TGConnectingPoint num="1" id="851" />
+<TGConnectingPoint num="0" id="664" />
+<TGConnectingPoint num="1" id="665" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="849" >
-<father id="852" num="0" />
+<SUBCOMPONENT type="-1" id="663" >
+<father id="666" num="0" />
 <cdparam x="354" y="785" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3354,17 +3348,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="856" >
+<COMPONENT type="1013" id="670" >
 <cdparam x="127" y="794" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="854" />
-<TGConnectingPoint num="1" id="855" />
+<TGConnectingPoint num="0" id="668" />
+<TGConnectingPoint num="1" id="669" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="853" >
-<father id="856" num="0" />
+<SUBCOMPONENT type="-1" id="667" >
+<father id="670" num="0" />
 <cdparam x="146" y="818" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3372,35 +3366,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="864" >
+<COMPONENT type="1012" id="678" >
 <cdparam x="993" y="780" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="860" />
-<TGConnectingPoint num="1" id="861" />
-<TGConnectingPoint num="2" id="862" />
-<TGConnectingPoint num="3" id="863" />
+<TGConnectingPoint num="0" id="674" />
+<TGConnectingPoint num="1" id="675" />
+<TGConnectingPoint num="2" id="676" />
+<TGConnectingPoint num="3" id="677" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="857" >
-<father id="864" num="0" />
+<SUBCOMPONENT type="-1" id="671" >
+<father id="678" num="0" />
 <cdparam x="949" y="793" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="858" >
-<father id="864" num="1" />
+<SUBCOMPONENT type="-1" id="672" >
+<father id="678" num="1" />
 <cdparam x="1028" y="790" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="859" >
-<father id="864" num="2" />
+<SUBCOMPONENT type="-1" id="673" >
+<father id="678" num="2" />
 <cdparam x="1013" y="825" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3408,17 +3402,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="868" >
+<COMPONENT type="1013" id="682" >
 <cdparam x="1003" y="701" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="866" />
-<TGConnectingPoint num="1" id="867" />
+<TGConnectingPoint num="0" id="680" />
+<TGConnectingPoint num="1" id="681" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="865" >
-<father id="868" num="0" />
+<SUBCOMPONENT type="-1" id="679" >
+<father id="682" num="0" />
 <cdparam x="1018" y="721" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3426,17 +3420,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="872" >
+<COMPONENT type="1013" id="686" >
 <cdparam x="459" y="783" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="870" />
-<TGConnectingPoint num="1" id="871" />
+<TGConnectingPoint num="0" id="684" />
+<TGConnectingPoint num="1" id="685" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="869" >
-<father id="872" num="0" />
+<SUBCOMPONENT type="-1" id="683" >
+<father id="686" num="0" />
 <cdparam x="474" y="802" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3444,17 +3438,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="876" >
+<COMPONENT type="1013" id="690" >
 <cdparam x="225" y="863" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="874" />
-<TGConnectingPoint num="1" id="875" />
+<TGConnectingPoint num="0" id="688" />
+<TGConnectingPoint num="1" id="689" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="873" >
-<father id="876" num="0" />
+<SUBCOMPONENT type="-1" id="687" >
+<father id="690" num="0" />
 <cdparam x="245" y="885" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3462,17 +3456,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="880" >
+<COMPONENT type="1013" id="694" >
 <cdparam x="1044" y="1057" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="878" />
-<TGConnectingPoint num="1" id="879" />
+<TGConnectingPoint num="0" id="692" />
+<TGConnectingPoint num="1" id="693" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="877" >
-<father id="880" num="0" />
+<SUBCOMPONENT type="-1" id="691" >
+<father id="694" num="0" />
 <cdparam x="1059" y="1077" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3480,35 +3474,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="888" >
+<COMPONENT type="1012" id="702" >
 <cdparam x="173" y="486" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="884" />
-<TGConnectingPoint num="1" id="885" />
-<TGConnectingPoint num="2" id="886" />
-<TGConnectingPoint num="3" id="887" />
+<TGConnectingPoint num="0" id="698" />
+<TGConnectingPoint num="1" id="699" />
+<TGConnectingPoint num="2" id="700" />
+<TGConnectingPoint num="3" id="701" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="881" >
-<father id="888" num="0" />
+<SUBCOMPONENT type="-1" id="695" >
+<father id="702" num="0" />
 <cdparam x="98" y="496" />
 <sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="882" >
-<father id="888" num="1" />
+<SUBCOMPONENT type="-1" id="696" >
+<father id="702" num="1" />
 <cdparam x="208" y="496" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="883" >
-<father id="888" num="2" />
+<SUBCOMPONENT type="-1" id="697" >
+<father id="702" num="2" />
 <cdparam x="193" y="531" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3516,35 +3510,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="896" >
+<COMPONENT type="1012" id="710" >
 <cdparam x="359" y="192" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="892" />
-<TGConnectingPoint num="1" id="893" />
-<TGConnectingPoint num="2" id="894" />
-<TGConnectingPoint num="3" id="895" />
+<TGConnectingPoint num="0" id="706" />
+<TGConnectingPoint num="1" id="707" />
+<TGConnectingPoint num="2" id="708" />
+<TGConnectingPoint num="3" id="709" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="889" >
-<father id="896" num="0" />
+<SUBCOMPONENT type="-1" id="703" >
+<father id="710" num="0" />
 <cdparam x="317" y="202" />
 <sizeparam width="81" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.a&gt;0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="890" >
-<father id="896" num="1" />
+<SUBCOMPONENT type="-1" id="704" >
+<father id="710" num="1" />
 <cdparam x="394" y="202" />
 <sizeparam width="91" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ tcpctrl.a==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="891" >
-<father id="896" num="2" />
+<SUBCOMPONENT type="-1" id="705" >
+<father id="710" num="2" />
 <cdparam x="379" y="237" />
 <sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3552,35 +3546,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="904" >
+<COMPONENT type="1012" id="718" >
 <cdparam x="449" y="582" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="900" />
-<TGConnectingPoint num="1" id="901" />
-<TGConnectingPoint num="2" id="902" />
-<TGConnectingPoint num="3" id="903" />
+<TGConnectingPoint num="0" id="714" />
+<TGConnectingPoint num="1" id="715" />
+<TGConnectingPoint num="2" id="716" />
+<TGConnectingPoint num="3" id="717" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="897" >
-<father id="904" num="0" />
+<SUBCOMPONENT type="-1" id="711" >
+<father id="718" num="0" />
 <cdparam x="404" y="592" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==9 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="898" >
-<father id="904" num="1" />
+<SUBCOMPONENT type="-1" id="712" >
+<father id="718" num="1" />
 <cdparam x="500" y="599" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="899" >
-<father id="904" num="2" />
+<SUBCOMPONENT type="-1" id="713" >
+<father id="718" num="2" />
 <cdparam x="469" y="627" />
 <sizeparam width="252" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3588,35 +3582,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ (tcpctrl.state ==2) or (tcpctrl.state ==4) ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="912" >
+<COMPONENT type="1012" id="726" >
 <cdparam x="274" y="564" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="908" />
-<TGConnectingPoint num="1" id="909" />
-<TGConnectingPoint num="2" id="910" />
-<TGConnectingPoint num="3" id="911" />
+<TGConnectingPoint num="0" id="722" />
+<TGConnectingPoint num="1" id="723" />
+<TGConnectingPoint num="2" id="724" />
+<TGConnectingPoint num="3" id="725" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="905" >
-<father id="912" num="0" />
+<SUBCOMPONENT type="-1" id="719" >
+<father id="726" num="0" />
 <cdparam x="228" y="574" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state == 1]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="906" >
-<father id="912" num="1" />
+<SUBCOMPONENT type="-1" id="720" >
+<father id="726" num="1" />
 <cdparam x="317" y="584" />
 <sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="907" >
-<father id="912" num="2" />
+<SUBCOMPONENT type="-1" id="721" >
+<father id="726" num="2" />
 <cdparam x="306" y="616" />
 <sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3624,16 +3618,16 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==4 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1000" id="914" >
+<COMPONENT type="1000" id="728" >
 <cdparam x="227" y="27" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="913" />
+<TGConnectingPoint num="0" id="727" />
 </COMPONENT>
 
-<COMPONENT type="301" id="931" >
+<COMPONENT type="301" id="745" >
 <cdparam x="10" y="30" />
 <sizeparam width="92" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3650,22 +3644,22 @@ the smart card and the terminal
 9: close wait
 10:last ack
 " />
-<TGConnectingPoint num="0" id="915" />
-<TGConnectingPoint num="1" id="916" />
-<TGConnectingPoint num="2" id="917" />
-<TGConnectingPoint num="3" id="918" />
-<TGConnectingPoint num="4" id="919" />
-<TGConnectingPoint num="5" id="920" />
-<TGConnectingPoint num="6" id="921" />
-<TGConnectingPoint num="7" id="922" />
-<TGConnectingPoint num="8" id="923" />
-<TGConnectingPoint num="9" id="924" />
-<TGConnectingPoint num="10" id="925" />
-<TGConnectingPoint num="11" id="926" />
-<TGConnectingPoint num="12" id="927" />
-<TGConnectingPoint num="13" id="928" />
-<TGConnectingPoint num="14" id="929" />
-<TGConnectingPoint num="15" id="930" />
+<TGConnectingPoint num="0" id="729" />
+<TGConnectingPoint num="1" id="730" />
+<TGConnectingPoint num="2" id="731" />
+<TGConnectingPoint num="3" id="732" />
+<TGConnectingPoint num="4" id="733" />
+<TGConnectingPoint num="5" id="734" />
+<TGConnectingPoint num="6" id="735" />
+<TGConnectingPoint num="7" id="736" />
+<TGConnectingPoint num="8" id="737" />
+<TGConnectingPoint num="9" id="738" />
+<TGConnectingPoint num="10" id="739" />
+<TGConnectingPoint num="11" id="740" />
+<TGConnectingPoint num="12" id="741" />
+<TGConnectingPoint num="13" id="742" />
+<TGConnectingPoint num="14" id="743" />
+<TGConnectingPoint num="15" id="744" />
 <extraparam>
 <Line value="0: closed" />
 <Line value="1: Listen" />
@@ -3681,223 +3675,223 @@ the smart card and the terminal
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="934" >
+<COMPONENT type="1011" id="748" >
 <cdparam x="98" y="549" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="932" />
-<TGConnectingPoint num="1" id="933" />
+<TGConnectingPoint num="0" id="746" />
+<TGConnectingPoint num="1" id="747" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="936" >
+<COMPONENT type="1001" id="750" >
 <cdparam x="138" y="615" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="935" />
+<TGConnectingPoint num="0" id="749" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="939" >
+<COMPONENT type="1009" id="753" >
 <cdparam x="967" y="585" />
 <sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="fromPtoT(1) " />
-<TGConnectingPoint num="0" id="937" />
-<TGConnectingPoint num="1" id="938" />
+<TGConnectingPoint num="0" id="751" />
+<TGConnectingPoint num="1" id="752" />
 <extraparam>
 <Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1014" id="943" >
+<COMPONENT type="1014" id="757" >
 <cdparam x="150" y="85" />
 <sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="for loop" value="for(i=0;(tcpctrl.a==0);i = i)" />
-<TGConnectingPoint num="0" id="940" />
-<TGConnectingPoint num="1" id="941" />
-<TGConnectingPoint num="2" id="942" />
+<TGConnectingPoint num="0" id="754" />
+<TGConnectingPoint num="1" id="755" />
+<TGConnectingPoint num="2" id="756" />
 <extraparam>
 <Data init="i=0" condition="(tcpctrl.a==0)" increment="i = i" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="945" >
+<COMPONENT type="1001" id="759" >
 <cdparam x="225" y="207" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="944" />
+<TGConnectingPoint num="0" id="758" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="948" >
+<COMPONENT type="1011" id="762" >
 <cdparam x="187" y="144" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state=0" />
-<TGConnectingPoint num="0" id="946" />
-<TGConnectingPoint num="1" id="947" />
+<TGConnectingPoint num="0" id="760" />
+<TGConnectingPoint num="1" id="761" />
 </COMPONENT>
 
-<COMPONENT type="1017" id="951" >
+<COMPONENT type="1017" id="765" >
 <cdparam x="316" y="133" />
 <sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="notified event" value="tcpctrl.a=?abort()" />
-<TGConnectingPoint num="0" id="949" />
-<TGConnectingPoint num="1" id="950" />
+<TGConnectingPoint num="0" id="763" />
+<TGConnectingPoint num="1" id="764" />
 <extraparam>
 <Data eventName="abort" variable="tcpctrl.a" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="954" >
+<COMPONENT type="1009" id="768" >
 <cdparam x="692" y="589" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="952" />
-<TGConnectingPoint num="1" id="953" />
+<TGConnectingPoint num="0" id="766" />
+<TGConnectingPoint num="1" id="767" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="957" >
+<COMPONENT type="1010" id="771" >
 <cdparam x="689" y="534" />
 <sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="timeOut() " />
-<TGConnectingPoint num="0" id="955" />
-<TGConnectingPoint num="1" id="956" />
+<TGConnectingPoint num="0" id="769" />
+<TGConnectingPoint num="1" id="770" />
 <extraparam>
 <Data eventName="timeOut" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="960" >
+<COMPONENT type="1010" id="774" >
 <cdparam x="977" y="528" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="receive() " />
-<TGConnectingPoint num="0" id="958" />
-<TGConnectingPoint num="1" id="959" />
+<TGConnectingPoint num="0" id="772" />
+<TGConnectingPoint num="1" id="773" />
 <extraparam>
 <Data eventName="receive" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="963" >
+<COMPONENT type="1010" id="777" >
 <cdparam x="439" y="492" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="close() " />
-<TGConnectingPoint num="0" id="961" />
-<TGConnectingPoint num="1" id="962" />
+<TGConnectingPoint num="0" id="775" />
+<TGConnectingPoint num="1" id="776" />
 <extraparam>
 <Data eventName="close" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="966" >
+<COMPONENT type="1010" id="780" >
 <cdparam x="250" y="468" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="send_TCP() " />
-<TGConnectingPoint num="0" id="964" />
-<TGConnectingPoint num="1" id="965" />
+<TGConnectingPoint num="0" id="778" />
+<TGConnectingPoint num="1" id="779" />
 <extraparam>
 <Data eventName="send_TCP" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="969" >
+<COMPONENT type="1010" id="783" >
 <cdparam x="163" y="383" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="open() " />
-<TGConnectingPoint num="0" id="967" />
-<TGConnectingPoint num="1" id="968" />
+<TGConnectingPoint num="0" id="781" />
+<TGConnectingPoint num="1" id="782" />
 <breakpoint />
 <extraparam>
 <Data eventName="open" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1018" id="980" >
+<COMPONENT type="1018" id="794" >
 <cdparam x="449" y="267" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="970" />
-<TGConnectingPoint num="1" id="971" />
-<TGConnectingPoint num="2" id="972" />
-<TGConnectingPoint num="3" id="973" />
-<TGConnectingPoint num="4" id="974" />
-<TGConnectingPoint num="5" id="975" />
-<TGConnectingPoint num="6" id="976" />
-<TGConnectingPoint num="7" id="977" />
-<TGConnectingPoint num="8" id="978" />
-<TGConnectingPoint num="9" id="979" />
+<TGConnectingPoint num="0" id="784" />
+<TGConnectingPoint num="1" id="785" />
+<TGConnectingPoint num="2" id="786" />
+<TGConnectingPoint num="3" id="787" />
+<TGConnectingPoint num="4" id="788" />
+<TGConnectingPoint num="5" id="789" />
+<TGConnectingPoint num="6" id="790" />
+<TGConnectingPoint num="7" id="791" />
+<TGConnectingPoint num="8" id="792" />
+<TGConnectingPoint num="9" id="793" />
 <breakpoint />
 </COMPONENT>
 
-<COMPONENT type="1001" id="982" >
+<COMPONENT type="1001" id="796" >
 <cdparam x="218" y="529" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="981" />
+<TGConnectingPoint num="0" id="795" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="984" >
+<COMPONENT type="1001" id="798" >
 <cdparam x="319" y="614" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="983" />
+<TGConnectingPoint num="0" id="797" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="987" >
+<COMPONENT type="1010" id="801" >
 <cdparam x="275" y="228" />
 <sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="abort() " />
-<TGConnectingPoint num="0" id="985" />
-<TGConnectingPoint num="1" id="986" />
+<TGConnectingPoint num="0" id="799" />
+<TGConnectingPoint num="1" id="800" />
 <extraparam>
 <Data eventName="abort" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="989" >
+<COMPONENT type="1001" id="803" >
 <cdparam x="291" y="290" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="988" />
+<TGConnectingPoint num="0" id="802" />
 </COMPONENT>
 
-<COMPONENT type="301" id="1006" >
+<COMPONENT type="301" id="820" >
 <cdparam x="602" y="86" />
 <sizeparam width="360" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3907,22 +3901,22 @@ ou depaquitiser un paquet TCP
 
 On prend b=1 comme exemple
 " />
-<TGConnectingPoint num="0" id="990" />
-<TGConnectingPoint num="1" id="991" />
-<TGConnectingPoint num="2" id="992" />
-<TGConnectingPoint num="3" id="993" />
-<TGConnectingPoint num="4" id="994" />
-<TGConnectingPoint num="5" id="995" />
-<TGConnectingPoint num="6" id="996" />
-<TGConnectingPoint num="7" id="997" />
-<TGConnectingPoint num="8" id="998" />
-<TGConnectingPoint num="9" id="999" />
-<TGConnectingPoint num="10" id="1000" />
-<TGConnectingPoint num="11" id="1001" />
-<TGConnectingPoint num="12" id="1002" />
-<TGConnectingPoint num="13" id="1003" />
-<TGConnectingPoint num="14" id="1004" />
-<TGConnectingPoint num="15" id="1005" />
+<TGConnectingPoint num="0" id="804" />
+<TGConnectingPoint num="1" id="805" />
+<TGConnectingPoint num="2" id="806" />
+<TGConnectingPoint num="3" id="807" />
+<TGConnectingPoint num="4" id="808" />
+<TGConnectingPoint num="5" id="809" />
+<TGConnectingPoint num="6" id="810" />
+<TGConnectingPoint num="7" id="811" />
+<TGConnectingPoint num="8" id="812" />
+<TGConnectingPoint num="9" id="813" />
+<TGConnectingPoint num="10" id="814" />
+<TGConnectingPoint num="11" id="815" />
+<TGConnectingPoint num="12" id="816" />
+<TGConnectingPoint num="13" id="817" />
+<TGConnectingPoint num="14" id="818" />
+<TGConnectingPoint num="15" id="819" />
 <extraparam>
 <Line value="b est le nombre d&apos;instructions necessaires pour paquetiser" />
 <Line value="ou depaquitiser un paquet TCP" />
@@ -3931,2488 +3925,2488 @@ On prend b=1 comme exemple
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1009" >
+<COMPONENT type="1009" id="823" >
 <cdparam x="188" y="808" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="fromAtoT(1) " />
-<TGConnectingPoint num="0" id="1007" />
-<TGConnectingPoint num="1" id="1008" />
+<TGConnectingPoint num="0" id="821" />
+<TGConnectingPoint num="1" id="822" />
 <extraparam>
 <Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1012" >
+<COMPONENT type="1006" id="826" >
 <cdparam x="191" y="1002" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1010" />
-<TGConnectingPoint num="1" id="1011" />
+<TGConnectingPoint num="0" id="824" />
+<TGConnectingPoint num="1" id="825" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1014" >
+<COMPONENT type="1001" id="828" >
 <cdparam x="220" y="1237" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1013" />
+<TGConnectingPoint num="0" id="827" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1017" >
+<COMPONENT type="1011" id="831" >
 <cdparam x="414" y="1032" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =5" />
-<TGConnectingPoint num="0" id="1015" />
-<TGConnectingPoint num="1" id="1016" />
+<TGConnectingPoint num="0" id="829" />
+<TGConnectingPoint num="1" id="830" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1019" >
+<COMPONENT type="1001" id="833" >
 <cdparam x="454" y="1213" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1018" />
+<TGConnectingPoint num="0" id="832" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1022" >
+<COMPONENT type="1011" id="836" >
 <cdparam x="84" y="1041" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state=3" />
-<TGConnectingPoint num="0" id="1020" />
-<TGConnectingPoint num="1" id="1021" />
+<TGConnectingPoint num="0" id="834" />
+<TGConnectingPoint num="1" id="835" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1025" >
+<COMPONENT type="1006" id="839" >
 <cdparam x="93" y="938" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1023" />
-<TGConnectingPoint num="1" id="1024" />
+<TGConnectingPoint num="0" id="837" />
+<TGConnectingPoint num="1" id="838" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1028" >
+<COMPONENT type="1011" id="842" >
 <cdparam x="292" y="1026" />
 <sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =10" />
-<TGConnectingPoint num="0" id="1026" />
-<TGConnectingPoint num="1" id="1027" />
+<TGConnectingPoint num="0" id="840" />
+<TGConnectingPoint num="1" id="841" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1030" >
+<COMPONENT type="1001" id="844" >
 <cdparam x="336" y="1229" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1029" />
+<TGConnectingPoint num="0" id="843" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1033" >
+<COMPONENT type="1006" id="847" >
 <cdparam x="425" y="941" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1031" />
-<TGConnectingPoint num="1" id="1032" />
+<TGConnectingPoint num="0" id="845" />
+<TGConnectingPoint num="1" id="846" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1036" >
+<COMPONENT type="1006" id="850" >
 <cdparam x="307" y="900" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1034" />
-<TGConnectingPoint num="1" id="1035" />
+<TGConnectingPoint num="0" id="848" />
+<TGConnectingPoint num="1" id="849" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1038" >
+<COMPONENT type="1001" id="852" >
 <cdparam x="790" y="1270" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1037" />
+<TGConnectingPoint num="0" id="851" />
 </COMPONENT>
 
-<COMPONENT type="301" id="1055" >
+<COMPONENT type="301" id="869" >
 <cdparam x="998" y="850" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Final
 " />
-<TGConnectingPoint num="0" id="1039" />
-<TGConnectingPoint num="1" id="1040" />
-<TGConnectingPoint num="2" id="1041" />
-<TGConnectingPoint num="3" id="1042" />
-<TGConnectingPoint num="4" id="1043" />
-<TGConnectingPoint num="5" id="1044" />
-<TGConnectingPoint num="6" id="1045" />
-<TGConnectingPoint num="7" id="1046" />
-<TGConnectingPoint num="8" id="1047" />
-<TGConnectingPoint num="9" id="1048" />
-<TGConnectingPoint num="10" id="1049" />
-<TGConnectingPoint num="11" id="1050" />
-<TGConnectingPoint num="12" id="1051" />
-<TGConnectingPoint num="13" id="1052" />
-<TGConnectingPoint num="14" id="1053" />
-<TGConnectingPoint num="15" id="1054" />
+<TGConnectingPoint num="0" id="853" />
+<TGConnectingPoint num="1" id="854" />
+<TGConnectingPoint num="2" id="855" />
+<TGConnectingPoint num="3" id="856" />
+<TGConnectingPoint num="4" id="857" />
+<TGConnectingPoint num="5" id="858" />
+<TGConnectingPoint num="6" id="859" />
+<TGConnectingPoint num="7" id="860" />
+<TGConnectingPoint num="8" id="861" />
+<TGConnectingPoint num="9" id="862" />
+<TGConnectingPoint num="10" id="863" />
+<TGConnectingPoint num="11" id="864" />
+<TGConnectingPoint num="12" id="865" />
+<TGConnectingPoint num="13" id="866" />
+<TGConnectingPoint num="14" id="867" />
+<TGConnectingPoint num="15" id="868" />
 <extraparam>
 <Line value="Final" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1058" >
+<COMPONENT type="1011" id="872" >
 <cdparam x="678" y="965" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="1056" />
-<TGConnectingPoint num="1" id="1057" />
+<TGConnectingPoint num="0" id="870" />
+<TGConnectingPoint num="1" id="871" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1060" >
+<COMPONENT type="1001" id="874" >
 <cdparam x="718" y="1032" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1059" />
+<TGConnectingPoint num="0" id="873" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1063" >
+<COMPONENT type="1006" id="877" >
 <cdparam x="761" y="1086" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1061" />
-<TGConnectingPoint num="1" id="1062" />
+<TGConnectingPoint num="0" id="875" />
+<TGConnectingPoint num="1" id="876" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1080" >
+<COMPONENT type="301" id="894" >
 <cdparam x="781" y="950" />
 <sizeparam width="89" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Active Open
 " />
-<TGConnectingPoint num="0" id="1064" />
-<TGConnectingPoint num="1" id="1065" />
-<TGConnectingPoint num="2" id="1066" />
-<TGConnectingPoint num="3" id="1067" />
-<TGConnectingPoint num="4" id="1068" />
-<TGConnectingPoint num="5" id="1069" />
-<TGConnectingPoint num="6" id="1070" />
-<TGConnectingPoint num="7" id="1071" />
-<TGConnectingPoint num="8" id="1072" />
-<TGConnectingPoint num="9" id="1073" />
-<TGConnectingPoint num="10" id="1074" />
-<TGConnectingPoint num="11" id="1075" />
-<TGConnectingPoint num="12" id="1076" />
-<TGConnectingPoint num="13" id="1077" />
-<TGConnectingPoint num="14" id="1078" />
-<TGConnectingPoint num="15" id="1079" />
+<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="1" id="879" />
+<TGConnectingPoint num="2" id="880" />
+<TGConnectingPoint num="3" id="881" />
+<TGConnectingPoint num="4" id="882" />
+<TGConnectingPoint num="5" id="883" />
+<TGConnectingPoint num="6" id="884" />
+<TGConnectingPoint num="7" id="885" />
+<TGConnectingPoint num="8" id="886" />
+<TGConnectingPoint num="9" id="887" />
+<TGConnectingPoint num="10" id="888" />
+<TGConnectingPoint num="11" id="889" />
+<TGConnectingPoint num="12" id="890" />
+<TGConnectingPoint num="13" id="891" />
+<TGConnectingPoint num="14" id="892" />
+<TGConnectingPoint num="15" id="893" />
 <extraparam>
 <Line value="Active Open" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1097" >
+<COMPONENT type="301" id="911" >
 <cdparam x="715" y="907" />
 <sizeparam width="97" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Passive Open
 " />
-<TGConnectingPoint num="0" id="1081" />
-<TGConnectingPoint num="1" id="1082" />
-<TGConnectingPoint num="2" id="1083" />
-<TGConnectingPoint num="3" id="1084" />
-<TGConnectingPoint num="4" id="1085" />
-<TGConnectingPoint num="5" id="1086" />
-<TGConnectingPoint num="6" id="1087" />
-<TGConnectingPoint num="7" id="1088" />
-<TGConnectingPoint num="8" id="1089" />
-<TGConnectingPoint num="9" id="1090" />
-<TGConnectingPoint num="10" id="1091" />
-<TGConnectingPoint num="11" id="1092" />
-<TGConnectingPoint num="12" id="1093" />
-<TGConnectingPoint num="13" id="1094" />
-<TGConnectingPoint num="14" id="1095" />
-<TGConnectingPoint num="15" id="1096" />
+<TGConnectingPoint num="0" id="895" />
+<TGConnectingPoint num="1" id="896" />
+<TGConnectingPoint num="2" id="897" />
+<TGConnectingPoint num="3" id="898" />
+<TGConnectingPoint num="4" id="899" />
+<TGConnectingPoint num="5" id="900" />
+<TGConnectingPoint num="6" id="901" />
+<TGConnectingPoint num="7" id="902" />
+<TGConnectingPoint num="8" id="903" />
+<TGConnectingPoint num="9" id="904" />
+<TGConnectingPoint num="10" id="905" />
+<TGConnectingPoint num="11" id="906" />
+<TGConnectingPoint num="12" id="907" />
+<TGConnectingPoint num="13" id="908" />
+<TGConnectingPoint num="14" id="909" />
+<TGConnectingPoint num="15" id="910" />
 <extraparam>
 <Line value="Passive Open" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1100" >
+<COMPONENT type="1011" id="914" >
 <cdparam x="750" y="1193" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =3" />
-<TGConnectingPoint num="0" id="1098" />
-<TGConnectingPoint num="1" id="1099" />
+<TGConnectingPoint num="0" id="912" />
+<TGConnectingPoint num="1" id="913" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1103" >
+<COMPONENT type="1011" id="917" >
 <cdparam x="446" y="768" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1101" />
-<TGConnectingPoint num="1" id="1102" />
+<TGConnectingPoint num="0" id="915" />
+<TGConnectingPoint num="1" id="916" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1105" >
+<COMPONENT type="1001" id="919" >
 <cdparam x="486" y="830" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1104" />
+<TGConnectingPoint num="0" id="918" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1108" >
+<COMPONENT type="1006" id="922" >
 <cdparam x="904" y="1123" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1106" />
-<TGConnectingPoint num="1" id="1107" />
+<TGConnectingPoint num="0" id="920" />
+<TGConnectingPoint num="1" id="921" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1125" >
+<COMPONENT type="301" id="939" >
 <cdparam x="884" y="1068" />
 <sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of Fin
 " />
-<TGConnectingPoint num="0" id="1109" />
-<TGConnectingPoint num="1" id="1110" />
-<TGConnectingPoint num="2" id="1111" />
-<TGConnectingPoint num="3" id="1112" />
-<TGConnectingPoint num="4" id="1113" />
-<TGConnectingPoint num="5" id="1114" />
-<TGConnectingPoint num="6" id="1115" />
-<TGConnectingPoint num="7" id="1116" />
-<TGConnectingPoint num="8" id="1117" />
-<TGConnectingPoint num="9" id="1118" />
-<TGConnectingPoint num="10" id="1119" />
-<TGConnectingPoint num="11" id="1120" />
-<TGConnectingPoint num="12" id="1121" />
-<TGConnectingPoint num="13" id="1122" />
-<TGConnectingPoint num="14" id="1123" />
-<TGConnectingPoint num="15" id="1124" />
+<TGConnectingPoint num="0" id="923" />
+<TGConnectingPoint num="1" id="924" />
+<TGConnectingPoint num="2" id="925" />
+<TGConnectingPoint num="3" id="926" />
+<TGConnectingPoint num="4" id="927" />
+<TGConnectingPoint num="5" id="928" />
+<TGConnectingPoint num="6" id="929" />
+<TGConnectingPoint num="7" id="930" />
+<TGConnectingPoint num="8" id="931" />
+<TGConnectingPoint num="9" id="932" />
+<TGConnectingPoint num="10" id="933" />
+<TGConnectingPoint num="11" id="934" />
+<TGConnectingPoint num="12" id="935" />
+<TGConnectingPoint num="13" id="936" />
+<TGConnectingPoint num="14" id="937" />
+<TGConnectingPoint num="15" id="938" />
 <extraparam>
 <Line value="send Ack of Fin" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1128" >
+<COMPONENT type="1011" id="942" >
 <cdparam x="893" y="1234" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =9" />
-<TGConnectingPoint num="0" id="1126" />
-<TGConnectingPoint num="1" id="1127" />
+<TGConnectingPoint num="0" id="940" />
+<TGConnectingPoint num="1" id="941" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1130" >
+<COMPONENT type="1001" id="944" >
 <cdparam x="933" y="1311" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1129" />
+<TGConnectingPoint num="0" id="943" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1133" >
+<COMPONENT type="1006" id="947" >
 <cdparam x="1010" y="1155" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1131" />
-<TGConnectingPoint num="1" id="1132" />
+<TGConnectingPoint num="0" id="945" />
+<TGConnectingPoint num="1" id="946" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1150" >
+<COMPONENT type="301" id="964" >
 <cdparam x="1000" y="1094" />
 <sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of Fin
 " />
-<TGConnectingPoint num="0" id="1134" />
-<TGConnectingPoint num="1" id="1135" />
-<TGConnectingPoint num="2" id="1136" />
-<TGConnectingPoint num="3" id="1137" />
-<TGConnectingPoint num="4" id="1138" />
-<TGConnectingPoint num="5" id="1139" />
-<TGConnectingPoint num="6" id="1140" />
-<TGConnectingPoint num="7" id="1141" />
-<TGConnectingPoint num="8" id="1142" />
-<TGConnectingPoint num="9" id="1143" />
-<TGConnectingPoint num="10" id="1144" />
-<TGConnectingPoint num="11" id="1145" />
-<TGConnectingPoint num="12" id="1146" />
-<TGConnectingPoint num="13" id="1147" />
-<TGConnectingPoint num="14" id="1148" />
-<TGConnectingPoint num="15" id="1149" />
+<TGConnectingPoint num="0" id="948" />
+<TGConnectingPoint num="1" id="949" />
+<TGConnectingPoint num="2" id="950" />
+<TGConnectingPoint num="3" id="951" />
+<TGConnectingPoint num="4" id="952" />
+<TGConnectingPoint num="5" id="953" />
+<TGConnectingPoint num="6" id="954" />
+<TGConnectingPoint num="7" id="955" />
+<TGConnectingPoint num="8" id="956" />
+<TGConnectingPoint num="9" id="957" />
+<TGConnectingPoint num="10" id="958" />
+<TGConnectingPoint num="11" id="959" />
+<TGConnectingPoint num="12" id="960" />
+<TGConnectingPoint num="13" id="961" />
+<TGConnectingPoint num="14" id="962" />
+<TGConnectingPoint num="15" id="963" />
 <extraparam>
 <Line value="send Ack of Fin" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1153" >
+<COMPONENT type="1011" id="967" >
 <cdparam x="999" y="1266" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =7" />
-<TGConnectingPoint num="0" id="1151" />
-<TGConnectingPoint num="1" id="1152" />
+<TGConnectingPoint num="0" id="965" />
+<TGConnectingPoint num="1" id="966" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1155" >
+<COMPONENT type="1001" id="969" >
 <cdparam x="1039" y="1341" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1154" />
+<TGConnectingPoint num="0" id="968" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1158" >
+<COMPONENT type="1006" id="972" >
 <cdparam x="683" y="758" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1156" />
-<TGConnectingPoint num="1" id="1157" />
+<TGConnectingPoint num="0" id="970" />
+<TGConnectingPoint num="1" id="971" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1160" >
+<COMPONENT type="1001" id="974" >
 <cdparam x="712" y="865" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1159" />
+<TGConnectingPoint num="0" id="973" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="1163" >
+<COMPONENT type="1007" id="977" >
 <cdparam x="93" y="1100" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1161" />
-<TGConnectingPoint num="1" id="1162" />
+<TGConnectingPoint num="0" id="975" />
+<TGConnectingPoint num="1" id="976" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1166" >
+<COMPONENT type="1006" id="980" >
 <cdparam x="104" y="1167" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1164" />
-<TGConnectingPoint num="1" id="1165" />
+<TGConnectingPoint num="0" id="978" />
+<TGConnectingPoint num="1" id="979" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1168" >
+<COMPONENT type="1001" id="982" >
 <cdparam x="122" y="1236" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1167" />
+<TGConnectingPoint num="0" id="981" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="1171" >
+<COMPONENT type="1007" id="985" >
 <cdparam x="191" y="1102" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1169" />
-<TGConnectingPoint num="1" id="1170" />
+<TGConnectingPoint num="0" id="983" />
+<TGConnectingPoint num="1" id="984" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1174" >
+<COMPONENT type="1006" id="988" >
 <cdparam x="202" y="1169" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1172" />
-<TGConnectingPoint num="1" id="1173" />
+<TGConnectingPoint num="0" id="986" />
+<TGConnectingPoint num="1" id="987" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="1177" >
+<COMPONENT type="1007" id="991" >
 <cdparam x="307" y="1106" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1175" />
-<TGConnectingPoint num="1" id="1176" />
+<TGConnectingPoint num="0" id="989" />
+<TGConnectingPoint num="1" id="990" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1180" >
+<COMPONENT type="1006" id="994" >
 <cdparam x="318" y="1173" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1178" />
-<TGConnectingPoint num="1" id="1179" />
+<TGConnectingPoint num="0" id="992" />
+<TGConnectingPoint num="1" id="993" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="1183" >
+<COMPONENT type="1007" id="997" >
 <cdparam x="425" y="1090" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1181" />
-<TGConnectingPoint num="1" id="1182" />
+<TGConnectingPoint num="0" id="995" />
+<TGConnectingPoint num="1" id="996" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1186" >
+<COMPONENT type="1006" id="1000" >
 <cdparam x="436" y="1159" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1184" />
-<TGConnectingPoint num="1" id="1185" />
+<TGConnectingPoint num="0" id="998" />
+<TGConnectingPoint num="1" id="999" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1189" >
+<COMPONENT type="1011" id="1003" >
 <cdparam x="56" y="861" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1187" />
-<TGConnectingPoint num="1" id="1188" />
+<TGConnectingPoint num="0" id="1001" />
+<TGConnectingPoint num="1" id="1002" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1192" >
+<COMPONENT type="1011" id="1006" >
 <cdparam x="154" y="940" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1190" />
-<TGConnectingPoint num="1" id="1191" />
+<TGConnectingPoint num="0" id="1004" />
+<TGConnectingPoint num="1" id="1005" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1195" >
+<COMPONENT type="1011" id="1009" >
 <cdparam x="388" y="865" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1193" />
-<TGConnectingPoint num="1" id="1194" />
+<TGConnectingPoint num="0" id="1007" />
+<TGConnectingPoint num="1" id="1008" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1198" >
+<COMPONENT type="1011" id="1012" >
 <cdparam x="270" y="831" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1196" />
-<TGConnectingPoint num="1" id="1197" />
+<TGConnectingPoint num="0" id="1010" />
+<TGConnectingPoint num="1" id="1011" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1201" >
+<COMPONENT type="1008" id="1015" >
 <cdparam x="207" y="1052" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1199" />
-<TGConnectingPoint num="1" id="1200" />
+<TGConnectingPoint num="0" id="1013" />
+<TGConnectingPoint num="1" id="1014" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1204" >
+<COMPONENT type="1008" id="1018" >
 <cdparam x="323" y="962" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1202" />
-<TGConnectingPoint num="1" id="1203" />
+<TGConnectingPoint num="0" id="1016" />
+<TGConnectingPoint num="1" id="1017" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1207" >
+<COMPONENT type="1008" id="1021" >
 <cdparam x="441" y="983" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1205" />
-<TGConnectingPoint num="1" id="1206" />
+<TGConnectingPoint num="0" id="1019" />
+<TGConnectingPoint num="1" id="1020" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1210" >
+<COMPONENT type="1008" id="1024" >
 <cdparam x="109" y="986" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1208" />
-<TGConnectingPoint num="1" id="1209" />
+<TGConnectingPoint num="0" id="1022" />
+<TGConnectingPoint num="1" id="1023" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1213" >
+<COMPONENT type="1008" id="1027" >
 <cdparam x="699" y="813" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1211" />
-<TGConnectingPoint num="1" id="1212" />
+<TGConnectingPoint num="0" id="1025" />
+<TGConnectingPoint num="1" id="1026" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1216" >
+<COMPONENT type="1008" id="1030" >
 <cdparam x="777" y="1141" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1214" />
-<TGConnectingPoint num="1" id="1215" />
+<TGConnectingPoint num="0" id="1028" />
+<TGConnectingPoint num="1" id="1029" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1219" >
+<COMPONENT type="1008" id="1033" >
 <cdparam x="920" y="1178" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1217" />
-<TGConnectingPoint num="1" id="1218" />
+<TGConnectingPoint num="0" id="1031" />
+<TGConnectingPoint num="1" id="1032" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1222" >
+<COMPONENT type="1008" id="1036" >
 <cdparam x="1026" y="1211" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1220" />
-<TGConnectingPoint num="1" id="1221" />
+<TGConnectingPoint num="0" id="1034" />
+<TGConnectingPoint num="1" id="1035" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1224" >
+<COMPONENT type="1001" id="1038" >
 <cdparam x="602" y="762" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1223" />
+<TGConnectingPoint num="0" id="1037" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1226" >
+<COMPONENT type="1001" id="1040" >
 <cdparam x="873" y="922" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1225" />
+<TGConnectingPoint num="0" id="1039" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1229" >
+<COMPONENT type="1006" id="1043" >
 <cdparam x="1169" y="1214" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1227" />
-<TGConnectingPoint num="1" id="1228" />
+<TGConnectingPoint num="0" id="1041" />
+<TGConnectingPoint num="1" id="1042" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1246" >
+<COMPONENT type="301" id="1060" >
 <cdparam x="1159" y="1153" />
 <sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of Fin
 " />
-<TGConnectingPoint num="0" id="1230" />
-<TGConnectingPoint num="1" id="1231" />
-<TGConnectingPoint num="2" id="1232" />
-<TGConnectingPoint num="3" id="1233" />
-<TGConnectingPoint num="4" id="1234" />
-<TGConnectingPoint num="5" id="1235" />
-<TGConnectingPoint num="6" id="1236" />
-<TGConnectingPoint num="7" id="1237" />
-<TGConnectingPoint num="8" id="1238" />
-<TGConnectingPoint num="9" id="1239" />
-<TGConnectingPoint num="10" id="1240" />
-<TGConnectingPoint num="11" id="1241" />
-<TGConnectingPoint num="12" id="1242" />
-<TGConnectingPoint num="13" id="1243" />
-<TGConnectingPoint num="14" id="1244" />
-<TGConnectingPoint num="15" id="1245" />
+<TGConnectingPoint num="0" id="1044" />
+<TGConnectingPoint num="1" id="1045" />
+<TGConnectingPoint num="2" id="1046" />
+<TGConnectingPoint num="3" id="1047" />
+<TGConnectingPoint num="4" id="1048" />
+<TGConnectingPoint num="5" id="1049" />
+<TGConnectingPoint num="6" id="1050" />
+<TGConnectingPoint num="7" id="1051" />
+<TGConnectingPoint num="8" id="1052" />
+<TGConnectingPoint num="9" id="1053" />
+<TGConnectingPoint num="10" id="1054" />
+<TGConnectingPoint num="11" id="1055" />
+<TGConnectingPoint num="12" id="1056" />
+<TGConnectingPoint num="13" id="1057" />
+<TGConnectingPoint num="14" id="1058" />
+<TGConnectingPoint num="15" id="1059" />
 <extraparam>
 <Line value="send Ack of Fin" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1249" >
+<COMPONENT type="1011" id="1063" >
 <cdparam x="1158" y="1295" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="1247" />
-<TGConnectingPoint num="1" id="1248" />
+<TGConnectingPoint num="0" id="1061" />
+<TGConnectingPoint num="1" id="1062" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1251" >
+<COMPONENT type="1001" id="1065" >
 <cdparam x="1198" y="1471" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1250" />
+<TGConnectingPoint num="0" id="1064" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1254" >
+<COMPONENT type="1011" id="1068" >
 <cdparam x="1158" y="1402" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1252" />
-<TGConnectingPoint num="1" id="1253" />
+<TGConnectingPoint num="0" id="1066" />
+<TGConnectingPoint num="1" id="1067" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1257" >
+<COMPONENT type="1008" id="1071" >
 <cdparam x="1185" y="1351" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1255" />
-<TGConnectingPoint num="1" id="1256" />
+<TGConnectingPoint num="0" id="1069" />
+<TGConnectingPoint num="1" id="1070" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1259" >
+<COMPONENT type="1001" id="1073" >
 <cdparam x="1277" y="1070" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1258" />
+<TGConnectingPoint num="0" id="1072" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1261" >
+<COMPONENT type="1001" id="1075" >
 <cdparam x="1519" y="1457" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1260" />
+<TGConnectingPoint num="0" id="1074" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1264" >
+<COMPONENT type="1006" id="1078" >
 <cdparam x="1489" y="1132" />
 <sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoA(1)" />
-<TGConnectingPoint num="0" id="1262" />
-<TGConnectingPoint num="1" id="1263" />
+<TGConnectingPoint num="0" id="1076" />
+<TGConnectingPoint num="1" id="1077" />
 <extraparam>
 <Data channelName="fromTtoA" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1267" >
+<COMPONENT type="1006" id="1081" >
 <cdparam x="1490" y="1348" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1265" />
-<TGConnectingPoint num="1" id="1266" />
+<TGConnectingPoint num="0" id="1079" />
+<TGConnectingPoint num="1" id="1080" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1270" >
+<COMPONENT type="1008" id="1084" >
 <cdparam x="1707" y="1026" />
 <sizeparam width="43" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="stop()" />
-<TGConnectingPoint num="0" id="1268" />
-<TGConnectingPoint num="1" id="1269" />
+<TGConnectingPoint num="0" id="1082" />
+<TGConnectingPoint num="1" id="1083" />
 <extraparam>
 <Data eventName="stop" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1287" >
+<COMPONENT type="301" id="1101" >
 <cdparam x="1759" y="1192" />
 <sizeparam width="86" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Correct ack
 " />
-<TGConnectingPoint num="0" id="1271" />
-<TGConnectingPoint num="1" id="1272" />
-<TGConnectingPoint num="2" id="1273" />
-<TGConnectingPoint num="3" id="1274" />
-<TGConnectingPoint num="4" id="1275" />
-<TGConnectingPoint num="5" id="1276" />
-<TGConnectingPoint num="6" id="1277" />
-<TGConnectingPoint num="7" id="1278" />
-<TGConnectingPoint num="8" id="1279" />
-<TGConnectingPoint num="9" id="1280" />
-<TGConnectingPoint num="10" id="1281" />
-<TGConnectingPoint num="11" id="1282" />
-<TGConnectingPoint num="12" id="1283" />
-<TGConnectingPoint num="13" id="1284" />
-<TGConnectingPoint num="14" id="1285" />
-<TGConnectingPoint num="15" id="1286" />
+<TGConnectingPoint num="0" id="1085" />
+<TGConnectingPoint num="1" id="1086" />
+<TGConnectingPoint num="2" id="1087" />
+<TGConnectingPoint num="3" id="1088" />
+<TGConnectingPoint num="4" id="1089" />
+<TGConnectingPoint num="5" id="1090" />
+<TGConnectingPoint num="6" id="1091" />
+<TGConnectingPoint num="7" id="1092" />
+<TGConnectingPoint num="8" id="1093" />
+<TGConnectingPoint num="9" id="1094" />
+<TGConnectingPoint num="10" id="1095" />
+<TGConnectingPoint num="11" id="1096" />
+<TGConnectingPoint num="12" id="1097" />
+<TGConnectingPoint num="13" id="1098" />
+<TGConnectingPoint num="14" id="1099" />
+<TGConnectingPoint num="15" id="1100" />
 <extraparam>
 <Line value="Correct ack" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1304" >
+<COMPONENT type="301" id="1118" >
 <cdparam x="1635" y="1168" />
 <sizeparam width="71" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="false ack
 " />
-<TGConnectingPoint num="0" id="1288" />
-<TGConnectingPoint num="1" id="1289" />
-<TGConnectingPoint num="2" id="1290" />
-<TGConnectingPoint num="3" id="1291" />
-<TGConnectingPoint num="4" id="1292" />
-<TGConnectingPoint num="5" id="1293" />
-<TGConnectingPoint num="6" id="1294" />
-<TGConnectingPoint num="7" id="1295" />
-<TGConnectingPoint num="8" id="1296" />
-<TGConnectingPoint num="9" id="1297" />
-<TGConnectingPoint num="10" id="1298" />
-<TGConnectingPoint num="11" id="1299" />
-<TGConnectingPoint num="12" id="1300" />
-<TGConnectingPoint num="13" id="1301" />
-<TGConnectingPoint num="14" id="1302" />
-<TGConnectingPoint num="15" id="1303" />
+<TGConnectingPoint num="0" id="1102" />
+<TGConnectingPoint num="1" id="1103" />
+<TGConnectingPoint num="2" id="1104" />
+<TGConnectingPoint num="3" id="1105" />
+<TGConnectingPoint num="4" id="1106" />
+<TGConnectingPoint num="5" id="1107" />
+<TGConnectingPoint num="6" id="1108" />
+<TGConnectingPoint num="7" id="1109" />
+<TGConnectingPoint num="8" id="1110" />
+<TGConnectingPoint num="9" id="1111" />
+<TGConnectingPoint num="10" id="1112" />
+<TGConnectingPoint num="11" id="1113" />
+<TGConnectingPoint num="12" id="1114" />
+<TGConnectingPoint num="13" id="1115" />
+<TGConnectingPoint num="14" id="1116" />
+<TGConnectingPoint num="15" id="1117" />
 <extraparam>
 <Line value="false ack" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1307" >
+<COMPONENT type="1006" id="1121" >
 <cdparam x="1602" y="1299" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1305" />
-<TGConnectingPoint num="1" id="1306" />
+<TGConnectingPoint num="0" id="1119" />
+<TGConnectingPoint num="1" id="1120" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1309" >
+<COMPONENT type="1001" id="1123" >
 <cdparam x="1631" y="1468" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1308" />
+<TGConnectingPoint num="0" id="1122" />
 </COMPONENT>
 
-<COMPONENT type="301" id="1326" >
+<COMPONENT type="301" id="1140" >
 <cdparam x="1469" y="1295" />
 <sizeparam width="127" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="return acknowldge
 " />
-<TGConnectingPoint num="0" id="1310" />
-<TGConnectingPoint num="1" id="1311" />
-<TGConnectingPoint num="2" id="1312" />
-<TGConnectingPoint num="3" id="1313" />
-<TGConnectingPoint num="4" id="1314" />
-<TGConnectingPoint num="5" id="1315" />
-<TGConnectingPoint num="6" id="1316" />
-<TGConnectingPoint num="7" id="1317" />
-<TGConnectingPoint num="8" id="1318" />
-<TGConnectingPoint num="9" id="1319" />
-<TGConnectingPoint num="10" id="1320" />
-<TGConnectingPoint num="11" id="1321" />
-<TGConnectingPoint num="12" id="1322" />
-<TGConnectingPoint num="13" id="1323" />
-<TGConnectingPoint num="14" id="1324" />
-<TGConnectingPoint num="15" id="1325" />
+<TGConnectingPoint num="0" id="1124" />
+<TGConnectingPoint num="1" id="1125" />
+<TGConnectingPoint num="2" id="1126" />
+<TGConnectingPoint num="3" id="1127" />
+<TGConnectingPoint num="4" id="1128" />
+<TGConnectingPoint num="5" id="1129" />
+<TGConnectingPoint num="6" id="1130" />
+<TGConnectingPoint num="7" id="1131" />
+<TGConnectingPoint num="8" id="1132" />
+<TGConnectingPoint num="9" id="1133" />
+<TGConnectingPoint num="10" id="1134" />
+<TGConnectingPoint num="11" id="1135" />
+<TGConnectingPoint num="12" id="1136" />
+<TGConnectingPoint num="13" id="1137" />
+<TGConnectingPoint num="14" id="1138" />
+<TGConnectingPoint num="15" id="1139" />
 <extraparam>
 <Line value="return acknowldge" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1343" >
+<COMPONENT type="301" id="1157" >
 <cdparam x="1620" y="927" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="data
 " />
-<TGConnectingPoint num="0" id="1327" />
-<TGConnectingPoint num="1" id="1328" />
-<TGConnectingPoint num="2" id="1329" />
-<TGConnectingPoint num="3" id="1330" />
-<TGConnectingPoint num="4" id="1331" />
-<TGConnectingPoint num="5" id="1332" />
-<TGConnectingPoint num="6" id="1333" />
-<TGConnectingPoint num="7" id="1334" />
-<TGConnectingPoint num="8" id="1335" />
-<TGConnectingPoint num="9" id="1336" />
-<TGConnectingPoint num="10" id="1337" />
-<TGConnectingPoint num="11" id="1338" />
-<TGConnectingPoint num="12" id="1339" />
-<TGConnectingPoint num="13" id="1340" />
-<TGConnectingPoint num="14" id="1341" />
-<TGConnectingPoint num="15" id="1342" />
+<TGConnectingPoint num="0" id="1141" />
+<TGConnectingPoint num="1" id="1142" />
+<TGConnectingPoint num="2" id="1143" />
+<TGConnectingPoint num="3" id="1144" />
+<TGConnectingPoint num="4" id="1145" />
+<TGConnectingPoint num="5" id="1146" />
+<TGConnectingPoint num="6" id="1147" />
+<TGConnectingPoint num="7" id="1148" />
+<TGConnectingPoint num="8" id="1149" />
+<TGConnectingPoint num="9" id="1150" />
+<TGConnectingPoint num="10" id="1151" />
+<TGConnectingPoint num="11" id="1152" />
+<TGConnectingPoint num="12" id="1153" />
+<TGConnectingPoint num="13" id="1154" />
+<TGConnectingPoint num="14" id="1155" />
+<TGConnectingPoint num="15" id="1156" />
 <extraparam>
 <Line value="data" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1346" >
+<COMPONENT type="1008" id="1160" >
 <cdparam x="1506" y="1405" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1344" />
-<TGConnectingPoint num="1" id="1345" />
+<TGConnectingPoint num="0" id="1158" />
+<TGConnectingPoint num="1" id="1159" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1349" >
+<COMPONENT type="1008" id="1163" >
 <cdparam x="1618" y="1348" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1347" />
-<TGConnectingPoint num="1" id="1348" />
+<TGConnectingPoint num="0" id="1161" />
+<TGConnectingPoint num="1" id="1162" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1352" >
+<COMPONENT type="1006" id="1166" >
 <cdparam x="1613" y="1404" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1350" />
-<TGConnectingPoint num="1" id="1351" />
+<TGConnectingPoint num="0" id="1164" />
+<TGConnectingPoint num="1" id="1165" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1354" >
+<COMPONENT type="1001" id="1168" >
 <cdparam x="1730" y="1335" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1353" />
+<TGConnectingPoint num="0" id="1167" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1357" >
+<COMPONENT type="1011" id="1171" >
 <cdparam x="1776" y="1349" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =4" />
-<TGConnectingPoint num="0" id="1355" />
-<TGConnectingPoint num="1" id="1356" />
+<TGConnectingPoint num="0" id="1169" />
+<TGConnectingPoint num="1" id="1170" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1359" >
+<COMPONENT type="1001" id="1173" >
 <cdparam x="1816" y="1457" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1358" />
+<TGConnectingPoint num="0" id="1172" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1362" >
+<COMPONENT type="1011" id="1176" >
 <cdparam x="1870" y="1411" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =6" />
-<TGConnectingPoint num="0" id="1360" />
-<TGConnectingPoint num="1" id="1361" />
+<TGConnectingPoint num="0" id="1174" />
+<TGConnectingPoint num="1" id="1175" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1364" >
+<COMPONENT type="1001" id="1178" >
 <cdparam x="1910" y="1481" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1363" />
+<TGConnectingPoint num="0" id="1177" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1366" >
+<COMPONENT type="1001" id="1180" >
 <cdparam x="1986" y="1543" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="0" id="1179" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1369" >
+<COMPONENT type="1011" id="1183" >
 <cdparam x="2051" y="1466" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1367" />
-<TGConnectingPoint num="1" id="1368" />
+<TGConnectingPoint num="0" id="1181" />
+<TGConnectingPoint num="1" id="1182" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1371" >
+<COMPONENT type="1001" id="1185" >
 <cdparam x="2091" y="1537" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1370" />
+<TGConnectingPoint num="0" id="1184" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1374" >
+<COMPONENT type="1011" id="1188" >
 <cdparam x="1946" y="1493" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1372" />
-<TGConnectingPoint num="1" id="1373" />
+<TGConnectingPoint num="0" id="1186" />
+<TGConnectingPoint num="1" id="1187" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1377" >
+<COMPONENT type="1011" id="1191" >
 <cdparam x="1946" y="1434" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="1375" />
-<TGConnectingPoint num="1" id="1376" />
+<TGConnectingPoint num="0" id="1189" />
+<TGConnectingPoint num="1" id="1190" />
 </COMPONENT>
 
-<COMPONENT type="301" id="1394" >
+<COMPONENT type="301" id="1208" >
 <cdparam x="1825" y="889" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Syn
 " />
-<TGConnectingPoint num="0" id="1378" />
-<TGConnectingPoint num="1" id="1379" />
-<TGConnectingPoint num="2" id="1380" />
-<TGConnectingPoint num="3" id="1381" />
-<TGConnectingPoint num="4" id="1382" />
-<TGConnectingPoint num="5" id="1383" />
-<TGConnectingPoint num="6" id="1384" />
-<TGConnectingPoint num="7" id="1385" />
-<TGConnectingPoint num="8" id="1386" />
-<TGConnectingPoint num="9" id="1387" />
-<TGConnectingPoint num="10" id="1388" />
-<TGConnectingPoint num="11" id="1389" />
-<TGConnectingPoint num="12" id="1390" />
-<TGConnectingPoint num="13" id="1391" />
-<TGConnectingPoint num="14" id="1392" />
-<TGConnectingPoint num="15" id="1393" />
+<TGConnectingPoint num="0" id="1192" />
+<TGConnectingPoint num="1" id="1193" />
+<TGConnectingPoint num="2" id="1194" />
+<TGConnectingPoint num="3" id="1195" />
+<TGConnectingPoint num="4" id="1196" />
+<TGConnectingPoint num="5" id="1197" />
+<TGConnectingPoint num="6" id="1198" />
+<TGConnectingPoint num="7" id="1199" />
+<TGConnectingPoint num="8" id="1200" />
+<TGConnectingPoint num="9" id="1201" />
+<TGConnectingPoint num="10" id="1202" />
+<TGConnectingPoint num="11" id="1203" />
+<TGConnectingPoint num="12" id="1204" />
+<TGConnectingPoint num="13" id="1205" />
+<TGConnectingPoint num="14" id="1206" />
+<TGConnectingPoint num="15" id="1207" />
 <extraparam>
 <Line value="Syn" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1411" >
+<COMPONENT type="301" id="1225" >
 <cdparam x="1707" y="945" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="ack
 " />
-<TGConnectingPoint num="0" id="1395" />
-<TGConnectingPoint num="1" id="1396" />
-<TGConnectingPoint num="2" id="1397" />
-<TGConnectingPoint num="3" id="1398" />
-<TGConnectingPoint num="4" id="1399" />
-<TGConnectingPoint num="5" id="1400" />
-<TGConnectingPoint num="6" id="1401" />
-<TGConnectingPoint num="7" id="1402" />
-<TGConnectingPoint num="8" id="1403" />
-<TGConnectingPoint num="9" id="1404" />
-<TGConnectingPoint num="10" id="1405" />
-<TGConnectingPoint num="11" id="1406" />
-<TGConnectingPoint num="12" id="1407" />
-<TGConnectingPoint num="13" id="1408" />
-<TGConnectingPoint num="14" id="1409" />
-<TGConnectingPoint num="15" id="1410" />
+<TGConnectingPoint num="0" id="1209" />
+<TGConnectingPoint num="1" id="1210" />
+<TGConnectingPoint num="2" id="1211" />
+<TGConnectingPoint num="3" id="1212" />
+<TGConnectingPoint num="4" id="1213" />
+<TGConnectingPoint num="5" id="1214" />
+<TGConnectingPoint num="6" id="1215" />
+<TGConnectingPoint num="7" id="1216" />
+<TGConnectingPoint num="8" id="1217" />
+<TGConnectingPoint num="9" id="1218" />
+<TGConnectingPoint num="10" id="1219" />
+<TGConnectingPoint num="11" id="1220" />
+<TGConnectingPoint num="12" id="1221" />
+<TGConnectingPoint num="13" id="1222" />
+<TGConnectingPoint num="14" id="1223" />
+<TGConnectingPoint num="15" id="1224" />
 <extraparam>
 <Line value="ack" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1414" >
+<COMPONENT type="1006" id="1228" >
 <cdparam x="2198" y="1198" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1412" />
-<TGConnectingPoint num="1" id="1413" />
+<TGConnectingPoint num="0" id="1226" />
+<TGConnectingPoint num="1" id="1227" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1416" >
+<COMPONENT type="1001" id="1230" >
 <cdparam x="2227" y="1483" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1415" />
+<TGConnectingPoint num="0" id="1229" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="1419" >
+<COMPONENT type="1007" id="1233" >
 <cdparam x="2198" y="1298" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1417" />
-<TGConnectingPoint num="1" id="1418" />
+<TGConnectingPoint num="0" id="1231" />
+<TGConnectingPoint num="1" id="1232" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1422" >
+<COMPONENT type="1006" id="1236" >
 <cdparam x="2209" y="1365" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1420" />
-<TGConnectingPoint num="1" id="1421" />
+<TGConnectingPoint num="0" id="1234" />
+<TGConnectingPoint num="1" id="1235" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1425" >
+<COMPONENT type="1011" id="1239" >
 <cdparam x="2161" y="1136" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1423" />
-<TGConnectingPoint num="1" id="1424" />
+<TGConnectingPoint num="0" id="1237" />
+<TGConnectingPoint num="1" id="1238" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1428" >
+<COMPONENT type="1008" id="1242" >
 <cdparam x="2214" y="1248" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1426" />
-<TGConnectingPoint num="1" id="1427" />
+<TGConnectingPoint num="0" id="1240" />
+<TGConnectingPoint num="1" id="1241" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1431" >
+<COMPONENT type="1011" id="1245" >
 <cdparam x="2187" y="1424" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1429" />
-<TGConnectingPoint num="1" id="1430" />
+<TGConnectingPoint num="0" id="1243" />
+<TGConnectingPoint num="1" id="1244" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1434" >
+<COMPONENT type="1006" id="1248" >
 <cdparam x="2278" y="1122" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1432" />
-<TGConnectingPoint num="1" id="1433" />
+<TGConnectingPoint num="0" id="1246" />
+<TGConnectingPoint num="1" id="1247" />
 <extraparam>
 <Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1451" >
+<COMPONENT type="301" id="1265" >
 <cdparam x="2283" y="1065" />
 <sizeparam width="114" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of SYN
 " />
-<TGConnectingPoint num="0" id="1435" />
-<TGConnectingPoint num="1" id="1436" />
-<TGConnectingPoint num="2" id="1437" />
-<TGConnectingPoint num="3" id="1438" />
-<TGConnectingPoint num="4" id="1439" />
-<TGConnectingPoint num="5" id="1440" />
-<TGConnectingPoint num="6" id="1441" />
-<TGConnectingPoint num="7" id="1442" />
-<TGConnectingPoint num="8" id="1443" />
-<TGConnectingPoint num="9" id="1444" />
-<TGConnectingPoint num="10" id="1445" />
-<TGConnectingPoint num="11" id="1446" />
-<TGConnectingPoint num="12" id="1447" />
-<TGConnectingPoint num="13" id="1448" />
-<TGConnectingPoint num="14" id="1449" />
-<TGConnectingPoint num="15" id="1450" />
+<TGConnectingPoint num="0" id="1249" />
+<TGConnectingPoint num="1" id="1250" />
+<TGConnectingPoint num="2" id="1251" />
+<TGConnectingPoint num="3" id="1252" />
+<TGConnectingPoint num="4" id="1253" />
+<TGConnectingPoint num="5" id="1254" />
+<TGConnectingPoint num="6" id="1255" />
+<TGConnectingPoint num="7" id="1256" />
+<TGConnectingPoint num="8" id="1257" />
+<TGConnectingPoint num="9" id="1258" />
+<TGConnectingPoint num="10" id="1259" />
+<TGConnectingPoint num="11" id="1260" />
+<TGConnectingPoint num="12" id="1261" />
+<TGConnectingPoint num="13" id="1262" />
+<TGConnectingPoint num="14" id="1263" />
+<TGConnectingPoint num="15" id="1264" />
 <extraparam>
 <Line value="send Ack of SYN" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1454" >
+<COMPONENT type="1011" id="1268" >
 <cdparam x="2267" y="1267" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1452" />
-<TGConnectingPoint num="1" id="1453" />
+<TGConnectingPoint num="0" id="1266" />
+<TGConnectingPoint num="1" id="1267" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1456" >
+<COMPONENT type="1001" id="1270" >
 <cdparam x="2307" y="1324" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1455" />
+<TGConnectingPoint num="0" id="1269" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1459" >
+<COMPONENT type="1008" id="1273" >
 <cdparam x="2294" y="1199" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1457" />
-<TGConnectingPoint num="1" id="1458" />
+<TGConnectingPoint num="0" id="1271" />
+<TGConnectingPoint num="1" id="1272" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1461" >
+<COMPONENT type="1001" id="1275" >
 <cdparam x="1637" y="1057" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1460" />
+<TGConnectingPoint num="0" id="1274" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1463" >
+<COMPONENT type="1001" id="1277" >
 <cdparam x="2168" y="1421" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1462" />
+<TGConnectingPoint num="0" id="1276" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1465" >
+<COMPONENT type="1001" id="1279" >
 <cdparam x="2267" y="1039" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1464" />
+<TGConnectingPoint num="0" id="1278" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1468" >
+<COMPONENT type="1008" id="1282" >
 <cdparam x="1465" y="1192" />
 <sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="receive_Application()" />
-<TGConnectingPoint num="0" id="1466" />
-<TGConnectingPoint num="1" id="1467" />
+<TGConnectingPoint num="0" id="1280" />
+<TGConnectingPoint num="1" id="1281" />
 <extraparam>
 <Data eventName="receive_Application" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1471" >
+<COMPONENT type="1009" id="1285" >
 <cdparam x="1698" y="1086" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="1469" />
-<TGConnectingPoint num="1" id="1470" />
+<TGConnectingPoint num="0" id="1283" />
+<TGConnectingPoint num="1" id="1284" />
 <extraparam>
 <Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="1472" >
+<CONNECTOR type="115" id="1286" >
 <cdparam x="192" y="445" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="190" y="449" id="723" />
-<P2  x="188" y="476" id="884" />
+<P1  x="190" y="449" id="537" />
+<P2  x="188" y="476" id="698" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1473" >
+<CONNECTOR type="115" id="1287" >
 <cdparam x="1048" y="795" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1048" y="795" id="862" />
-<P2  x="1728" y="865" id="784" />
+<P1  x="1048" y="795" id="676" />
+<P2  x="1728" y="865" id="598" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1474" >
+<CONNECTOR type="115" id="1288" >
 <cdparam x="1048" y="795" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1089" y="954" id="834" />
-<P2  x="1208" y="1010" id="804" />
+<P1  x="1089" y="954" id="648" />
+<P2  x="1208" y="1010" id="618" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1475" >
+<CONNECTOR type="115" id="1289" >
 <cdparam x="1008" y="610" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="1008" y="610" id="938" />
-<P2  x="1008" y="696" id="866" />
+<P1  x="1008" y="610" id="752" />
+<P2  x="1008" y="696" id="680" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1476" >
+<CONNECTOR type="115" id="1290" >
 <cdparam x="722" y="614" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="722" y="614" id="953" />
-<P2  x="722" y="689" id="822" />
+<P1  x="722" y="614" id="767" />
+<P2  x="722" y="689" id="636" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1477" >
+<CONNECTOR type="115" id="1291" >
 <cdparam x="504" y="597" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="504" y="597" id="902" />
-<P2  x="572" y="702" id="816" />
+<P1  x="504" y="597" id="716" />
+<P2  x="572" y="702" id="630" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1478" >
+<CONNECTOR type="115" id="1292" >
 <cdparam x="464" y="637" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="464" y="637" id="903" />
-<P2  x="464" y="778" id="870" />
+<P1  x="464" y="637" id="717" />
+<P2  x="464" y="778" id="684" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1479" >
+<CONNECTOR type="115" id="1293" >
 <cdparam x="424" y="597" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="424" y="597" id="901" />
-<P2  x="346" y="759" id="850" />
+<P1  x="424" y="597" id="715" />
+<P2  x="346" y="759" id="664" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1480" >
+<CONNECTOR type="115" id="1294" >
 <cdparam x="289" y="619" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to read channel" value="null" />
-<P1  x="289" y="619" id="911" />
-<P2  x="230" y="803" id="1007" />
+<P1  x="289" y="619" id="725" />
+<P2  x="230" y="803" id="821" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1481" >
+<CONNECTOR type="115" id="1295" >
 <cdparam x="249" y="579" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="249" y="579" id="909" />
-<P2  x="132" y="789" id="854" />
+<P1  x="249" y="579" id="723" />
+<P2  x="132" y="789" id="668" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1482" >
+<CONNECTOR type="115" id="1296" >
 <cdparam x="371" y="93" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to notified event" value="null" />
-<P1  x="320" y="99" id="941" />
-<P2  x="374" y="128" id="949" />
+<P1  x="320" y="99" id="755" />
+<P2  x="374" y="128" id="763" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1483" >
+<CONNECTOR type="115" id="1297" >
 <cdparam x="234" y="169" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="235" y="169" id="947" />
-<P2  x="235" y="202" id="944" />
+<P1  x="235" y="169" id="761" />
+<P2  x="235" y="202" id="758" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1484" >
+<CONNECTOR type="115" id="1298" >
 <cdparam x="234" y="104" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to action state" value="null" />
-<P1  x="235" y="110" id="942" />
-<P2  x="235" y="139" id="946" />
+<P1  x="235" y="110" id="756" />
+<P2  x="235" y="139" id="760" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1485" >
+<CONNECTOR type="115" id="1299" >
 <cdparam x="234" y="47" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for loop" value="null" />
-<P1  x="234" y="47" id="913" />
-<P2  x="235" y="80" id="940" />
+<P1  x="234" y="47" id="727" />
+<P2  x="235" y="80" id="754" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1486" >
+<CONNECTOR type="115" id="1300" >
 <cdparam x="425" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from notified event to choice" value="null" />
-<P1  x="374" y="158" id="950" />
-<P2  x="374" y="182" id="892" />
+<P1  x="374" y="158" id="764" />
+<P2  x="374" y="182" id="706" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1487" >
+<CONNECTOR type="115" id="1301" >
 <cdparam x="564" y="482" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="464" y="322" id="976" />
-<P2  x="722" y="529" id="955" />
+<P1  x="464" y="322" id="790" />
+<P2  x="722" y="529" id="769" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1488" >
+<CONNECTOR type="115" id="1302" >
 <cdparam x="722" y="559" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="722" y="559" id="956" />
-<P2  x="722" y="584" id="952" />
+<P1  x="722" y="559" id="770" />
+<P2  x="722" y="584" id="766" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1489" >
+<CONNECTOR type="115" id="1303" >
 <cdparam x="604" y="442" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="504" y="282" id="972" />
-<P2  x="1008" y="523" id="958" />
+<P1  x="504" y="282" id="786" />
+<P2  x="1008" y="523" id="772" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1490" >
+<CONNECTOR type="115" id="1304" >
 <cdparam x="1007" y="553" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="1008" y="553" id="959" />
-<P2  x="1008" y="580" id="937" />
+<P1  x="1008" y="553" id="773" />
+<P2  x="1008" y="580" id="751" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1491" >
+<CONNECTOR type="115" id="1305" >
 <cdparam x="524" y="442" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="464" y="322" id="973" />
-<P2  x="464" y="487" id="961" />
+<P1  x="464" y="322" id="787" />
+<P2  x="464" y="487" id="775" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1492" >
+<CONNECTOR type="115" id="1306" >
 <cdparam x="330" y="428" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="424" y="282" id="974" />
-<P2  x="289" y="463" id="964" />
+<P1  x="424" y="282" id="788" />
+<P2  x="289" y="463" id="778" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1493" >
+<CONNECTOR type="115" id="1307" >
 <cdparam x="318" y="520" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to choice" value="null" />
-<P1  x="289" y="493" id="965" />
-<P2  x="289" y="554" id="908" />
+<P1  x="289" y="493" id="779" />
+<P2  x="289" y="554" id="722" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1494" >
+<CONNECTOR type="115" id="1308" >
 <cdparam x="160" y="481" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="148" y="501" id="885" />
-<P2  x="148" y="544" id="932" />
+<P1  x="148" y="501" id="699" />
+<P2  x="148" y="544" id="746" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1495" >
+<CONNECTOR type="115" id="1309" >
 <cdparam x="290" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="424" y="282" id="971" />
-<P2  x="188" y="378" id="967" />
+<P1  x="424" y="282" id="785" />
+<P2  x="188" y="378" id="781" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1496" >
+<CONNECTOR type="115" id="1310" >
 <cdparam x="229" y="467" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to choice" value="null" />
-<P1  x="188" y="408" id="968" />
-<P2  x="190" y="419" id="722" />
+<P1  x="188" y="408" id="782" />
+<P2  x="190" y="419" id="536" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1497" >
+<CONNECTOR type="115" id="1311" >
 <cdparam x="228" y="501" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="228" y="501" id="886" />
-<P2  x="228" y="524" id="981" />
+<P1  x="228" y="501" id="700" />
+<P2  x="228" y="524" id="795" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1498" >
+<CONNECTOR type="115" id="1312" >
 <cdparam x="334" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="334" y="207" id="893" />
-<P2  x="301" y="223" id="985" />
+<P1  x="334" y="207" id="707" />
+<P2  x="301" y="223" id="799" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1499" >
+<CONNECTOR type="115" id="1313" >
 <cdparam x="301" y="253" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to stop state" value="null" />
-<P1  x="301" y="253" id="986" />
-<P2  x="301" y="285" id="988" />
+<P1  x="301" y="253" id="800" />
+<P2  x="301" y="285" id="802" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1500" >
+<CONNECTOR type="115" id="1314" >
 <cdparam x="464" y="517" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to choice" value="null" />
-<P1  x="464" y="517" id="962" />
-<P2  x="464" y="572" id="900" />
+<P1  x="464" y="517" id="776" />
+<P2  x="464" y="572" id="714" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1501" >
+<CONNECTOR type="115" id="1315" >
 <cdparam x="329" y="579" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="329" y="579" id="910" />
-<P2  x="329" y="609" id="983" />
+<P1  x="329" y="579" id="724" />
+<P2  x="329" y="609" id="797" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1502" >
+<CONNECTOR type="115" id="1316" >
 <cdparam x="126" y="574" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="148" y="574" id="933" />
-<P2  x="148" y="610" id="935" />
+<P1  x="148" y="574" id="747" />
+<P2  x="148" y="610" id="749" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1503" >
+<CONNECTOR type="115" id="1317" >
 <cdparam x="414" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to select" value="null" />
-<P1  x="414" y="207" id="894" />
-<P2  x="464" y="257" id="970" />
+<P1  x="414" y="207" id="708" />
+<P2  x="464" y="257" id="784" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1504" >
+<CONNECTOR type="115" id="1318" >
 <cdparam x="230" y="833" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="230" y="833" id="1008" />
-<P2  x="230" y="858" id="874" />
+<P1  x="230" y="833" id="822" />
+<P2  x="230" y="858" id="688" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1505" >
+<CONNECTOR type="115" id="1319" >
 <cdparam x="716" y="749" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="968" y="795" id="861" />
-<P2  x="843" y="859" id="844" />
+<P1  x="968" y="795" id="675" />
+<P2  x="843" y="859" id="658" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1506" >
+<CONNECTOR type="115" id="1320" >
 <cdparam x="720" y="1074" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="728" y="990" id="1057" />
-<P2  x="728" y="1027" id="1059" />
+<P1  x="728" y="990" id="871" />
+<P2  x="728" y="1027" id="873" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1507" >
+<CONNECTOR type="115" id="1321" >
 <cdparam x="733" y="899" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="803" y="884" id="845" />
-<P2  x="728" y="960" id="1056" />
+<P1  x="803" y="884" id="659" />
+<P2  x="728" y="960" id="870" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1508" >
+<CONNECTOR type="115" id="1322" >
 <cdparam x="800" y="938" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="843" y="924" id="847" />
-<P2  x="800" y="1004" id="838" />
+<P1  x="843" y="924" id="661" />
+<P2  x="800" y="1004" id="652" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1509" >
+<CONNECTOR type="115" id="1323" >
 <cdparam x="800" y="1057" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="800" y="1044" id="839" />
-<P2  x="800" y="1081" id="1061" />
+<P1  x="800" y="1044" id="653" />
+<P2  x="800" y="1081" id="875" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1510" >
+<CONNECTOR type="115" id="1324" >
 <cdparam x="132" y="886" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="132" y="886" id="1188" />
-<P2  x="132" y="933" id="1023" />
+<P1  x="132" y="886" id="1002" />
+<P2  x="132" y="933" id="837" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1511" >
+<CONNECTOR type="115" id="1325" >
 <cdparam x="943" y="1061" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="943" y="1060" id="827" />
-<P2  x="943" y="1118" id="1106" />
+<P1  x="943" y="1060" id="641" />
+<P2  x="943" y="1118" id="920" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1512" >
+<CONNECTOR type="115" id="1326" >
 <cdparam x="1049" y="1093" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1049" y="1092" id="879" />
-<P2  x="1049" y="1150" id="1131" />
+<P1  x="1049" y="1092" id="693" />
+<P2  x="1049" y="1150" id="945" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1513" >
+<CONNECTOR type="115" id="1327" >
 <cdparam x="1049" y="994" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1049" y="994" id="835" />
-<P2  x="1049" y="1052" id="878" />
+<P1  x="1049" y="994" id="649" />
+<P2  x="1049" y="1052" id="692" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1514" >
+<CONNECTOR type="115" id="1328" >
 <cdparam x="696" y="742" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="722" y="729" id="823" />
-<P2  x="722" y="753" id="1156" />
+<P1  x="722" y="729" id="637" />
+<P2  x="722" y="753" id="970" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1515" >
+<CONNECTOR type="115" id="1329" >
 <cdparam x="132" y="1125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="132" y="1125" id="1162" />
-<P2  x="132" y="1162" id="1164" />
+<P1  x="132" y="1125" id="976" />
+<P2  x="132" y="1162" id="978" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1516" >
+<CONNECTOR type="115" id="1330" >
 <cdparam x="132" y="1192" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="132" y="1192" id="1165" />
-<P2  x="132" y="1231" id="1167" />
+<P1  x="132" y="1192" id="979" />
+<P2  x="132" y="1231" id="981" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1517" >
+<CONNECTOR type="115" id="1331" >
 <cdparam x="132" y="1066" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send request" value="null" />
-<P1  x="132" y="1066" id="1021" />
-<P2  x="132" y="1095" id="1161" />
+<P1  x="132" y="1066" id="835" />
+<P2  x="132" y="1095" id="975" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1518" >
+<CONNECTOR type="115" id="1332" >
 <cdparam x="229" y="1127" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="230" y="1127" id="1170" />
-<P2  x="230" y="1164" id="1172" />
+<P1  x="230" y="1127" id="984" />
+<P2  x="230" y="1164" id="986" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1519" >
+<CONNECTOR type="115" id="1333" >
 <cdparam x="346" y="1131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="346" y="1131" id="1176" />
-<P2  x="346" y="1168" id="1178" />
+<P1  x="346" y="1131" id="990" />
+<P2  x="346" y="1168" id="992" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1520" >
+<CONNECTOR type="115" id="1334" >
 <cdparam x="346" y="1051" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send request" value="null" />
-<P1  x="346" y="1051" id="1027" />
-<P2  x="346" y="1101" id="1175" />
+<P1  x="346" y="1051" id="841" />
+<P2  x="346" y="1101" id="989" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1521" >
+<CONNECTOR type="115" id="1335" >
 <cdparam x="437" y="1118" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="464" y="1115" id="1182" />
-<P2  x="464" y="1154" id="1184" />
+<P1  x="464" y="1115" id="996" />
+<P2  x="464" y="1154" id="998" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1522" >
+<CONNECTOR type="115" id="1336" >
 <cdparam x="438" y="1057" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send request" value="null" />
-<P1  x="464" y="1057" id="1016" />
-<P2  x="464" y="1085" id="1181" />
+<P1  x="464" y="1057" id="830" />
+<P2  x="464" y="1085" id="995" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1523" >
+<CONNECTOR type="115" id="1337" >
 <cdparam x="132" y="808" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="132" y="829" id="855" />
-<P2  x="132" y="856" id="1187" />
+<P1  x="132" y="829" id="669" />
+<P2  x="132" y="856" id="1001" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1524" >
+<CONNECTOR type="115" id="1338" >
 <cdparam x="230" y="898" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="230" y="898" id="875" />
-<P2  x="230" y="935" id="1190" />
+<P1  x="230" y="898" id="689" />
+<P2  x="230" y="935" id="1004" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1525" >
+<CONNECTOR type="115" id="1339" >
 <cdparam x="230" y="965" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="230" y="965" id="1191" />
-<P2  x="230" y="997" id="1010" />
+<P1  x="230" y="965" id="1005" />
+<P2  x="230" y="997" id="824" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1526" >
+<CONNECTOR type="115" id="1340" >
 <cdparam x="346" y="799" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="346" y="799" id="851" />
-<P2  x="346" y="826" id="1196" />
+<P1  x="346" y="799" id="665" />
+<P2  x="346" y="826" id="1010" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1527" >
+<CONNECTOR type="115" id="1341" >
 <cdparam x="346" y="856" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="346" y="856" id="1197" />
-<P2  x="346" y="895" id="1034" />
+<P1  x="346" y="856" id="1011" />
+<P2  x="346" y="895" id="848" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1528" >
+<CONNECTOR type="115" id="1342" >
 <cdparam x="439" y="818" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="464" y="818" id="871" />
-<P2  x="464" y="860" id="1193" />
+<P1  x="464" y="818" id="685" />
+<P2  x="464" y="860" id="1007" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1529" >
+<CONNECTOR type="115" id="1343" >
 <cdparam x="439" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="464" y="890" id="1194" />
-<P2  x="464" y="936" id="1031" />
+<P1  x="464" y="890" id="1008" />
+<P2  x="464" y="936" id="845" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1530" >
+<CONNECTOR type="115" id="1344" >
 <cdparam x="132" y="963" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="132" y="963" id="1024" />
-<P2  x="132" y="981" id="1208" />
+<P1  x="132" y="963" id="838" />
+<P2  x="132" y="981" id="1022" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1531" >
+<CONNECTOR type="115" id="1345" >
 <cdparam x="132" y="1011" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="132" y="1011" id="1209" />
-<P2  x="132" y="1036" id="1020" />
+<P1  x="132" y="1011" id="1023" />
+<P2  x="132" y="1036" id="834" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1532" >
+<CONNECTOR type="115" id="1346" >
 <cdparam x="230" y="1027" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="230" y="1027" id="1011" />
-<P2  x="230" y="1047" id="1199" />
+<P1  x="230" y="1027" id="825" />
+<P2  x="230" y="1047" id="1013" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1533" >
+<CONNECTOR type="115" id="1347" >
 <cdparam x="228" y="1088" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send request" value="null" />
-<P1  x="230" y="1077" id="1200" />
-<P2  x="230" y="1097" id="1169" />
+<P1  x="230" y="1077" id="1014" />
+<P2  x="230" y="1097" id="983" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1534" >
+<CONNECTOR type="115" id="1348" >
 <cdparam x="346" y="925" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="346" y="925" id="1035" />
-<P2  x="346" y="957" id="1202" />
+<P1  x="346" y="925" id="849" />
+<P2  x="346" y="957" id="1016" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1535" >
+<CONNECTOR type="115" id="1349" >
 <cdparam x="348" y="987" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="346" y="987" id="1203" />
-<P2  x="346" y="1021" id="1026" />
+<P1  x="346" y="987" id="1017" />
+<P2  x="346" y="1021" id="840" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1536" >
+<CONNECTOR type="115" id="1350" >
 <cdparam x="439" y="966" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="464" y="966" id="1032" />
-<P2  x="464" y="978" id="1205" />
+<P1  x="464" y="966" id="846" />
+<P2  x="464" y="978" id="1019" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1537" >
+<CONNECTOR type="115" id="1351" >
 <cdparam x="438" y="1008" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="464" y="1008" id="1206" />
-<P2  x="464" y="1027" id="1015" />
+<P1  x="464" y="1008" id="1020" />
+<P2  x="464" y="1027" id="829" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1538" >
+<CONNECTOR type="115" id="1352" >
 <cdparam x="722" y="783" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="722" y="783" id="1157" />
-<P2  x="722" y="808" id="1211" />
+<P1  x="722" y="783" id="971" />
+<P2  x="722" y="808" id="1025" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1539" >
+<CONNECTOR type="115" id="1353" >
 <cdparam x="722" y="838" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="722" y="838" id="1212" />
-<P2  x="722" y="860" id="1159" />
+<P1  x="722" y="838" id="1026" />
+<P2  x="722" y="860" id="973" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1540" >
+<CONNECTOR type="115" id="1354" >
 <cdparam x="800" y="1111" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="800" y="1111" id="1062" />
-<P2  x="800" y="1136" id="1214" />
+<P1  x="800" y="1111" id="876" />
+<P2  x="800" y="1136" id="1028" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1541" >
+<CONNECTOR type="115" id="1355" >
 <cdparam x="798" y="1166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="800" y="1166" id="1215" />
-<P2  x="800" y="1188" id="1098" />
+<P1  x="800" y="1166" id="1029" />
+<P2  x="800" y="1188" id="912" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1542" >
+<CONNECTOR type="115" id="1356" >
 <cdparam x="943" y="1148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="943" y="1148" id="1107" />
-<P2  x="943" y="1173" id="1217" />
+<P1  x="943" y="1148" id="921" />
+<P2  x="943" y="1173" id="1031" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1543" >
+<CONNECTOR type="115" id="1357" >
 <cdparam x="950" y="1201" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="943" y="1203" id="1218" />
-<P2  x="943" y="1229" id="1126" />
+<P1  x="943" y="1203" id="1032" />
+<P2  x="943" y="1229" id="940" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1544" >
+<CONNECTOR type="115" id="1358" >
 <cdparam x="1049" y="1180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1049" y="1180" id="1132" />
-<P2  x="1049" y="1206" id="1220" />
+<P1  x="1049" y="1180" id="946" />
+<P2  x="1049" y="1206" id="1034" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1545" >
+<CONNECTOR type="115" id="1359" >
 <cdparam x="1049" y="1223" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="1049" y="1236" id="1221" />
-<P2  x="1049" y="1261" id="1151" />
+<P1  x="1049" y="1236" id="1035" />
+<P2  x="1049" y="1261" id="965" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1546" >
+<CONNECTOR type="115" id="1360" >
 <cdparam x="883" y="884" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="883" y="884" id="846" />
-<P2  x="883" y="917" id="1225" />
+<P1  x="883" y="884" id="660" />
+<P2  x="883" y="917" id="1039" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1547" >
+<CONNECTOR type="115" id="1361" >
 <cdparam x="612" y="727" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="612" y="727" id="818" />
-<P2  x="612" y="757" id="1223" />
+<P1  x="612" y="727" id="632" />
+<P2  x="612" y="757" id="1037" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1548" >
+<CONNECTOR type="115" id="1362" >
 <cdparam x="532" y="727" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="532" y="727" id="817" />
-<P2  x="496" y="763" id="1101" />
+<P1  x="532" y="727" id="631" />
+<P2  x="496" y="763" id="915" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1549" >
+<CONNECTOR type="115" id="1363" >
 <cdparam x="799" y="1218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="800" y="1218" id="1099" />
-<P2  x="800" y="1265" id="1037" />
+<P1  x="800" y="1218" id="913" />
+<P2  x="800" y="1265" id="851" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1550" >
+<CONNECTOR type="115" id="1364" >
 <cdparam x="1009" y="954" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1009" y="954" id="833" />
-<P2  x="943" y="1020" id="826" />
+<P1  x="1009" y="954" id="647" />
+<P2  x="943" y="1020" id="640" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1551" >
+<CONNECTOR type="115" id="1365" >
 <cdparam x="229" y="1194" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="230" y="1194" id="1173" />
-<P2  x="230" y="1232" id="1013" />
+<P1  x="230" y="1194" id="987" />
+<P2  x="230" y="1232" id="827" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1552" >
+<CONNECTOR type="115" id="1366" >
 <cdparam x="346" y="1198" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="346" y="1198" id="1179" />
-<P2  x="346" y="1224" id="1029" />
+<P1  x="346" y="1198" id="993" />
+<P2  x="346" y="1224" id="843" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1553" >
+<CONNECTOR type="115" id="1367" >
 <cdparam x="438" y="1184" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="464" y="1184" id="1185" />
-<P2  x="464" y="1208" id="1018" />
+<P1  x="464" y="1184" id="999" />
+<P2  x="464" y="1208" id="832" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1554" >
+<CONNECTOR type="115" id="1368" >
 <cdparam x="496" y="793" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="496" y="793" id="1102" />
-<P2  x="496" y="825" id="1104" />
+<P1  x="496" y="793" id="916" />
+<P2  x="496" y="825" id="918" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1555" >
+<CONNECTOR type="115" id="1369" >
 <cdparam x="943" y="1259" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="943" y="1259" id="1127" />
-<P2  x="943" y="1306" id="1129" />
+<P1  x="943" y="1259" id="941" />
+<P2  x="943" y="1306" id="943" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1556" >
+<CONNECTOR type="115" id="1370" >
 <cdparam x="1008" y="736" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to choice" value="null" />
-<P1  x="1008" y="736" id="867" />
-<P2  x="1008" y="770" id="860" />
+<P1  x="1008" y="736" id="681" />
+<P2  x="1008" y="770" id="674" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1557" >
+<CONNECTOR type="115" id="1371" >
 <cdparam x="1008" y="835" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1008" y="835" id="863" />
-<P2  x="1049" y="929" id="832" />
+<P1  x="1008" y="835" id="677" />
+<P2  x="1049" y="929" id="646" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1558" >
+<CONNECTOR type="115" id="1372" >
 <cdparam x="1049" y="1291" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1049" y="1291" id="1152" />
-<P2  x="1049" y="1336" id="1154" />
+<P1  x="1049" y="1291" id="966" />
+<P2  x="1049" y="1336" id="968" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1559" >
+<CONNECTOR type="115" id="1373" >
 <cdparam x="1208" y="1152" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1208" y="1142" id="811" />
-<P2  x="1208" y="1209" id="1227" />
+<P1  x="1208" y="1142" id="625" />
+<P2  x="1208" y="1209" id="1041" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1560" >
+<CONNECTOR type="115" id="1374" >
 <cdparam x="1208" y="1239" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to action state" value="null" />
-<P1  x="1208" y="1239" id="1228" />
-<P2  x="1208" y="1290" id="1247" />
+<P1  x="1208" y="1239" id="1042" />
+<P2  x="1208" y="1290" id="1061" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1561" >
+<CONNECTOR type="115" id="1375" >
 <cdparam x="1208" y="1320" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="1208" y="1320" id="1248" />
-<P2  x="1208" y="1346" id="1255" />
+<P1  x="1208" y="1320" id="1062" />
+<P2  x="1208" y="1346" id="1069" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1562" >
+<CONNECTOR type="115" id="1376" >
 <cdparam x="1206" y="1385" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="1208" y="1376" id="1256" />
-<P2  x="1208" y="1397" id="1252" />
+<P1  x="1208" y="1376" id="1070" />
+<P2  x="1208" y="1397" id="1066" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1563" >
+<CONNECTOR type="115" id="1377" >
 <cdparam x="1206" y="1088" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1208" y="1075" id="807" />
-<P2  x="1208" y="1102" id="810" />
+<P1  x="1208" y="1075" id="621" />
+<P2  x="1208" y="1102" id="624" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1564" >
+<CONNECTOR type="115" id="1378" >
 <cdparam x="1248" y="1035" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="1248" y="1035" id="806" />
-<P2  x="1287" y="1065" id="1258" />
+<P1  x="1248" y="1035" id="620" />
+<P2  x="1287" y="1065" id="1072" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1565" >
+<CONNECTOR type="115" id="1379" >
 <cdparam x="1207" y="1427" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1208" y="1427" id="1253" />
-<P2  x="1208" y="1466" id="1250" />
+<P1  x="1208" y="1427" id="1067" />
+<P2  x="1208" y="1466" id="1064" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1566" >
+<CONNECTOR type="115" id="1380" >
 <cdparam x="1553" y="1019" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1567" y="1021" id="777" />
-<P2  x="1529" y="1059" id="770" />
+<P1  x="1567" y="1021" id="591" />
+<P2  x="1529" y="1059" id="584" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1567" >
+<CONNECTOR type="115" id="1381" >
 <cdparam x="1529" y="1324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1529" y="1289" id="767" />
-<P2  x="1529" y="1343" id="1265" />
+<P1  x="1529" y="1289" id="581" />
+<P2  x="1529" y="1343" id="1079" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1568" >
+<CONNECTOR type="115" id="1382" >
 <cdparam x="1684" y="929" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to send event" value="null" />
-<P1  x="1728" y="930" id="787" />
-<P2  x="1728" y="1021" id="1268" />
+<P1  x="1728" y="930" id="601" />
+<P2  x="1728" y="1021" id="1082" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1569" >
+<CONNECTOR type="115" id="1383" >
 <cdparam x="1615" y="1283" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1641" y="1270" id="791" />
-<P2  x="1641" y="1294" id="1305" />
+<P1  x="1641" y="1270" id="605" />
+<P2  x="1641" y="1294" id="1119" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1570" >
+<CONNECTOR type="115" id="1384" >
 <cdparam x="1641" y="1324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1641" y="1324" id="1306" />
-<P2  x="1641" y="1343" id="1347" />
+<P1  x="1641" y="1324" id="1120" />
+<P2  x="1641" y="1343" id="1161" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1571" >
+<CONNECTOR type="115" id="1385" >
 <cdparam x="1529" y="1373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1529" y="1373" id="1266" />
-<P2  x="1529" y="1400" id="1344" />
+<P1  x="1529" y="1373" id="1080" />
+<P2  x="1529" y="1400" id="1158" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1572" >
+<CONNECTOR type="115" id="1386" >
 <cdparam x="1529" y="1422" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="1529" y="1430" id="1345" />
-<P2  x="1529" y="1452" id="1260" />
+<P1  x="1529" y="1430" id="1159" />
+<P2  x="1529" y="1452" id="1074" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1573" >
+<CONNECTOR type="115" id="1387" >
 <cdparam x="1642" y="1373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="1641" y="1373" id="1348" />
-<P2  x="1641" y="1399" id="1350" />
+<P1  x="1641" y="1373" id="1162" />
+<P2  x="1641" y="1399" id="1164" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1574" >
+<CONNECTOR type="115" id="1388" >
 <cdparam x="1956" y="1361" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="1956" y="1361" id="745" />
-<P2  x="1920" y="1406" id="1360" />
+<P1  x="1956" y="1361" id="559" />
+<P2  x="1920" y="1406" id="1174" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1575" >
+<CONNECTOR type="115" id="1389" >
 <cdparam x="2100" y="1490" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="2101" y="1491" id="1368" />
-<P2  x="2101" y="1532" id="1370" />
+<P1  x="2101" y="1491" id="1182" />
+<P2  x="2101" y="1532" id="1184" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1576" >
+<CONNECTOR type="115" id="1390" >
 <cdparam x="1996" y="1401" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="1996" y="1401" id="747" />
-<P2  x="1996" y="1429" id="1375" />
+<P1  x="1996" y="1401" id="561" />
+<P2  x="1996" y="1429" id="1189" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1577" >
+<CONNECTOR type="115" id="1391" >
 <cdparam x="1996" y="1459" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to action state" value="null" />
-<P1  x="1996" y="1459" id="1376" />
-<P2  x="1996" y="1488" id="1372" />
+<P1  x="1996" y="1459" id="1190" />
+<P2  x="1996" y="1488" id="1186" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1578" >
+<CONNECTOR type="115" id="1392" >
 <cdparam x="2021" y="1038" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="2237" y="966" id="737" />
-<P2  x="2237" y="1054" id="794" />
+<P1  x="2237" y="966" id="551" />
+<P2  x="2237" y="1054" id="608" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1579" >
+<CONNECTOR type="115" id="1393" >
 <cdparam x="2217" y="1323" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="2237" y="1323" id="1418" />
-<P2  x="2237" y="1360" id="1420" />
+<P1  x="2237" y="1323" id="1232" />
+<P2  x="2237" y="1360" id="1234" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1580" >
+<CONNECTOR type="115" id="1394" >
 <cdparam x="2218" y="1094" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="2237" y="1094" id="795" />
-<P2  x="2237" y="1131" id="1423" />
+<P1  x="2237" y="1094" id="609" />
+<P2  x="2237" y="1131" id="1237" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1581" >
+<CONNECTOR type="115" id="1395" >
 <cdparam x="2218" y="1161" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="2237" y="1161" id="1424" />
-<P2  x="2237" y="1193" id="1412" />
+<P1  x="2237" y="1161" id="1238" />
+<P2  x="2237" y="1193" id="1226" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1582" >
+<CONNECTOR type="115" id="1396" >
 <cdparam x="2218" y="1223" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="2237" y="1223" id="1413" />
-<P2  x="2237" y="1243" id="1426" />
+<P1  x="2237" y="1223" id="1227" />
+<P2  x="2237" y="1243" id="1240" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1583" >
+<CONNECTOR type="115" id="1397" >
 <cdparam x="2216" y="1284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send request" value="null" />
-<P1  x="2237" y="1273" id="1427" />
-<P2  x="2237" y="1293" id="1417" />
+<P1  x="2237" y="1273" id="1241" />
+<P2  x="2237" y="1293" id="1231" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1584" >
+<CONNECTOR type="115" id="1398" >
 <cdparam x="2217" y="1390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to action state" value="null" />
-<P1  x="2237" y="1390" id="1421" />
-<P2  x="2237" y="1419" id="1429" />
+<P1  x="2237" y="1390" id="1235" />
+<P2  x="2237" y="1419" id="1243" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1585" >
+<CONNECTOR type="115" id="1399" >
 <cdparam x="2341" y="1060" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="2317" y="1059" id="799" />
-<P2  x="2317" y="1117" id="1432" />
+<P1  x="2317" y="1059" id="613" />
+<P2  x="2317" y="1117" id="1246" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1586" >
+<CONNECTOR type="115" id="1400" >
 <cdparam x="1529" y="1099" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1529" y="1099" id="771" />
-<P2  x="1529" y="1127" id="1262" />
+<P1  x="1529" y="1099" id="585" />
+<P2  x="1529" y="1127" id="1076" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1587" >
+<CONNECTOR type="115" id="1401" >
 <cdparam x="2101" y="1433" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="2101" y="1433" id="731" />
-<P2  x="2101" y="1461" id="1367" />
+<P1  x="2101" y="1433" id="545" />
+<P2  x="2101" y="1461" id="1181" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1588" >
+<CONNECTOR type="115" id="1402" >
 <cdparam x="2158" y="1460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="2141" y="1393" id="730" />
-<P2  x="2178" y="1416" id="1462" />
+<P1  x="2141" y="1393" id="544" />
+<P2  x="2178" y="1416" id="1276" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1589" >
+<CONNECTOR type="115" id="1403" >
 <cdparam x="1688" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1688" y="890" id="785" />
-<P2  x="1607" y="996" id="776" />
+<P1  x="1688" y="890" id="599" />
+<P2  x="1607" y="996" id="590" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1590" >
+<CONNECTOR type="115" id="1404" >
 <cdparam x="1768" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1768" y="890" id="786" />
-<P2  x="2277" y="941" id="736" />
+<P1  x="1768" y="890" id="600" />
+<P2  x="2277" y="941" id="550" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1591" >
+<CONNECTOR type="115" id="1405" >
 <cdparam x="2317" y="966" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="2317" y="966" id="738" />
-<P2  x="2317" y="1019" id="798" />
+<P1  x="2317" y="966" id="552" />
+<P2  x="2317" y="1019" id="612" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1592" >
+<CONNECTOR type="115" id="1406" >
 <cdparam x="2341" y="1147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="2317" y="1147" id="1433" />
-<P2  x="2317" y="1194" id="1457" />
+<P1  x="2317" y="1147" id="1247" />
+<P2  x="2317" y="1194" id="1271" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1593" >
+<CONNECTOR type="115" id="1407" >
 <cdparam x="2341" y="1224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send event" value="null" />
-<P1  x="2317" y="1224" id="1458" />
-<P2  x="2317" y="1262" id="1452" />
+<P1  x="2317" y="1224" id="1272" />
+<P2  x="2317" y="1262" id="1266" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1594" >
+<CONNECTOR type="115" id="1408" >
 <cdparam x="1731" y="1051" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to choice" value="null" />
-<P1  x="1728" y="1051" id="1269" />
-<P2  x="1728" y="1081" id="1469" />
+<P1  x="1728" y="1051" id="1083" />
+<P2  x="1728" y="1081" id="1283" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1595" >
+<CONNECTOR type="115" id="1409" >
 <cdparam x="1647" y="1021" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="1647" y="1021" id="778" />
-<P2  x="1647" y="1052" id="1460" />
+<P1  x="1647" y="1021" id="592" />
+<P2  x="1647" y="1052" id="1274" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1596" >
+<CONNECTOR type="115" id="1410" >
 <cdparam x="1826" y="1324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="1826" y="1324" id="755" />
-<P2  x="1826" y="1344" id="1355" />
+<P1  x="1826" y="1324" id="569" />
+<P2  x="1826" y="1344" id="1169" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1597" >
+<CONNECTOR type="115" id="1411" >
 <cdparam x="1826" y="1374" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1826" y="1374" id="1356" />
-<P2  x="1826" y="1452" id="1358" />
+<P1  x="1826" y="1374" id="1170" />
+<P2  x="1826" y="1452" id="1172" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1598" >
+<CONNECTOR type="115" id="1412" >
 <cdparam x="1786" y="1284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="1786" y="1284" id="753" />
-<P2  x="1740" y="1330" id="1353" />
+<P1  x="1786" y="1284" id="567" />
+<P2  x="1740" y="1330" id="1167" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1599" >
+<CONNECTOR type="115" id="1413" >
 <cdparam x="1920" y="1436" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1920" y="1436" id="1361" />
-<P2  x="1920" y="1476" id="1363" />
+<P1  x="1920" y="1436" id="1175" />
+<P2  x="1920" y="1476" id="1177" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1600" >
+<CONNECTOR type="115" id="1414" >
 <cdparam x="1996" y="1518" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1996" y="1518" id="1373" />
-<P2  x="1996" y="1538" id="1365" />
+<P1  x="1996" y="1518" id="1187" />
+<P2  x="1996" y="1538" id="1179" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1601" >
+<CONNECTOR type="115" id="1415" >
 <cdparam x="2036" y="1361" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="2036" y="1361" id="746" />
-<P2  x="2101" y="1368" id="728" />
+<P1  x="2036" y="1361" id="560" />
+<P2  x="2101" y="1368" id="542" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1602" >
+<CONNECTOR type="115" id="1416" >
 <cdparam x="1866" y="1284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1866" y="1284" id="754" />
-<P2  x="1996" y="1336" id="744" />
+<P1  x="1866" y="1284" id="568" />
+<P2  x="1996" y="1336" id="558" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1603" >
+<CONNECTOR type="115" id="1417" >
 <cdparam x="2341" y="1292" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="2317" y="1292" id="1453" />
-<P2  x="2317" y="1319" id="1455" />
+<P1  x="2317" y="1292" id="1267" />
+<P2  x="2317" y="1319" id="1269" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1604" >
+<CONNECTOR type="115" id="1418" >
 <cdparam x="2217" y="1449" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="2237" y="1449" id="1430" />
-<P2  x="2237" y="1478" id="1415" />
+<P1  x="2237" y="1449" id="1244" />
+<P2  x="2237" y="1478" id="1229" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1605" >
+<CONNECTOR type="115" id="1419" >
 <cdparam x="2277" y="1006" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="2277" y="1006" id="739" />
-<P2  x="2277" y="1034" id="1464" />
+<P1  x="2277" y="1006" id="553" />
+<P2  x="2277" y="1034" id="1278" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1606" >
+<CONNECTOR type="115" id="1420" >
 <cdparam x="1642" y="1429" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="1641" y="1429" id="1351" />
-<P2  x="1641" y="1463" id="1308" />
+<P1  x="1641" y="1429" id="1165" />
+<P2  x="1641" y="1463" id="1122" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1607" >
+<CONNECTOR type="115" id="1421" >
 <cdparam x="1529" y="1157" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1529" y="1157" id="1263" />
-<P2  x="1529" y="1187" id="1466" />
+<P1  x="1529" y="1157" id="1077" />
+<P2  x="1529" y="1187" id="1280" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1608" >
+<CONNECTOR type="115" id="1422" >
 <cdparam x="1529" y="1217" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to execI" value="null" />
-<P1  x="1529" y="1217" id="1467" />
-<P2  x="1529" y="1249" id="766" />
+<P1  x="1529" y="1217" id="1281" />
+<P2  x="1529" y="1249" id="580" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1609" >
+<CONNECTOR type="115" id="1423" >
 <cdparam x="1691" y="1156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1688" y="1156" id="761" />
-<P2  x="1641" y="1230" id="790" />
+<P1  x="1688" y="1156" id="575" />
+<P2  x="1641" y="1230" id="604" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1610" >
+<CONNECTOR type="115" id="1424" >
 <cdparam x="1771" y="1156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1768" y="1156" id="762" />
-<P2  x="1826" y="1259" id="752" />
+<P1  x="1768" y="1156" id="576" />
+<P2  x="1826" y="1259" id="566" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1611" >
+<CONNECTOR type="115" id="1425" >
 <cdparam x="1731" y="1111" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to choice" value="null" />
-<P1  x="1728" y="1111" id="1470" />
-<P2  x="1728" y="1131" id="760" />
+<P1  x="1728" y="1111" id="1284" />
+<P2  x="1728" y="1131" id="574" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -6425,227 +6419,227 @@ On prend b=1 comme exemple
 
 <Modeling type="TML Architecture" nameTab="Mapping1" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1102" id="1636" >
+<COMPONENT type="1102" id="1450" >
 <cdparam x="612" y="450" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1612" />
-<TGConnectingPoint num="1" id="1613" />
-<TGConnectingPoint num="2" id="1614" />
-<TGConnectingPoint num="3" id="1615" />
-<TGConnectingPoint num="4" id="1616" />
-<TGConnectingPoint num="5" id="1617" />
-<TGConnectingPoint num="6" id="1618" />
-<TGConnectingPoint num="7" id="1619" />
-<TGConnectingPoint num="8" id="1620" />
-<TGConnectingPoint num="9" id="1621" />
-<TGConnectingPoint num="10" id="1622" />
-<TGConnectingPoint num="11" id="1623" />
-<TGConnectingPoint num="12" id="1624" />
-<TGConnectingPoint num="13" id="1625" />
-<TGConnectingPoint num="14" id="1626" />
-<TGConnectingPoint num="15" id="1627" />
-<TGConnectingPoint num="16" id="1628" />
-<TGConnectingPoint num="17" id="1629" />
-<TGConnectingPoint num="18" id="1630" />
-<TGConnectingPoint num="19" id="1631" />
-<TGConnectingPoint num="20" id="1632" />
-<TGConnectingPoint num="21" id="1633" />
-<TGConnectingPoint num="22" id="1634" />
-<TGConnectingPoint num="23" id="1635" />
+<TGConnectingPoint num="0" id="1426" />
+<TGConnectingPoint num="1" id="1427" />
+<TGConnectingPoint num="2" id="1428" />
+<TGConnectingPoint num="3" id="1429" />
+<TGConnectingPoint num="4" id="1430" />
+<TGConnectingPoint num="5" id="1431" />
+<TGConnectingPoint num="6" id="1432" />
+<TGConnectingPoint num="7" id="1433" />
+<TGConnectingPoint num="8" id="1434" />
+<TGConnectingPoint num="9" id="1435" />
+<TGConnectingPoint num="10" id="1436" />
+<TGConnectingPoint num="11" id="1437" />
+<TGConnectingPoint num="12" id="1438" />
+<TGConnectingPoint num="13" id="1439" />
+<TGConnectingPoint num="14" id="1440" />
+<TGConnectingPoint num="15" id="1441" />
+<TGConnectingPoint num="16" id="1442" />
+<TGConnectingPoint num="17" id="1443" />
+<TGConnectingPoint num="18" id="1444" />
+<TGConnectingPoint num="19" id="1445" />
+<TGConnectingPoint num="20" id="1446" />
+<TGConnectingPoint num="21" id="1447" />
+<TGConnectingPoint num="22" id="1448" />
+<TGConnectingPoint num="23" id="1449" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="Bus0" />
 <attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0"  referenceAttack="null" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="1661" >
+<COMPONENT type="1105" id="1475" >
 <cdparam x="797" y="120" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1637" />
-<TGConnectingPoint num="1" id="1638" />
-<TGConnectingPoint num="2" id="1639" />
-<TGConnectingPoint num="3" id="1640" />
-<TGConnectingPoint num="4" id="1641" />
-<TGConnectingPoint num="5" id="1642" />
-<TGConnectingPoint num="6" id="1643" />
-<TGConnectingPoint num="7" id="1644" />
-<TGConnectingPoint num="8" id="1645" />
-<TGConnectingPoint num="9" id="1646" />
-<TGConnectingPoint num="10" id="1647" />
-<TGConnectingPoint num="11" id="1648" />
-<TGConnectingPoint num="12" id="1649" />
-<TGConnectingPoint num="13" id="1650" />
-<TGConnectingPoint num="14" id="1651" />
-<TGConnectingPoint num="15" id="1652" />
-<TGConnectingPoint num="16" id="1653" />
-<TGConnectingPoint num="17" id="1654" />
-<TGConnectingPoint num="18" id="1655" />
-<TGConnectingPoint num="19" id="1656" />
-<TGConnectingPoint num="20" id="1657" />
-<TGConnectingPoint num="21" id="1658" />
-<TGConnectingPoint num="22" id="1659" />
-<TGConnectingPoint num="23" id="1660" />
+<TGConnectingPoint num="0" id="1451" />
+<TGConnectingPoint num="1" id="1452" />
+<TGConnectingPoint num="2" id="1453" />
+<TGConnectingPoint num="3" id="1454" />
+<TGConnectingPoint num="4" id="1455" />
+<TGConnectingPoint num="5" id="1456" />
+<TGConnectingPoint num="6" id="1457" />
+<TGConnectingPoint num="7" id="1458" />
+<TGConnectingPoint num="8" id="1459" />
+<TGConnectingPoint num="9" id="1460" />
+<TGConnectingPoint num="10" id="1461" />
+<TGConnectingPoint num="11" id="1462" />
+<TGConnectingPoint num="12" id="1463" />
+<TGConnectingPoint num="13" id="1464" />
+<TGConnectingPoint num="14" id="1465" />
+<TGConnectingPoint num="15" id="1466" />
+<TGConnectingPoint num="16" id="1467" />
+<TGConnectingPoint num="17" id="1468" />
+<TGConnectingPoint num="18" id="1469" />
+<TGConnectingPoint num="19" id="1470" />
+<TGConnectingPoint num="20" id="1471" />
+<TGConnectingPoint num="21" id="1472" />
+<TGConnectingPoint num="22" id="1473" />
+<TGConnectingPoint num="23" id="1474" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="Memory0" />
 <attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="1731" >
+<COMPONENT type="1100" id="1545" >
 <cdparam x="51" y="90" />
 <sizeparam width="459" height="321" minWidth="150" minHeight="150" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="cpu0" value="name" />
-<TGConnectingPoint num="0" id="1707" />
-<TGConnectingPoint num="1" id="1708" />
-<TGConnectingPoint num="2" id="1709" />
-<TGConnectingPoint num="3" id="1710" />
-<TGConnectingPoint num="4" id="1711" />
-<TGConnectingPoint num="5" id="1712" />
-<TGConnectingPoint num="6" id="1713" />
-<TGConnectingPoint num="7" id="1714" />
-<TGConnectingPoint num="8" id="1715" />
-<TGConnectingPoint num="9" id="1716" />
-<TGConnectingPoint num="10" id="1717" />
-<TGConnectingPoint num="11" id="1718" />
-<TGConnectingPoint num="12" id="1719" />
-<TGConnectingPoint num="13" id="1720" />
-<TGConnectingPoint num="14" id="1721" />
-<TGConnectingPoint num="15" id="1722" />
-<TGConnectingPoint num="16" id="1723" />
-<TGConnectingPoint num="17" id="1724" />
-<TGConnectingPoint num="18" id="1725" />
-<TGConnectingPoint num="19" id="1726" />
-<TGConnectingPoint num="20" id="1727" />
-<TGConnectingPoint num="21" id="1728" />
-<TGConnectingPoint num="22" id="1729" />
-<TGConnectingPoint num="23" id="1730" />
+<TGConnectingPoint num="0" id="1521" />
+<TGConnectingPoint num="1" id="1522" />
+<TGConnectingPoint num="2" id="1523" />
+<TGConnectingPoint num="3" id="1524" />
+<TGConnectingPoint num="4" id="1525" />
+<TGConnectingPoint num="5" id="1526" />
+<TGConnectingPoint num="6" id="1527" />
+<TGConnectingPoint num="7" id="1528" />
+<TGConnectingPoint num="8" id="1529" />
+<TGConnectingPoint num="9" id="1530" />
+<TGConnectingPoint num="10" id="1531" />
+<TGConnectingPoint num="11" id="1532" />
+<TGConnectingPoint num="12" id="1533" />
+<TGConnectingPoint num="13" id="1534" />
+<TGConnectingPoint num="14" id="1535" />
+<TGConnectingPoint num="15" id="1536" />
+<TGConnectingPoint num="16" id="1537" />
+<TGConnectingPoint num="17" id="1538" />
+<TGConnectingPoint num="18" id="1539" />
+<TGConnectingPoint num="19" id="1540" />
+<TGConnectingPoint num="20" id="1541" />
+<TGConnectingPoint num="21" id="1542" />
+<TGConnectingPoint num="22" id="1543" />
+<TGConnectingPoint num="23" id="1544" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="cpu0" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="99"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1670" >
-<father id="1731" num="0" />
+<SUBCOMPONENT type="1101" id="1484" >
+<father id="1545" num="0" />
 <cdparam x="92" y="154" />
-<sizeparam width="163" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1662" />
-<TGConnectingPoint num="1" id="1663" />
-<TGConnectingPoint num="2" id="1664" />
-<TGConnectingPoint num="3" id="1665" />
-<TGConnectingPoint num="4" id="1666" />
-<TGConnectingPoint num="5" id="1667" />
-<TGConnectingPoint num="6" id="1668" />
-<TGConnectingPoint num="7" id="1669" />
+<TGConnectingPoint num="0" id="1476" />
+<TGConnectingPoint num="1" id="1477" />
+<TGConnectingPoint num="2" id="1478" />
+<TGConnectingPoint num="3" id="1479" />
+<TGConnectingPoint num="4" id="1480" />
+<TGConnectingPoint num="5" id="1481" />
+<TGConnectingPoint num="6" id="1482" />
+<TGConnectingPoint num="7" id="1483" />
 <extraparam>
 <info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1679" >
-<father id="1731" num="1" />
+<SUBCOMPONENT type="1101" id="1493" >
+<father id="1545" num="1" />
 <cdparam x="291" y="153" />
-<sizeparam width="136" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1671" />
-<TGConnectingPoint num="1" id="1672" />
-<TGConnectingPoint num="2" id="1673" />
-<TGConnectingPoint num="3" id="1674" />
-<TGConnectingPoint num="4" id="1675" />
-<TGConnectingPoint num="5" id="1676" />
-<TGConnectingPoint num="6" id="1677" />
-<TGConnectingPoint num="7" id="1678" />
+<TGConnectingPoint num="0" id="1485" />
+<TGConnectingPoint num="1" id="1486" />
+<TGConnectingPoint num="2" id="1487" />
+<TGConnectingPoint num="3" id="1488" />
+<TGConnectingPoint num="4" id="1489" />
+<TGConnectingPoint num="5" id="1490" />
+<TGConnectingPoint num="6" id="1491" />
+<TGConnectingPoint num="7" id="1492" />
 <extraparam>
 <info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1688" >
-<father id="1731" num="2" />
+<SUBCOMPONENT type="1101" id="1502" >
+<father id="1545" num="2" />
 <cdparam x="96" y="246" />
-<sizeparam width="108" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="351" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1680" />
-<TGConnectingPoint num="1" id="1681" />
-<TGConnectingPoint num="2" id="1682" />
-<TGConnectingPoint num="3" id="1683" />
-<TGConnectingPoint num="4" id="1684" />
-<TGConnectingPoint num="5" id="1685" />
-<TGConnectingPoint num="6" id="1686" />
-<TGConnectingPoint num="7" id="1687" />
+<TGConnectingPoint num="0" id="1494" />
+<TGConnectingPoint num="1" id="1495" />
+<TGConnectingPoint num="2" id="1496" />
+<TGConnectingPoint num="3" id="1497" />
+<TGConnectingPoint num="4" id="1498" />
+<TGConnectingPoint num="5" id="1499" />
+<TGConnectingPoint num="6" id="1500" />
+<TGConnectingPoint num="7" id="1501" />
 <extraparam>
 <info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1697" >
-<father id="1731" num="3" />
+<SUBCOMPONENT type="1101" id="1511" >
+<father id="1545" num="3" />
 <cdparam x="290" y="234" />
-<sizeparam width="139" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1689" />
-<TGConnectingPoint num="1" id="1690" />
-<TGConnectingPoint num="2" id="1691" />
-<TGConnectingPoint num="3" id="1692" />
-<TGConnectingPoint num="4" id="1693" />
-<TGConnectingPoint num="5" id="1694" />
-<TGConnectingPoint num="6" id="1695" />
-<TGConnectingPoint num="7" id="1696" />
+<TGConnectingPoint num="0" id="1503" />
+<TGConnectingPoint num="1" id="1504" />
+<TGConnectingPoint num="2" id="1505" />
+<TGConnectingPoint num="3" id="1506" />
+<TGConnectingPoint num="4" id="1507" />
+<TGConnectingPoint num="5" id="1508" />
+<TGConnectingPoint num="6" id="1509" />
+<TGConnectingPoint num="7" id="1510" />
 <extraparam>
 <info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1706" >
-<father id="1731" num="4" />
+<SUBCOMPONENT type="1101" id="1520" >
+<father id="1545" num="4" />
 <cdparam x="226" y="304" />
 <sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1698" />
-<TGConnectingPoint num="1" id="1699" />
-<TGConnectingPoint num="2" id="1700" />
-<TGConnectingPoint num="3" id="1701" />
-<TGConnectingPoint num="4" id="1702" />
-<TGConnectingPoint num="5" id="1703" />
-<TGConnectingPoint num="6" id="1704" />
-<TGConnectingPoint num="7" id="1705" />
+<TGConnectingPoint num="0" id="1512" />
+<TGConnectingPoint num="1" id="1513" />
+<TGConnectingPoint num="2" id="1514" />
+<TGConnectingPoint num="3" id="1515" />
+<TGConnectingPoint num="4" id="1516" />
+<TGConnectingPoint num="5" id="1517" />
+<TGConnectingPoint num="6" id="1518" />
+<TGConnectingPoint num="7" id="1519" />
 <extraparam>
 <info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="1732" >
+<CONNECTOR type="125" id="1546" >
 <cdparam x="800" y="322" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="847" y="320" id="1651" />
-<P2  x="799" y="450" id="1621" />
+<P1  x="847" y="320" id="1465" />
+<P2  x="799" y="450" id="1435" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1733" >
+<CONNECTOR type="125" id="1547" >
 <cdparam x="510" y="411" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="510" y="411" id="1714" />
-<P2  x="612" y="462" id="1622" />
+<P1  x="510" y="411" id="1528" />
+<P2  x="612" y="462" id="1436" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -6662,323 +6656,323 @@ On prend b=1 comme exemple
 
 <Modeling type="TML Architecture" nameTab="Mapping2" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="1758" >
+<COMPONENT type="1105" id="1572" >
 <cdparam x="309" y="358" />
 <sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1734" />
-<TGConnectingPoint num="1" id="1735" />
-<TGConnectingPoint num="2" id="1736" />
-<TGConnectingPoint num="3" id="1737" />
-<TGConnectingPoint num="4" id="1738" />
-<TGConnectingPoint num="5" id="1739" />
-<TGConnectingPoint num="6" id="1740" />
-<TGConnectingPoint num="7" id="1741" />
-<TGConnectingPoint num="8" id="1742" />
-<TGConnectingPoint num="9" id="1743" />
-<TGConnectingPoint num="10" id="1744" />
-<TGConnectingPoint num="11" id="1745" />
-<TGConnectingPoint num="12" id="1746" />
-<TGConnectingPoint num="13" id="1747" />
-<TGConnectingPoint num="14" id="1748" />
-<TGConnectingPoint num="15" id="1749" />
-<TGConnectingPoint num="16" id="1750" />
-<TGConnectingPoint num="17" id="1751" />
-<TGConnectingPoint num="18" id="1752" />
-<TGConnectingPoint num="19" id="1753" />
-<TGConnectingPoint num="20" id="1754" />
-<TGConnectingPoint num="21" id="1755" />
-<TGConnectingPoint num="22" id="1756" />
-<TGConnectingPoint num="23" id="1757" />
+<TGConnectingPoint num="0" id="1548" />
+<TGConnectingPoint num="1" id="1549" />
+<TGConnectingPoint num="2" id="1550" />
+<TGConnectingPoint num="3" id="1551" />
+<TGConnectingPoint num="4" id="1552" />
+<TGConnectingPoint num="5" id="1553" />
+<TGConnectingPoint num="6" id="1554" />
+<TGConnectingPoint num="7" id="1555" />
+<TGConnectingPoint num="8" id="1556" />
+<TGConnectingPoint num="9" id="1557" />
+<TGConnectingPoint num="10" id="1558" />
+<TGConnectingPoint num="11" id="1559" />
+<TGConnectingPoint num="12" id="1560" />
+<TGConnectingPoint num="13" id="1561" />
+<TGConnectingPoint num="14" id="1562" />
+<TGConnectingPoint num="15" id="1563" />
+<TGConnectingPoint num="16" id="1564" />
+<TGConnectingPoint num="17" id="1565" />
+<TGConnectingPoint num="18" id="1566" />
+<TGConnectingPoint num="19" id="1567" />
+<TGConnectingPoint num="20" id="1568" />
+<TGConnectingPoint num="21" id="1569" />
+<TGConnectingPoint num="22" id="1570" />
+<TGConnectingPoint num="23" id="1571" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="Memory0" />
 <attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="1783" >
+<COMPONENT type="1102" id="1597" >
 <cdparam x="278" y="269" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1759" />
-<TGConnectingPoint num="1" id="1760" />
-<TGConnectingPoint num="2" id="1761" />
-<TGConnectingPoint num="3" id="1762" />
-<TGConnectingPoint num="4" id="1763" />
-<TGConnectingPoint num="5" id="1764" />
-<TGConnectingPoint num="6" id="1765" />
-<TGConnectingPoint num="7" id="1766" />
-<TGConnectingPoint num="8" id="1767" />
-<TGConnectingPoint num="9" id="1768" />
-<TGConnectingPoint num="10" id="1769" />
-<TGConnectingPoint num="11" id="1770" />
-<TGConnectingPoint num="12" id="1771" />
-<TGConnectingPoint num="13" id="1772" />
-<TGConnectingPoint num="14" id="1773" />
-<TGConnectingPoint num="15" id="1774" />
-<TGConnectingPoint num="16" id="1775" />
-<TGConnectingPoint num="17" id="1776" />
-<TGConnectingPoint num="18" id="1777" />
-<TGConnectingPoint num="19" id="1778" />
-<TGConnectingPoint num="20" id="1779" />
-<TGConnectingPoint num="21" id="1780" />
-<TGConnectingPoint num="22" id="1781" />
-<TGConnectingPoint num="23" id="1782" />
+<TGConnectingPoint num="0" id="1573" />
+<TGConnectingPoint num="1" id="1574" />
+<TGConnectingPoint num="2" id="1575" />
+<TGConnectingPoint num="3" id="1576" />
+<TGConnectingPoint num="4" id="1577" />
+<TGConnectingPoint num="5" id="1578" />
+<TGConnectingPoint num="6" id="1579" />
+<TGConnectingPoint num="7" id="1580" />
+<TGConnectingPoint num="8" id="1581" />
+<TGConnectingPoint num="9" id="1582" />
+<TGConnectingPoint num="10" id="1583" />
+<TGConnectingPoint num="11" id="1584" />
+<TGConnectingPoint num="12" id="1585" />
+<TGConnectingPoint num="13" id="1586" />
+<TGConnectingPoint num="14" id="1587" />
+<TGConnectingPoint num="15" id="1588" />
+<TGConnectingPoint num="16" id="1589" />
+<TGConnectingPoint num="17" id="1590" />
+<TGConnectingPoint num="18" id="1591" />
+<TGConnectingPoint num="19" id="1592" />
+<TGConnectingPoint num="20" id="1593" />
+<TGConnectingPoint num="21" id="1594" />
+<TGConnectingPoint num="22" id="1595" />
+<TGConnectingPoint num="23" id="1596" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="Bus0" />
 <attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="5"  privacy="0"  referenceAttack="ReadDataFromBus" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="1817" >
+<COMPONENT type="1100" id="1631" >
 <cdparam x="574" y="227" />
 <sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="1793" />
-<TGConnectingPoint num="1" id="1794" />
-<TGConnectingPoint num="2" id="1795" />
-<TGConnectingPoint num="3" id="1796" />
-<TGConnectingPoint num="4" id="1797" />
-<TGConnectingPoint num="5" id="1798" />
-<TGConnectingPoint num="6" id="1799" />
-<TGConnectingPoint num="7" id="1800" />
-<TGConnectingPoint num="8" id="1801" />
-<TGConnectingPoint num="9" id="1802" />
-<TGConnectingPoint num="10" id="1803" />
-<TGConnectingPoint num="11" id="1804" />
-<TGConnectingPoint num="12" id="1805" />
-<TGConnectingPoint num="13" id="1806" />
-<TGConnectingPoint num="14" id="1807" />
-<TGConnectingPoint num="15" id="1808" />
-<TGConnectingPoint num="16" id="1809" />
-<TGConnectingPoint num="17" id="1810" />
-<TGConnectingPoint num="18" id="1811" />
-<TGConnectingPoint num="19" id="1812" />
-<TGConnectingPoint num="20" id="1813" />
-<TGConnectingPoint num="21" id="1814" />
-<TGConnectingPoint num="22" id="1815" />
-<TGConnectingPoint num="23" id="1816" />
+<TGConnectingPoint num="0" id="1607" />
+<TGConnectingPoint num="1" id="1608" />
+<TGConnectingPoint num="2" id="1609" />
+<TGConnectingPoint num="3" id="1610" />
+<TGConnectingPoint num="4" id="1611" />
+<TGConnectingPoint num="5" id="1612" />
+<TGConnectingPoint num="6" id="1613" />
+<TGConnectingPoint num="7" id="1614" />
+<TGConnectingPoint num="8" id="1615" />
+<TGConnectingPoint num="9" id="1616" />
+<TGConnectingPoint num="10" id="1617" />
+<TGConnectingPoint num="11" id="1618" />
+<TGConnectingPoint num="12" id="1619" />
+<TGConnectingPoint num="13" id="1620" />
+<TGConnectingPoint num="14" id="1621" />
+<TGConnectingPoint num="15" id="1622" />
+<TGConnectingPoint num="16" id="1623" />
+<TGConnectingPoint num="17" id="1624" />
+<TGConnectingPoint num="18" id="1625" />
+<TGConnectingPoint num="19" id="1626" />
+<TGConnectingPoint num="20" id="1627" />
+<TGConnectingPoint num="21" id="1628" />
+<TGConnectingPoint num="22" id="1629" />
+<TGConnectingPoint num="23" id="1630" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU2" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1792" >
-<father id="1817" num="0" />
+<SUBCOMPONENT type="1101" id="1606" >
+<father id="1631" num="0" />
 <cdparam x="604" y="279" />
 <sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
 <infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1784" />
-<TGConnectingPoint num="1" id="1785" />
-<TGConnectingPoint num="2" id="1786" />
-<TGConnectingPoint num="3" id="1787" />
-<TGConnectingPoint num="4" id="1788" />
-<TGConnectingPoint num="5" id="1789" />
-<TGConnectingPoint num="6" id="1790" />
-<TGConnectingPoint num="7" id="1791" />
+<TGConnectingPoint num="0" id="1598" />
+<TGConnectingPoint num="1" id="1599" />
+<TGConnectingPoint num="2" id="1600" />
+<TGConnectingPoint num="3" id="1601" />
+<TGConnectingPoint num="4" id="1602" />
+<TGConnectingPoint num="5" id="1603" />
+<TGConnectingPoint num="6" id="1604" />
+<TGConnectingPoint num="7" id="1605" />
 <extraparam>
 <info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="1851" >
+<COMPONENT type="1100" id="1665" >
 <cdparam x="56" y="231" />
 <sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="1827" />
-<TGConnectingPoint num="1" id="1828" />
-<TGConnectingPoint num="2" id="1829" />
-<TGConnectingPoint num="3" id="1830" />
-<TGConnectingPoint num="4" id="1831" />
-<TGConnectingPoint num="5" id="1832" />
-<TGConnectingPoint num="6" id="1833" />
-<TGConnectingPoint num="7" id="1834" />
-<TGConnectingPoint num="8" id="1835" />
-<TGConnectingPoint num="9" id="1836" />
-<TGConnectingPoint num="10" id="1837" />
-<TGConnectingPoint num="11" id="1838" />
-<TGConnectingPoint num="12" id="1839" />
-<TGConnectingPoint num="13" id="1840" />
-<TGConnectingPoint num="14" id="1841" />
-<TGConnectingPoint num="15" id="1842" />
-<TGConnectingPoint num="16" id="1843" />
-<TGConnectingPoint num="17" id="1844" />
-<TGConnectingPoint num="18" id="1845" />
-<TGConnectingPoint num="19" id="1846" />
-<TGConnectingPoint num="20" id="1847" />
-<TGConnectingPoint num="21" id="1848" />
-<TGConnectingPoint num="22" id="1849" />
-<TGConnectingPoint num="23" id="1850" />
+<TGConnectingPoint num="0" id="1641" />
+<TGConnectingPoint num="1" id="1642" />
+<TGConnectingPoint num="2" id="1643" />
+<TGConnectingPoint num="3" id="1644" />
+<TGConnectingPoint num="4" id="1645" />
+<TGConnectingPoint num="5" id="1646" />
+<TGConnectingPoint num="6" id="1647" />
+<TGConnectingPoint num="7" id="1648" />
+<TGConnectingPoint num="8" id="1649" />
+<TGConnectingPoint num="9" id="1650" />
+<TGConnectingPoint num="10" id="1651" />
+<TGConnectingPoint num="11" id="1652" />
+<TGConnectingPoint num="12" id="1653" />
+<TGConnectingPoint num="13" id="1654" />
+<TGConnectingPoint num="14" id="1655" />
+<TGConnectingPoint num="15" id="1656" />
+<TGConnectingPoint num="16" id="1657" />
+<TGConnectingPoint num="17" id="1658" />
+<TGConnectingPoint num="18" id="1659" />
+<TGConnectingPoint num="19" id="1660" />
+<TGConnectingPoint num="20" id="1661" />
+<TGConnectingPoint num="21" id="1662" />
+<TGConnectingPoint num="22" id="1663" />
+<TGConnectingPoint num="23" id="1664" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU1" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1826" >
-<father id="1851" num="0" />
+<SUBCOMPONENT type="1101" id="1640" >
+<father id="1665" num="0" />
 <cdparam x="49" y="276" />
 <sizeparam width="172" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
 <infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1818" />
-<TGConnectingPoint num="1" id="1819" />
-<TGConnectingPoint num="2" id="1820" />
-<TGConnectingPoint num="3" id="1821" />
-<TGConnectingPoint num="4" id="1822" />
-<TGConnectingPoint num="5" id="1823" />
-<TGConnectingPoint num="6" id="1824" />
-<TGConnectingPoint num="7" id="1825" />
+<TGConnectingPoint num="0" id="1632" />
+<TGConnectingPoint num="1" id="1633" />
+<TGConnectingPoint num="2" id="1634" />
+<TGConnectingPoint num="3" id="1635" />
+<TGConnectingPoint num="4" id="1636" />
+<TGConnectingPoint num="5" id="1637" />
+<TGConnectingPoint num="6" id="1638" />
+<TGConnectingPoint num="7" id="1639" />
 <extraparam>
 <info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="1903" >
+<COMPONENT type="1100" id="1717" >
 <cdparam x="267" y="59" />
 <sizeparam width="272" height="167" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="1879" />
-<TGConnectingPoint num="1" id="1880" />
-<TGConnectingPoint num="2" id="1881" />
-<TGConnectingPoint num="3" id="1882" />
-<TGConnectingPoint num="4" id="1883" />
-<TGConnectingPoint num="5" id="1884" />
-<TGConnectingPoint num="6" id="1885" />
-<TGConnectingPoint num="7" id="1886" />
-<TGConnectingPoint num="8" id="1887" />
-<TGConnectingPoint num="9" id="1888" />
-<TGConnectingPoint num="10" id="1889" />
-<TGConnectingPoint num="11" id="1890" />
-<TGConnectingPoint num="12" id="1891" />
-<TGConnectingPoint num="13" id="1892" />
-<TGConnectingPoint num="14" id="1893" />
-<TGConnectingPoint num="15" id="1894" />
-<TGConnectingPoint num="16" id="1895" />
-<TGConnectingPoint num="17" id="1896" />
-<TGConnectingPoint num="18" id="1897" />
-<TGConnectingPoint num="19" id="1898" />
-<TGConnectingPoint num="20" id="1899" />
-<TGConnectingPoint num="21" id="1900" />
-<TGConnectingPoint num="22" id="1901" />
-<TGConnectingPoint num="23" id="1902" />
+<TGConnectingPoint num="0" id="1693" />
+<TGConnectingPoint num="1" id="1694" />
+<TGConnectingPoint num="2" id="1695" />
+<TGConnectingPoint num="3" id="1696" />
+<TGConnectingPoint num="4" id="1697" />
+<TGConnectingPoint num="5" id="1698" />
+<TGConnectingPoint num="6" id="1699" />
+<TGConnectingPoint num="7" id="1700" />
+<TGConnectingPoint num="8" id="1701" />
+<TGConnectingPoint num="9" id="1702" />
+<TGConnectingPoint num="10" id="1703" />
+<TGConnectingPoint num="11" id="1704" />
+<TGConnectingPoint num="12" id="1705" />
+<TGConnectingPoint num="13" id="1706" />
+<TGConnectingPoint num="14" id="1707" />
+<TGConnectingPoint num="15" id="1708" />
+<TGConnectingPoint num="16" id="1709" />
+<TGConnectingPoint num="17" id="1710" />
+<TGConnectingPoint num="18" id="1711" />
+<TGConnectingPoint num="19" id="1712" />
+<TGConnectingPoint num="20" id="1713" />
+<TGConnectingPoint num="21" id="1714" />
+<TGConnectingPoint num="22" id="1715" />
+<TGConnectingPoint num="23" id="1716" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU0" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1860" >
-<father id="1903" num="0" />
+<SUBCOMPONENT type="1101" id="1674" >
+<father id="1717" num="0" />
 <cdparam x="277" y="90" />
 <sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="163" minY="0" maxY="127" />
 <infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1852" />
-<TGConnectingPoint num="1" id="1853" />
-<TGConnectingPoint num="2" id="1854" />
-<TGConnectingPoint num="3" id="1855" />
-<TGConnectingPoint num="4" id="1856" />
-<TGConnectingPoint num="5" id="1857" />
-<TGConnectingPoint num="6" id="1858" />
-<TGConnectingPoint num="7" id="1859" />
+<TGConnectingPoint num="0" id="1666" />
+<TGConnectingPoint num="1" id="1667" />
+<TGConnectingPoint num="2" id="1668" />
+<TGConnectingPoint num="3" id="1669" />
+<TGConnectingPoint num="4" id="1670" />
+<TGConnectingPoint num="5" id="1671" />
+<TGConnectingPoint num="6" id="1672" />
+<TGConnectingPoint num="7" id="1673" />
 <extraparam>
 <info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1869" >
-<father id="1903" num="1" />
+<SUBCOMPONENT type="1101" id="1683" >
+<father id="1717" num="1" />
 <cdparam x="293" y="165" />
 <sizeparam width="144" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="128" minY="0" maxY="127" />
 <infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1861" />
-<TGConnectingPoint num="1" id="1862" />
-<TGConnectingPoint num="2" id="1863" />
-<TGConnectingPoint num="3" id="1864" />
-<TGConnectingPoint num="4" id="1865" />
-<TGConnectingPoint num="5" id="1866" />
-<TGConnectingPoint num="6" id="1867" />
-<TGConnectingPoint num="7" id="1868" />
+<TGConnectingPoint num="0" id="1675" />
+<TGConnectingPoint num="1" id="1676" />
+<TGConnectingPoint num="2" id="1677" />
+<TGConnectingPoint num="3" id="1678" />
+<TGConnectingPoint num="4" id="1679" />
+<TGConnectingPoint num="5" id="1680" />
+<TGConnectingPoint num="6" id="1681" />
+<TGConnectingPoint num="7" id="1682" />
 <extraparam>
 <info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1878" >
-<father id="1903" num="2" />
+<SUBCOMPONENT type="1101" id="1692" >
+<father id="1717" num="2" />
 <cdparam x="392" y="119" />
 <sizeparam width="141" height="37" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="131" minY="0" maxY="130" />
 <infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1870" />
-<TGConnectingPoint num="1" id="1871" />
-<TGConnectingPoint num="2" id="1872" />
-<TGConnectingPoint num="3" id="1873" />
-<TGConnectingPoint num="4" id="1874" />
-<TGConnectingPoint num="5" id="1875" />
-<TGConnectingPoint num="6" id="1876" />
-<TGConnectingPoint num="7" id="1877" />
+<TGConnectingPoint num="0" id="1684" />
+<TGConnectingPoint num="1" id="1685" />
+<TGConnectingPoint num="2" id="1686" />
+<TGConnectingPoint num="3" id="1687" />
+<TGConnectingPoint num="4" id="1688" />
+<TGConnectingPoint num="5" id="1689" />
+<TGConnectingPoint num="6" id="1690" />
+<TGConnectingPoint num="7" id="1691" />
 <extraparam>
 <info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="1904" >
+<CONNECTOR type="125" id="1718" >
 <cdparam x="402" y="367" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1  x="403" y="358" id="1735" />
-<P2  x="403" y="319" id="1765" />
+<P1  x="403" y="358" id="1549" />
+<P2  x="403" y="319" id="1579" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1905" >
+<CONNECTOR type="125" id="1719" >
 <cdparam x="190" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1  x="221" y="294" id="1831" />
-<P2  x="278" y="294" id="1762" />
+<P1  x="221" y="294" id="1645" />
+<P2  x="278" y="294" id="1576" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1906" >
+<CONNECTOR type="125" id="1720" >
 <cdparam x="662" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1  x="574" y="294" id="1796" />
-<P2  x="528" y="294" id="1763" />
+<P1  x="574" y="294" id="1610" />
+<P2  x="528" y="294" id="1577" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1907" >
+<CONNECTOR type="125" id="1721" >
 <cdparam x="388" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1  x="403" y="226" id="1885" />
-<P2  x="403" y="269" id="1760" />
+<P1  x="403" y="226" id="1699" />
+<P2  x="403" y="269" id="1574" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
diff --git a/src/main/java/ui/TMLComponentDesignPanel.java b/src/main/java/ui/TMLComponentDesignPanel.java
index 28b63c05cd..130fcfce4e 100755
--- a/src/main/java/ui/TMLComponentDesignPanel.java
+++ b/src/main/java/ui/TMLComponentDesignPanel.java
@@ -38,8 +38,6 @@
  */
 
 
-
-
 package ui;
 
 import myutil.GraphicLib;
@@ -60,47 +58,47 @@ import java.util.Iterator;
 import java.util.Vector;
 
 /**
-   * Class TMLComponentDesignPanel
-   * Managenemt of TML component-based design panels
-   * Creation: 10/03/2008
-   * @version 1.0 10/03/2008
-   * @author Ludovic APVRILLE, Andrea ENRICI
-   * @see MainGUI
+ * Class TMLComponentDesignPanel
+ * Managenemt of TML component-based design panels
+ * Creation: 10/03/2008
+ *
+ * @author Ludovic APVRILLE, Andrea ENRICI
+ * @version 1.0 10/03/2008
+ * @see MainGUI
  */
 public class TMLComponentDesignPanel extends TURTLEPanel {
-    
-	public TMLComponentTaskDiagramPanel tmlctdp;
-    
-	public Vector<TGComponent> validated, ignored;
+
+    public TMLComponentTaskDiagramPanel tmlctdp;
+
+    public Vector<TGComponent> validated, ignored;
 
     public TMLComponentDesignPanel(MainGUI _mgui) {
         super(_mgui);
-        
-    	// Issue #41 Ordering of tabbed panes 
+
+        // Issue #41 Ordering of tabbed panes
         tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
-        
+
         cl = new ChangeListener() {
-        	
-        	@Override
-        	public void stateChanged(ChangeEvent e){
-        		mgui.paneDesignAction(e);
-        	}
+
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                mgui.paneDesignAction(e);
+            }
         };
-        
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
-        
+
         // Issue #41: Ordering of tabbed panes
-        tabbedPane.setTabLayoutPolicy( JTabbedPane.SCROLL_TAB_LAYOUT );
+        tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
     }
 
-	
 
     public TMLActivityDiagramPanel getTMLActivityDiagramPanel(String _name) {
         TMLActivityDiagramPanel tmladp;
-        for(int i=1; i<panels.size(); i++) {
-            tmladp = (TMLActivityDiagramPanel)(panels.elementAt(i));
-            if (tmladp.getName().compareTo(_name) ==0 || _name.endsWith(tmladp.getName())) {
+        for (int i = 1; i < panels.size(); i++) {
+            tmladp = (TMLActivityDiagramPanel) (panels.elementAt(i));
+            if (tmladp.getName().compareTo(_name) == 0 || _name.endsWith(tmladp.getName())) {
                 return tmladp;
             }
         }
@@ -124,7 +122,7 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
         JPanel toolBarPanel = new JPanel();
         toolBarPanel.setLayout(new BorderLayout());
 
-        TMLActivityDiagramToolBar toolBarActivity       = new TMLActivityDiagramToolBar(mgui);
+        TMLActivityDiagramToolBar toolBarActivity = new TMLActivityDiagramToolBar(mgui);
         toolbars.add(toolBarActivity);
 
         TMLActivityDiagramPanel tmladp = new TMLActivityDiagramPanel(mgui, toolBarActivity);
@@ -133,7 +131,7 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(tmladp);
         tmladp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT );
+        jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
         toolBarPanel.add(toolBarActivity, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         panels.add(tmladp);
@@ -160,7 +158,7 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(tmlctdp);
         tmlctdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT );
+        jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
         toolBarPanel.add(toolBarTML, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab("TML Component Task Diagram", IconManager.imgic1208, toolBarPanel, "Opens TML component task diagram");
@@ -171,12 +169,12 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
         //jsp.setVisible(true);
     }
 
-     public String saveHeaderInXml(String extensionToName) {
-	 if (extensionToName == null) {
-	     return "<Modeling type=\"TML Component Design\" nameTab=\"" + mgui.getTabName(this) + "\" >\n";
-	 }
-	 return "<Modeling type=\"TML Component Design\" nameTab=\"" + mgui.getTabName(this) + extensionToName + "\" >\n";
-	 
+    public String saveHeaderInXml(String extensionToName) {
+        if (extensionToName == null) {
+            return "<Modeling type=\"TML Component Design\" nameTab=\"" + mgui.getTabName(this) + "\" >\n";
+        }
+        return "<Modeling type=\"TML Component Design\" nameTab=\"" + mgui.getTabName(this) + extensionToName + "\" >\n";
+
     }
 
     public String saveTailInXml() {
@@ -184,7 +182,7 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
     }
 
     public String toString() {
-        return mgui.getTitleAt(this) +  "(DIPLODOCUS Component Application diagram)";
+        return mgui.getTitleAt(this) + "(DIPLODOCUS Component Application diagram)";
     }
 
     public java.util.List<String> getAllNonMappedTMLPrimitiveComponentNames(String _name, TMLArchiDiagramPanel _tadp, boolean ref, String name) {
@@ -195,45 +193,46 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
         return tmlctdp.getPrimitiveComponentByName(_name);
     }
 
-	public String[] getCompOutChannels(){
-		return tmlctdp.getCompOutChannels();
-	}
+    public String[] getCompOutChannels() {
+        return tmlctdp.getCompOutChannels();
+    }
 
-	public String[] getCompInChannels(){
-		return tmlctdp.getCompInChannels();
-	}
+    public String[] getCompInChannels() {
+        return tmlctdp.getCompInChannels();
+    }
 
     public java.util.List<String> getAllTMLCommunicationNames(String _name) {
         return tmlctdp.getAllTMLCommunicationNames(_name);
     }
 
-    public java.util.List<String> getAllTMLInputPorts( String _name ) {
-        return tmlctdp.getAllTMLInputPorts( _name );
+    public java.util.List<String> getAllTMLInputPorts(String _name) {
+        return tmlctdp.getAllTMLInputPorts(_name);
     }
 
-    public java.util.List<String> getAllTMLEventNames( String _name ) {
-        return tmlctdp.getAllTMLEventNames( _name );
+    public java.util.List<String> getAllTMLEventNames(String _name) {
+        return tmlctdp.getAllTMLEventNames(_name);
     }
 
     public java.util.List<String> getAllCompositeComponent(String _name) {
         return tmlctdp.getAllCompositeComponent(_name);
     }
-		
-		public Vector<String> getAllTMLTasksAttributes() {
-			return tmlctdp.getAllTMLTasksAttributes();
-		}
+
+    public Vector<String> getAllTMLTasksAttributes() {
+        return tmlctdp.getAllTMLTasksAttributes();
+    }
+
     public java.util.List<String> getAllTMLTaskNames(String _name) {
-	return tmlctdp.getAllTMLTaskNames(_name);
+        return tmlctdp.getAllTMLTaskNames(_name);
     }
 
-    public void getListOfBreakPoints( java.util.List<Point> points ) {
-       // TGComponent tgc;
+    public void getListOfBreakPoints(java.util.List<Point> points) {
+        // TGComponent tgc;
         Iterator<TMLCPrimitiveComponent> iterator = tmlctdp.getPrimitiveComponentList().listIterator();
         TMLCPrimitiveComponent tmlcpc;
         TMLActivityDiagramPanel tmladp;
 
-        while(iterator.hasNext()) {
-           // tgc = (TGComponent)(iterator.next());
+        while (iterator.hasNext()) {
+            // tgc = (TGComponent)(iterator.next());
             //if (tgc instanceof TMLCPrimitiveComponent) {
             tmlcpc = iterator.next();
             if (tmlcpc.getDIPLOID() != -1) {
@@ -248,58 +247,58 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
 //            }
         }
     }
-    
-    public java.util.List<String> getAllCryptoConfig(){
-    	java.util.List<String> cryptoConfigs=new ArrayList<String>();
-    	TMLActivityDiagramPanel tmladp;
-        
-    	for(int i=1; i<panels.size(); i++) {
-            tmladp = (TMLActivityDiagramPanel)(panels.elementAt(i));
+
+    public java.util.List<String> getAllCryptoConfig() {
+        java.util.List<String> cryptoConfigs = new ArrayList<String>();
+        TMLActivityDiagramPanel tmladp;
+
+        for (int i = 1; i < panels.size(); i++) {
+            tmladp = (TMLActivityDiagramPanel) (panels.elementAt(i));
             cryptoConfigs.addAll(tmladp.getAllCryptoConfig());
         }
-	
-    	return cryptoConfigs;
+
+        return cryptoConfigs;
     }
-    
-    public java.util.List<String> getAllNonce(){
-    	java.util.List<String> ns=new ArrayList<String>();
-    	TMLActivityDiagramPanel tmladp;
-        
-    	for(int i=1; i<panels.size(); i++) {
-            tmladp = (TMLActivityDiagramPanel)(panels.elementAt(i));
+
+    public java.util.List<String> getAllNonce() {
+        java.util.List<String> ns = new ArrayList<String>();
+        TMLActivityDiagramPanel tmladp;
+
+        for (int i = 1; i < panels.size(); i++) {
+            tmladp = (TMLActivityDiagramPanel) (panels.elementAt(i));
             ns.addAll(tmladp.getAllNonce());
         }
-	return ns;
+        return ns;
     }
 
-    public ArrayList<String> getAllKeys(){
-	ArrayList<String> ns=new ArrayList<String>();
-	TMLActivityDiagramPanel tmladp;
-        for(int i=1; i<panels.size(); i++) {
-            tmladp = (TMLActivityDiagramPanel)(panels.elementAt(i));
+    public ArrayList<String> getAllKeys() {
+        ArrayList<String> ns = new ArrayList<String>();
+        TMLActivityDiagramPanel tmladp;
+        for (int i = 1; i < panels.size(); i++) {
+            tmladp = (TMLActivityDiagramPanel) (panels.elementAt(i));
             ns.addAll(tmladp.getAllKeys());
         }
-	return ns;
+        return ns;
     }
 
     public String[] getAllOutEvents(String nameOfComponent) {
-	return tmlctdp.getAllOutEvents(nameOfComponent);
+        return tmlctdp.getAllOutEvents(nameOfComponent);
     }
 
     public String[] getAllInEvents(String nameOfComponent) {
-	return tmlctdp.getAllInEvents(nameOfComponent);
+        return tmlctdp.getAllInEvents(nameOfComponent);
     }
 
     public String[] getAllOutChannels(String nameOfComponent) {
-	return tmlctdp.getAllOutChannels(nameOfComponent);
+        return tmlctdp.getAllOutChannels(nameOfComponent);
     }
 
     public String[] getAllInChannels(String nameOfComponent) {
-	return tmlctdp.getAllInChannels(nameOfComponent);
+        return tmlctdp.getAllInChannels(nameOfComponent);
     }
 
     public String[] getAllOutRequests(String nameOfComponent) {
-	return tmlctdp.getAllOutRequests(nameOfComponent);
+        return tmlctdp.getAllOutRequests(nameOfComponent);
     }
-  
+
 }
diff --git a/src/main/java/ui/tmlad/TMLADSendEvent.java b/src/main/java/ui/tmlad/TMLADSendEvent.java
index 5c0a73288c..73e39c03a0 100755
--- a/src/main/java/ui/tmlad/TMLADSendEvent.java
+++ b/src/main/java/ui/tmlad/TMLADSendEvent.java
@@ -37,8 +37,6 @@
  */
 
 
-
-
 package ui.tmlad;
 
 import myutil.GraphicLib;
@@ -55,22 +53,23 @@ import java.awt.geom.Line2D;
 import java.util.ArrayList;
 
 /**
-   * Class TMLADSendEvent
-   * Action of sending an event
-   * Creation: 21/11/2005
-   * @version 1.0 21/11/2005
-   * @author Ludovic APVRILLE
+ * Class TMLADSendEvent
+ * Action of sending an event
+ * Creation: 21/11/2005
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 21/11/2005
  */
 public class TMLADSendEvent extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
-    protected int textX =  5;
-    protected int textY =  15;
+    protected int textX = 5;
+    protected int textY = 15;
     protected int arc = 5;
     protected int linebreak = 10;
 
     protected String eventName = "evt";
     int nParam = 5;
-    protected String [] params = new String[nParam];
+    protected String[] params = new String[nParam];
 
     protected int stateOfError = 0; // Not yet checked
 
@@ -80,7 +79,7 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
 
     public int reachabilityInformation;
 
-    public TMLADSendEvent(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
+    public TMLADSendEvent(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
         super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
 
         width = 30;
@@ -92,7 +91,7 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
         connectingPoint[0] = new TGConnectingPointTMLAD(this, 0, -lineLength, true, false, 0.5, 0.0);
         connectingPoint[1] = new TGConnectingPointTMLAD(this, 0, lineLength, false, true, 0.5, 1.0);
 
-        for(int i=0; i<nParam; i++) {
+        for (int i = 0; i < nParam; i++) {
             params[i] = "";
         }
         //params[0] = "1";
@@ -109,26 +108,26 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
 
     public void internalDrawing(Graphics g) {
 
-        int w  = g.getFontMetrics().stringWidth(value);
+        int w = g.getFontMetrics().stringWidth(value);
         int w1 = Math.max(minWidth, w + 2 * textX);
         if ((w1 != width) & (!tdp.isScaled())) {
-            setCd(x + width/2 - w1/2, y);
+            setCd(x + width / 2 - w1 / 2, y);
             width = w1;            //updateConnectingPoints();
         }
 
 
-        if (stateOfError > 0)  {
+        if (stateOfError > 0) {
             Color c = g.getColor();
-            switch(stateOfError) {
-            case ErrorHighlight.OK:
-                g.setColor(ColorManager.TML_PORT_EVENT);
-                break;
-            default:
-                g.setColor(ColorManager.UNKNOWN_BOX_ACTION);
+            switch (stateOfError) {
+                case ErrorHighlight.OK:
+                    g.setColor(ColorManager.TML_PORT_EVENT);
+                    break;
+                default:
+                    g.setColor(ColorManager.UNKNOWN_BOX_ACTION);
             }
             // Making the polygon
-            int [] px1 = {x, x+width-linebreak, x+width, x+width-linebreak, x};
-            int [] py1 = {y, y, y+(height/2), y+height, y+height};
+            int[] px1 = {x, x + width - linebreak, x + width, x + width - linebreak, x};
+            int[] py1 = {y, y, y + (height / 2), y + height, y + height};
             g.fillPolygon(px1, py1, 5);
             g.setColor(c);
         }
@@ -137,8 +136,8 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
         Color c = g.getColor();
         //System.out.println("Color=" + c);
 
-        g.drawLine(x+(width/2), y, x+(width/2), y - lineLength);
-        g.drawLine(x+(width/2), y+height, x+(width/2), y + lineLength + height);
+        g.drawLine(x + (width / 2), y, x + (width / 2), y - lineLength);
+        g.drawLine(x + (width / 2), y + height, x + (width / 2), y + lineLength + height);
 
         /*if (g.getColor().equals(ColorManager.NORMAL_0)) {
           g.setColor(ColorManager.TML_PORT_EVENT);
@@ -149,58 +148,58 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
         int height1 = height;
         int width1 = width;
         g.setColor(ColorManager.TML_PORT_EVENT);
-        g.drawLine(x1, y1, x1+width1-linebreak, y1);
-        g.drawLine(x1, y1+height1, x1+width1-linebreak, y1+height1);
-        g.drawLine(x1, y1, x1, y1+height1);
-        g.drawLine(x1+width1-linebreak, y1, x1+width1, y1+height1/2);
-        g.drawLine(x1+width1-linebreak, y1+height1, x1+width1, y1+height1/2);
+        g.drawLine(x1, y1, x1 + width1 - linebreak, y1);
+        g.drawLine(x1, y1 + height1, x1 + width1 - linebreak, y1 + height1);
+        g.drawLine(x1, y1, x1, y1 + height1);
+        g.drawLine(x1 + width1 - linebreak, y1, x1 + width1, y1 + height1 / 2);
+        g.drawLine(x1 + width1 - linebreak, y1 + height1, x1 + width1, y1 + height1 / 2);
         g.setColor(c);
 
-        g.drawLine(x, y, x+width-linebreak, y);
-        g.drawLine(x, y+height, x+width-linebreak, y+height);
-        g.drawLine(x, y, x, y+height);
-        g.drawLine(x+width-linebreak, y, x+width, y+height/2);
-        g.drawLine(x+width-linebreak, y+height, x+width, y+height/2);
+        g.drawLine(x, y, x + width - linebreak, y);
+        g.drawLine(x, y + height, x + width - linebreak, y + height);
+        g.drawLine(x, y, x, y + height);
+        g.drawLine(x + width - linebreak, y, x + width, y + height / 2);
+        g.drawLine(x + width - linebreak, y + height, x + width, y + height / 2);
 
 
+        g.drawString("evt", x + (width - w) / 2, y);
+        g.drawString(value, x + (width - w) / 2, y + textY);
 
-        g.drawString("evt", x+(width-w) / 2, y);
-        g.drawString(value, x + (width - w) / 2 , y + textY);
-	
-	drawReachabilityInformation(g);
+        drawReachabilityInformation(g);
 
     }
- 
+
     public void drawReachabilityInformation(Graphics g) {
         if (reachabilityInformation > 0) {
 
             Color c = g.getColor();
             Color c1;
-            switch(reachabilityInformation) {
-            case REACHABLE:
-                c1 = Color.green;
-                break;
-            case NOT_REACHABLE:
-                c1 = Color.red;
-                break;
-            default:
-                return;
+            switch (reachabilityInformation) {
+                case REACHABLE:
+                    c1 = Color.green;
+                    break;
+                case NOT_REACHABLE:
+                    c1 = Color.red;
+                    break;
+                default:
+                    return;
             }
 
-            GraphicLib.arrowWithLine(g, 1, 0, 10, x-30, y-3, x-15, y-3, true);
-            g.drawOval(x-11, y-10, 7, 9);
+            GraphicLib.arrowWithLine(g, 1, 0, 10, x - 30, y - 3, x - 15, y - 3, true);
+            g.drawOval(x - 11, y - 10, 7, 9);
             g.setColor(c1);
-            g.fillRect(x-12, y-7, 9, 7);
+            g.fillRect(x - 12, y - 7, 9, 7);
             g.setColor(c);
-            g.drawRect(x-12, y-7, 9, 7);
+            g.drawRect(x - 12, y - 7, 9, 7);
         }
     }
+
     public TGComponent isOnMe(int _x, int _y) {
         if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
             return this;
         }
 
-        if ((int)(Line2D.ptSegDistSq(x+(width/2), y-lineLength, x+(width/2), y + lineLength + height, _x, _y)) < distanceSelected) {
+        if ((int) (Line2D.ptSegDistSq(x + (width / 2), y - lineLength, x + (width / 2), y + lineLength + height, _x, _y)) < distanceSelected) {
             return this;
         }
 
@@ -210,7 +209,7 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
     public void makeValue() {
         boolean first = true;
         value = eventName + "(";
-        for(int i=0; i<nParam; i++) {
+        for (int i = 0; i < nParam; i++) {
             if (params[i].length() > 0) {
                 if (!first) {
                     value += ", " + params[i];
@@ -245,12 +244,12 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
 
     public String getRealParamValue(int index) {
         int cpt = 0;
-        for(int i=0; i<nParam; i++) {
+        for (int i = 0; i < nParam; i++) {
             if (params[i].length() > 0) {
                 if (cpt == index) {
                     return params[i];
                 }
-                cpt ++;
+                cpt++;
             }
         }
         return "";
@@ -258,9 +257,9 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
 
     public int realNbOfParams() {
         int cpt = 0;
-        for(int i=0; i<nParam; i++) {
+        for (int i = 0; i < nParam; i++) {
             if (params[i].length() > 0) {
-                cpt ++;
+                cpt++;
             }
         }
         return cpt;
@@ -271,28 +270,28 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
     }
 
     public boolean editOndoubleClick(JFrame frame) {
-        String [] labels = new String[nParam + 1];
-        String [] values = new String[nParam + 1];
+        String[] labels = new String[nParam + 1];
+        String[] values = new String[nParam + 1];
         labels[0] = "Event name";
         values[0] = eventName;
-        for(int i=0; i<nParam; i++) {
-            labels[i+1] = "Param #" + (i+1);
-            values[i+1] = params[i];
+        for (int i = 0; i < nParam; i++) {
+            labels[i + 1] = "Param #" + (i + 1);
+            values[i + 1] = params[i];
         }
-	ArrayList<String []> help = new ArrayList<String []>();
-	String[] allOutEvents = tdp.getMGUI().getAllOutEvents();
-	help.add(allOutEvents);
-	
-	
-        JDialogMultiString jdms = new JDialogMultiString(frame, "Setting event's properties", nParam+1, labels, values, help);
-      //  jdms.setSize(450, 300);
+        ArrayList<String[]> help = new ArrayList<String[]>();
+        String[] allOutEvents = tdp.getMGUI().getAllOutEvents();
+        help.add(allOutEvents);
+
+
+        JDialogMultiString jdms = new JDialogMultiString(frame, "Setting event's properties", nParam + 1, labels, values, help);
+        //  jdms.setSize(450, 300);
         GraphicLib.centerOnParent(jdms, 450, 300);
-        jdms.setVisible( true ); // blocked until dialog has been closed
+        jdms.setVisible(true); // blocked until dialog has been closed
 
         if (jdms.hasBeenSet() && (jdms.hasValidString(0))) {
             eventName = jdms.getString(0);
-            for(int i=0; i<nParam; i++) {
-                params[i] = jdms.getString(i+1);
+            for (int i = 0; i < nParam; i++) {
+                params[i] = jdms.getString(i + 1);
             }
 
             makeValue();
@@ -310,7 +309,7 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
         sb.append("\" nbOfParams=\"");
         sb.append(nbOfParams());
         sb.append("\" />\n");
-        for(int i=0; i<nParam; i++) {
+        for (int i = 0; i < nParam; i++) {
             if (params[i].length() > 0) {
                 sb.append("<Param index=\"");
                 sb.append(i);
@@ -324,7 +323,7 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
     }
 
     @Override
-    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException {
         //System.out.println("*** load extra synchro *** " + getId());
         try {
 
@@ -337,12 +336,12 @@ public class TMLADSendEvent extends TGCWithoutInternalComponent implements Check
             //System.out.println("Loading Synchronization gates");
             //System.out.println(nl.toString());
 
-            for(int i=0; i<nl.getLength(); i++) {
+            for (int i = 0; i < nl.getLength(); i++) {
                 n1 = nl.item(i);
                 //System.out.println(n1);
                 if (n1.getNodeType() == Node.ELEMENT_NODE) {
                     nli = n1.getChildNodes();
-                    for(int j=0; j<nli.getLength(); j++) {
+                    for (int j = 0; j < nli.getLength(); j++) {
                         n2 = nli.item(j);
                         //System.out.println(n2);
                         if (n2.getNodeType() == Node.ELEMENT_NODE) {
diff --git a/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java b/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
index 84285ea558..1a3ec1b28b 100755
--- a/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
+++ b/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
@@ -38,8 +38,6 @@
  */
 
 
-
-
 package ui.tmlcompd;
 
 
@@ -54,12 +52,13 @@ import java.util.*;
  * Class TMLComponentTaskDiagramPanel
  * Panel for drawing TML component-tasks
  * Creation: 10/03/2008
- * @version 1.0 10/03/2008
+ *
  * @author Ludovic APVRILLE, Andrea ENRICI
+ * @version 1.0 10/03/2008
  */
 public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
 
-    public  TMLComponentTaskDiagramPanel(MainGUI mgui, TToolBar _ttb) {
+    public TMLComponentTaskDiagramPanel(MainGUI mgui, TToolBar _ttb) {
         super(mgui, _ttb);
         /*TDiagramMouseManager tdmm = new TDiagramMouseManager(this);
           addMouseListener(tdmm);
@@ -81,7 +80,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
     public boolean actionOnAdd(TGComponent tgc) {
         //System.out.println("Action on add! value=" + tgc.getValue());
         if (tgc instanceof TMLCPrimitiveComponent) {
-            TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent)(tgc);
+            TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent) (tgc);
             //System.out.println(" *** Add component *** name=" + tmcpc.getValue());
             mgui.addTMLCPrimitiveComponent(tp, tmcpc.getValue());
             return true;
@@ -92,7 +91,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         //updatePorts();
         if (tgc instanceof TMLCCompositePort) {
             if (tgc.getFather() instanceof TMLCCompositeComponent) {
-                getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent)(tgc.getFather()));
+                getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent) (tgc.getFather()));
             }
         }
 
@@ -102,18 +101,18 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
     public boolean actionOnRemove(TGComponent tgc) {
         //System.out.println("Action on remove tgc=" + tgc + " value=" + tgc.getValue());
         if (tgc instanceof TMLCPrimitiveComponent) {
-            TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent)(tgc);
+            TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent) (tgc);
             mgui.removeTMLCPrimitiveComponent(tp, tmcpc.getValue());
             //resetAllInstancesOf(tgcc);
             return true;
         }
 
         if (tgc instanceof TMLCCompositeComponent) {
-            TMLCCompositeComponent tmcc = (TMLCCompositeComponent)(tgc);
-            Iterator<TMLCPrimitiveComponent> iterator =  tmcc.getAllPrimitiveComponents().listIterator();
+            TMLCCompositeComponent tmcc = (TMLCCompositeComponent) (tgc);
+            Iterator<TMLCPrimitiveComponent> iterator = tmcc.getAllPrimitiveComponents().listIterator();
             TMLCPrimitiveComponent tmcpc;
 
-            while(iterator.hasNext()) {
+            while (iterator.hasNext()) {
                 tmcpc = iterator.next();
                 mgui.removeTMLCPrimitiveComponent(tp, tmcpc.getValue());
             }
@@ -137,7 +136,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             updatePorts();
             //System.out.println("fatherOfRemoved = " + fatherOfRemoved);
             if (fatherOfRemoved instanceof TMLCCompositeComponent) {
-                getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent)(fatherOfRemoved));
+                getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent) (fatherOfRemoved));
                 //System.out.println("Shall do the update");
             }
         }
@@ -145,21 +144,21 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         return true;
     }
 
-    public List<TMLCPrimitivePort> getPortsByName(String name){
+    public List<TMLCPrimitivePort> getPortsByName(String name) {
         List<TMLCPrimitivePort> ports = new ArrayList<TMLCPrimitivePort>();
-        for (TGComponent tgc : componentList){
+        for (TGComponent tgc : componentList) {
 
-            if (tgc instanceof TMLCPrimitiveComponent){
+            if (tgc instanceof TMLCPrimitiveComponent) {
                 TMLCPrimitiveComponent comp = (TMLCPrimitiveComponent) tgc;
                 List<TMLCPrimitivePort> cps = comp.getAllChannelsOriginPorts();
-                for (TMLCPrimitivePort port : cps){
-                    if (port.commName.equals(name)){
+                for (TMLCPrimitivePort port : cps) {
+                    if (port.commName.equals(name)) {
                         ports.add(port);
                     }
                 }
                 cps = comp.getAllChannelsDestinationPorts();
-                for (TMLCPrimitivePort port : cps){
-                    if (port.commName.equals(name)){
+                for (TMLCPrimitivePort port : cps) {
+                    if (port.commName.equals(name)) {
                         ports.add(port);
                     }
                 }
@@ -171,12 +170,12 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
     public boolean actionOnValueChanged(TGComponent tgc) {
         //System.out.println("Action on value changed on component:" + tgc);
         if (tgc instanceof TMLCPrimitiveComponent) {
-            TMLCPrimitiveComponent t = (TMLCPrimitiveComponent)tgc;
+            TMLCPrimitiveComponent t = (TMLCPrimitiveComponent) tgc;
             mgui.newTMLTaskName(tp, t.oldValue, t.getValue());
             return true;
         }
         if (tgc instanceof TMLCCompositeComponent) {
-            TMLCCompositeComponent tmlcc = (TMLCCompositeComponent)tgc;
+            TMLCCompositeComponent tmlcc = (TMLCCompositeComponent) tgc;
             getMGUI().updateReferenceToTMLCCompositeComponent(tmlcc);
         }
         return true;
@@ -193,17 +192,18 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
     public boolean nameRecordComponentInUse(String oldValue, String newValue) {
         boolean ko = mgui.nameComponentInUse(tp, oldValue, newValue);
-        return ko? ko : nameAllRecordComponentInUse(oldValue, newValue);
+        return ko ? ko : nameAllRecordComponentInUse(oldValue, newValue);
     }
 
     /**
      * Check if newvalue is already a name of a component.
-     * @author Fabien Tessier
+     *
      * @param newvalue
      * @return true if the name is used
+     * @author Fabien Tessier
      */
     public boolean isCompositeNameUsed(String newvalue) {
-        for (TGComponent tgc: this.componentList) {
+        for (TGComponent tgc : this.componentList) {
             if (tgc.getValue().equals(newvalue))
                 return true;
         }
@@ -215,7 +215,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         Iterator<TMLCRecordComponent> iterator = getRecordComponentList().listIterator();
         TMLCRecordComponent record;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             record = iterator.next();
 
             if (record.getName().compareTo(newValue) == 0) {
@@ -232,7 +232,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         Iterator<TGComponent> iterator = componentList.listIterator();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCRecordComponent) {
@@ -240,11 +240,11 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             }
 
             if (tgc instanceof TMLCCompositeComponent) {
-                ll.addAll(((TMLCCompositeComponent)tgc).getAllRecordComponents());
+                ll.addAll(((TMLCCompositeComponent) tgc).getAllRecordComponents());
             }
 
             if (tgc instanceof TMLCRemoteCompositeComponent) {
-                ll.addAll(((TMLCRemoteCompositeComponent)tgc).getAllRecordComponents());
+                ll.addAll(((TMLCRemoteCompositeComponent) tgc).getAllRecordComponents());
             }
         }
 
@@ -257,19 +257,19 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         Iterator<TGComponent> iterator = componentList.listIterator();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCPrimitiveComponent) {
-                ll.add( (TMLCPrimitiveComponent) tgc );
+                ll.add((TMLCPrimitiveComponent) tgc);
             }
 
             if (tgc instanceof TMLCCompositeComponent) {
-                ll.addAll(((TMLCCompositeComponent)tgc).getAllPrimitiveComponents());
+                ll.addAll(((TMLCCompositeComponent) tgc).getAllPrimitiveComponents());
             }
 
             if (tgc instanceof TMLCRemoteCompositeComponent) {
-                ll.addAll(((TMLCRemoteCompositeComponent)tgc).getAllPrimitiveComponents());
+                ll.addAll(((TMLCRemoteCompositeComponent) tgc).getAllPrimitiveComponents());
             }
         }
 
@@ -285,17 +285,17 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         ll = getAllPortsConnectedTo(_port);
         Iterator<TGComponent> li = ll.listIterator();
 
-        while(li.hasNext()) {
+        while (li.hasNext()) {
             o = li.next();
 
             if (o instanceof TMLCPrimitivePort) {
-                p = (TMLCPrimitivePort)o;
+                p = (TMLCPrimitivePort) o;
 
                 //   if (p.getFather() != null) {
                 if (p.getFather() instanceof TMLCPrimitiveComponent) {
                     if (componentsToTakeIntoAccount.contains(p.getFather())) {
                         //TraceManager.addDev("-> port " + _port + " is connected to " + o);
-                        ret.add( p );
+                        ret.add(p);
                     }
                 }
                 //    }
@@ -307,7 +307,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
     public List<TGComponent> getAllPortsConnectedTo(TMLCPrimitivePort _port) {
         List<TGComponent> ll = new LinkedList<TGComponent>();
-        getAllPortsConnectedTo( ll, _port );
+        getAllPortsConnectedTo(ll, _port);
 
         return ll;
     }
@@ -328,7 +328,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         //TraceManager.addDev("*** Adding channels ***");
 
-        while( iterator.hasNext() ) {
+        while (iterator.hasNext()) {
             //            tgc = iterator.next();
             //            if( tgc instanceof TMLCPrimitiveComponent ) {
             tmlc = iterator.next();
@@ -336,31 +336,30 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             ports = tmlc.getAllChannelsOriginPorts();
             //TraceManager.addDev("Ports size:" + ports.size());
             li = ports.listIterator();
-            while( li.hasNext() ) {
+            while (li.hasNext()) {
                 port1 = li.next();
-                portstome = getPortsConnectedTo( port1, components );
+                portstome = getPortsConnectedTo(port1, components);
                 //TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
 
                 Iterator<TMLCPrimitivePort> ite = portstome.listIterator();
 
-                while( ite.hasNext()) {
+                while (ite.hasNext()) {
                     //if ( portstome.size() == 1 ) {
                     //TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
                     port2 = ite.next();
                     if (!port2.isOrigin()) {
-                        String []text1 = port1.getPortName().split( "," );
-                        String []text2 = port2.getPortName().split( "," );
-                        for ( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
+                        String[] text1 = port1.getPortName().split(",");
+                        String[] text2 = port2.getPortName().split(",");
+                        for (j = 0; j < Math.min(text1.length, text2.length); j++) {
                             name1 = text1[j].trim();
                             name2 = text2[j].trim();
-                            if( name1.equals( name2 ) ) {
+                            if (name1.equals(name2)) {
                                 name = name1;
-                            }
-                            else {
+                            } else {
                                 name = name1 + "__" + name2;
                             }
                             //TraceManager.addDev( "About to add " + _topname + " " + name + " " );
-                            al.add( _topname + "::" + name );
+                            al.add(_topname + "::" + name);
                         }
                     }
                 }
@@ -371,7 +370,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         return al;
     }
 
-    public List<String> getAllTMLInputPorts( String _topname ) {   //the destination ports
+    public List<String> getAllTMLInputPorts(String _topname) {   //the destination ports
 
         //Use HashSet to avoid returning multiple identical ports due to the presence of join nodes
         Set<String> al = new HashSet<String>();
@@ -386,7 +385,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         TMLCPrimitivePort port1, port2;
         int j;
 
-        while( iterator.hasNext() ) {
+        while (iterator.hasNext()) {
             //tgc = iterator.next();
 
             //if( tgc instanceof TMLCPrimitiveComponent ) {
@@ -395,23 +394,23 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             ports = tmlc.getAllChannelsOriginPorts();
             //TraceManager.addDev("Ports size:" + ports.size());
             li = ports.listIterator();
-            while( li.hasNext() ) {
+            while (li.hasNext()) {
                 port1 = li.next();
-                portstome = getPortsConnectedTo( port1, components );   //this prints the ports via TraceManager
+                portstome = getPortsConnectedTo(port1, components);   //this prints the ports via TraceManager
                 //TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
                 Iterator<TMLCPrimitivePort> ite = portstome.listIterator();
-                while( ite.hasNext()) {
+                while (ite.hasNext()) {
                     //if ( portstome.size() == 1 ) {
                     //TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
                     port2 = ite.next();
-                    if( !port2.isOrigin() ) {
-                        String []text1 = port1.getPortName().split( "," );
-                        String []text2 = port2.getPortName().split( "," );
-                        for( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
+                    if (!port2.isOrigin()) {
+                        String[] text1 = port1.getPortName().split(",");
+                        String[] text2 = port2.getPortName().split(",");
+                        for (j = 0; j < Math.min(text1.length, text2.length); j++) {
                             //name1 = text1[j].trim();
                             name2 = text2[j].trim();
                             //TraceManager.addDev( "The input port is: " + name2 );
-                            al.add( _topname + "::" + name2 );
+                            al.add(_topname + "::" + name2);
                         }
                     }
                 }
@@ -422,7 +421,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         //return ArrayList<String>( Arrays.asListal );
     }
 
-    public List<String> getAllTMLEventNames( String _topname ) {
+    public List<String> getAllTMLEventNames(String _topname) {
 
         List<String> al = new ArrayList<String>();
         //     TGComponent tgc;
@@ -435,36 +434,35 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         TMLCPrimitivePort port1, port2;
         int j;
 
-        while( iterator.hasNext() ) {
-            tmlc = iterator.next() ;
+        while (iterator.hasNext()) {
+            tmlc = iterator.next();
             // if( tgc instanceof TMLCPrimitiveComponent ) {
             //   tmlc = ( TMLCPrimitiveComponent )tgc;
             //TraceManager.addDev("Component:" + tmlc.getValue());
             ports = tmlc.getAllEventsOriginPorts();
             //TraceManager.addDev("Ports size:" + ports.size());
             li = ports.listIterator();
-            while( li.hasNext() ) {
+            while (li.hasNext()) {
                 port1 = li.next();
-                portstome = getPortsConnectedTo( port1, components );
+                portstome = getPortsConnectedTo(port1, components);
                 //TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
                 //Iterator<TMLCPrimitivePort> ite = portstome.listIterator();
                 //while(ite.hasNext()) {
                 //TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
                 //}
-                if ( portstome.size() == 1 ) {
+                if (portstome.size() == 1) {
                     port2 = portstome.get(0);
-                    String []text1 = port1.getPortName().split( "," );
-                    String []text2 = port2.getPortName().split( "," );
-                    for ( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
+                    String[] text1 = port1.getPortName().split(",");
+                    String[] text2 = port2.getPortName().split(",");
+                    for (j = 0; j < Math.min(text1.length, text2.length); j++) {
                         name1 = text1[j].trim();
                         name2 = text2[j].trim();
-                        if( name1.equals( name2 ) ) {
+                        if (name1.equals(name2)) {
                             name = name1;
-                        }
-                        else {
+                        } else {
                             name = name1 + "__" + name2;
                         }
-                        al.add( _topname + "::" + name );
+                        al.add(_topname + "::" + name);
                     }
                 }
             }
@@ -475,18 +473,17 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
     }
 
 
-
-    public void getAllPortsConnectedTo( List<TGComponent> ll, TMLCPrimitivePort _port) {
+    public void getAllPortsConnectedTo(List<TGComponent> ll, TMLCPrimitivePort _port) {
         List<TGComponent> components = getMGUI().getAllTMLComponents();
         Iterator<TGComponent> iterator = components.listIterator();
         TGComponent tgc, tgc1, tgc2;
         TMLCPortConnector portco;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCPortConnector) {
-                portco = (TMLCPortConnector)tgc;
+                portco = (TMLCPortConnector) tgc;
                 //System.out.println("portco");
                 tgc1 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP1());
                 tgc2 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP2());
@@ -494,11 +491,11 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
                     //TraceManager.addDev("tgc1=" + tgc1 + " tgc2=" + tgc2);
 
                     if (tgc1 instanceof TMLCRemoteCompositeComponent) {
-                        tgc1 = ((TMLCRemoteCompositeComponent)tgc1).getPortOf(portco.getTGConnectingPointP1());
+                        tgc1 = ((TMLCRemoteCompositeComponent) tgc1).getPortOf(portco.getTGConnectingPointP1());
                     }
 
                     if (tgc2 instanceof TMLCRemoteCompositeComponent) {
-                        tgc2 = ((TMLCRemoteCompositeComponent)tgc2).getPortOf(portco.getTGConnectingPointP2());
+                        tgc2 = ((TMLCRemoteCompositeComponent) tgc2).getPortOf(portco.getTGConnectingPointP2());
                     }
 
                     //System.out.println("tgc1=" + tgc1 + " tgc2=" + tgc2);
@@ -518,7 +515,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
     }
 
     public String getXMLHead() {
-        return "<TMLComponentTaskDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() + zoomParam() +" >";
+        return "<TMLComponentTaskDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() + zoomParam() + " >";
     }
 
     public String getXMLTail() {
@@ -542,7 +539,6 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
     }
 
 
-
     public boolean areAttributesVisible() {
         return attributesVisible;
     }
@@ -588,11 +584,11 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         List<String> list = new ArrayList<String>();
         //String name;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCPrimitiveComponent) {
-                addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent)tgc, list, _topName, _tadp, ref, _name);
+                addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent) tgc, list, _topName, _tadp, ref, _name);
             }
             if (tgc instanceof TMLCCompositeComponent) {
                 getAllNonMappedTMLPrimitiveComponentNamesByComponent(tgc, list, _topName, _tadp, ref, _name);
@@ -605,10 +601,10 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
     public void getAllNonMappedTMLPrimitiveComponentNamesByComponent(TGComponent tgc, List<String> list, String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
         TGComponent tgc1;
 
-        for(int i=0; i<tgc.getNbInternalTGComponent(); i++) {
-            tgc1 = tgc.getInternalTGComponent(i) ;
+        for (int i = 0; i < tgc.getNbInternalTGComponent(); i++) {
+            tgc1 = tgc.getInternalTGComponent(i);
             if (tgc1 instanceof TMLCPrimitiveComponent) {
-                addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent)tgc1, list, _topName, _tadp, ref, _name);
+                addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent) tgc1, list, _topName, _tadp, ref, _name);
             }
             if (tgc1 instanceof TMLCCompositeComponent) {
                 getAllNonMappedTMLPrimitiveComponentNamesByComponent(tgc1, list, _topName, _tadp, ref, _name);
@@ -623,11 +619,11 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         TMLCCompositeComponent tmlcc;
         Iterator<TGComponent> iterator = componentList.listIterator();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc1 = iterator.next();
 
             if (tgc1 instanceof TMLCCompositeComponent) {
-                tmlcc = (TMLCCompositeComponent)tgc1;
+                tmlcc = (TMLCCompositeComponent) tgc1;
                 s = _name + "::" + tmlcc.getValue();
                 list.add(s);
                 tmlcc.getAllCompositeComponents(list, _name);
@@ -643,26 +639,26 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         if (ref && name1.equals(_name)) {
             list.add(_topName + "::" + name1);
         } else {
-            if (!_tadp.isMapped(_topName,  name1)) {
+            if (!_tadp.isMapped(_topName, name1)) {
                 list.add(_topName + "::" + name1);
             }
         }
     }
 
-    public String[] getCompOutChannels(){
+    public String[] getCompOutChannels() {
         List<String> chls = new ArrayList<String>();
         TGComponent tgc;
         Iterator<TGComponent> iterator = componentList.listIterator();
         // List<String> list = new ArrayList<String>();
         TMLCPrimitiveComponent tmp;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
             if (tgc instanceof TMLCPrimitiveComponent) {
                 TMLCPrimitiveComponent comp = (TMLCPrimitiveComponent) tgc;
                 List<TMLCPrimitivePort> ll = comp.getAllChannelsOriginPorts();
                 Iterator<TMLCPrimitivePort> ite = ll.listIterator();
-                while(ite.hasNext()) {
+                while (ite.hasNext()) {
                     TMLCPrimitivePort port = ite.next();
                     chls.add(port.getPortName());
                 }
@@ -673,20 +669,20 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         return chlArray;
     }
 
-    public String[] getCompInChannels(){
+    public String[] getCompInChannels() {
         List<String> chls = new ArrayList<String>();
         TGComponent tgc;
         Iterator<TGComponent> iterator = componentList.listIterator();
         // List<String> list = new ArrayList<String>();
         TMLCPrimitiveComponent tmp;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
             if (tgc instanceof TMLCPrimitiveComponent) {
                 TMLCPrimitiveComponent comp = (TMLCPrimitiveComponent) tgc;
                 List<TMLCPrimitivePort> ll = comp.getAllChannelsDestinationPorts();
                 Iterator<TMLCPrimitivePort> ite = ll.listIterator();
-                while(ite.hasNext()) {
+                while (ite.hasNext()) {
                     TMLCPrimitivePort port = ite.next();
                     chls.add(port.getPortName());
                 }
@@ -704,23 +700,23 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         // List<String> list = new ArrayList<String>();
         TMLCPrimitiveComponent tmp;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
             if (tgc instanceof TMLCPrimitiveComponent) {
                 if (tgc.getValue().equals(_name)) {
-                    return ((TMLCPrimitiveComponent)tgc);
+                    return ((TMLCPrimitiveComponent) tgc);
                 }
             }
 
             if (tgc instanceof TMLCCompositeComponent) {
-                tmp = ((TMLCCompositeComponent)tgc).getPrimitiveComponentByName(_name);
+                tmp = ((TMLCCompositeComponent) tgc).getPrimitiveComponentByName(_name);
                 if (tmp != null) {
                     return tmp;
                 }
             }
 
             if (tgc instanceof TMLCRemoteCompositeComponent) {
-                tmp = ((TMLCRemoteCompositeComponent)tgc).getPrimitiveComponentByName(_name);
+                tmp = ((TMLCRemoteCompositeComponent) tgc).getPrimitiveComponentByName(_name);
                 if (tmp != null) {
                     return tmp;
                 }
@@ -735,15 +731,15 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         Iterator<TGComponent> iterator = componentList.listIterator();
         TGComponent tgc;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCCompositeComponent) {
-                ((TMLCCompositeComponent)tgc).updateReferenceToTMLCCompositeComponent(tmlcc);
+                ((TMLCCompositeComponent) tgc).updateReferenceToTMLCCompositeComponent(tmlcc);
             }
 
             if (tgc instanceof TMLCRemoteCompositeComponent) {
-                ((TMLCRemoteCompositeComponent)tgc).updateReference(tmlcc);
+                ((TMLCRemoteCompositeComponent) tgc).updateReference(tmlcc);
             }
         }
     }
@@ -753,11 +749,11 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         Iterator<TGComponent> iterator = componentList.listIterator();
         TMLCCompositeComponent tmp;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCCompositeComponent) {
-                tmp = (TMLCCompositeComponent)tgc;
+                tmp = (TMLCCompositeComponent) tgc;
                 if (tmp.getValue().equals(_name)) {
                     return tmp;
                 }
@@ -778,7 +774,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         TGComponent tgc1;
         TGComponent tgc2;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCPortConnector) {
@@ -921,19 +917,19 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         try {
             s = elt.getAttribute("channels");
             //System.out.println("S=" + s);
-            if (s.compareTo("false") ==0) {
+            if (s.compareTo("false") == 0) {
                 setChannelsVisible(false);
             } else {
                 setChannelsVisible(true);
             }
             s = elt.getAttribute("events");
-            if (s.compareTo("false") ==0) {
+            if (s.compareTo("false") == 0) {
                 setEventsVisible(false);
             } else {
                 setEventsVisible(true);
             }
             s = elt.getAttribute("requests");
-            if (s.compareTo("false") ==0) {
+            if (s.compareTo("false") == 0) {
                 setRequestsVisible(false);
             } else {
                 setRequestsVisible(true);
@@ -957,7 +953,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         List<TGComponent> list = new ArrayList<TGComponent>();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (!(tgc instanceof TGConnector)) {
@@ -967,7 +963,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
 
         //System.out.println("Putting to back ...");
-        for(TGComponent tgc1: list) {
+        for (TGComponent tgc1 : list) {
             //System.out.println("Putting to back: " + tgc1);
             componentList.remove(tgc1);
             componentList.add(tgc1);
@@ -980,16 +976,16 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         iterator = componentList.listIterator();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCCompositeComponent) {
-                ((TMLCCompositeComponent)(tgc)).delayedLoad();
+                ((TMLCCompositeComponent) (tgc)).delayedLoad();
             }
 
             if (tgc instanceof TMLCRemoteCompositeComponent) {
                 try {
-                    ((TMLCRemoteCompositeComponent)(tgc)).delayedLoad();
+                    ((TMLCRemoteCompositeComponent) (tgc)).delayedLoad();
                 } catch (Exception e) {
                 }
             }
@@ -1004,7 +1000,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         //String error = "";
 
         // Checking rules of paths, and setting colors accordingly
-        for(TMLCPath path: paths) {
+        for (TMLCPath path : paths) {
             path.checkRules();
             if (path.hasError()) {
                 TraceManager.addDev("Path error:" + path.getErrorMessage());
@@ -1032,13 +1028,13 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         iterator = componentList.listIterator();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCCompositeComponent) {
-                ports.addAll(((TMLCCompositeComponent)tgc).getAllInternalCompositePorts());
-                pports.addAll(((TMLCCompositeComponent)tgc).getAllInternalPrimitivePorts());
-                referencedports.addAll(((TMLCCompositeComponent)tgc).getAllReferencedCompositePorts());
+                ports.addAll(((TMLCCompositeComponent) tgc).getAllInternalCompositePorts());
+                pports.addAll(((TMLCCompositeComponent) tgc).getAllInternalPrimitivePorts());
+                referencedports.addAll(((TMLCCompositeComponent) tgc).getAllReferencedCompositePorts());
             }
 
             /*if (tgc instanceof TMLCRemoteCompositeComponent) {
@@ -1047,24 +1043,24 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
               }*/
 
             if (tgc instanceof TMLCPrimitiveComponent) {
-                pports.addAll(((TMLCPrimitiveComponent)tgc).getAllInternalPrimitivePorts());
+                pports.addAll(((TMLCPrimitiveComponent) tgc).getAllInternalPrimitivePorts());
             }
 
             if (tgc instanceof TMLCCompositePort) {
-                ports.add((TMLCCompositePort)tgc);
+                ports.add((TMLCCompositePort) tgc);
             }
 
             if (tgc instanceof TMLCPrimitivePort) {
-                pports.add((TMLCPrimitivePort)tgc);
+                pports.add((TMLCPrimitivePort) tgc);
             }
 
             if (tgc instanceof TMLCChannelFacility) {
-                facilities.add((TMLCChannelFacility)tgc);
+                facilities.add((TMLCChannelFacility) tgc);
             }
         }
 
         // Remove All Current Links To Ports
-        for(TMLCCompositePort port:ports) {
+        for (TMLCCompositePort port : ports) {
             if (!referencedports.contains(port)) {
                 port.purge();
             }
@@ -1078,9 +1074,9 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         //System.out.println("pports size=" + pports.size() + " ports size=" + ports.size());
 
-        for(TMLCPrimitivePort pport:pports) {
+        for (TMLCPrimitivePort pport : pports) {
             //System.out.println("port id=" + pport.getId());
-            for(int i=0; i<pport.getNbConnectingPoint(); i++) {
+            for (int i = 0; i < pport.getNbConnectingPoint(); i++) {
                 tp = pport.getTGConnectingPointAtIndex(i);
                 connector = findTGConnectorUsing(tp);
                 if (connector != null) {
@@ -1111,7 +1107,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             tp2 = connector.getTGConnectingPointP1();
         }
 
-        TGComponent tgc = (TGComponent)(tp2.getFather());
+        TGComponent tgc = (TGComponent) (tp2.getFather());
         int index = tgc.getIndexOfTGConnectingPoint(tp2);
 
         if (tgc instanceof TMLCPrimitivePort) {
@@ -1126,9 +1122,9 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         }
 
         //System.out.println("Composite port? tgc=" + tgc);
-        if(tgc instanceof TMLCCompositePort) {
+        if (tgc instanceof TMLCCompositePort) {
             //System.out.println("Composite port!");
-            cp = (TMLCChannelFacility)tgc;
+            cp = (TMLCChannelFacility) tgc;
             mets.add(cp);
 
             inindex = cp.getInpIndex();
@@ -1147,7 +1143,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
                             conflictMessage = "More than two sending non-request ports ";
                             //System.out.println("Conflict issue 1");
                         } else {
-                            if ((outindex<5 && index>4) || (outindex>4 && index<5)) {
+                            if ((outindex < 5 && index > 4) || (outindex > 4 && index < 5)) {
                                 conflictMessage = "Sending ports on both side of a composite port";
                                 //System.out.println("Conflict issue 2");
                             }
@@ -1155,7 +1151,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
                     }
                 } else {
                     if (inindex > -1) {
-                        if ((inindex<5 && index<5) || (inindex>4 && index>4)) {
+                        if ((inindex < 5 && index < 5) || (inindex > 4 && index > 4)) {
                             conflictMessage = "Sending and receiving ports on the same side of a composite port";
                             //System.out.println("Conflict issue 3");
                         }
@@ -1176,7 +1172,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
                     //System.out.println("Conflict issue 4");
                 } else {
                     if (outindex > -1) {
-                        if ((index<5 && outindex<5) || (index>4 && outindex>4)) {
+                        if ((index < 5 && outindex < 5) || (index > 4 && outindex > 4)) {
                             conflictMessage = "Sending and receiving ports on the same side of a composite port";
                             //System.out.println("Conflict issue 5");
                         }
@@ -1189,14 +1185,14 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
                     conflictMessage = conflictMessageTmp;
                 }
             }
-        } else if(tgc instanceof TMLCFork) {
+        } else if (tgc instanceof TMLCFork) {
             // Only one out, more than one in is ok
             // No TMLCJoin
-            cp = (TMLCChannelFacility)tgc;
+            cp = (TMLCChannelFacility) tgc;
             mets.add(cp);
 
             // Checks that "mets" contains no TMLJoin
-            for(TMLCChannelFacility met: mets) {
+            for (TMLCChannelFacility met : mets) {
                 if (met instanceof TMLCJoin) {
                     conflictMessage = "Join and Fork operators are mixed in the same channel";
                     conflictMessageTmp = explore(pport, tp2, cp, mets);
@@ -1225,14 +1221,14 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             } else {
                 conflictMessage = explore(pport, tp2, cp, mets);
             }
-        } else if(tgc instanceof TMLCJoin) {
+        } else if (tgc instanceof TMLCJoin) {
             // Only one out, more than one in is ok
             // No TMLCFork
-            cp = (TMLCChannelFacility)tgc;
+            cp = (TMLCChannelFacility) tgc;
             mets.add(cp);
 
             // Checks that "mets" contains no TMLJoin
-            for(TMLCChannelFacility met: mets) {
+            for (TMLCChannelFacility met : mets) {
                 if (met instanceof TMLCFork) {
                     conflictMessage = "Fork and Join operators are mixed in the same channel";
                     conflictMessageTmp = explore(pport, tp2, cp, mets);
@@ -1263,7 +1259,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             }
         }
         if (cp != null) {
-            if ((cp.getInPort() != null) && (cp.getOutPort() != null)){
+            if ((cp.getInPort() != null) && (cp.getOutPort() != null)) {
                 if (cp.getInPort().getType() != cp.getOutPort().getType()) {
                     conflictMessage = "Ports are not compatible";
                 } else {
@@ -1281,7 +1277,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         TGConnectingPoint tp;
         TGConnector connector;
 
-        for(int i=0; i<cp.getNbConnectingPoint(); i++) {
+        for (int i = 0; i < cp.getNbConnectingPoint(); i++) {
             tp = cp.getTGConnectingPointAtIndex(i);
             if (tp != _tp) {
                 connector = findTGConnectorUsing(tp);
@@ -1302,7 +1298,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             return;
         }
 
-        for(TMLCChannelFacility port: mets) {
+        for (TMLCChannelFacility port : mets) {
             port.setConflict(conflict, message);
         }
     }
@@ -1312,7 +1308,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         Iterator<TGComponent> iterator = componentList.listIterator();
         List<String> list = new ArrayList<String>();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCPrimitiveComponent) {
@@ -1398,14 +1394,14 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         Iterator<TGComponent> iterator = componentList.listIterator();
         Vector<String> list = new Vector<String>();
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
-            if( tgc instanceof TMLCCompositeComponent ) {
-                for( TMLCPrimitiveComponent primComp: ((TMLCCompositeComponent)tgc).getAllPrimitiveComponents() ) {
-                    for( Object o: primComp.getAttributeList() )   {
+            if (tgc instanceof TMLCCompositeComponent) {
+                for (TMLCPrimitiveComponent primComp : ((TMLCCompositeComponent) tgc).getAllPrimitiveComponents()) {
+                    for (Object o : primComp.getAttributeList()) {
                         String s = o.toString();
-                        list.add( primComp.getValue() + "." + s.substring( 2, s.length()-1 ) );
+                        list.add(primComp.getValue() + "." + s.substring(2, s.length() - 1));
                     }
                 }
             }
@@ -1416,16 +1412,16 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
     public Vector<String> getAllRecords(TMLCPrimitiveComponent tgc) {
         Vector<String> list = new Vector<String>();
-        getAllRecords((TMLCCompositeComponent)(tgc.getFather()), list);
+        getAllRecords((TMLCCompositeComponent) (tgc.getFather()), list);
         return list;
     }
 
-    public void getAllRecords(TMLCCompositeComponent comp,  Vector<String> list) {
+    public void getAllRecords(TMLCCompositeComponent comp, Vector<String> list) {
         TGComponent tgc;
         if (comp == null) {
             Iterator<TGComponent> iterator = componentList.listIterator();
 
-            while(iterator.hasNext()) {
+            while (iterator.hasNext()) {
                 tgc = iterator.next();
 
                 if (tgc instanceof TMLCRecordComponent) {
@@ -1435,50 +1431,50 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             return;
         }
 
-        for(int i=0; i<comp.getNbInternalTGComponent(); i++) {
+        for (int i = 0; i < comp.getNbInternalTGComponent(); i++) {
             tgc = comp.getInternalTGComponent(i);
             if (tgc instanceof TMLCRecordComponent) {
                 list.add(tgc.getValue());
             }
         }
 
-        getAllRecords((TMLCCompositeComponent)(comp.getFather()), list);
+        getAllRecords((TMLCCompositeComponent) (comp.getFather()), list);
     }
 
     public TMLCRecordComponent getRecordNamed(TMLCPrimitiveComponent tgc, String _nameOfRecord) {
-        return getRecordNamed((TMLCCompositeComponent)(tgc.getFather()), _nameOfRecord);
+        return getRecordNamed((TMLCCompositeComponent) (tgc.getFather()), _nameOfRecord);
     }
 
-    public TMLCRecordComponent getRecordNamed(TMLCCompositeComponent comp,  String _nameOfRecord) {
+    public TMLCRecordComponent getRecordNamed(TMLCCompositeComponent comp, String _nameOfRecord) {
         TGComponent tgc;
         if (comp == null) {
             Iterator<TGComponent> iterator = componentList.listIterator();
 
-            while(iterator.hasNext()) {
+            while (iterator.hasNext()) {
                 tgc = iterator.next();
                 if (tgc instanceof TMLCRecordComponent) {
                     if (tgc.getValue().compareTo(_nameOfRecord) == 0) {
-                        return (TMLCRecordComponent)tgc;
+                        return (TMLCRecordComponent) tgc;
                     }
                 }
             }
             return null;
         }
 
-        for(int i=0; i<comp.getNbInternalTGComponent(); i++) {
+        for (int i = 0; i < comp.getNbInternalTGComponent(); i++) {
             tgc = comp.getInternalTGComponent(i);
             if (tgc instanceof TMLCRecordComponent) {
                 if (tgc.getValue().compareTo(_nameOfRecord) == 0) {
-                    return (TMLCRecordComponent)tgc;
+                    return (TMLCRecordComponent) tgc;
                 }
             }
         }
 
-        return getRecordNamed((TMLCCompositeComponent)(comp.getFather()), _nameOfRecord);
+        return getRecordNamed((TMLCCompositeComponent) (comp.getFather()), _nameOfRecord);
     }
 
 
-    public void findAllReferencedPanels( List<TMLComponentTaskDiagramPanel> panels) {
+    public void findAllReferencedPanels(List<TMLComponentTaskDiagramPanel> panels) {
         if (panels.contains(this)) {
             return;
         }
@@ -1489,20 +1485,20 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         Iterator<TGComponent> iterator = componentList.listIterator();
         TGComponent tgc;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
 
             if (tgc instanceof TMLCRemoteCompositeComponent) {
-                TMLCRemoteCompositeComponent remote = (TMLCRemoteCompositeComponent)tgc;
+                TMLCRemoteCompositeComponent remote = (TMLCRemoteCompositeComponent) tgc;
                 TDiagramPanel panel = remote.getReferencedDiagram();
-                if ((panel != null) && (panel instanceof TMLComponentTaskDiagramPanel)){
-                    ((TMLComponentTaskDiagramPanel)panel).findAllReferencedPanels(panels);
+                if ((panel != null) && (panel instanceof TMLComponentTaskDiagramPanel)) {
+                    ((TMLComponentTaskDiagramPanel) panel).findAllReferencedPanels(panels);
                 }
             }
 
             if (tgc instanceof TMLCCompositeComponent) {
                 //We must find all panels referencing this component
-                panels.addAll(mgui.getAllPanelsReferencingTMLCCompositeComponent((TMLCCompositeComponent)tgc));
+                panels.addAll(mgui.getAllPanelsReferencingTMLCCompositeComponent((TMLCCompositeComponent) tgc));
             }
         }
     }
@@ -1521,7 +1517,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         // Go through the component list of all panels, and make paths. Then, go thru connectors,
         // and merge paths until nomore merging is possible
 
-        for (TDiagramPanel panel: panels) {
+        for (TDiagramPanel panel : panels) {
             iterator = panel.getComponentList().listIterator();
 
 
@@ -1529,24 +1525,24 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
             List<TMLCPrimitivePort> listpp;
 
 
-            while(iterator.hasNext()) {
+            while (iterator.hasNext()) {
                 tgc = iterator.next();
 
                 if (tgc instanceof TMLCCompositeComponent) {
-                    listcp = ((TMLCCompositeComponent)tgc).getAllInternalCompositePorts();
-                    for(TMLCCompositePort cp: listcp) {
+                    listcp = ((TMLCCompositeComponent) tgc).getAllInternalCompositePorts();
+                    for (TMLCCompositePort cp : listcp) {
                         addToPaths(paths, cp);
                     }
 
-                    listpp = ((TMLCCompositeComponent)tgc).getAllInternalPrimitivePorts();
-                    for(TMLCPrimitivePort pp: listpp) {
+                    listpp = ((TMLCCompositeComponent) tgc).getAllInternalPrimitivePorts();
+                    for (TMLCPrimitivePort pp : listpp) {
                         addToPaths(paths, pp);
                     }
                 }
 
                 if (tgc instanceof TMLCPrimitiveComponent) {
-                    listpp = ((TMLCPrimitiveComponent)tgc).getAllInternalPrimitivePorts();
-                    for(TMLCPrimitivePort pp: listpp) {
+                    listpp = ((TMLCPrimitiveComponent) tgc).getAllInternalPrimitivePorts();
+                    for (TMLCPrimitivePort pp : listpp) {
                         addToPaths(paths, pp);
                     }
                 }
@@ -1571,34 +1567,34 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
         // Use connectors to merge paths with one another
 
-        for (TDiagramPanel panel: panels) {
+        for (TDiagramPanel panel : panels) {
             iterator = panel.getComponentList().listIterator();
             TMLCPortConnector connector;
             TGComponent tgc1, tgc2;
             TMLCPath path1, path2;
 
-            while(iterator.hasNext()) {
+            while (iterator.hasNext()) {
                 tgc = iterator.next();
 
                 if (tgc instanceof TMLCPortConnector) {
-                    connector = (TMLCPortConnector)tgc;
+                    connector = (TMLCPortConnector) tgc;
                     if (connector.getTGConnectingPointP1().getFather() instanceof TGComponent) {
-                        tgc1 = (TGComponent)(connector.getTGConnectingPointP1().getFather());
+                        tgc1 = (TGComponent) (connector.getTGConnectingPointP1().getFather());
                     } else {
                         tgc1 = null;
                     }
                     if (connector.getTGConnectingPointP2().getFather() instanceof TGComponent) {
-                        tgc2 = (TGComponent)(connector.getTGConnectingPointP2().getFather());
+                        tgc2 = (TGComponent) (connector.getTGConnectingPointP2().getFather());
                     } else {
                         tgc2 = null;
                     }
 
 
                     if (tgc1 instanceof TMLCRemoteCompositeComponent) {
-                        tgc1 = ((TMLCRemoteCompositeComponent)tgc1).getPortOf(connector.getTGConnectingPointP1());
+                        tgc1 = ((TMLCRemoteCompositeComponent) tgc1).getPortOf(connector.getTGConnectingPointP1());
                     }
                     if (tgc2 instanceof TMLCRemoteCompositeComponent) {
-                        tgc2 = ((TMLCRemoteCompositeComponent)tgc2).getPortOf(connector.getTGConnectingPointP2());
+                        tgc2 = ((TMLCRemoteCompositeComponent) tgc2).getPortOf(connector.getTGConnectingPointP2());
                     }
 
                     //TraceManager.addDev("tgc1=" + tgc1 +  " tgc2=" + tgc2);
@@ -1641,8 +1637,8 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
 
     }
 
-    public TMLCPath getPathOf( List<TMLCPath> paths, TGComponent tgc) {
-        for(TMLCPath path: paths) {
+    public TMLCPath getPathOf(List<TMLCPath> paths, TGComponent tgc) {
+        for (TMLCPath path : paths) {
             if (path.contains(tgc)) {
                 return path;
             }
@@ -1651,10 +1647,10 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         return null;
     }
 
-    public void addToPaths( List<TMLCPath> paths, TGComponent tgc) {
+    public void addToPaths(List<TMLCPath> paths, TGComponent tgc) {
         // Boolean found = false;
 
-        for(TMLCPath path: paths) {
+        for (TMLCPath path : paths) {
             if (path.contains(tgc)) {
                 // found = true;
                 return;
@@ -1673,17 +1669,17 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         Iterator<TGComponent> iterator = componentList.listIterator();
         TGComponent tgc;
 
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             tgc = iterator.next();
             if (tgc instanceof TMLCCompositeComponent) {
-                if (((TMLCCompositeComponent)tgc).hasRefencesTo(tmlcc)) {
+                if (((TMLCCompositeComponent) tgc).hasRefencesTo(tmlcc)) {
                     panels.add(this);
                     return;
                 }
             }
 
             if (tgc instanceof TMLCRemoteCompositeComponent) {
-                if (((TMLCRemoteCompositeComponent)tgc).getReference() == tmlcc) {
+                if (((TMLCRemoteCompositeComponent) tgc).getReference() == tmlcc) {
                     panels.add(this);
                     return;
                 }
@@ -1699,17 +1695,24 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         }
 
         List<TMLCPrimitivePort> ll = comp.getAllEventsOriginPorts();
-        String[]terms = new String[ll.size()];
+        LinkedList<String> lString = new LinkedList<>();
+
+
+        //String[] terms = new String[ll.size()];
         Iterator<TMLCPrimitivePort> ite = ll.listIterator();
-        int i = 0;
 
-        while(ite.hasNext()) {
+        while (ite.hasNext()) {
             TMLCPrimitivePort port = ite.next();
-            terms[i] = port.getPortName();
-            i ++;
+
+            String name = port.getPortName();
+            String [] allNames = name.split(",");
+            for(int i=0; i<allNames.length; i++) {
+                lString.add(allNames[i]);
+            }
+
         }
 
-        return terms;
+        return  (String [])(lString.toArray(new String[lString.size()]));
     }
 
     public String[] getAllInEvents(String nameOfComponent) {
@@ -1719,13 +1722,13 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         }
 
         List<TMLCPrimitivePort> ll = comp.getAllEventsDestinationPorts();
-        String[]terms = new String[ll.size()];
+        String[] terms = new String[ll.size()];
         ListIterator<TMLCPrimitivePort> ite = ll.listIterator();
         int i = 0;
-        while(ite.hasNext()) {
+        while (ite.hasNext()) {
             TMLCPrimitivePort port = ite.next();
             terms[i] = port.getPortName();
-            i ++;
+            i++;
         }
 
         return terms;
@@ -1738,10 +1741,10 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         }
 
         List<TMLCPrimitivePort> ll = comp.getAllChannelsOriginPorts();
-        String[]terms = new String[ll.size()];
+        String[] terms = new String[ll.size()];
         Iterator<TMLCPrimitivePort> ite = ll.listIterator();
         int i = 0;
-        while(ite.hasNext()) {
+        while (ite.hasNext()) {
             TMLCPrimitivePort port = ite.next();
             terms[i] = port.getPortName();
             i++;
@@ -1757,13 +1760,13 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         }
 
         List<TMLCPrimitivePort> ll = comp.getAllRequestsOriginPorts();
-        String[]terms = new String[ll.size()];
+        String[] terms = new String[ll.size()];
         Iterator<TMLCPrimitivePort> ite = ll.listIterator();
         int i = 0;
-        while(ite.hasNext()) {
+        while (ite.hasNext()) {
             TMLCPrimitivePort port = ite.next();
             terms[i] = port.getPortName();
-            i ++;
+            i++;
         }
 
         return terms;
@@ -1776,11 +1779,11 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
         }
 
         List<TMLCPrimitivePort> ll = comp.getAllChannelsDestinationPorts();
-        String[]terms = new String[ll.size()];
+        String[] terms = new String[ll.size()];
         Iterator<TMLCPrimitivePort> ite = ll.listIterator();
         int i = 0;
 
-        while(ite.hasNext()) {
+        while (ite.hasNext()) {
             TMLCPrimitivePort port = ite.next();
             terms[i] = port.getPortName();
             i++;
-- 
GitLab