From 43cd297afa9c60b8b3c66d82bb5f14302d8dba9d Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Mon, 18 Apr 2016 15:09:31 +0000
Subject: [PATCH] Update on Sd msg management

---
 modeling/testavatar.xml                       | 1790 +++++++++--------
 .../sd/TGConnectorMessageAsyncOrSyncSD.java   |  164 ++
 src/ui/sd/TGConnectorMessageAsyncSD.java      |  114 +-
 src/ui/sd/TGConnectorMessageSD.java           |  257 +--
 src/ui/sd/TGConnectorMessageSyncSD.java       |  113 +-
 5 files changed, 1385 insertions(+), 1053 deletions(-)
 create mode 100755 src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java

diff --git a/modeling/testavatar.xml b/modeling/testavatar.xml
index 1ab50965d3..e6adaabc8b 100644
--- a/modeling/testavatar.xml
+++ b/modeling/testavatar.xml
@@ -2,6 +2,144 @@
 
 <TURTLEGMODELING version="0.98-beta4">
 
+<Modeling type="Avatar Analysis" nameTab="Analysis" >
+<SequenceDiagramPanel name="MyScenario0" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="606" id="50" >
+<cdparam x="403" y="129" />
+<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="instance" value="Instance name" />
+<TGConnectingPoint num="0" id="1" />
+<TGConnectingPoint num="1" id="2" />
+<TGConnectingPoint num="2" id="3" />
+<TGConnectingPoint num="3" id="4" />
+<TGConnectingPoint num="4" id="5" />
+<TGConnectingPoint num="5" id="6" />
+<TGConnectingPoint num="6" id="7" />
+<TGConnectingPoint num="7" id="8" />
+<TGConnectingPoint num="8" id="9" />
+<TGConnectingPoint num="9" id="10" />
+<TGConnectingPoint num="10" id="11" />
+<TGConnectingPoint num="11" id="12" />
+<TGConnectingPoint num="12" id="13" />
+<TGConnectingPoint num="13" id="14" />
+<TGConnectingPoint num="14" id="15" />
+<TGConnectingPoint num="15" id="16" />
+<TGConnectingPoint num="16" id="17" />
+<TGConnectingPoint num="17" id="18" />
+<TGConnectingPoint num="18" id="19" />
+<TGConnectingPoint num="19" id="20" />
+<TGConnectingPoint num="20" id="21" />
+<TGConnectingPoint num="21" id="22" />
+<TGConnectingPoint num="22" id="23" />
+<TGConnectingPoint num="23" id="24" />
+<TGConnectingPoint num="24" id="25" />
+<TGConnectingPoint num="25" id="26" />
+<TGConnectingPoint num="26" id="27" />
+<TGConnectingPoint num="27" id="28" />
+<TGConnectingPoint num="28" id="29" />
+<TGConnectingPoint num="29" id="30" />
+<TGConnectingPoint num="30" id="31" />
+<TGConnectingPoint num="31" id="32" />
+<TGConnectingPoint num="32" id="33" />
+<TGConnectingPoint num="33" id="34" />
+<TGConnectingPoint num="34" id="35" />
+<TGConnectingPoint num="35" id="36" />
+<TGConnectingPoint num="36" id="37" />
+<TGConnectingPoint num="37" id="38" />
+<TGConnectingPoint num="38" id="39" />
+<TGConnectingPoint num="39" id="40" />
+<TGConnectingPoint num="40" id="41" />
+<TGConnectingPoint num="41" id="42" />
+<TGConnectingPoint num="42" id="43" />
+<TGConnectingPoint num="43" id="44" />
+<TGConnectingPoint num="44" id="45" />
+<TGConnectingPoint num="45" id="46" />
+<TGConnectingPoint num="46" id="47" />
+<TGConnectingPoint num="47" id="48" />
+<TGConnectingPoint num="48" id="49" />
+<extraparam>
+<Actor data="false" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="606" id="100" >
+<cdparam x="194" y="139" />
+<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="instance" value="Instance name" />
+<TGConnectingPoint num="0" id="51" />
+<TGConnectingPoint num="1" id="52" />
+<TGConnectingPoint num="2" id="53" />
+<TGConnectingPoint num="3" id="54" />
+<TGConnectingPoint num="4" id="55" />
+<TGConnectingPoint num="5" id="56" />
+<TGConnectingPoint num="6" id="57" />
+<TGConnectingPoint num="7" id="58" />
+<TGConnectingPoint num="8" id="59" />
+<TGConnectingPoint num="9" id="60" />
+<TGConnectingPoint num="10" id="61" />
+<TGConnectingPoint num="11" id="62" />
+<TGConnectingPoint num="12" id="63" />
+<TGConnectingPoint num="13" id="64" />
+<TGConnectingPoint num="14" id="65" />
+<TGConnectingPoint num="15" id="66" />
+<TGConnectingPoint num="16" id="67" />
+<TGConnectingPoint num="17" id="68" />
+<TGConnectingPoint num="18" id="69" />
+<TGConnectingPoint num="19" id="70" />
+<TGConnectingPoint num="20" id="71" />
+<TGConnectingPoint num="21" id="72" />
+<TGConnectingPoint num="22" id="73" />
+<TGConnectingPoint num="23" id="74" />
+<TGConnectingPoint num="24" id="75" />
+<TGConnectingPoint num="25" id="76" />
+<TGConnectingPoint num="26" id="77" />
+<TGConnectingPoint num="27" id="78" />
+<TGConnectingPoint num="28" id="79" />
+<TGConnectingPoint num="29" id="80" />
+<TGConnectingPoint num="30" id="81" />
+<TGConnectingPoint num="31" id="82" />
+<TGConnectingPoint num="32" id="83" />
+<TGConnectingPoint num="33" id="84" />
+<TGConnectingPoint num="34" id="85" />
+<TGConnectingPoint num="35" id="86" />
+<TGConnectingPoint num="36" id="87" />
+<TGConnectingPoint num="37" id="88" />
+<TGConnectingPoint num="38" id="89" />
+<TGConnectingPoint num="39" id="90" />
+<TGConnectingPoint num="40" id="91" />
+<TGConnectingPoint num="41" id="92" />
+<TGConnectingPoint num="42" id="93" />
+<TGConnectingPoint num="43" id="94" />
+<TGConnectingPoint num="44" id="95" />
+<TGConnectingPoint num="45" id="96" />
+<TGConnectingPoint num="46" id="97" />
+<TGConnectingPoint num="47" id="98" />
+<TGConnectingPoint num="48" id="99" />
+<extraparam>
+<Actor data="false" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="106" id="101" >
+<cdparam x="199" y="189" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="msg?" />
+<P1  x="199" y="189" id="55" />
+<P2  x="408" y="189" id="6" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+
+</SequenceDiagramPanel>
+
+</Modeling>
+
+
+
+
 <Modeling type="AVATAR Design" nameTab="TestAsynchronous1" >
 <AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
 <MainCode value="void __user_init() {"/>
@@ -10,13 +148,13 @@
 <Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="2" >
+<CONNECTOR type="5002" id="103" >
 <cdparam x="486" y="360" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="1" />
-<P1  x="486" y="360" id="43" />
-<P2  x="763" y="360" id="17" />
+<TGConnectingPoint num="0" id="102" />
+<P1  x="486" y="360" id="144" />
+<P2  x="763" y="360" id="118" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in m2()" />
@@ -24,13 +162,13 @@
 <FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4" >
+<CONNECTOR type="5002" id="105" >
 <cdparam x="486" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="3" />
-<P1  x="486" y="310" id="34" />
-<P2  x="763" y="310" id="8" />
+<TGConnectingPoint num="0" id="104" />
+<P1  x="486" y="310" id="135" />
+<P2  x="763" y="310" id="109" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in m0()" />
@@ -40,36 +178,36 @@
 <FIFOType asynchronous="true" size="5" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="29" >
+<COMPONENT type="5000" id="130" >
 <cdparam x="763" y="210" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="B1" />
-<TGConnectingPoint num="0" id="5" />
-<TGConnectingPoint num="1" id="6" />
-<TGConnectingPoint num="2" id="7" />
-<TGConnectingPoint num="3" id="8" />
-<TGConnectingPoint num="4" id="9" />
-<TGConnectingPoint num="5" id="10" />
-<TGConnectingPoint num="6" id="11" />
-<TGConnectingPoint num="7" id="12" />
-<TGConnectingPoint num="8" id="13" />
-<TGConnectingPoint num="9" id="14" />
-<TGConnectingPoint num="10" id="15" />
-<TGConnectingPoint num="11" id="16" />
-<TGConnectingPoint num="12" id="17" />
-<TGConnectingPoint num="13" id="18" />
-<TGConnectingPoint num="14" id="19" />
-<TGConnectingPoint num="15" id="20" />
-<TGConnectingPoint num="16" id="21" />
-<TGConnectingPoint num="17" id="22" />
-<TGConnectingPoint num="18" id="23" />
-<TGConnectingPoint num="19" id="24" />
-<TGConnectingPoint num="20" id="25" />
-<TGConnectingPoint num="21" id="26" />
-<TGConnectingPoint num="22" id="27" />
-<TGConnectingPoint num="23" id="28" />
+<TGConnectingPoint num="0" id="106" />
+<TGConnectingPoint num="1" id="107" />
+<TGConnectingPoint num="2" id="108" />
+<TGConnectingPoint num="3" id="109" />
+<TGConnectingPoint num="4" id="110" />
+<TGConnectingPoint num="5" id="111" />
+<TGConnectingPoint num="6" id="112" />
+<TGConnectingPoint num="7" id="113" />
+<TGConnectingPoint num="8" id="114" />
+<TGConnectingPoint num="9" id="115" />
+<TGConnectingPoint num="10" id="116" />
+<TGConnectingPoint num="11" id="117" />
+<TGConnectingPoint num="12" id="118" />
+<TGConnectingPoint num="13" id="119" />
+<TGConnectingPoint num="14" id="120" />
+<TGConnectingPoint num="15" id="121" />
+<TGConnectingPoint num="16" id="122" />
+<TGConnectingPoint num="17" id="123" />
+<TGConnectingPoint num="18" id="124" />
+<TGConnectingPoint num="19" id="125" />
+<TGConnectingPoint num="20" id="126" />
+<TGConnectingPoint num="21" id="127" />
+<TGConnectingPoint num="22" id="128" />
+<TGConnectingPoint num="23" id="129" />
 <extraparam>
 <CryptoBlock value="false" />
 <Signal value="in m0()" />
@@ -78,36 +216,36 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="54" >
+<COMPONENT type="5000" id="155" >
 <cdparam x="236" y="210" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="B0" />
-<TGConnectingPoint num="0" id="30" />
-<TGConnectingPoint num="1" id="31" />
-<TGConnectingPoint num="2" id="32" />
-<TGConnectingPoint num="3" id="33" />
-<TGConnectingPoint num="4" id="34" />
-<TGConnectingPoint num="5" id="35" />
-<TGConnectingPoint num="6" id="36" />
-<TGConnectingPoint num="7" id="37" />
-<TGConnectingPoint num="8" id="38" />
-<TGConnectingPoint num="9" id="39" />
-<TGConnectingPoint num="10" id="40" />
-<TGConnectingPoint num="11" id="41" />
-<TGConnectingPoint num="12" id="42" />
-<TGConnectingPoint num="13" id="43" />
-<TGConnectingPoint num="14" id="44" />
-<TGConnectingPoint num="15" id="45" />
-<TGConnectingPoint num="16" id="46" />
-<TGConnectingPoint num="17" id="47" />
-<TGConnectingPoint num="18" id="48" />
-<TGConnectingPoint num="19" id="49" />
-<TGConnectingPoint num="20" id="50" />
-<TGConnectingPoint num="21" id="51" />
-<TGConnectingPoint num="22" id="52" />
-<TGConnectingPoint num="23" id="53" />
+<TGConnectingPoint num="0" id="131" />
+<TGConnectingPoint num="1" id="132" />
+<TGConnectingPoint num="2" id="133" />
+<TGConnectingPoint num="3" id="134" />
+<TGConnectingPoint num="4" id="135" />
+<TGConnectingPoint num="5" id="136" />
+<TGConnectingPoint num="6" id="137" />
+<TGConnectingPoint num="7" id="138" />
+<TGConnectingPoint num="8" id="139" />
+<TGConnectingPoint num="9" id="140" />
+<TGConnectingPoint num="10" id="141" />
+<TGConnectingPoint num="11" id="142" />
+<TGConnectingPoint num="12" id="143" />
+<TGConnectingPoint num="13" id="144" />
+<TGConnectingPoint num="14" id="145" />
+<TGConnectingPoint num="15" id="146" />
+<TGConnectingPoint num="16" id="147" />
+<TGConnectingPoint num="17" id="148" />
+<TGConnectingPoint num="18" id="149" />
+<TGConnectingPoint num="19" id="150" />
+<TGConnectingPoint num="20" id="151" />
+<TGConnectingPoint num="21" id="152" />
+<TGConnectingPoint num="22" id="153" />
+<TGConnectingPoint num="23" id="154" />
 <extraparam>
 <CryptoBlock value="false" />
 <Signal value="out m0()" />
@@ -120,55 +258,55 @@
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="B1" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="67" >
+<CONNECTOR type="5102" id="168" >
 <cdparam x="441" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<P1  x="441" y="388" id="123" />
-<P2  x="486" y="111" id="177" />
+<TGConnectingPoint num="0" id="164" />
+<TGConnectingPoint num="1" id="165" />
+<TGConnectingPoint num="2" id="166" />
+<TGConnectingPoint num="3" id="167" />
+<P1  x="441" y="388" id="224" />
+<P2  x="486" y="111" id="278" />
 <Point x="441" y="464" />
 <Point x="710" y="472" />
 <Point x="651" y="82" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="55" >
-<father id="67" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="156" >
+<father id="168" num="0" />
 <cdparam x="441" y="464" />
 <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="56" >
-<father id="67" num="1" />
+<SUBCOMPONENT type="-1" id="157" >
+<father id="168" num="1" />
 <cdparam x="710" y="472" />
 <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="57" >
-<father id="67" num="2" />
+<SUBCOMPONENT type="-1" id="158" >
+<father id="168" num="2" />
 <cdparam x="651" y="82" />
 <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="62" >
-<father id="67" num="3" />
+<SUBCOMPONENT type="-1" id="163" >
+<father id="168" num="3" />
 <cdparam x="441" y="428" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="58" />
-<TGConnectingPoint num="1" id="59" />
-<TGConnectingPoint num="2" id="60" />
-<TGConnectingPoint num="3" id="61" />
+<TGConnectingPoint num="0" id="159" />
+<TGConnectingPoint num="1" id="160" />
+<TGConnectingPoint num="2" id="161" />
+<TGConnectingPoint num="3" id="162" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -178,25 +316,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="74" >
+<CONNECTOR type="5102" id="175" >
 <cdparam x="436" y="155" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="73" />
-<P1  x="436" y="155" id="161" />
-<P2  x="441" y="358" id="122" />
+<TGConnectingPoint num="0" id="174" />
+<P1  x="436" y="155" id="262" />
+<P2  x="441" y="358" id="223" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="72" >
-<father id="74" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="173" >
+<father id="175" num="0" />
 <cdparam x="393" y="317" />
 <sizeparam width="67" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="68" />
-<TGConnectingPoint num="1" id="69" />
-<TGConnectingPoint num="2" id="70" />
-<TGConnectingPoint num="3" id="71" />
+<TGConnectingPoint num="0" id="169" />
+<TGConnectingPoint num="1" id="170" />
+<TGConnectingPoint num="2" id="171" />
+<TGConnectingPoint num="3" id="172" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -206,55 +344,55 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="87" >
+<CONNECTOR type="5102" id="188" >
 <cdparam x="482" y="259" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="83" />
-<TGConnectingPoint num="1" id="84" />
-<TGConnectingPoint num="2" id="85" />
-<TGConnectingPoint num="3" id="86" />
-<P1  x="482" y="259" id="134" />
-<P2  x="486" y="130" id="159" />
+<TGConnectingPoint num="0" id="184" />
+<TGConnectingPoint num="1" id="185" />
+<TGConnectingPoint num="2" id="186" />
+<TGConnectingPoint num="3" id="187" />
+<P1  x="482" y="259" id="235" />
+<P2  x="486" y="130" id="260" />
 <Point x="478" y="278" />
 <Point x="578" y="283" />
 <Point x="577" y="136" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="75" >
-<father id="87" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="176" >
+<father id="188" num="0" />
 <cdparam x="478" y="278" />
 <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="76" >
-<father id="87" num="1" />
+<SUBCOMPONENT type="-1" id="177" >
+<father id="188" num="1" />
 <cdparam x="578" y="283" />
 <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="77" >
-<father id="87" num="2" />
+<SUBCOMPONENT type="-1" id="178" >
+<father id="188" num="2" />
 <cdparam x="577" y="136" />
 <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="82" >
-<father id="87" num="3" />
+<SUBCOMPONENT type="-1" id="183" >
+<father id="188" num="3" />
 <cdparam x="482" y="299" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="78" />
-<TGConnectingPoint num="1" id="79" />
-<TGConnectingPoint num="2" id="80" />
-<TGConnectingPoint num="3" id="81" />
+<TGConnectingPoint num="0" id="179" />
+<TGConnectingPoint num="1" id="180" />
+<TGConnectingPoint num="2" id="181" />
+<TGConnectingPoint num="3" id="182" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -264,55 +402,55 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="100" >
+<CONNECTOR type="5102" id="201" >
 <cdparam x="369" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="96" />
-<TGConnectingPoint num="1" id="97" />
-<TGConnectingPoint num="2" id="98" />
-<TGConnectingPoint num="3" id="99" />
-<P1  x="369" y="254" id="145" />
-<P2  x="386" y="130" id="158" />
+<TGConnectingPoint num="0" id="197" />
+<TGConnectingPoint num="1" id="198" />
+<TGConnectingPoint num="2" id="199" />
+<TGConnectingPoint num="3" id="200" />
+<P1  x="369" y="254" id="246" />
+<P2  x="386" y="130" id="259" />
 <Point x="364" y="274" />
 <Point x="303" y="280" />
 <Point x="269" y="142" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="88" >
-<father id="100" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="189" >
+<father id="201" num="0" />
 <cdparam x="364" y="274" />
 <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="89" >
-<father id="100" num="1" />
+<SUBCOMPONENT type="-1" id="190" >
+<father id="201" num="1" />
 <cdparam x="303" y="280" />
 <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="90" >
-<father id="100" num="2" />
+<SUBCOMPONENT type="-1" id="191" >
+<father id="201" num="2" />
 <cdparam x="269" y="142" />
 <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="95" >
-<father id="100" num="3" />
+<SUBCOMPONENT type="-1" id="196" >
+<father id="201" num="3" />
 <cdparam x="369" y="294" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="91" />
-<TGConnectingPoint num="1" id="92" />
-<TGConnectingPoint num="2" id="93" />
-<TGConnectingPoint num="3" id="94" />
+<TGConnectingPoint num="0" id="192" />
+<TGConnectingPoint num="1" id="193" />
+<TGConnectingPoint num="2" id="194" />
+<TGConnectingPoint num="3" id="195" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -322,25 +460,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="107" >
+<CONNECTOR type="5102" id="208" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="106" />
-<P1  x="407" y="70" id="196" />
-<P2  x="411" y="105" id="163" />
+<TGConnectingPoint num="0" id="207" />
+<P1  x="407" y="70" id="297" />
+<P2  x="411" y="105" id="264" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="105" >
-<father id="107" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="206" >
+<father id="208" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="101" />
-<TGConnectingPoint num="1" id="102" />
-<TGConnectingPoint num="2" id="103" />
-<TGConnectingPoint num="3" id="104" />
+<TGConnectingPoint num="0" id="202" />
+<TGConnectingPoint num="1" id="203" />
+<TGConnectingPoint num="2" id="204" />
+<TGConnectingPoint num="3" id="205" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -350,25 +488,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="114" >
+<CONNECTOR type="5102" id="215" >
 <cdparam x="386" y="155" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="113" />
-<P1  x="386" y="155" id="160" />
-<P2  x="369" y="224" id="144" />
+<TGConnectingPoint num="0" id="214" />
+<P1  x="386" y="155" id="261" />
+<P2  x="369" y="224" id="245" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="112" >
-<father id="114" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="213" >
+<father id="215" num="0" />
 <cdparam x="386" y="195" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="108" />
-<TGConnectingPoint num="1" id="109" />
-<TGConnectingPoint num="2" id="110" />
-<TGConnectingPoint num="3" id="111" />
+<TGConnectingPoint num="0" id="209" />
+<TGConnectingPoint num="1" id="210" />
+<TGConnectingPoint num="2" id="211" />
+<TGConnectingPoint num="3" id="212" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -378,25 +516,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="121" >
+<CONNECTOR type="5102" id="222" >
 <cdparam x="473" y="155" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="120" />
-<P1  x="473" y="155" id="186" />
-<P2  x="482" y="229" id="133" />
+<TGConnectingPoint num="0" id="221" />
+<P1  x="473" y="155" id="287" />
+<P2  x="482" y="229" id="234" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="119" >
-<father id="121" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="220" >
+<father id="222" num="0" />
 <cdparam x="473" y="195" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="115" />
-<TGConnectingPoint num="1" id="116" />
-<TGConnectingPoint num="2" id="117" />
-<TGConnectingPoint num="3" id="118" />
+<TGConnectingPoint num="0" id="216" />
+<TGConnectingPoint num="1" id="217" />
+<TGConnectingPoint num="2" id="218" />
+<TGConnectingPoint num="3" id="219" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -406,142 +544,142 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="132" >
+<COMPONENT type="5103" id="233" >
 <cdparam x="423" y="363" />
 <sizeparam width="37" 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 signal" value="m2()" />
-<TGConnectingPoint num="0" id="122" />
-<TGConnectingPoint num="1" id="123" />
-<TGConnectingPoint num="2" id="124" />
-<TGConnectingPoint num="3" id="125" />
-<TGConnectingPoint num="4" id="126" />
-<TGConnectingPoint num="5" id="127" />
-<TGConnectingPoint num="6" id="128" />
-<TGConnectingPoint num="7" id="129" />
-<TGConnectingPoint num="8" id="130" />
-<TGConnectingPoint num="9" id="131" />
+<TGConnectingPoint num="0" id="223" />
+<TGConnectingPoint num="1" id="224" />
+<TGConnectingPoint num="2" id="225" />
+<TGConnectingPoint num="3" id="226" />
+<TGConnectingPoint num="4" id="227" />
+<TGConnectingPoint num="5" id="228" />
+<TGConnectingPoint num="6" id="229" />
+<TGConnectingPoint num="7" id="230" />
+<TGConnectingPoint num="8" id="231" />
+<TGConnectingPoint num="9" id="232" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="143" >
+<COMPONENT type="5104" id="244" >
 <cdparam x="460" y="234" />
 <sizeparam width="45" 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="Receive signal" value="m1()" />
-<TGConnectingPoint num="0" id="133" />
-<TGConnectingPoint num="1" id="134" />
-<TGConnectingPoint num="2" id="135" />
-<TGConnectingPoint num="3" id="136" />
-<TGConnectingPoint num="4" id="137" />
-<TGConnectingPoint num="5" id="138" />
-<TGConnectingPoint num="6" id="139" />
-<TGConnectingPoint num="7" id="140" />
-<TGConnectingPoint num="8" id="141" />
-<TGConnectingPoint num="9" id="142" />
+<TGConnectingPoint num="0" id="234" />
+<TGConnectingPoint num="1" id="235" />
+<TGConnectingPoint num="2" id="236" />
+<TGConnectingPoint num="3" id="237" />
+<TGConnectingPoint num="4" id="238" />
+<TGConnectingPoint num="5" id="239" />
+<TGConnectingPoint num="6" id="240" />
+<TGConnectingPoint num="7" id="241" />
+<TGConnectingPoint num="8" id="242" />
+<TGConnectingPoint num="9" id="243" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="154" >
+<COMPONENT type="5104" id="255" >
 <cdparam x="347" y="229" />
 <sizeparam width="45" 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="Receive signal" value="m0()" />
-<TGConnectingPoint num="0" id="144" />
-<TGConnectingPoint num="1" id="145" />
-<TGConnectingPoint num="2" id="146" />
-<TGConnectingPoint num="3" id="147" />
-<TGConnectingPoint num="4" id="148" />
-<TGConnectingPoint num="5" id="149" />
-<TGConnectingPoint num="6" id="150" />
-<TGConnectingPoint num="7" id="151" />
-<TGConnectingPoint num="8" id="152" />
-<TGConnectingPoint num="9" id="153" />
+<TGConnectingPoint num="0" id="245" />
+<TGConnectingPoint num="1" id="246" />
+<TGConnectingPoint num="2" id="247" />
+<TGConnectingPoint num="3" id="248" />
+<TGConnectingPoint num="4" id="249" />
+<TGConnectingPoint num="5" id="250" />
+<TGConnectingPoint num="6" id="251" />
+<TGConnectingPoint num="7" id="252" />
+<TGConnectingPoint num="8" id="253" />
+<TGConnectingPoint num="9" id="254" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="195" >
+<COMPONENT type="5106" id="296" >
 <cdparam x="386" y="105" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Waiting4Sig" />
-<TGConnectingPoint num="0" id="155" />
-<TGConnectingPoint num="1" id="156" />
-<TGConnectingPoint num="2" id="157" />
-<TGConnectingPoint num="3" id="158" />
-<TGConnectingPoint num="4" id="159" />
-<TGConnectingPoint num="5" id="160" />
-<TGConnectingPoint num="6" id="161" />
-<TGConnectingPoint num="7" id="162" />
-<TGConnectingPoint num="8" id="163" />
-<TGConnectingPoint num="9" id="164" />
-<TGConnectingPoint num="10" id="165" />
-<TGConnectingPoint num="11" id="166" />
-<TGConnectingPoint num="12" id="167" />
-<TGConnectingPoint num="13" id="168" />
-<TGConnectingPoint num="14" id="169" />
-<TGConnectingPoint num="15" id="170" />
-<TGConnectingPoint num="16" id="171" />
-<TGConnectingPoint num="17" id="172" />
-<TGConnectingPoint num="18" id="173" />
-<TGConnectingPoint num="19" id="174" />
-<TGConnectingPoint num="20" id="175" />
-<TGConnectingPoint num="21" id="176" />
-<TGConnectingPoint num="22" id="177" />
-<TGConnectingPoint num="23" id="178" />
-<TGConnectingPoint num="24" id="179" />
-<TGConnectingPoint num="25" id="180" />
-<TGConnectingPoint num="26" id="181" />
-<TGConnectingPoint num="27" id="182" />
-<TGConnectingPoint num="28" id="183" />
-<TGConnectingPoint num="29" id="184" />
-<TGConnectingPoint num="30" id="185" />
-<TGConnectingPoint num="31" id="186" />
-<TGConnectingPoint num="32" id="187" />
-<TGConnectingPoint num="33" id="188" />
-<TGConnectingPoint num="34" id="189" />
-<TGConnectingPoint num="35" id="190" />
-<TGConnectingPoint num="36" id="191" />
-<TGConnectingPoint num="37" id="192" />
-<TGConnectingPoint num="38" id="193" />
-<TGConnectingPoint num="39" id="194" />
+<TGConnectingPoint num="0" id="256" />
+<TGConnectingPoint num="1" id="257" />
+<TGConnectingPoint num="2" id="258" />
+<TGConnectingPoint num="3" id="259" />
+<TGConnectingPoint num="4" id="260" />
+<TGConnectingPoint num="5" id="261" />
+<TGConnectingPoint num="6" id="262" />
+<TGConnectingPoint num="7" id="263" />
+<TGConnectingPoint num="8" id="264" />
+<TGConnectingPoint num="9" id="265" />
+<TGConnectingPoint num="10" id="266" />
+<TGConnectingPoint num="11" id="267" />
+<TGConnectingPoint num="12" id="268" />
+<TGConnectingPoint num="13" id="269" />
+<TGConnectingPoint num="14" id="270" />
+<TGConnectingPoint num="15" id="271" />
+<TGConnectingPoint num="16" id="272" />
+<TGConnectingPoint num="17" id="273" />
+<TGConnectingPoint num="18" id="274" />
+<TGConnectingPoint num="19" id="275" />
+<TGConnectingPoint num="20" id="276" />
+<TGConnectingPoint num="21" id="277" />
+<TGConnectingPoint num="22" id="278" />
+<TGConnectingPoint num="23" id="279" />
+<TGConnectingPoint num="24" id="280" />
+<TGConnectingPoint num="25" id="281" />
+<TGConnectingPoint num="26" id="282" />
+<TGConnectingPoint num="27" id="283" />
+<TGConnectingPoint num="28" id="284" />
+<TGConnectingPoint num="29" id="285" />
+<TGConnectingPoint num="30" id="286" />
+<TGConnectingPoint num="31" id="287" />
+<TGConnectingPoint num="32" id="288" />
+<TGConnectingPoint num="33" id="289" />
+<TGConnectingPoint num="34" id="290" />
+<TGConnectingPoint num="35" id="291" />
+<TGConnectingPoint num="36" id="292" />
+<TGConnectingPoint num="37" id="293" />
+<TGConnectingPoint num="38" id="294" />
+<TGConnectingPoint num="39" id="295" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="197" >
+<COMPONENT type="5100" id="298" >
 <cdparam x="400" y="50" />
 <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="196" />
+<TGConnectingPoint num="0" id="297" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="B0" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="204" >
+<CONNECTOR type="5102" id="305" >
 <cdparam x="486" y="244" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="203" />
-<P1  x="486" y="244" id="250" />
-<P2  x="531" y="340" id="289" />
+<TGConnectingPoint num="0" id="304" />
+<P1  x="486" y="244" id="351" />
+<P2  x="531" y="340" id="390" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="202" >
-<father id="204" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="303" >
+<father id="305" num="0" />
 <cdparam x="486" y="304" />
 <sizeparam width="67" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="198" />
-<TGConnectingPoint num="1" id="199" />
-<TGConnectingPoint num="2" id="200" />
-<TGConnectingPoint num="3" id="201" />
+<TGConnectingPoint num="0" id="299" />
+<TGConnectingPoint num="1" id="300" />
+<TGConnectingPoint num="2" id="301" />
+<TGConnectingPoint num="3" id="302" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="5" />
@@ -551,25 +689,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="211" >
+<CONNECTOR type="5102" id="312" >
 <cdparam x="423" y="244" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="210" />
-<P1  x="423" y="244" id="263" />
-<P2  x="402" y="329" id="278" />
+<TGConnectingPoint num="0" id="311" />
+<P1  x="423" y="244" id="364" />
+<P2  x="402" y="329" id="379" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="209" >
-<father id="211" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="310" >
+<father id="312" num="0" />
 <cdparam x="332" y="285" />
 <sizeparam width="75" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="205" />
-<TGConnectingPoint num="1" id="206" />
-<TGConnectingPoint num="2" id="207" />
-<TGConnectingPoint num="3" id="208" />
+<TGConnectingPoint num="0" id="306" />
+<TGConnectingPoint num="1" id="307" />
+<TGConnectingPoint num="2" id="308" />
+<TGConnectingPoint num="3" id="309" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="10" />
@@ -579,25 +717,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="218" >
+<CONNECTOR type="5102" id="319" >
 <cdparam x="342" y="124" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="217" />
-<P1  x="342" y="124" id="300" />
-<P2  x="461" y="194" id="236" />
+<TGConnectingPoint num="0" id="318" />
+<P1  x="342" y="124" id="401" />
+<P2  x="461" y="194" id="337" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="216" >
-<father id="218" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="317" >
+<father id="319" num="0" />
 <cdparam x="342" y="164" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="212" />
-<TGConnectingPoint num="1" id="213" />
-<TGConnectingPoint num="2" id="214" />
-<TGConnectingPoint num="3" id="215" />
+<TGConnectingPoint num="0" id="313" />
+<TGConnectingPoint num="1" id="314" />
+<TGConnectingPoint num="2" id="315" />
+<TGConnectingPoint num="3" id="316" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -607,25 +745,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="225" >
+<CONNECTOR type="5102" id="326" >
 <cdparam x="344" y="182" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="224" />
-<P1  x="531" y="370" id="290" />
-<P2  x="546" y="408" id="233" />
+<TGConnectingPoint num="0" id="325" />
+<P1  x="531" y="370" id="391" />
+<P2  x="546" y="408" id="334" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="223" >
-<father id="225" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="324" >
+<father id="326" num="0" />
 <cdparam x="344" y="222" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="219" />
-<TGConnectingPoint num="1" id="220" />
-<TGConnectingPoint num="2" id="221" />
-<TGConnectingPoint num="3" id="222" />
+<TGConnectingPoint num="0" id="320" />
+<TGConnectingPoint num="1" id="321" />
+<TGConnectingPoint num="2" id="322" />
+<TGConnectingPoint num="3" id="323" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -635,25 +773,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="232" >
+<CONNECTOR type="5102" id="333" >
 <cdparam x="348" y="244" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="231" />
-<P1  x="402" y="359" id="279" />
-<P2  x="371" y="455" id="276" />
+<TGConnectingPoint num="0" id="332" />
+<P1  x="402" y="359" id="380" />
+<P2  x="371" y="455" id="377" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="230" >
-<father id="232" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="331" >
+<father id="333" num="0" />
 <cdparam x="355" y="403" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="226" />
-<TGConnectingPoint num="1" id="227" />
-<TGConnectingPoint num="2" id="228" />
-<TGConnectingPoint num="3" id="229" />
+<TGConnectingPoint num="0" id="327" />
+<TGConnectingPoint num="1" id="328" />
+<TGConnectingPoint num="2" id="329" />
+<TGConnectingPoint num="3" id="330" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -663,117 +801,117 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="234" >
+<COMPONENT type="5101" id="335" >
 <cdparam x="536" y="413" />
 <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="233" />
+<TGConnectingPoint num="0" id="334" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="275" >
+<COMPONENT type="5106" id="376" >
 <cdparam x="411" y="194" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="235" />
-<TGConnectingPoint num="1" id="236" />
-<TGConnectingPoint num="2" id="237" />
-<TGConnectingPoint num="3" id="238" />
-<TGConnectingPoint num="4" id="239" />
-<TGConnectingPoint num="5" id="240" />
-<TGConnectingPoint num="6" id="241" />
-<TGConnectingPoint num="7" id="242" />
-<TGConnectingPoint num="8" id="243" />
-<TGConnectingPoint num="9" id="244" />
-<TGConnectingPoint num="10" id="245" />
-<TGConnectingPoint num="11" id="246" />
-<TGConnectingPoint num="12" id="247" />
-<TGConnectingPoint num="13" id="248" />
-<TGConnectingPoint num="14" id="249" />
-<TGConnectingPoint num="15" id="250" />
-<TGConnectingPoint num="16" id="251" />
-<TGConnectingPoint num="17" id="252" />
-<TGConnectingPoint num="18" id="253" />
-<TGConnectingPoint num="19" id="254" />
-<TGConnectingPoint num="20" id="255" />
-<TGConnectingPoint num="21" id="256" />
-<TGConnectingPoint num="22" id="257" />
-<TGConnectingPoint num="23" id="258" />
-<TGConnectingPoint num="24" id="259" />
-<TGConnectingPoint num="25" id="260" />
-<TGConnectingPoint num="26" id="261" />
-<TGConnectingPoint num="27" id="262" />
-<TGConnectingPoint num="28" id="263" />
-<TGConnectingPoint num="29" id="264" />
-<TGConnectingPoint num="30" id="265" />
-<TGConnectingPoint num="31" id="266" />
-<TGConnectingPoint num="32" id="267" />
-<TGConnectingPoint num="33" id="268" />
-<TGConnectingPoint num="34" id="269" />
-<TGConnectingPoint num="35" id="270" />
-<TGConnectingPoint num="36" id="271" />
-<TGConnectingPoint num="37" id="272" />
-<TGConnectingPoint num="38" id="273" />
-<TGConnectingPoint num="39" id="274" />
+<TGConnectingPoint num="0" id="336" />
+<TGConnectingPoint num="1" id="337" />
+<TGConnectingPoint num="2" id="338" />
+<TGConnectingPoint num="3" id="339" />
+<TGConnectingPoint num="4" id="340" />
+<TGConnectingPoint num="5" id="341" />
+<TGConnectingPoint num="6" id="342" />
+<TGConnectingPoint num="7" id="343" />
+<TGConnectingPoint num="8" id="344" />
+<TGConnectingPoint num="9" id="345" />
+<TGConnectingPoint num="10" id="346" />
+<TGConnectingPoint num="11" id="347" />
+<TGConnectingPoint num="12" id="348" />
+<TGConnectingPoint num="13" id="349" />
+<TGConnectingPoint num="14" id="350" />
+<TGConnectingPoint num="15" id="351" />
+<TGConnectingPoint num="16" id="352" />
+<TGConnectingPoint num="17" id="353" />
+<TGConnectingPoint num="18" id="354" />
+<TGConnectingPoint num="19" id="355" />
+<TGConnectingPoint num="20" id="356" />
+<TGConnectingPoint num="21" id="357" />
+<TGConnectingPoint num="22" id="358" />
+<TGConnectingPoint num="23" id="359" />
+<TGConnectingPoint num="24" id="360" />
+<TGConnectingPoint num="25" id="361" />
+<TGConnectingPoint num="26" id="362" />
+<TGConnectingPoint num="27" id="363" />
+<TGConnectingPoint num="28" id="364" />
+<TGConnectingPoint num="29" id="365" />
+<TGConnectingPoint num="30" id="366" />
+<TGConnectingPoint num="31" id="367" />
+<TGConnectingPoint num="32" id="368" />
+<TGConnectingPoint num="33" id="369" />
+<TGConnectingPoint num="34" id="370" />
+<TGConnectingPoint num="35" id="371" />
+<TGConnectingPoint num="36" id="372" />
+<TGConnectingPoint num="37" id="373" />
+<TGConnectingPoint num="38" id="374" />
+<TGConnectingPoint num="39" id="375" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="277" >
+<COMPONENT type="5101" id="378" >
 <cdparam x="361" y="460" />
 <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="276" />
+<TGConnectingPoint num="0" id="377" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="288" >
+<COMPONENT type="5103" id="389" >
 <cdparam x="384" y="334" />
 <sizeparam width="37" 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 signal" value="m1()" />
-<TGConnectingPoint num="0" id="278" />
-<TGConnectingPoint num="1" id="279" />
-<TGConnectingPoint num="2" id="280" />
-<TGConnectingPoint num="3" id="281" />
-<TGConnectingPoint num="4" id="282" />
-<TGConnectingPoint num="5" id="283" />
-<TGConnectingPoint num="6" id="284" />
-<TGConnectingPoint num="7" id="285" />
-<TGConnectingPoint num="8" id="286" />
-<TGConnectingPoint num="9" id="287" />
+<TGConnectingPoint num="0" id="379" />
+<TGConnectingPoint num="1" id="380" />
+<TGConnectingPoint num="2" id="381" />
+<TGConnectingPoint num="3" id="382" />
+<TGConnectingPoint num="4" id="383" />
+<TGConnectingPoint num="5" id="384" />
+<TGConnectingPoint num="6" id="385" />
+<TGConnectingPoint num="7" id="386" />
+<TGConnectingPoint num="8" id="387" />
+<TGConnectingPoint num="9" id="388" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="299" >
+<COMPONENT type="5103" id="400" >
 <cdparam x="513" y="345" />
 <sizeparam width="37" 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 signal" value="m0()" />
-<TGConnectingPoint num="0" id="289" />
-<TGConnectingPoint num="1" id="290" />
-<TGConnectingPoint num="2" id="291" />
-<TGConnectingPoint num="3" id="292" />
-<TGConnectingPoint num="4" id="293" />
-<TGConnectingPoint num="5" id="294" />
-<TGConnectingPoint num="6" id="295" />
-<TGConnectingPoint num="7" id="296" />
-<TGConnectingPoint num="8" id="297" />
-<TGConnectingPoint num="9" id="298" />
+<TGConnectingPoint num="0" id="390" />
+<TGConnectingPoint num="1" id="391" />
+<TGConnectingPoint num="2" id="392" />
+<TGConnectingPoint num="3" id="393" />
+<TGConnectingPoint num="4" id="394" />
+<TGConnectingPoint num="5" id="395" />
+<TGConnectingPoint num="6" id="396" />
+<TGConnectingPoint num="7" id="397" />
+<TGConnectingPoint num="8" id="398" />
+<TGConnectingPoint num="9" id="399" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="301" >
+<COMPONENT type="5100" id="402" >
 <cdparam x="335" y="104" />
 <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="300" />
+<TGConnectingPoint num="0" id="401" />
 </COMPONENT>
 
 
@@ -786,182 +924,182 @@
 
 <Modeling type="ADD" nameTab="Deployment1" >
 <ADDDiagramPanel name="Deployment Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="5361" id="326" >
+<COMPONENT type="5361" id="427" >
 <cdparam x="464" y="404" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Timer0" value="name" />
-<TGConnectingPoint num="0" id="302" />
-<TGConnectingPoint num="1" id="303" />
-<TGConnectingPoint num="2" id="304" />
-<TGConnectingPoint num="3" id="305" />
-<TGConnectingPoint num="4" id="306" />
-<TGConnectingPoint num="5" id="307" />
-<TGConnectingPoint num="6" id="308" />
-<TGConnectingPoint num="7" id="309" />
-<TGConnectingPoint num="8" id="310" />
-<TGConnectingPoint num="9" id="311" />
-<TGConnectingPoint num="10" id="312" />
-<TGConnectingPoint num="11" id="313" />
-<TGConnectingPoint num="12" id="314" />
-<TGConnectingPoint num="13" id="315" />
-<TGConnectingPoint num="14" id="316" />
-<TGConnectingPoint num="15" id="317" />
-<TGConnectingPoint num="16" id="318" />
-<TGConnectingPoint num="17" id="319" />
-<TGConnectingPoint num="18" id="320" />
-<TGConnectingPoint num="19" id="321" />
-<TGConnectingPoint num="20" id="322" />
-<TGConnectingPoint num="21" id="323" />
-<TGConnectingPoint num="22" id="324" />
-<TGConnectingPoint num="23" id="325" />
+<TGConnectingPoint num="0" id="403" />
+<TGConnectingPoint num="1" id="404" />
+<TGConnectingPoint num="2" id="405" />
+<TGConnectingPoint num="3" id="406" />
+<TGConnectingPoint num="4" id="407" />
+<TGConnectingPoint num="5" id="408" />
+<TGConnectingPoint num="6" id="409" />
+<TGConnectingPoint num="7" id="410" />
+<TGConnectingPoint num="8" id="411" />
+<TGConnectingPoint num="9" id="412" />
+<TGConnectingPoint num="10" id="413" />
+<TGConnectingPoint num="11" id="414" />
+<TGConnectingPoint num="12" id="415" />
+<TGConnectingPoint num="13" id="416" />
+<TGConnectingPoint num="14" id="417" />
+<TGConnectingPoint num="15" id="418" />
+<TGConnectingPoint num="16" id="419" />
+<TGConnectingPoint num="17" id="420" />
+<TGConnectingPoint num="18" id="421" />
+<TGConnectingPoint num="19" id="422" />
+<TGConnectingPoint num="20" id="423" />
+<TGConnectingPoint num="21" id="424" />
+<TGConnectingPoint num="22" id="425" />
+<TGConnectingPoint num="23" id="426" />
 <extraparam>
 <info stereotype="Timer" nodeName="Timer0" />
 <attributes index="0"  nIrq="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5355" id="369" >
+<COMPONENT type="5355" id="470" >
 <cdparam x="830" y="298" />
 <sizeparam width="409" height="195" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="345" />
-<TGConnectingPoint num="1" id="346" />
-<TGConnectingPoint num="2" id="347" />
-<TGConnectingPoint num="3" id="348" />
-<TGConnectingPoint num="4" id="349" />
-<TGConnectingPoint num="5" id="350" />
-<TGConnectingPoint num="6" id="351" />
-<TGConnectingPoint num="7" id="352" />
-<TGConnectingPoint num="8" id="353" />
-<TGConnectingPoint num="9" id="354" />
-<TGConnectingPoint num="10" id="355" />
-<TGConnectingPoint num="11" id="356" />
-<TGConnectingPoint num="12" id="357" />
-<TGConnectingPoint num="13" id="358" />
-<TGConnectingPoint num="14" id="359" />
-<TGConnectingPoint num="15" id="360" />
-<TGConnectingPoint num="16" id="361" />
-<TGConnectingPoint num="17" id="362" />
-<TGConnectingPoint num="18" id="363" />
-<TGConnectingPoint num="19" id="364" />
-<TGConnectingPoint num="20" id="365" />
-<TGConnectingPoint num="21" id="366" />
-<TGConnectingPoint num="22" id="367" />
-<TGConnectingPoint num="23" id="368" />
+<TGConnectingPoint num="0" id="446" />
+<TGConnectingPoint num="1" id="447" />
+<TGConnectingPoint num="2" id="448" />
+<TGConnectingPoint num="3" id="449" />
+<TGConnectingPoint num="4" id="450" />
+<TGConnectingPoint num="5" id="451" />
+<TGConnectingPoint num="6" id="452" />
+<TGConnectingPoint num="7" id="453" />
+<TGConnectingPoint num="8" id="454" />
+<TGConnectingPoint num="9" id="455" />
+<TGConnectingPoint num="10" id="456" />
+<TGConnectingPoint num="11" id="457" />
+<TGConnectingPoint num="12" id="458" />
+<TGConnectingPoint num="13" id="459" />
+<TGConnectingPoint num="14" id="460" />
+<TGConnectingPoint num="15" id="461" />
+<TGConnectingPoint num="16" id="462" />
+<TGConnectingPoint num="17" id="463" />
+<TGConnectingPoint num="18" id="464" />
+<TGConnectingPoint num="19" id="465" />
+<TGConnectingPoint num="20" id="466" />
+<TGConnectingPoint num="21" id="467" />
+<TGConnectingPoint num="22" id="468" />
+<TGConnectingPoint num="23" id="469" />
 <extraparam>
 <info stereotype="RAM" nodeName="Memory0" />
 <attributes byteDataSize="4"  index="0" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5362" id="335" >
-<father id="369" num="0" />
-<cdparam x="881" y="397" />
+<SUBCOMPONENT type="5362" id="436" >
+<father id="470" num="0" />
+<cdparam x="873" y="343" />
 <sizeparam width="340" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="69" minY="0" maxY="155" />
-<infoparam name="TGComponent" value="TestAsynchronous1::B0/in m2() #--# B1/out m2()" />
-<TGConnectingPoint num="0" id="327" />
-<TGConnectingPoint num="1" id="328" />
-<TGConnectingPoint num="2" id="329" />
-<TGConnectingPoint num="3" id="330" />
-<TGConnectingPoint num="4" id="331" />
-<TGConnectingPoint num="5" id="332" />
-<TGConnectingPoint num="6" id="333" />
-<TGConnectingPoint num="7" id="334" />
+<infoparam name="TGComponent" value="B0/out m0" />
+<TGConnectingPoint num="0" id="428" />
+<TGConnectingPoint num="1" id="429" />
+<TGConnectingPoint num="2" id="430" />
+<TGConnectingPoint num="3" id="431" />
+<TGConnectingPoint num="4" id="432" />
+<TGConnectingPoint num="5" id="433" />
+<TGConnectingPoint num="6" id="434" />
+<TGConnectingPoint num="7" id="435" />
 <extraparam>
-<info value="TestAsynchronous1::B0/in m2() #--# B1/out m2()" channelName="B0/in m2() #--# B1/out m2()" referenceDiagram="TestAsynchronous1" />
+<info value="B0/out m0" channelName="B0/out m0() #--# B1/in m0()" referenceDiagram="TestAsynchronous1" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5362" id="344" >
-<father id="369" num="1" />
-<cdparam x="873" y="343" />
+<SUBCOMPONENT type="5362" id="445" >
+<father id="470" num="1" />
+<cdparam x="881" y="397" />
 <sizeparam width="340" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="69" minY="0" maxY="155" />
-<infoparam name="TGComponent" value="TestAsynchronous1::B0/out m0() #--# B1/in m0()" />
-<TGConnectingPoint num="0" id="336" />
-<TGConnectingPoint num="1" id="337" />
-<TGConnectingPoint num="2" id="338" />
-<TGConnectingPoint num="3" id="339" />
-<TGConnectingPoint num="4" id="340" />
-<TGConnectingPoint num="5" id="341" />
-<TGConnectingPoint num="6" id="342" />
-<TGConnectingPoint num="7" id="343" />
+<infoparam name="TGComponent" value="B0/in m2" />
+<TGConnectingPoint num="0" id="437" />
+<TGConnectingPoint num="1" id="438" />
+<TGConnectingPoint num="2" id="439" />
+<TGConnectingPoint num="3" id="440" />
+<TGConnectingPoint num="4" id="441" />
+<TGConnectingPoint num="5" id="442" />
+<TGConnectingPoint num="6" id="443" />
+<TGConnectingPoint num="7" id="444" />
 <extraparam>
-<info value="TestAsynchronous1::B0/out m0() #--# B1/in m0()" channelName="B0/out m0() #--# B1/in m0()" referenceDiagram="TestAsynchronous1" />
+<info value="B0/in m2" channelName="B0/in m2() #--# B1/out m2()" referenceDiagram="TestAsynchronous1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5363" id="394" >
+<COMPONENT type="5363" id="495" >
 <cdparam x="671" y="87" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="370" />
-<TGConnectingPoint num="1" id="371" />
-<TGConnectingPoint num="2" id="372" />
-<TGConnectingPoint num="3" id="373" />
-<TGConnectingPoint num="4" id="374" />
-<TGConnectingPoint num="5" id="375" />
-<TGConnectingPoint num="6" id="376" />
-<TGConnectingPoint num="7" id="377" />
-<TGConnectingPoint num="8" id="378" />
-<TGConnectingPoint num="9" id="379" />
-<TGConnectingPoint num="10" id="380" />
-<TGConnectingPoint num="11" id="381" />
-<TGConnectingPoint num="12" id="382" />
-<TGConnectingPoint num="13" id="383" />
-<TGConnectingPoint num="14" id="384" />
-<TGConnectingPoint num="15" id="385" />
-<TGConnectingPoint num="16" id="386" />
-<TGConnectingPoint num="17" id="387" />
-<TGConnectingPoint num="18" id="388" />
-<TGConnectingPoint num="19" id="389" />
-<TGConnectingPoint num="20" id="390" />
-<TGConnectingPoint num="21" id="391" />
-<TGConnectingPoint num="22" id="392" />
-<TGConnectingPoint num="23" id="393" />
+<TGConnectingPoint num="0" id="471" />
+<TGConnectingPoint num="1" id="472" />
+<TGConnectingPoint num="2" id="473" />
+<TGConnectingPoint num="3" id="474" />
+<TGConnectingPoint num="4" id="475" />
+<TGConnectingPoint num="5" id="476" />
+<TGConnectingPoint num="6" id="477" />
+<TGConnectingPoint num="7" id="478" />
+<TGConnectingPoint num="8" id="479" />
+<TGConnectingPoint num="9" id="480" />
+<TGConnectingPoint num="10" id="481" />
+<TGConnectingPoint num="11" id="482" />
+<TGConnectingPoint num="12" id="483" />
+<TGConnectingPoint num="13" id="484" />
+<TGConnectingPoint num="14" id="485" />
+<TGConnectingPoint num="15" id="486" />
+<TGConnectingPoint num="16" id="487" />
+<TGConnectingPoint num="17" id="488" />
+<TGConnectingPoint num="18" id="489" />
+<TGConnectingPoint num="19" id="490" />
+<TGConnectingPoint num="20" id="491" />
+<TGConnectingPoint num="21" id="492" />
+<TGConnectingPoint num="22" id="493" />
+<TGConnectingPoint num="23" id="494" />
 <extraparam>
 <info stereotype="VGMN" nodeName="Bus0" />
 <attributes index="0"  nbOfAttachedInitiators="0"  nbOfAttachedTargets="0"  minLatency="0"  fifoDepth="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5351" id="419" >
+<COMPONENT type="5351" id="520" >
 <cdparam x="203" y="93" />
 <sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="395" />
-<TGConnectingPoint num="1" id="396" />
-<TGConnectingPoint num="2" id="397" />
-<TGConnectingPoint num="3" id="398" />
-<TGConnectingPoint num="4" id="399" />
-<TGConnectingPoint num="5" id="400" />
-<TGConnectingPoint num="6" id="401" />
-<TGConnectingPoint num="7" id="402" />
-<TGConnectingPoint num="8" id="403" />
-<TGConnectingPoint num="9" id="404" />
-<TGConnectingPoint num="10" id="405" />
-<TGConnectingPoint num="11" id="406" />
-<TGConnectingPoint num="12" id="407" />
-<TGConnectingPoint num="13" id="408" />
-<TGConnectingPoint num="14" id="409" />
-<TGConnectingPoint num="15" id="410" />
-<TGConnectingPoint num="16" id="411" />
-<TGConnectingPoint num="17" id="412" />
-<TGConnectingPoint num="18" id="413" />
-<TGConnectingPoint num="19" id="414" />
-<TGConnectingPoint num="20" id="415" />
-<TGConnectingPoint num="21" id="416" />
-<TGConnectingPoint num="22" id="417" />
-<TGConnectingPoint num="23" id="418" />
+<TGConnectingPoint num="0" id="496" />
+<TGConnectingPoint num="1" id="497" />
+<TGConnectingPoint num="2" id="498" />
+<TGConnectingPoint num="3" id="499" />
+<TGConnectingPoint num="4" id="500" />
+<TGConnectingPoint num="5" id="501" />
+<TGConnectingPoint num="6" id="502" />
+<TGConnectingPoint num="7" id="503" />
+<TGConnectingPoint num="8" id="504" />
+<TGConnectingPoint num="9" id="505" />
+<TGConnectingPoint num="10" id="506" />
+<TGConnectingPoint num="11" id="507" />
+<TGConnectingPoint num="12" id="508" />
+<TGConnectingPoint num="13" id="509" />
+<TGConnectingPoint num="14" id="510" />
+<TGConnectingPoint num="15" id="511" />
+<TGConnectingPoint num="16" id="512" />
+<TGConnectingPoint num="17" id="513" />
+<TGConnectingPoint num="18" id="514" />
+<TGConnectingPoint num="19" id="515" />
+<TGConnectingPoint num="20" id="516" />
+<TGConnectingPoint num="21" id="517" />
+<TGConnectingPoint num="22" id="518" />
+<TGConnectingPoint num="23" id="519" />
 <extraparam>
 <info stereotype="CPU" nodeName="CPU0" />
 <attributes nbOfIrq="6"  iCacheWays="0"  iCacheSets="0"  iCacheWords="0"  dCacheWays="0"  dCacheSets="0"  dCacheWords="0" />
@@ -981,16 +1119,16 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="Block1;Block0;" />
+<Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="421" >
+<CONNECTOR type="5002" id="522" >
 <cdparam x="408" y="223" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="420" />
-<P1  x="408" y="223" id="468" />
-<P2  x="670" y="227" id="442" />
+<TGConnectingPoint num="0" id="521" />
+<P1  x="408" y="223" id="569" />
+<P2  x="670" y="227" id="543" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in receive()" />
@@ -1000,64 +1138,64 @@
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="302" id="438" >
+<COMPONENT type="302" id="539" >
 <cdparam x="219" y="346" />
-<sizeparam width="209" height="71" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="297" height="71" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Proverif Pragma" value="#PublicConstant v.c
 " />
-<TGConnectingPoint num="0" id="422" />
-<TGConnectingPoint num="1" id="423" />
-<TGConnectingPoint num="2" id="424" />
-<TGConnectingPoint num="3" id="425" />
-<TGConnectingPoint num="4" id="426" />
-<TGConnectingPoint num="5" id="427" />
-<TGConnectingPoint num="6" id="428" />
-<TGConnectingPoint num="7" id="429" />
-<TGConnectingPoint num="8" id="430" />
-<TGConnectingPoint num="9" id="431" />
-<TGConnectingPoint num="10" id="432" />
-<TGConnectingPoint num="11" id="433" />
-<TGConnectingPoint num="12" id="434" />
-<TGConnectingPoint num="13" id="435" />
-<TGConnectingPoint num="14" id="436" />
-<TGConnectingPoint num="15" id="437" />
+<TGConnectingPoint num="0" id="523" />
+<TGConnectingPoint num="1" id="524" />
+<TGConnectingPoint num="2" id="525" />
+<TGConnectingPoint num="3" id="526" />
+<TGConnectingPoint num="4" id="527" />
+<TGConnectingPoint num="5" id="528" />
+<TGConnectingPoint num="6" id="529" />
+<TGConnectingPoint num="7" id="530" />
+<TGConnectingPoint num="8" id="531" />
+<TGConnectingPoint num="9" id="532" />
+<TGConnectingPoint num="10" id="533" />
+<TGConnectingPoint num="11" id="534" />
+<TGConnectingPoint num="12" id="535" />
+<TGConnectingPoint num="13" id="536" />
+<TGConnectingPoint num="14" id="537" />
+<TGConnectingPoint num="15" id="538" />
 <extraparam>
 <Line value="#PublicConstant v.c" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="463" >
+<COMPONENT type="5000" id="564" >
 <cdparam x="670" y="127" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block1" value="Block1" />
-<TGConnectingPoint num="0" id="439" />
-<TGConnectingPoint num="1" id="440" />
-<TGConnectingPoint num="2" id="441" />
-<TGConnectingPoint num="3" id="442" />
-<TGConnectingPoint num="4" id="443" />
-<TGConnectingPoint num="5" id="444" />
-<TGConnectingPoint num="6" id="445" />
-<TGConnectingPoint num="7" id="446" />
-<TGConnectingPoint num="8" id="447" />
-<TGConnectingPoint num="9" id="448" />
-<TGConnectingPoint num="10" id="449" />
-<TGConnectingPoint num="11" id="450" />
-<TGConnectingPoint num="12" id="451" />
-<TGConnectingPoint num="13" id="452" />
-<TGConnectingPoint num="14" id="453" />
-<TGConnectingPoint num="15" id="454" />
-<TGConnectingPoint num="16" id="455" />
-<TGConnectingPoint num="17" id="456" />
-<TGConnectingPoint num="18" id="457" />
-<TGConnectingPoint num="19" id="458" />
-<TGConnectingPoint num="20" id="459" />
-<TGConnectingPoint num="21" id="460" />
-<TGConnectingPoint num="22" id="461" />
-<TGConnectingPoint num="23" id="462" />
+<TGConnectingPoint num="0" id="540" />
+<TGConnectingPoint num="1" id="541" />
+<TGConnectingPoint num="2" id="542" />
+<TGConnectingPoint num="3" id="543" />
+<TGConnectingPoint num="4" id="544" />
+<TGConnectingPoint num="5" id="545" />
+<TGConnectingPoint num="6" id="546" />
+<TGConnectingPoint num="7" id="547" />
+<TGConnectingPoint num="8" id="548" />
+<TGConnectingPoint num="9" id="549" />
+<TGConnectingPoint num="10" id="550" />
+<TGConnectingPoint num="11" id="551" />
+<TGConnectingPoint num="12" id="552" />
+<TGConnectingPoint num="13" id="553" />
+<TGConnectingPoint num="14" id="554" />
+<TGConnectingPoint num="15" id="555" />
+<TGConnectingPoint num="16" id="556" />
+<TGConnectingPoint num="17" id="557" />
+<TGConnectingPoint num="18" id="558" />
+<TGConnectingPoint num="19" id="559" />
+<TGConnectingPoint num="20" id="560" />
+<TGConnectingPoint num="21" id="561" />
+<TGConnectingPoint num="22" id="562" />
+<TGConnectingPoint num="23" id="563" />
 <extraparam>
 <CryptoBlock value="false" />
 <Signal value="in receive()" />
@@ -1065,36 +1203,36 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="488" >
+<COMPONENT type="5000" id="589" >
 <cdparam x="158" y="123" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block0" value="Block0" />
-<TGConnectingPoint num="0" id="464" />
-<TGConnectingPoint num="1" id="465" />
-<TGConnectingPoint num="2" id="466" />
-<TGConnectingPoint num="3" id="467" />
-<TGConnectingPoint num="4" id="468" />
-<TGConnectingPoint num="5" id="469" />
-<TGConnectingPoint num="6" id="470" />
-<TGConnectingPoint num="7" id="471" />
-<TGConnectingPoint num="8" id="472" />
-<TGConnectingPoint num="9" id="473" />
-<TGConnectingPoint num="10" id="474" />
-<TGConnectingPoint num="11" id="475" />
-<TGConnectingPoint num="12" id="476" />
-<TGConnectingPoint num="13" id="477" />
-<TGConnectingPoint num="14" id="478" />
-<TGConnectingPoint num="15" id="479" />
-<TGConnectingPoint num="16" id="480" />
-<TGConnectingPoint num="17" id="481" />
-<TGConnectingPoint num="18" id="482" />
-<TGConnectingPoint num="19" id="483" />
-<TGConnectingPoint num="20" id="484" />
-<TGConnectingPoint num="21" id="485" />
-<TGConnectingPoint num="22" id="486" />
-<TGConnectingPoint num="23" id="487" />
+<TGConnectingPoint num="0" id="565" />
+<TGConnectingPoint num="1" id="566" />
+<TGConnectingPoint num="2" id="567" />
+<TGConnectingPoint num="3" id="568" />
+<TGConnectingPoint num="4" id="569" />
+<TGConnectingPoint num="5" id="570" />
+<TGConnectingPoint num="6" id="571" />
+<TGConnectingPoint num="7" id="572" />
+<TGConnectingPoint num="8" id="573" />
+<TGConnectingPoint num="9" id="574" />
+<TGConnectingPoint num="10" id="575" />
+<TGConnectingPoint num="11" id="576" />
+<TGConnectingPoint num="12" id="577" />
+<TGConnectingPoint num="13" id="578" />
+<TGConnectingPoint num="14" id="579" />
+<TGConnectingPoint num="15" id="580" />
+<TGConnectingPoint num="16" id="581" />
+<TGConnectingPoint num="17" id="582" />
+<TGConnectingPoint num="18" id="583" />
+<TGConnectingPoint num="19" id="584" />
+<TGConnectingPoint num="20" id="585" />
+<TGConnectingPoint num="21" id="586" />
+<TGConnectingPoint num="22" id="587" />
+<TGConnectingPoint num="23" id="588" />
 <extraparam>
 <CryptoBlock value="false" />
 <Signal value="out send()" />
@@ -1106,25 +1244,25 @@
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Block1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="495" >
+<CONNECTOR type="5102" id="596" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="494" />
-<P1  x="407" y="70" id="630" />
-<P2  x="404" y="92" id="605" />
+<TGConnectingPoint num="0" id="595" />
+<P1  x="407" y="70" id="731" />
+<P2  x="404" y="92" id="706" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="493" >
-<father id="495" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="594" >
+<father id="596" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="489" />
-<TGConnectingPoint num="1" id="490" />
-<TGConnectingPoint num="2" id="491" />
-<TGConnectingPoint num="3" id="492" />
+<TGConnectingPoint num="0" id="590" />
+<TGConnectingPoint num="1" id="591" />
+<TGConnectingPoint num="2" id="592" />
+<TGConnectingPoint num="3" id="593" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1134,25 +1272,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="502" >
+<CONNECTOR type="5102" id="603" >
 <cdparam x="404" y="142" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="501" />
-<P1  x="404" y="142" id="617" />
-<P2  x="375" y="210" id="578" />
+<TGConnectingPoint num="0" id="602" />
+<P1  x="404" y="142" id="718" />
+<P2  x="375" y="210" id="679" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="500" >
-<father id="502" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="601" >
+<father id="603" num="0" />
 <cdparam x="404" y="182" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="496" />
-<TGConnectingPoint num="1" id="497" />
-<TGConnectingPoint num="2" id="498" />
-<TGConnectingPoint num="3" id="499" />
+<TGConnectingPoint num="0" id="597" />
+<TGConnectingPoint num="1" id="598" />
+<TGConnectingPoint num="2" id="599" />
+<TGConnectingPoint num="3" id="600" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1162,25 +1300,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="509" >
+<CONNECTOR type="5102" id="610" >
 <cdparam x="492" y="142" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="508" />
-<P1  x="492" y="142" id="596" />
-<P2  x="541" y="217" id="567" />
+<TGConnectingPoint num="0" id="609" />
+<P1  x="492" y="142" id="697" />
+<P2  x="541" y="217" id="668" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="507" >
-<father id="509" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="608" >
+<father id="610" num="0" />
 <cdparam x="492" y="182" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="503" />
-<TGConnectingPoint num="1" id="504" />
-<TGConnectingPoint num="2" id="505" />
-<TGConnectingPoint num="3" id="506" />
+<TGConnectingPoint num="0" id="604" />
+<TGConnectingPoint num="1" id="605" />
+<TGConnectingPoint num="2" id="606" />
+<TGConnectingPoint num="3" id="607" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1190,25 +1328,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="516" >
+<CONNECTOR type="5102" id="617" >
 <cdparam x="541" y="247" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="515" />
-<P1  x="541" y="247" id="568" />
-<P2  x="550" y="296" id="534" />
+<TGConnectingPoint num="0" id="616" />
+<P1  x="541" y="247" id="669" />
+<P2  x="550" y="296" id="635" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="514" >
-<father id="516" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="615" >
+<father id="617" num="0" />
 <cdparam x="541" y="287" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="510" />
-<TGConnectingPoint num="1" id="511" />
-<TGConnectingPoint num="2" id="512" />
-<TGConnectingPoint num="3" id="513" />
+<TGConnectingPoint num="0" id="611" />
+<TGConnectingPoint num="1" id="612" />
+<TGConnectingPoint num="2" id="613" />
+<TGConnectingPoint num="3" id="614" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1218,25 +1356,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="523" >
+<CONNECTOR type="5102" id="624" >
 <cdparam x="375" y="240" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="522" />
-<P1  x="375" y="240" id="579" />
-<P2  x="332" y="290" id="524" />
+<TGConnectingPoint num="0" id="623" />
+<P1  x="375" y="240" id="680" />
+<P2  x="332" y="290" id="625" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="521" >
-<father id="523" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="622" >
+<father id="624" num="0" />
 <cdparam x="375" y="280" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="517" />
-<TGConnectingPoint num="1" id="518" />
-<TGConnectingPoint num="2" id="519" />
-<TGConnectingPoint num="3" id="520" />
+<TGConnectingPoint num="0" id="618" />
+<TGConnectingPoint num="1" id="619" />
+<TGConnectingPoint num="2" id="620" />
+<TGConnectingPoint num="3" id="621" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1246,184 +1384,184 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="525" >
+<COMPONENT type="5101" id="626" >
 <cdparam x="322" y="295" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="524" />
+<TGConnectingPoint num="0" id="625" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="566" >
+<COMPONENT type="5106" id="667" >
 <cdparam x="525" y="296" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="error" />
-<TGConnectingPoint num="0" id="526" />
-<TGConnectingPoint num="1" id="527" />
-<TGConnectingPoint num="2" id="528" />
-<TGConnectingPoint num="3" id="529" />
-<TGConnectingPoint num="4" id="530" />
-<TGConnectingPoint num="5" id="531" />
-<TGConnectingPoint num="6" id="532" />
-<TGConnectingPoint num="7" id="533" />
-<TGConnectingPoint num="8" id="534" />
-<TGConnectingPoint num="9" id="535" />
-<TGConnectingPoint num="10" id="536" />
-<TGConnectingPoint num="11" id="537" />
-<TGConnectingPoint num="12" id="538" />
-<TGConnectingPoint num="13" id="539" />
-<TGConnectingPoint num="14" id="540" />
-<TGConnectingPoint num="15" id="541" />
-<TGConnectingPoint num="16" id="542" />
-<TGConnectingPoint num="17" id="543" />
-<TGConnectingPoint num="18" id="544" />
-<TGConnectingPoint num="19" id="545" />
-<TGConnectingPoint num="20" id="546" />
-<TGConnectingPoint num="21" id="547" />
-<TGConnectingPoint num="22" id="548" />
-<TGConnectingPoint num="23" id="549" />
-<TGConnectingPoint num="24" id="550" />
-<TGConnectingPoint num="25" id="551" />
-<TGConnectingPoint num="26" id="552" />
-<TGConnectingPoint num="27" id="553" />
-<TGConnectingPoint num="28" id="554" />
-<TGConnectingPoint num="29" id="555" />
-<TGConnectingPoint num="30" id="556" />
-<TGConnectingPoint num="31" id="557" />
-<TGConnectingPoint num="32" id="558" />
-<TGConnectingPoint num="33" id="559" />
-<TGConnectingPoint num="34" id="560" />
-<TGConnectingPoint num="35" id="561" />
-<TGConnectingPoint num="36" id="562" />
-<TGConnectingPoint num="37" id="563" />
-<TGConnectingPoint num="38" id="564" />
-<TGConnectingPoint num="39" id="565" />
+<TGConnectingPoint num="0" id="627" />
+<TGConnectingPoint num="1" id="628" />
+<TGConnectingPoint num="2" id="629" />
+<TGConnectingPoint num="3" id="630" />
+<TGConnectingPoint num="4" id="631" />
+<TGConnectingPoint num="5" id="632" />
+<TGConnectingPoint num="6" id="633" />
+<TGConnectingPoint num="7" id="634" />
+<TGConnectingPoint num="8" id="635" />
+<TGConnectingPoint num="9" id="636" />
+<TGConnectingPoint num="10" id="637" />
+<TGConnectingPoint num="11" id="638" />
+<TGConnectingPoint num="12" id="639" />
+<TGConnectingPoint num="13" id="640" />
+<TGConnectingPoint num="14" id="641" />
+<TGConnectingPoint num="15" id="642" />
+<TGConnectingPoint num="16" id="643" />
+<TGConnectingPoint num="17" id="644" />
+<TGConnectingPoint num="18" id="645" />
+<TGConnectingPoint num="19" id="646" />
+<TGConnectingPoint num="20" id="647" />
+<TGConnectingPoint num="21" id="648" />
+<TGConnectingPoint num="22" id="649" />
+<TGConnectingPoint num="23" id="650" />
+<TGConnectingPoint num="24" id="651" />
+<TGConnectingPoint num="25" id="652" />
+<TGConnectingPoint num="26" id="653" />
+<TGConnectingPoint num="27" id="654" />
+<TGConnectingPoint num="28" id="655" />
+<TGConnectingPoint num="29" id="656" />
+<TGConnectingPoint num="30" id="657" />
+<TGConnectingPoint num="31" id="658" />
+<TGConnectingPoint num="32" id="659" />
+<TGConnectingPoint num="33" id="660" />
+<TGConnectingPoint num="34" id="661" />
+<TGConnectingPoint num="35" id="662" />
+<TGConnectingPoint num="36" id="663" />
+<TGConnectingPoint num="37" id="664" />
+<TGConnectingPoint num="38" id="665" />
+<TGConnectingPoint num="39" id="666" />
 <accessibility />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="577" >
+<COMPONENT type="5104" id="678" >
 <cdparam x="518" y="222" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="fail()" />
-<TGConnectingPoint num="0" id="567" />
-<TGConnectingPoint num="1" id="568" />
-<TGConnectingPoint num="2" id="569" />
-<TGConnectingPoint num="3" id="570" />
-<TGConnectingPoint num="4" id="571" />
-<TGConnectingPoint num="5" id="572" />
-<TGConnectingPoint num="6" id="573" />
-<TGConnectingPoint num="7" id="574" />
-<TGConnectingPoint num="8" id="575" />
-<TGConnectingPoint num="9" id="576" />
+<TGConnectingPoint num="0" id="668" />
+<TGConnectingPoint num="1" id="669" />
+<TGConnectingPoint num="2" id="670" />
+<TGConnectingPoint num="3" id="671" />
+<TGConnectingPoint num="4" id="672" />
+<TGConnectingPoint num="5" id="673" />
+<TGConnectingPoint num="6" id="674" />
+<TGConnectingPoint num="7" id="675" />
+<TGConnectingPoint num="8" id="676" />
+<TGConnectingPoint num="9" id="677" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="588" >
+<COMPONENT type="5104" id="689" >
 <cdparam x="339" y="215" />
 <sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="receive()" />
-<TGConnectingPoint num="0" id="578" />
-<TGConnectingPoint num="1" id="579" />
-<TGConnectingPoint num="2" id="580" />
-<TGConnectingPoint num="3" id="581" />
-<TGConnectingPoint num="4" id="582" />
-<TGConnectingPoint num="5" id="583" />
-<TGConnectingPoint num="6" id="584" />
-<TGConnectingPoint num="7" id="585" />
-<TGConnectingPoint num="8" id="586" />
-<TGConnectingPoint num="9" id="587" />
+<TGConnectingPoint num="0" id="679" />
+<TGConnectingPoint num="1" id="680" />
+<TGConnectingPoint num="2" id="681" />
+<TGConnectingPoint num="3" id="682" />
+<TGConnectingPoint num="4" id="683" />
+<TGConnectingPoint num="5" id="684" />
+<TGConnectingPoint num="6" id="685" />
+<TGConnectingPoint num="7" id="686" />
+<TGConnectingPoint num="8" id="687" />
+<TGConnectingPoint num="9" id="688" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="629" >
+<COMPONENT type="5106" id="730" >
 <cdparam x="392" y="92" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="state0" />
-<TGConnectingPoint num="0" id="589" />
-<TGConnectingPoint num="1" id="590" />
-<TGConnectingPoint num="2" id="591" />
-<TGConnectingPoint num="3" id="592" />
-<TGConnectingPoint num="4" id="593" />
-<TGConnectingPoint num="5" id="594" />
-<TGConnectingPoint num="6" id="595" />
-<TGConnectingPoint num="7" id="596" />
-<TGConnectingPoint num="8" id="597" />
-<TGConnectingPoint num="9" id="598" />
-<TGConnectingPoint num="10" id="599" />
-<TGConnectingPoint num="11" id="600" />
-<TGConnectingPoint num="12" id="601" />
-<TGConnectingPoint num="13" id="602" />
-<TGConnectingPoint num="14" id="603" />
-<TGConnectingPoint num="15" id="604" />
-<TGConnectingPoint num="16" id="605" />
-<TGConnectingPoint num="17" id="606" />
-<TGConnectingPoint num="18" id="607" />
-<TGConnectingPoint num="19" id="608" />
-<TGConnectingPoint num="20" id="609" />
-<TGConnectingPoint num="21" id="610" />
-<TGConnectingPoint num="22" id="611" />
-<TGConnectingPoint num="23" id="612" />
-<TGConnectingPoint num="24" id="613" />
-<TGConnectingPoint num="25" id="614" />
-<TGConnectingPoint num="26" id="615" />
-<TGConnectingPoint num="27" id="616" />
-<TGConnectingPoint num="28" id="617" />
-<TGConnectingPoint num="29" id="618" />
-<TGConnectingPoint num="30" id="619" />
-<TGConnectingPoint num="31" id="620" />
-<TGConnectingPoint num="32" id="621" />
-<TGConnectingPoint num="33" id="622" />
-<TGConnectingPoint num="34" id="623" />
-<TGConnectingPoint num="35" id="624" />
-<TGConnectingPoint num="36" id="625" />
-<TGConnectingPoint num="37" id="626" />
-<TGConnectingPoint num="38" id="627" />
-<TGConnectingPoint num="39" id="628" />
+<TGConnectingPoint num="0" id="690" />
+<TGConnectingPoint num="1" id="691" />
+<TGConnectingPoint num="2" id="692" />
+<TGConnectingPoint num="3" id="693" />
+<TGConnectingPoint num="4" id="694" />
+<TGConnectingPoint num="5" id="695" />
+<TGConnectingPoint num="6" id="696" />
+<TGConnectingPoint num="7" id="697" />
+<TGConnectingPoint num="8" id="698" />
+<TGConnectingPoint num="9" id="699" />
+<TGConnectingPoint num="10" id="700" />
+<TGConnectingPoint num="11" id="701" />
+<TGConnectingPoint num="12" id="702" />
+<TGConnectingPoint num="13" id="703" />
+<TGConnectingPoint num="14" id="704" />
+<TGConnectingPoint num="15" id="705" />
+<TGConnectingPoint num="16" id="706" />
+<TGConnectingPoint num="17" id="707" />
+<TGConnectingPoint num="18" id="708" />
+<TGConnectingPoint num="19" id="709" />
+<TGConnectingPoint num="20" id="710" />
+<TGConnectingPoint num="21" id="711" />
+<TGConnectingPoint num="22" id="712" />
+<TGConnectingPoint num="23" id="713" />
+<TGConnectingPoint num="24" id="714" />
+<TGConnectingPoint num="25" id="715" />
+<TGConnectingPoint num="26" id="716" />
+<TGConnectingPoint num="27" id="717" />
+<TGConnectingPoint num="28" id="718" />
+<TGConnectingPoint num="29" id="719" />
+<TGConnectingPoint num="30" id="720" />
+<TGConnectingPoint num="31" id="721" />
+<TGConnectingPoint num="32" id="722" />
+<TGConnectingPoint num="33" id="723" />
+<TGConnectingPoint num="34" id="724" />
+<TGConnectingPoint num="35" id="725" />
+<TGConnectingPoint num="36" id="726" />
+<TGConnectingPoint num="37" id="727" />
+<TGConnectingPoint num="38" id="728" />
+<TGConnectingPoint num="39" id="729" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="631" >
+<COMPONENT type="5100" id="732" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="630" />
+<TGConnectingPoint num="0" id="731" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Block0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="638" >
+<CONNECTOR type="5102" id="739" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="637" />
-<P1  x="407" y="70" id="734" />
-<P2  x="407" y="115" id="694" />
+<TGConnectingPoint num="0" id="738" />
+<P1  x="407" y="70" id="835" />
+<P2  x="407" y="115" id="795" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="636" >
-<father id="638" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="737" >
+<father id="739" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="632" />
-<TGConnectingPoint num="1" id="633" />
-<TGConnectingPoint num="2" id="634" />
-<TGConnectingPoint num="3" id="635" />
+<TGConnectingPoint num="0" id="733" />
+<TGConnectingPoint num="1" id="734" />
+<TGConnectingPoint num="2" id="735" />
+<TGConnectingPoint num="3" id="736" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1433,25 +1571,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="645" >
+<CONNECTOR type="5102" id="746" >
 <cdparam x="357" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="644" />
-<P1  x="357" y="165" id="698" />
-<P2  x="306" y="224" id="682" />
+<TGConnectingPoint num="0" id="745" />
+<P1  x="357" y="165" id="799" />
+<P2  x="306" y="224" id="783" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="643" >
-<father id="645" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="744" >
+<father id="746" num="0" />
 <cdparam x="357" y="205" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="639" />
-<TGConnectingPoint num="1" id="640" />
-<TGConnectingPoint num="2" id="641" />
-<TGConnectingPoint num="3" id="642" />
+<TGConnectingPoint num="0" id="740" />
+<TGConnectingPoint num="1" id="741" />
+<TGConnectingPoint num="2" id="742" />
+<TGConnectingPoint num="3" id="743" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1461,25 +1599,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="652" >
+<CONNECTOR type="5102" id="753" >
 <cdparam x="457" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="651" />
-<P1  x="457" y="165" id="700" />
-<P2  x="503" y="244" id="671" />
+<TGConnectingPoint num="0" id="752" />
+<P1  x="457" y="165" id="801" />
+<P2  x="503" y="244" id="772" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="650" >
-<father id="652" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="751" >
+<father id="753" num="0" />
 <cdparam x="457" y="205" />
 <sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="646" />
-<TGConnectingPoint num="1" id="647" />
-<TGConnectingPoint num="2" id="648" />
-<TGConnectingPoint num="3" id="649" />
+<TGConnectingPoint num="0" id="747" />
+<TGConnectingPoint num="1" id="748" />
+<TGConnectingPoint num="2" id="749" />
+<TGConnectingPoint num="3" id="750" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -1489,25 +1627,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="659" >
+<CONNECTOR type="5102" id="760" >
 <cdparam x="306" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="658" />
-<P1  x="306" y="254" id="683" />
-<P2  x="308" y="307" id="669" />
+<TGConnectingPoint num="0" id="759" />
+<P1  x="306" y="254" id="784" />
+<P2  x="308" y="307" id="770" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="657" >
-<father id="659" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="758" >
+<father id="760" num="0" />
 <cdparam x="306" y="294" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="653" />
-<TGConnectingPoint num="1" id="654" />
-<TGConnectingPoint num="2" id="655" />
-<TGConnectingPoint num="3" id="656" />
+<TGConnectingPoint num="0" id="754" />
+<TGConnectingPoint num="1" id="755" />
+<TGConnectingPoint num="2" id="756" />
+<TGConnectingPoint num="3" id="757" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1517,25 +1655,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="666" >
+<CONNECTOR type="5102" id="767" >
 <cdparam x="503" y="274" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="665" />
-<P1  x="503" y="274" id="672" />
-<P2  x="510" y="305" id="667" />
+<TGConnectingPoint num="0" id="766" />
+<P1  x="503" y="274" id="773" />
+<P2  x="510" y="305" id="768" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="664" >
-<father id="666" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="765" >
+<father id="767" num="0" />
 <cdparam x="503" y="314" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="660" />
-<TGConnectingPoint num="1" id="661" />
-<TGConnectingPoint num="2" id="662" />
-<TGConnectingPoint num="3" id="663" />
+<TGConnectingPoint num="0" id="761" />
+<TGConnectingPoint num="1" id="762" />
+<TGConnectingPoint num="2" id="763" />
+<TGConnectingPoint num="3" id="764" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1545,117 +1683,117 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="668" >
+<COMPONENT type="5101" id="769" >
 <cdparam x="500" y="310" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="667" />
+<TGConnectingPoint num="0" id="768" />
 </COMPONENT>
 
-<COMPONENT type="5101" id="670" >
+<COMPONENT type="5101" id="771" >
 <cdparam x="298" y="312" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="669" />
+<TGConnectingPoint num="0" id="770" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="681" >
+<COMPONENT type="5103" id="782" >
 <cdparam x="484" y="249" />
 <sizeparam width="38" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="fail()" />
-<TGConnectingPoint num="0" id="671" />
-<TGConnectingPoint num="1" id="672" />
-<TGConnectingPoint num="2" id="673" />
-<TGConnectingPoint num="3" id="674" />
-<TGConnectingPoint num="4" id="675" />
-<TGConnectingPoint num="5" id="676" />
-<TGConnectingPoint num="6" id="677" />
-<TGConnectingPoint num="7" id="678" />
-<TGConnectingPoint num="8" id="679" />
-<TGConnectingPoint num="9" id="680" />
+<TGConnectingPoint num="0" id="772" />
+<TGConnectingPoint num="1" id="773" />
+<TGConnectingPoint num="2" id="774" />
+<TGConnectingPoint num="3" id="775" />
+<TGConnectingPoint num="4" id="776" />
+<TGConnectingPoint num="5" id="777" />
+<TGConnectingPoint num="6" id="778" />
+<TGConnectingPoint num="7" id="779" />
+<TGConnectingPoint num="8" id="780" />
+<TGConnectingPoint num="9" id="781" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="692" >
+<COMPONENT type="5103" id="793" >
 <cdparam x="281" y="229" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="send()" />
-<TGConnectingPoint num="0" id="682" />
-<TGConnectingPoint num="1" id="683" />
-<TGConnectingPoint num="2" id="684" />
-<TGConnectingPoint num="3" id="685" />
-<TGConnectingPoint num="4" id="686" />
-<TGConnectingPoint num="5" id="687" />
-<TGConnectingPoint num="6" id="688" />
-<TGConnectingPoint num="7" id="689" />
-<TGConnectingPoint num="8" id="690" />
-<TGConnectingPoint num="9" id="691" />
+<TGConnectingPoint num="0" id="783" />
+<TGConnectingPoint num="1" id="784" />
+<TGConnectingPoint num="2" id="785" />
+<TGConnectingPoint num="3" id="786" />
+<TGConnectingPoint num="4" id="787" />
+<TGConnectingPoint num="5" id="788" />
+<TGConnectingPoint num="6" id="789" />
+<TGConnectingPoint num="7" id="790" />
+<TGConnectingPoint num="8" id="791" />
+<TGConnectingPoint num="9" id="792" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="733" >
+<COMPONENT type="5106" id="834" >
 <cdparam x="357" y="115" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="state0" />
-<TGConnectingPoint num="0" id="693" />
-<TGConnectingPoint num="1" id="694" />
-<TGConnectingPoint num="2" id="695" />
-<TGConnectingPoint num="3" id="696" />
-<TGConnectingPoint num="4" id="697" />
-<TGConnectingPoint num="5" id="698" />
-<TGConnectingPoint num="6" id="699" />
-<TGConnectingPoint num="7" id="700" />
-<TGConnectingPoint num="8" id="701" />
-<TGConnectingPoint num="9" id="702" />
-<TGConnectingPoint num="10" id="703" />
-<TGConnectingPoint num="11" id="704" />
-<TGConnectingPoint num="12" id="705" />
-<TGConnectingPoint num="13" id="706" />
-<TGConnectingPoint num="14" id="707" />
-<TGConnectingPoint num="15" id="708" />
-<TGConnectingPoint num="16" id="709" />
-<TGConnectingPoint num="17" id="710" />
-<TGConnectingPoint num="18" id="711" />
-<TGConnectingPoint num="19" id="712" />
-<TGConnectingPoint num="20" id="713" />
-<TGConnectingPoint num="21" id="714" />
-<TGConnectingPoint num="22" id="715" />
-<TGConnectingPoint num="23" id="716" />
-<TGConnectingPoint num="24" id="717" />
-<TGConnectingPoint num="25" id="718" />
-<TGConnectingPoint num="26" id="719" />
-<TGConnectingPoint num="27" id="720" />
-<TGConnectingPoint num="28" id="721" />
-<TGConnectingPoint num="29" id="722" />
-<TGConnectingPoint num="30" id="723" />
-<TGConnectingPoint num="31" id="724" />
-<TGConnectingPoint num="32" id="725" />
-<TGConnectingPoint num="33" id="726" />
-<TGConnectingPoint num="34" id="727" />
-<TGConnectingPoint num="35" id="728" />
-<TGConnectingPoint num="36" id="729" />
-<TGConnectingPoint num="37" id="730" />
-<TGConnectingPoint num="38" id="731" />
-<TGConnectingPoint num="39" id="732" />
+<TGConnectingPoint num="0" id="794" />
+<TGConnectingPoint num="1" id="795" />
+<TGConnectingPoint num="2" id="796" />
+<TGConnectingPoint num="3" id="797" />
+<TGConnectingPoint num="4" id="798" />
+<TGConnectingPoint num="5" id="799" />
+<TGConnectingPoint num="6" id="800" />
+<TGConnectingPoint num="7" id="801" />
+<TGConnectingPoint num="8" id="802" />
+<TGConnectingPoint num="9" id="803" />
+<TGConnectingPoint num="10" id="804" />
+<TGConnectingPoint num="11" id="805" />
+<TGConnectingPoint num="12" id="806" />
+<TGConnectingPoint num="13" id="807" />
+<TGConnectingPoint num="14" id="808" />
+<TGConnectingPoint num="15" id="809" />
+<TGConnectingPoint num="16" id="810" />
+<TGConnectingPoint num="17" id="811" />
+<TGConnectingPoint num="18" id="812" />
+<TGConnectingPoint num="19" id="813" />
+<TGConnectingPoint num="20" id="814" />
+<TGConnectingPoint num="21" id="815" />
+<TGConnectingPoint num="22" id="816" />
+<TGConnectingPoint num="23" id="817" />
+<TGConnectingPoint num="24" id="818" />
+<TGConnectingPoint num="25" id="819" />
+<TGConnectingPoint num="26" id="820" />
+<TGConnectingPoint num="27" id="821" />
+<TGConnectingPoint num="28" id="822" />
+<TGConnectingPoint num="29" id="823" />
+<TGConnectingPoint num="30" id="824" />
+<TGConnectingPoint num="31" id="825" />
+<TGConnectingPoint num="32" id="826" />
+<TGConnectingPoint num="33" id="827" />
+<TGConnectingPoint num="34" id="828" />
+<TGConnectingPoint num="35" id="829" />
+<TGConnectingPoint num="36" id="830" />
+<TGConnectingPoint num="37" id="831" />
+<TGConnectingPoint num="38" id="832" />
+<TGConnectingPoint num="39" id="833" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="735" >
+<COMPONENT type="5100" id="836" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="734" />
+<TGConnectingPoint num="0" id="835" />
 </COMPONENT>
 
 
diff --git a/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
new file mode 100755
index 0000000000..124c03a0a8
--- /dev/null
+++ b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
@@ -0,0 +1,164 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class TGConnectorMessageAsyncOrSyncSD
+   * Connector used in SD for exchanging messages between instances
+   * Creation: 18/04/2016
+   * @version 1.0 18/04/2016
+   * @author Ludovic APVRILLE
+   * @see
+   */
+
+package ui.sd;
+
+
+import java.awt.*;
+import java.awt.geom.*;
+import java.util.*;
+
+import myutil.*;
+import ui.*;
+
+
+public  class TGConnectorMessageAsyncOrSyncSD extends TGConnectorMessageSD {
+    public boolean isAsync;
+
+    protected int arrowLength = 10;
+
+    public TGConnectorMessageAsyncOrSyncSD( int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos,
+                                            TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2,
+                                            Vector _listPoint ) {
+        super(_x, _y,  _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
+        myImageIcon = IconManager.imgic504;
+    }
+
+    protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
+        if (isAsync) {
+            if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
+                g.drawLine(x1, y1, x2, y2);
+            } else {
+                GraphicLib.arrowWithLine(g, 1, 1, 10, x1, y1, x2, y2, false);
+            }
+
+            if (!tdp.isScaled()) {
+                widthValue  = g.getFontMetrics().stringWidth(value);
+                heightValue = g.getFontMetrics().getHeight();
+            }
+
+            g.drawString(value, ((p1.getX() + p2.getX()) / 2)-widthValue/2, ((p1.getY() + p2.getY()) / 2) - 5);
+        } else {
+            if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
+                g.drawLine(x1, y1, x2, y2);
+            } else {
+                GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
+            }
+
+            if (!tdp.isScaled()) {
+                widthValue  = g.getFontMetrics().stringWidth(value);
+                heightValue = g.getFontMetrics().getHeight();
+            }
+
+            //g.drawString(value, (p1.getX() + p2.getX()) / 2, ((p1.getY() + p2.getY()) / 2) - 5);
+            g.drawString(value, ((p1.getX() + p2.getX()) / 2)-widthValue/2, ((p1.getY() + p2.getY()) / 2) - 5);
+        }
+    }
+
+    public void setType(boolean _isAsync) {
+	isAsync = isAsync;
+    }
+
+    public int getType() {
+        if (isAsync) {
+            return TGComponentManager.CONNECTOR_MESSAGE_ASYNC_SD;
+        } else {
+            return  return TGComponentManager.CONNECTOR_MESSAGE_SYNC_SD;
+        }
+    }
+
+     protected String translateExtraParam() {
+        StringBuffer sb = new StringBuffer("<extraparam>\n");
+        sb.append("<isAsync value=\"" + isAsync + "\" /> ");
+        sb.append("</extraparam>\n");
+        return new String(sb);
+    }
+
+
+    public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+
+        String s;
+        String tmpGlobalCode = "";
+
+        try {
+            NodeList nli;
+            Node n1, n2;
+            Element elt;
+            isAsync = false;
+
+
+            //System.out.println("Loading attributes");
+            //System.out.println(nl.toString());
+
+            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++) {
+                        n2 = nli.item(j);
+                        //System.out.println(n2);
+                        if (n2.getNodeType() == Node.ELEMENT_NODE) {
+                            elt = (Element) n2;
+			    if (elt.getTagName().equals("isAsync")) {
+                                s = elt.getAttribute("value");
+                                if (s.equals("true")) {
+                                    isAsync = true;
+                                } else {
+				    isAsync = false;
+				}
+                            }
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            throw new MalformedModelingException();
+        }
+    }
+    
+}
diff --git a/src/ui/sd/TGConnectorMessageAsyncSD.java b/src/ui/sd/TGConnectorMessageAsyncSD.java
index 3258ee66f5..0f05d0570c 100755
--- a/src/ui/sd/TGConnectorMessageAsyncSD.java
+++ b/src/ui/sd/TGConnectorMessageAsyncSD.java
@@ -1,48 +1,48 @@
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
-ludovic.apvrille AT enst.fr
-
-This software is a computer program whose purpose is to allow the 
-edition of TURTLE analysis, design and deployment diagrams, to 
-allow the generation of RT-LOTOS or Java code from this diagram, 
-and at last to allow the analysis of formal validation traces 
-obtained from external tools, e.g. RTL from LAAS-CNRS and CADP 
-from INRIA Rhone-Alpes.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and  rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.
-
-/**
- * Class TGConnectorMessageAsyncSD
- * Connector used in SD for exchanging messages between instances
- * Creation: 04/10/2004
- * @version 1.0 04/10/2004
- * @author Ludovic APVRILLE
- * @see
- */
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class TGConnectorMessageAsyncSD
+   * Connector used in SD for exchanging messages between instances
+   * Creation: 04/10/2004
+   * @version 1.0 04/10/2004
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package ui.sd;
 
@@ -50,6 +50,10 @@ package ui.sd;
 import java.awt.*;
 import java.awt.geom.*;
 import java.util.*;
+import java.awt.event.*;
+import javax.swing.*;
+
+
 
 import myutil.*;
 import ui.*;
@@ -58,30 +62,40 @@ import ui.*;
 public  class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
 
     protected int arrowLength = 10;
-    
+
     public TGConnectorMessageAsyncSD( int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos,
-																			TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2,
-																			Vector _listPoint ) {
+                                      TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2,
+                                      Vector _listPoint ) {
         super(_x, _y,  _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
         myImageIcon = IconManager.imgic504;
     }
-    
+
     protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
         if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
             g.drawLine(x1, y1, x2, y2);
         } else {
             GraphicLib.arrowWithLine(g, 1, 1, 10, x1, y1, x2, y2, false);
         }
-        
+
         if (!tdp.isScaled()) {
             widthValue  = g.getFontMetrics().stringWidth(value);
             heightValue = g.getFontMetrics().getHeight();
         }
-        
+
         g.drawString(value, ((p1.getX() + p2.getX()) / 2)-widthValue/2, ((p1.getY() + p2.getY()) / 2) - 5);
     }
-    
+
     public int getType() {
         return TGComponentManager.CONNECTOR_MESSAGE_ASYNC_SD;
     }
+
+    public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
+        componentMenu.addSeparator();
+        JMenuItem generate = null;
+        // Should verify first whether it is connected to a formal requirement with a verify relation, or not
+        generate = new JMenuItem(TO_SYNC);
+
+        generate.addActionListener(menuAL);
+        componentMenu.add(generate);
+    }
 }
diff --git a/src/ui/sd/TGConnectorMessageSD.java b/src/ui/sd/TGConnectorMessageSD.java
index c650e98174..61ab4d0f65 100755
--- a/src/ui/sd/TGConnectorMessageSD.java
+++ b/src/ui/sd/TGConnectorMessageSD.java
@@ -1,54 +1,54 @@
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
-ludovic.apvrille AT enst.fr
-
-This software is a computer program whose purpose is to allow the 
-edition of TURTLE analysis, design and deployment diagrams, to 
-allow the generation of RT-LOTOS or Java code from this diagram, 
-and at last to allow the analysis of formal validation traces 
-obtained from external tools, e.g. RTL from LAAS-CNRS and CADP 
-from INRIA Rhone-Alpes.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and  rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.
-
-/**
-* Class TGConnectorMessageSD
-* Connector used in SD for exchanging messages between instances
-* Creation: 04/10/2004
-* @version 1.0 04/10/2004
-* @author Ludovic APVRILLE
-* @see
-*/
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class TGConnectorMessageSD
+   * Connector used in SD for exchanging messages between instances
+   * Creation: 04/10/2004
+   * @version 1.0 04/10/2004
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package ui.sd;
 
 
 
-//import java.awt.*;
+import java.awt.event.*;
 //import java.awt.geom.*;
 import javax.swing.*;
 import java.util.*;
@@ -56,84 +56,89 @@ import java.util.*;
 import myutil.*;
 import ui.*;
 
-public  abstract class TGConnectorMessageSD extends TGConnector {
+public abstract class TGConnectorMessageSD extends TGConnector {
+    public final String TO_SYNC = "To synchronous message";
+    public final String TO_ASYNC = "To asynchronous message";
+
     protected int arrowLength = 10;
     protected int widthValue, heightValue;
-    
+
+   
+
     public TGConnectorMessageSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
         super(_x, _y,  _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
         myImageIcon = IconManager.imgic202;
         value = "msg?";
         editable = true;
     }
-    
+
     public String getMessage() {
         return value;
     }
-	
-	// Part before '()' section
-	public String getFirstPartMessage() {
-		int index0 = value.indexOf('(');
-			if (index0 == -1) {
-				return value;
-			} else {
-				return value.substring(0, index0);
-			}		
-	}
-	
-	public String getSecondPartMessage() {
-		String tmp = value.trim();
-		int index0 = tmp.indexOf('(');
-			if (index0 == -1) {
-				return "";
-			} else {
-				return tmp.substring(index0, tmp.length());
-			}		
-	}
-	
-	public boolean isMessageWellFormed() {
-		//System.out.println("Analyzing message:" + value);
-		
-		int index0 = value.indexOf('(');
-		String name;
-		
-		if (index0 == -1) {
-			name = value;
-		} else {
-			name = value.substring(0, index0);
-		}
-		
-		if (!TAttribute.isAValidId(name, false, false)) {
-			return false;
-		}
-			
-		if (index0 == -1) {
-			return true;
-		}
-		
-		String tmp = value.trim();
-		if (!tmp.endsWith(")")) {
-			return false;
-		}
-		
-		// Check for individual parameters
-		index0 = tmp.indexOf('(');
-		tmp = tmp.substring(index0+1, tmp.length()-1);
-		
-		String[] params = tmp.split(",");
-		for(int i=0; i<params.length; i++) {
-			tmp = params[i].trim();
-			//System.out.println("First=" + tmp);
-			if (!TAttribute.isAValidId(tmp, false, false)) {
-				return false;
-			}
-		}
-		
-		return true;
-	}
-	
-	
-    
+
+    // Part before '()' section
+    public String getFirstPartMessage() {
+        int index0 = value.indexOf('(');
+        if (index0 == -1) {
+            return value;
+        } else {
+            return value.substring(0, index0);
+        }
+    }
+
+    public String getSecondPartMessage() {
+        String tmp = value.trim();
+        int index0 = tmp.indexOf('(');
+        if (index0 == -1) {
+            return "";
+        } else {
+            return tmp.substring(index0, tmp.length());
+        }
+    }
+
+    public boolean isMessageWellFormed() {
+        //System.out.println("Analyzing message:" + value);
+
+        int index0 = value.indexOf('(');
+        String name;
+
+        if (index0 == -1) {
+            name = value;
+        } else {
+            name = value.substring(0, index0);
+        }
+
+        if (!TAttribute.isAValidId(name, false, false)) {
+            return false;
+        }
+
+        if (index0 == -1) {
+            return true;
+        }
+
+        String tmp = value.trim();
+        if (!tmp.endsWith(")")) {
+            return false;
+        }
+
+        // Check for individual parameters
+        index0 = tmp.indexOf('(');
+        tmp = tmp.substring(index0+1, tmp.length()-1);
+
+        String[] params = tmp.split(",");
+        for(int i=0; i<params.length; i++) {
+            tmp = params[i].trim();
+            //System.out.println("First=" + tmp);
+            if (!TAttribute.isAValidId(tmp, false, false)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
+
     public boolean editOndoubleClick(JFrame frame) {
         //System.out.println("Double click");
         String text = getName() + ": ";
@@ -141,28 +146,34 @@ public  abstract class TGConnectorMessageSD extends TGConnector {
             text = getTopLevelName() + " / " + text;
         }
         String s = (String)JOptionPane.showInputDialog(frame, text,
-			"setting message name", JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
-			null,
-			getValue());
+                                                       "setting message name", JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
+                                                       null,
+                                                       getValue());
         if ((s != null) && (s.length() > 0)) {
             setValue(s);
             return true;
         }
         return false;
     }
-    
-    public TGComponent extraIsOnOnlyMe(int x1, int y1) {  
+
+    public TGComponent extraIsOnOnlyMe(int x1, int y1) {
         //System.out.println("Extra");
         if (GraphicLib.isInRectangle(x1, y1, ((p1.getX() + p2.getX()) / 2)-widthValue/2, ((p1.getY() + p2.getY()) / 2) - 5 - heightValue, widthValue, heightValue)) {
             return this;
         }
         return null;
     }
-}
-
-
-
-
-
-
 
+    public boolean eventOnPopup(ActionEvent e) {
+        String s = e.getActionCommand();
+	TraceManager.addDev("action: " + s);
+        if (s.indexOf(TO_SYNC) > -1) {
+            TraceManager.addDev("To Sync message");
+        }
+	if (s.indexOf(TO_ASYNC) > -1) {
+            TraceManager.addDev("To async message");
+        } 
+            
+        return true;
+    }
+}
diff --git a/src/ui/sd/TGConnectorMessageSyncSD.java b/src/ui/sd/TGConnectorMessageSyncSD.java
index d0fc09701a..ac6d3d43a6 100755
--- a/src/ui/sd/TGConnectorMessageSyncSD.java
+++ b/src/ui/sd/TGConnectorMessageSyncSD.java
@@ -1,73 +1,75 @@
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
-ludovic.apvrille AT enst.fr
-
-This software is a computer program whose purpose is to allow the 
-edition of TURTLE analysis, design and deployment diagrams, to 
-allow the generation of RT-LOTOS or Java code from this diagram, 
-and at last to allow the analysis of formal validation traces 
-obtained from external tools, e.g. RTL from LAAS-CNRS and CADP 
-from INRIA Rhone-Alpes.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and  rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.
-
-/**
- * Class TGConnectorMessageSyncSD
- * Connector used in SD for exchanging messages between instances
- * Creation: 04/10/2004
- * @version 1.0 04/10/2004
- * @author Ludovic APVRILLE
- * @see
- */
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class TGConnectorMessageSyncSD
+   * Connector used in SD for exchanging messages between instances
+   * Creation: 04/10/2004
+   * @version 1.0 04/10/2004
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package ui.sd;
 
 import java.awt.*;
 import java.awt.geom.*;
 import java.util.*;
+import java.awt.event.*;
+import javax.swing.*;
 
 import myutil.*;
 import ui.*;
 
 public  class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
     protected int arrowLength = 10;
-    
+
     public TGConnectorMessageSyncSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
         super(_x, _y,  _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
         myImageIcon = IconManager.imgic502;
     }
-    
+
     protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
         if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
             g.drawLine(x1, y1, x2, y2);
         } else {
             GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
         }
-        
+
         if (!tdp.isScaled()) {
             widthValue  = g.getFontMetrics().stringWidth(value);
             heightValue = g.getFontMetrics().getHeight();
@@ -76,16 +78,19 @@ public  class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
         //g.drawString(value, (p1.getX() + p2.getX()) / 2, ((p1.getY() + p2.getY()) / 2) - 5);
         g.drawString(value, ((p1.getX() + p2.getX()) / 2)-widthValue/2, ((p1.getY() + p2.getY()) / 2) - 5);
     }
-    
+
+    public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
+        componentMenu.addSeparator();
+        JMenuItem generate = null;
+        // Should verify first whether it is connected to a formal requirement with a verify relation, or not
+        generate = new JMenuItem(TO_ASYNC);
+
+        generate.addActionListener(menuAL);
+        componentMenu.add(generate);
+    }
+
 
     public int getType() {
         return TGComponentManager.CONNECTOR_MESSAGE_SYNC_SD;
     }
 }
-
-
-
-
-
-
-
-- 
GitLab