From 3802338e0db3d805ba98e657f248f7e035a480e2 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Mon, 23 Apr 2018 18:01:20 +0200
Subject: [PATCH] Update on dialog windows: graphical enhancements
---
modeling/AVATAR/CoffeeMachine_Avatar.xml | 2542 +++++++-------
modeling/DIPLODOCUS/ZigBeeTutorial.xml | 2988 ++++++++---------
.../java/ui/avatarpd/AvatarPDProperty.java | 2 +-
.../java/ui/avatarrd/AvatarRDRequirement.java | 2 +-
src/main/java/ui/tmlcp/TMLCPForLoop.java | 57 +-
.../java/ui/window/JDialogAvatarProperty.java | 1 +
.../java/ui/window/JDialogAvatarState.java | 1 +
src/main/java/ui/window/JDialogBase.java | 43 +-
.../java/ui/window/JDialogConstraint.java | 1 +
.../java/ui/window/JDialogModelChecking.java | 124 +-
.../java/ui/window/JDialogMultiString.java | 70 +-
.../java/ui/window/JDialogMultiStringCP.java | 98 +-
.../java/ui/window/JDialogRequirement.java | 6 +-
.../ui/window/JDialogSelectAvatarBlock.java | 135 +-
.../ui/window/JDialogSelectTMLComponent.java | 96 +-
.../java/ui/window/JDialogSelectTMLNodes.java | 106 +-
16 files changed, 3177 insertions(+), 3095 deletions(-)
diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index fbfc6d8341..2015d36ada 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -540,8 +540,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
<TGConnectingPoint num="0" id="329" />
-<P1 x="502" y="258" id="455" />
-<P2 x="502" y="334" id="343" />
+<P1 x="503" y="258" id="455" />
+<P2 x="507" y="334" id="343" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="5310" id="336" >
@@ -578,7 +578,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="337" />
-<P1 x="313" y="261" id="368" />
+<P1 x="318" y="261" id="381" />
<P2 x="361" y="261" id="356" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -588,7 +588,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
<TGConnectingPoint num="0" id="339" />
<P1 x="390" y="286" id="354" />
-<P2 x="390" y="331" id="348" />
+<P2 x="394" y="331" id="348" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="5311" id="342" >
@@ -596,13 +596,13 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="341" />
-<P1 x="309" y="211" id="381" />
+<P1 x="318" y="211" id="368" />
<P2 x="361" y="211" id="355" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="5308" id="347" >
<cdparam x="446" y="334" />
-<sizeparam width="112" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="122" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
<infoparam name="TGComponent" value="WalletCoinProperty" />
@@ -618,7 +618,7 @@
<COMPONENT type="5308" id="352" >
<cdparam x="340" y="331" />
-<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="108" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
<infoparam name="TGComponent" value="oneCoinProperty" />
@@ -685,11 +685,11 @@
</COMPONENT>
<SUBCOMPONENT type="5304" id="378" >
<father id="416" num="0" />
-<cdparam x="165" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="166" y="191" />
+<sizeparam width="152" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<cdrectangleparam minX="0" maxX="16" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
<TGConnectingPoint num="0" id="366" />
<TGConnectingPoint num="1" id="367" />
<TGConnectingPoint num="2" id="368" />
@@ -705,11 +705,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5304" id="391" >
<father id="416" num="1" />
-<cdparam x="170" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="154" y="241" />
+<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<cdrectangleparam minX="0" maxX="4" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
<TGConnectingPoint num="0" id="379" />
<TGConnectingPoint num="1" id="380" />
<TGConnectingPoint num="2" id="381" />
@@ -781,7 +781,7 @@
<COMPONENT type="5306" id="466" >
<cdparam x="467" y="209" />
-<sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="103" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
<infoparam name="TGComponent" value="nbOfCoins >= 0" />
@@ -810,8 +810,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
<TGConnectingPoint num="0" id="467" />
-<P1 x="634" y="495" id="643" />
-<P2 x="635" y="562" id="500" />
+<P1 x="637" y="538" id="649" />
+<P2 x="638" y="563" id="500" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="5312" id="470" >
@@ -820,7 +820,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
<TGConnectingPoint num="0" id="469" />
<P1 x="577" y="471" id="654" />
-<P2 x="654" y="495" id="644" />
+<P2 x="617" y="498" id="642" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="5312" id="472" >
@@ -829,7 +829,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
<TGConnectingPoint num="0" id="471" />
<P1 x="694" y="472" id="496" />
-<P2 x="674" y="505" id="645" />
+<P2 x="657" y="498" id="644" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="5311" id="478" >
@@ -839,7 +839,7 @@
<TGConnectingPoint num="0" id="475" />
<TGConnectingPoint num="1" id="476" />
<TGConnectingPoint num="2" id="477" />
-<P1 x="581" y="154" id="564" />
+<P1 x="581" y="154" id="551" />
<P2 x="546" y="305" id="621" />
<Point x="518" y="154" />
<Point x="518" y="305" />
@@ -867,7 +867,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="480" />
<TGConnectingPoint num="1" id="481" />
-<P1 x="631" y="164" id="559" />
+<P1 x="631" y="164" id="546" />
<P2 x="667" y="310" id="608" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
@@ -895,7 +895,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="486" />
<TGConnectingPoint num="1" id="487" />
-<P1 x="721" y="158" id="544" />
+<P1 x="721" y="158" id="557" />
<P2 x="700" y="204" id="598" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
@@ -931,7 +931,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="493" />
-<P1 x="491" y="345" id="507" />
+<P1 x="492" y="345" id="507" />
<P2 x="546" y="345" id="625" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -952,8 +952,8 @@
</COMPONENT>
<COMPONENT type="5308" id="504" >
-<cdparam x="562" y="562" />
-<sizeparam width="146" height="54" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="559" y="563" />
+<sizeparam width="158" height="54" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="BeverageDeliverProperty" />
@@ -1001,9 +1001,9 @@
<SUBCOMPONENT type="5304" id="517" >
<father id="542" num="0" />
<cdparam x="391" y="326" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="101" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="32" minY="0" maxY="114" />
+<cdrectangleparam minX="0" maxX="31" minY="0" maxY="114" />
<infoparam name="TGComponent" value="beverageReady" />
<TGConnectingPoint num="0" id="505" />
<TGConnectingPoint num="1" id="506" />
@@ -1050,13 +1050,13 @@
<TGConnectingPoint num="22" id="591" />
<TGConnectingPoint num="23" id="592" />
</COMPONENT>
-<SUBCOMPONENT type="5303" id="555" >
+<SUBCOMPONENT type="5304" id="555" >
<father id="593" num="0" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
-<infoparam name="TGComponent" value="nbOfCoins" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
<TGConnectingPoint num="0" id="543" />
<TGConnectingPoint num="1" id="544" />
<TGConnectingPoint num="2" id="545" />
@@ -1069,17 +1069,14 @@
<TGConnectingPoint num="9" id="552" />
<TGConnectingPoint num="10" id="553" />
<TGConnectingPoint num="11" id="554" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="568" >
+<SUBCOMPONENT type="5303" id="568" >
<father id="593" num="1" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
+<infoparam name="TGComponent" value="nbOfCoins" />
<TGConnectingPoint num="0" id="556" />
<TGConnectingPoint num="1" id="557" />
<TGConnectingPoint num="2" id="558" />
@@ -1092,6 +1089,9 @@
<TGConnectingPoint num="9" id="565" />
<TGConnectingPoint num="10" id="566" />
<TGConnectingPoint num="11" id="567" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5306" id="605" >
@@ -1165,7 +1165,7 @@
</COMPONENT>
<COMPONENT type="5309" id="652" >
-<cdparam x="594" y="495" />
+<cdparam x="597" y="498" />
<sizeparam width="80" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
@@ -1213,7 +1213,7 @@
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
-<Validated value="Wallet;CoffeeMachine;CoffeeButton;TeaButton;" />
+<Validated value="Wallet;CoffeeMachine;TeaButton;CoffeeButton;" />
<Ignored value="" />
<CONNECTOR type="5002" id="659" >
@@ -1221,8 +1221,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="658" />
-<P1 x="559" y="330" id="712" />
-<P2 x="560" y="377" id="770" />
+<P1 x="559" y="330" id="720" />
+<P2 x="560" y="377" id="753" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushCoffeeButton()" />
@@ -1235,8 +1235,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
<TGConnectingPoint num="0" id="660" />
-<P1 x="306" y="110" id="692" />
-<P2 x="445" y="108" id="766" />
+<P1 x="306" y="110" id="675" />
+<P2 x="445" y="108" id="749" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in getCoin(int nbOfCoins)" />
@@ -1251,8 +1251,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="662" />
-<P1 x="789" y="326" id="737" />
-<P2 x="790" y="377" id="771" />
+<P1 x="789" y="326" id="695" />
+<P2 x="790" y="377" id="754" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushTeaButton()" />
@@ -1260,36 +1260,36 @@
<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
</extraparam>
</CONNECTOR>
-<COMPONENT type="5000" id="705" >
+<COMPONENT type="5000" id="688" >
<cdparam x="106" y="56" />
<sizeparam width="200" height="218" 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="Wallet" />
-<TGConnectingPoint num="0" id="681" />
-<TGConnectingPoint num="1" id="682" />
-<TGConnectingPoint num="2" id="683" />
-<TGConnectingPoint num="3" id="684" />
-<TGConnectingPoint num="4" id="685" />
-<TGConnectingPoint num="5" id="686" />
-<TGConnectingPoint num="6" id="687" />
-<TGConnectingPoint num="7" id="688" />
-<TGConnectingPoint num="8" id="689" />
-<TGConnectingPoint num="9" id="690" />
-<TGConnectingPoint num="10" id="691" />
-<TGConnectingPoint num="11" id="692" />
-<TGConnectingPoint num="12" id="693" />
-<TGConnectingPoint num="13" id="694" />
-<TGConnectingPoint num="14" id="695" />
-<TGConnectingPoint num="15" id="696" />
-<TGConnectingPoint num="16" id="697" />
-<TGConnectingPoint num="17" id="698" />
-<TGConnectingPoint num="18" id="699" />
-<TGConnectingPoint num="19" id="700" />
-<TGConnectingPoint num="20" id="701" />
-<TGConnectingPoint num="21" id="702" />
-<TGConnectingPoint num="22" id="703" />
-<TGConnectingPoint num="23" id="704" />
+<TGConnectingPoint num="0" id="664" />
+<TGConnectingPoint num="1" id="665" />
+<TGConnectingPoint num="2" id="666" />
+<TGConnectingPoint num="3" id="667" />
+<TGConnectingPoint num="4" id="668" />
+<TGConnectingPoint num="5" id="669" />
+<TGConnectingPoint num="6" id="670" />
+<TGConnectingPoint num="7" id="671" />
+<TGConnectingPoint num="8" id="672" />
+<TGConnectingPoint num="9" id="673" />
+<TGConnectingPoint num="10" id="674" />
+<TGConnectingPoint num="11" id="675" />
+<TGConnectingPoint num="12" id="676" />
+<TGConnectingPoint num="13" id="677" />
+<TGConnectingPoint num="14" id="678" />
+<TGConnectingPoint num="15" id="679" />
+<TGConnectingPoint num="16" id="680" />
+<TGConnectingPoint num="17" id="681" />
+<TGConnectingPoint num="18" id="682" />
+<TGConnectingPoint num="19" id="683" />
+<TGConnectingPoint num="20" id="684" />
+<TGConnectingPoint num="21" id="685" />
+<TGConnectingPoint num="22" id="686" />
+<TGConnectingPoint num="23" id="687" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
@@ -1302,36 +1302,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="780" >
+<COMPONENT type="5000" id="763" >
<cdparam x="445" y="19" />
<sizeparam width="461" height="358" 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="CoffeeMachine" />
-<TGConnectingPoint num="0" id="756" />
-<TGConnectingPoint num="1" id="757" />
-<TGConnectingPoint num="2" id="758" />
-<TGConnectingPoint num="3" id="759" />
-<TGConnectingPoint num="4" id="760" />
-<TGConnectingPoint num="5" id="761" />
-<TGConnectingPoint num="6" id="762" />
-<TGConnectingPoint num="7" id="763" />
-<TGConnectingPoint num="8" id="764" />
-<TGConnectingPoint num="9" id="765" />
-<TGConnectingPoint num="10" id="766" />
-<TGConnectingPoint num="11" id="767" />
-<TGConnectingPoint num="12" id="768" />
-<TGConnectingPoint num="13" id="769" />
-<TGConnectingPoint num="14" id="770" />
-<TGConnectingPoint num="15" id="771" />
-<TGConnectingPoint num="16" id="772" />
-<TGConnectingPoint num="17" id="773" />
-<TGConnectingPoint num="18" id="774" />
-<TGConnectingPoint num="19" id="775" />
-<TGConnectingPoint num="20" id="776" />
-<TGConnectingPoint num="21" id="777" />
-<TGConnectingPoint num="22" id="778" />
-<TGConnectingPoint num="23" id="779" />
+<TGConnectingPoint num="0" id="739" />
+<TGConnectingPoint num="1" id="740" />
+<TGConnectingPoint num="2" id="741" />
+<TGConnectingPoint num="3" id="742" />
+<TGConnectingPoint num="4" id="743" />
+<TGConnectingPoint num="5" id="744" />
+<TGConnectingPoint num="6" id="745" />
+<TGConnectingPoint num="7" id="746" />
+<TGConnectingPoint num="8" id="747" />
+<TGConnectingPoint num="9" id="748" />
+<TGConnectingPoint num="10" id="749" />
+<TGConnectingPoint num="11" id="750" />
+<TGConnectingPoint num="12" id="751" />
+<TGConnectingPoint num="13" id="752" />
+<TGConnectingPoint num="14" id="753" />
+<TGConnectingPoint num="15" id="754" />
+<TGConnectingPoint num="16" id="755" />
+<TGConnectingPoint num="17" id="756" />
+<TGConnectingPoint num="18" id="757" />
+<TGConnectingPoint num="19" id="758" />
+<TGConnectingPoint num="20" id="759" />
+<TGConnectingPoint num="21" id="760" />
+<TGConnectingPoint num="22" id="761" />
+<TGConnectingPoint num="23" id="762" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
@@ -1348,74 +1348,74 @@
<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="730" >
-<father id="780" num="0" />
-<cdparam x="464" y="228" />
-<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="713" >
+<father id="763" num="0" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="706" />
-<TGConnectingPoint num="1" id="707" />
-<TGConnectingPoint num="2" id="708" />
-<TGConnectingPoint num="3" id="709" />
-<TGConnectingPoint num="4" id="710" />
-<TGConnectingPoint num="5" id="711" />
-<TGConnectingPoint num="6" id="712" />
-<TGConnectingPoint num="7" id="713" />
-<TGConnectingPoint num="8" id="714" />
-<TGConnectingPoint num="9" id="715" />
-<TGConnectingPoint num="10" id="716" />
-<TGConnectingPoint num="11" id="717" />
-<TGConnectingPoint num="12" id="718" />
-<TGConnectingPoint num="13" id="719" />
-<TGConnectingPoint num="14" id="720" />
-<TGConnectingPoint num="15" id="721" />
-<TGConnectingPoint num="16" id="722" />
-<TGConnectingPoint num="17" id="723" />
-<TGConnectingPoint num="18" id="724" />
-<TGConnectingPoint num="19" id="725" />
-<TGConnectingPoint num="20" id="726" />
-<TGConnectingPoint num="21" id="727" />
-<TGConnectingPoint num="22" id="728" />
-<TGConnectingPoint num="23" id="729" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="689" />
+<TGConnectingPoint num="1" id="690" />
+<TGConnectingPoint num="2" id="691" />
+<TGConnectingPoint num="3" id="692" />
+<TGConnectingPoint num="4" id="693" />
+<TGConnectingPoint num="5" id="694" />
+<TGConnectingPoint num="6" id="695" />
+<TGConnectingPoint num="7" id="696" />
+<TGConnectingPoint num="8" id="697" />
+<TGConnectingPoint num="9" id="698" />
+<TGConnectingPoint num="10" id="699" />
+<TGConnectingPoint num="11" id="700" />
+<TGConnectingPoint num="12" id="701" />
+<TGConnectingPoint num="13" id="702" />
+<TGConnectingPoint num="14" id="703" />
+<TGConnectingPoint num="15" id="704" />
+<TGConnectingPoint num="16" id="705" />
+<TGConnectingPoint num="17" id="706" />
+<TGConnectingPoint num="18" id="707" />
+<TGConnectingPoint num="19" id="708" />
+<TGConnectingPoint num="20" id="709" />
+<TGConnectingPoint num="21" id="710" />
+<TGConnectingPoint num="22" id="711" />
+<TGConnectingPoint num="23" id="712" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
<Signal value="out push()" attached="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="755" >
-<father id="780" num="1" />
-<cdparam x="695" y="224" />
-<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="738" >
+<father id="763" num="1" />
+<cdparam x="464" y="228" />
+<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
-<TGConnectingPoint num="0" id="731" />
-<TGConnectingPoint num="1" id="732" />
-<TGConnectingPoint num="2" id="733" />
-<TGConnectingPoint num="3" id="734" />
-<TGConnectingPoint num="4" id="735" />
-<TGConnectingPoint num="5" id="736" />
-<TGConnectingPoint num="6" id="737" />
-<TGConnectingPoint num="7" id="738" />
-<TGConnectingPoint num="8" id="739" />
-<TGConnectingPoint num="9" id="740" />
-<TGConnectingPoint num="10" id="741" />
-<TGConnectingPoint num="11" id="742" />
-<TGConnectingPoint num="12" id="743" />
-<TGConnectingPoint num="13" id="744" />
-<TGConnectingPoint num="14" id="745" />
-<TGConnectingPoint num="15" id="746" />
-<TGConnectingPoint num="16" id="747" />
-<TGConnectingPoint num="17" id="748" />
-<TGConnectingPoint num="18" id="749" />
-<TGConnectingPoint num="19" id="750" />
-<TGConnectingPoint num="20" id="751" />
-<TGConnectingPoint num="21" id="752" />
-<TGConnectingPoint num="22" id="753" />
-<TGConnectingPoint num="23" id="754" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
+<TGConnectingPoint num="0" id="714" />
+<TGConnectingPoint num="1" id="715" />
+<TGConnectingPoint num="2" id="716" />
+<TGConnectingPoint num="3" id="717" />
+<TGConnectingPoint num="4" id="718" />
+<TGConnectingPoint num="5" id="719" />
+<TGConnectingPoint num="6" id="720" />
+<TGConnectingPoint num="7" id="721" />
+<TGConnectingPoint num="8" id="722" />
+<TGConnectingPoint num="9" id="723" />
+<TGConnectingPoint num="10" id="724" />
+<TGConnectingPoint num="11" id="725" />
+<TGConnectingPoint num="12" id="726" />
+<TGConnectingPoint num="13" id="727" />
+<TGConnectingPoint num="14" id="728" />
+<TGConnectingPoint num="15" id="729" />
+<TGConnectingPoint num="16" id="730" />
+<TGConnectingPoint num="17" id="731" />
+<TGConnectingPoint num="18" id="732" />
+<TGConnectingPoint num="19" id="733" />
+<TGConnectingPoint num="20" id="734" />
+<TGConnectingPoint num="21" id="735" />
+<TGConnectingPoint num="22" id="736" />
+<TGConnectingPoint num="23" id="737" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
@@ -1427,25 +1427,25 @@
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="787" >
+<CONNECTOR type="5102" id="770" >
<cdparam x="516" y="264" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="786" />
-<P1 x="485" y="219" id="828" />
-<P2 x="485" y="274" id="839" />
+<TGConnectingPoint num="0" id="769" />
+<P1 x="485" y="219" id="811" />
+<P2 x="485" y="274" id="822" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="785" >
-<father id="787" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="768" >
+<father id="770" num="0" />
<cdparam x="493" y="251" />
-<sizeparam width="161" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="173" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="781" />
-<TGConnectingPoint num="1" id="782" />
-<TGConnectingPoint num="2" id="783" />
-<TGConnectingPoint num="3" id="784" />
+<TGConnectingPoint num="0" id="764" />
+<TGConnectingPoint num="1" id="765" />
+<TGConnectingPoint num="2" id="766" />
+<TGConnectingPoint num="3" id="767" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1458,25 +1458,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="794" >
+<CONNECTOR type="5102" id="777" >
<cdparam x="382" y="165" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="793" />
-<P1 x="382" y="165" id="935" />
-<P2 x="485" y="189" id="827" />
+<TGConnectingPoint num="0" id="776" />
+<P1 x="382" y="165" id="918" />
+<P2 x="485" y="189" id="810" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="792" >
-<father id="794" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="775" >
+<father id="777" num="0" />
<cdparam x="382" 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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="788" />
-<TGConnectingPoint num="1" id="789" />
-<TGConnectingPoint num="2" id="790" />
-<TGConnectingPoint num="3" id="791" />
+<TGConnectingPoint num="0" id="771" />
+<TGConnectingPoint num="1" id="772" />
+<TGConnectingPoint num="2" id="773" />
+<TGConnectingPoint num="3" id="774" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1487,25 +1487,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="801" >
+<CONNECTOR type="5102" id="784" >
<cdparam x="223" y="260" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="800" />
-<P1 x="251" y="231" id="817" />
-<P2 x="252" y="300" id="880" />
+<TGConnectingPoint num="0" id="783" />
+<P1 x="251" y="231" id="800" />
+<P2 x="252" y="300" id="863" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="799" >
-<father id="801" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="782" >
+<father id="784" num="0" />
<cdparam x="175" y="246" />
-<sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="221" height="60" 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="795" />
-<TGConnectingPoint num="1" id="796" />
-<TGConnectingPoint num="2" id="797" />
-<TGConnectingPoint num="3" id="798" />
+<TGConnectingPoint num="0" id="778" />
+<TGConnectingPoint num="1" id="779" />
+<TGConnectingPoint num="2" id="780" />
+<TGConnectingPoint num="3" id="781" />
<extraparam>
<guard value="[ ]" />
<afterMin value="minUserDelay" />
@@ -1518,25 +1518,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="808" >
+<CONNECTOR type="5102" id="791" >
<cdparam x="357" y="165" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="807" />
-<P1 x="357" y="165" id="934" />
-<P2 x="251" y="201" id="816" />
+<TGConnectingPoint num="0" id="790" />
+<P1 x="357" y="165" id="917" />
+<P2 x="251" y="201" id="799" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="806" >
-<father id="808" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="789" >
+<father id="791" num="0" />
<cdparam x="220" y="174" />
-<sizeparam width="93" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="99" 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="802" />
-<TGConnectingPoint num="1" id="803" />
-<TGConnectingPoint num="2" id="804" />
-<TGConnectingPoint num="3" id="805" />
+<TGConnectingPoint num="0" id="785" />
+<TGConnectingPoint num="1" id="786" />
+<TGConnectingPoint num="2" id="787" />
+<TGConnectingPoint num="3" id="788" />
<extraparam>
<guard value="[nbOfCoins > 0]" />
<afterMin value="" />
@@ -1547,25 +1547,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="815" >
+<CONNECTOR type="5102" id="798" >
<cdparam x="369" y="115" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="814" />
-<P1 x="370" y="64" id="961" />
-<P2 x="370" y="135" id="921" />
+<TGConnectingPoint num="0" id="797" />
+<P1 x="370" y="64" id="944" />
+<P2 x="370" y="135" id="904" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="813" >
-<father id="815" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="796" >
+<father id="798" num="0" />
<cdparam x="376" y="105" />
-<sizeparam width="156" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="173" 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="809" />
-<TGConnectingPoint num="1" id="810" />
-<TGConnectingPoint num="2" id="811" />
-<TGConnectingPoint num="3" id="812" />
+<TGConnectingPoint num="0" id="792" />
+<TGConnectingPoint num="1" id="793" />
+<TGConnectingPoint num="2" id="794" />
+<TGConnectingPoint num="3" id="795" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1577,224 +1577,224 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="826" >
-<cdparam x="217" y="206" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="809" >
+<cdparam x="214" y="206" />
+<sizeparam width="74" 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="putCoin(x)" />
-<TGConnectingPoint num="0" id="816" />
-<TGConnectingPoint num="1" id="817" />
-<TGConnectingPoint num="2" id="818" />
-<TGConnectingPoint num="3" id="819" />
-<TGConnectingPoint num="4" id="820" />
-<TGConnectingPoint num="5" id="821" />
-<TGConnectingPoint num="6" id="822" />
-<TGConnectingPoint num="7" id="823" />
-<TGConnectingPoint num="8" id="824" />
-<TGConnectingPoint num="9" id="825" />
+<TGConnectingPoint num="0" id="799" />
+<TGConnectingPoint num="1" id="800" />
+<TGConnectingPoint num="2" id="801" />
+<TGConnectingPoint num="3" id="802" />
+<TGConnectingPoint num="4" id="803" />
+<TGConnectingPoint num="5" id="804" />
+<TGConnectingPoint num="6" id="805" />
+<TGConnectingPoint num="7" id="806" />
+<TGConnectingPoint num="8" id="807" />
+<TGConnectingPoint num="9" id="808" />
</COMPONENT>
-<COMPONENT type="5104" id="837" >
-<cdparam x="447" y="194" />
-<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="820" >
+<cdparam x="444" y="194" />
+<sizeparam width="82" 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="getCoin(x)" />
-<TGConnectingPoint num="0" id="827" />
-<TGConnectingPoint num="1" id="828" />
-<TGConnectingPoint num="2" id="829" />
-<TGConnectingPoint num="3" id="830" />
-<TGConnectingPoint num="4" id="831" />
-<TGConnectingPoint num="5" id="832" />
-<TGConnectingPoint num="6" id="833" />
-<TGConnectingPoint num="7" id="834" />
-<TGConnectingPoint num="8" id="835" />
-<TGConnectingPoint num="9" id="836" />
+<TGConnectingPoint num="0" id="810" />
+<TGConnectingPoint num="1" id="811" />
+<TGConnectingPoint num="2" id="812" />
+<TGConnectingPoint num="3" id="813" />
+<TGConnectingPoint num="4" id="814" />
+<TGConnectingPoint num="5" id="815" />
+<TGConnectingPoint num="6" id="816" />
+<TGConnectingPoint num="7" id="817" />
+<TGConnectingPoint num="8" id="818" />
+<TGConnectingPoint num="9" id="819" />
</COMPONENT>
-<COMPONENT type="5106" id="878" >
+<COMPONENT type="5106" id="861" >
<cdparam x="460" y="274" />
<sizeparam width="50" height="40" 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="main" />
-<TGConnectingPoint num="0" id="838" />
-<TGConnectingPoint num="1" id="839" />
-<TGConnectingPoint num="2" id="840" />
-<TGConnectingPoint num="3" id="841" />
-<TGConnectingPoint num="4" id="842" />
-<TGConnectingPoint num="5" id="843" />
-<TGConnectingPoint num="6" id="844" />
-<TGConnectingPoint num="7" id="845" />
-<TGConnectingPoint num="8" id="846" />
-<TGConnectingPoint num="9" id="847" />
-<TGConnectingPoint num="10" id="848" />
-<TGConnectingPoint num="11" id="849" />
-<TGConnectingPoint num="12" id="850" />
-<TGConnectingPoint num="13" id="851" />
-<TGConnectingPoint num="14" id="852" />
-<TGConnectingPoint num="15" id="853" />
-<TGConnectingPoint num="16" id="854" />
-<TGConnectingPoint num="17" id="855" />
-<TGConnectingPoint num="18" id="856" />
-<TGConnectingPoint num="19" id="857" />
-<TGConnectingPoint num="20" id="858" />
-<TGConnectingPoint num="21" id="859" />
-<TGConnectingPoint num="22" id="860" />
-<TGConnectingPoint num="23" id="861" />
-<TGConnectingPoint num="24" id="862" />
-<TGConnectingPoint num="25" id="863" />
-<TGConnectingPoint num="26" id="864" />
-<TGConnectingPoint num="27" id="865" />
-<TGConnectingPoint num="28" id="866" />
-<TGConnectingPoint num="29" id="867" />
-<TGConnectingPoint num="30" id="868" />
-<TGConnectingPoint num="31" id="869" />
-<TGConnectingPoint num="32" id="870" />
-<TGConnectingPoint num="33" id="871" />
-<TGConnectingPoint num="34" id="872" />
-<TGConnectingPoint num="35" id="873" />
-<TGConnectingPoint num="36" id="874" />
-<TGConnectingPoint num="37" id="875" />
-<TGConnectingPoint num="38" id="876" />
-<TGConnectingPoint num="39" id="877" />
+<TGConnectingPoint num="0" id="821" />
+<TGConnectingPoint num="1" id="822" />
+<TGConnectingPoint num="2" id="823" />
+<TGConnectingPoint num="3" id="824" />
+<TGConnectingPoint num="4" id="825" />
+<TGConnectingPoint num="5" id="826" />
+<TGConnectingPoint num="6" id="827" />
+<TGConnectingPoint num="7" id="828" />
+<TGConnectingPoint num="8" id="829" />
+<TGConnectingPoint num="9" id="830" />
+<TGConnectingPoint num="10" id="831" />
+<TGConnectingPoint num="11" id="832" />
+<TGConnectingPoint num="12" id="833" />
+<TGConnectingPoint num="13" id="834" />
+<TGConnectingPoint num="14" id="835" />
+<TGConnectingPoint num="15" id="836" />
+<TGConnectingPoint num="16" id="837" />
+<TGConnectingPoint num="17" id="838" />
+<TGConnectingPoint num="18" id="839" />
+<TGConnectingPoint num="19" id="840" />
+<TGConnectingPoint num="20" id="841" />
+<TGConnectingPoint num="21" id="842" />
+<TGConnectingPoint num="22" id="843" />
+<TGConnectingPoint num="23" id="844" />
+<TGConnectingPoint num="24" id="845" />
+<TGConnectingPoint num="25" id="846" />
+<TGConnectingPoint num="26" id="847" />
+<TGConnectingPoint num="27" id="848" />
+<TGConnectingPoint num="28" id="849" />
+<TGConnectingPoint num="29" id="850" />
+<TGConnectingPoint num="30" id="851" />
+<TGConnectingPoint num="31" id="852" />
+<TGConnectingPoint num="32" id="853" />
+<TGConnectingPoint num="33" id="854" />
+<TGConnectingPoint num="34" id="855" />
+<TGConnectingPoint num="35" id="856" />
+<TGConnectingPoint num="36" id="857" />
+<TGConnectingPoint num="37" id="858" />
+<TGConnectingPoint num="38" id="859" />
+<TGConnectingPoint num="39" id="860" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="919" >
+<COMPONENT type="5106" id="902" >
<cdparam x="227" y="300" />
<sizeparam width="50" height="40" 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="main" />
-<TGConnectingPoint num="0" id="879" />
-<TGConnectingPoint num="1" id="880" />
-<TGConnectingPoint num="2" id="881" />
-<TGConnectingPoint num="3" id="882" />
-<TGConnectingPoint num="4" id="883" />
-<TGConnectingPoint num="5" id="884" />
-<TGConnectingPoint num="6" id="885" />
-<TGConnectingPoint num="7" id="886" />
-<TGConnectingPoint num="8" id="887" />
-<TGConnectingPoint num="9" id="888" />
-<TGConnectingPoint num="10" id="889" />
-<TGConnectingPoint num="11" id="890" />
-<TGConnectingPoint num="12" id="891" />
-<TGConnectingPoint num="13" id="892" />
-<TGConnectingPoint num="14" id="893" />
-<TGConnectingPoint num="15" id="894" />
-<TGConnectingPoint num="16" id="895" />
-<TGConnectingPoint num="17" id="896" />
-<TGConnectingPoint num="18" id="897" />
-<TGConnectingPoint num="19" id="898" />
-<TGConnectingPoint num="20" id="899" />
-<TGConnectingPoint num="21" id="900" />
-<TGConnectingPoint num="22" id="901" />
-<TGConnectingPoint num="23" id="902" />
-<TGConnectingPoint num="24" id="903" />
-<TGConnectingPoint num="25" id="904" />
-<TGConnectingPoint num="26" id="905" />
-<TGConnectingPoint num="27" id="906" />
-<TGConnectingPoint num="28" id="907" />
-<TGConnectingPoint num="29" id="908" />
-<TGConnectingPoint num="30" id="909" />
-<TGConnectingPoint num="31" id="910" />
-<TGConnectingPoint num="32" id="911" />
-<TGConnectingPoint num="33" id="912" />
-<TGConnectingPoint num="34" id="913" />
-<TGConnectingPoint num="35" id="914" />
-<TGConnectingPoint num="36" id="915" />
-<TGConnectingPoint num="37" id="916" />
-<TGConnectingPoint num="38" id="917" />
-<TGConnectingPoint num="39" id="918" />
+<TGConnectingPoint num="0" id="862" />
+<TGConnectingPoint num="1" id="863" />
+<TGConnectingPoint num="2" id="864" />
+<TGConnectingPoint num="3" id="865" />
+<TGConnectingPoint num="4" id="866" />
+<TGConnectingPoint num="5" id="867" />
+<TGConnectingPoint num="6" id="868" />
+<TGConnectingPoint num="7" id="869" />
+<TGConnectingPoint num="8" id="870" />
+<TGConnectingPoint num="9" id="871" />
+<TGConnectingPoint num="10" id="872" />
+<TGConnectingPoint num="11" id="873" />
+<TGConnectingPoint num="12" id="874" />
+<TGConnectingPoint num="13" id="875" />
+<TGConnectingPoint num="14" id="876" />
+<TGConnectingPoint num="15" id="877" />
+<TGConnectingPoint num="16" id="878" />
+<TGConnectingPoint num="17" id="879" />
+<TGConnectingPoint num="18" id="880" />
+<TGConnectingPoint num="19" id="881" />
+<TGConnectingPoint num="20" id="882" />
+<TGConnectingPoint num="21" id="883" />
+<TGConnectingPoint num="22" id="884" />
+<TGConnectingPoint num="23" id="885" />
+<TGConnectingPoint num="24" id="886" />
+<TGConnectingPoint num="25" id="887" />
+<TGConnectingPoint num="26" id="888" />
+<TGConnectingPoint num="27" id="889" />
+<TGConnectingPoint num="28" id="890" />
+<TGConnectingPoint num="29" id="891" />
+<TGConnectingPoint num="30" id="892" />
+<TGConnectingPoint num="31" id="893" />
+<TGConnectingPoint num="32" id="894" />
+<TGConnectingPoint num="33" id="895" />
+<TGConnectingPoint num="34" id="896" />
+<TGConnectingPoint num="35" id="897" />
+<TGConnectingPoint num="36" id="898" />
+<TGConnectingPoint num="37" id="899" />
+<TGConnectingPoint num="38" id="900" />
+<TGConnectingPoint num="39" id="901" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="960" >
+<COMPONENT type="5106" id="943" >
<cdparam x="345" y="135" />
<sizeparam width="50" height="30" 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="main" />
-<TGConnectingPoint num="0" id="920" />
-<TGConnectingPoint num="1" id="921" />
-<TGConnectingPoint num="2" id="922" />
-<TGConnectingPoint num="3" id="923" />
-<TGConnectingPoint num="4" id="924" />
-<TGConnectingPoint num="5" id="925" />
-<TGConnectingPoint num="6" id="926" />
-<TGConnectingPoint num="7" id="927" />
-<TGConnectingPoint num="8" id="928" />
-<TGConnectingPoint num="9" id="929" />
-<TGConnectingPoint num="10" id="930" />
-<TGConnectingPoint num="11" id="931" />
-<TGConnectingPoint num="12" id="932" />
-<TGConnectingPoint num="13" id="933" />
-<TGConnectingPoint num="14" id="934" />
-<TGConnectingPoint num="15" id="935" />
-<TGConnectingPoint num="16" id="936" />
-<TGConnectingPoint num="17" id="937" />
-<TGConnectingPoint num="18" id="938" />
-<TGConnectingPoint num="19" id="939" />
-<TGConnectingPoint num="20" id="940" />
-<TGConnectingPoint num="21" id="941" />
-<TGConnectingPoint num="22" id="942" />
-<TGConnectingPoint num="23" id="943" />
-<TGConnectingPoint num="24" id="944" />
-<TGConnectingPoint num="25" id="945" />
-<TGConnectingPoint num="26" id="946" />
-<TGConnectingPoint num="27" id="947" />
-<TGConnectingPoint num="28" id="948" />
-<TGConnectingPoint num="29" id="949" />
-<TGConnectingPoint num="30" id="950" />
-<TGConnectingPoint num="31" id="951" />
-<TGConnectingPoint num="32" id="952" />
-<TGConnectingPoint num="33" id="953" />
-<TGConnectingPoint num="34" id="954" />
-<TGConnectingPoint num="35" id="955" />
-<TGConnectingPoint num="36" id="956" />
-<TGConnectingPoint num="37" id="957" />
-<TGConnectingPoint num="38" id="958" />
-<TGConnectingPoint num="39" id="959" />
+<TGConnectingPoint num="0" id="903" />
+<TGConnectingPoint num="1" id="904" />
+<TGConnectingPoint num="2" id="905" />
+<TGConnectingPoint num="3" id="906" />
+<TGConnectingPoint num="4" id="907" />
+<TGConnectingPoint num="5" id="908" />
+<TGConnectingPoint num="6" id="909" />
+<TGConnectingPoint num="7" id="910" />
+<TGConnectingPoint num="8" id="911" />
+<TGConnectingPoint num="9" id="912" />
+<TGConnectingPoint num="10" id="913" />
+<TGConnectingPoint num="11" id="914" />
+<TGConnectingPoint num="12" id="915" />
+<TGConnectingPoint num="13" id="916" />
+<TGConnectingPoint num="14" id="917" />
+<TGConnectingPoint num="15" id="918" />
+<TGConnectingPoint num="16" id="919" />
+<TGConnectingPoint num="17" id="920" />
+<TGConnectingPoint num="18" id="921" />
+<TGConnectingPoint num="19" id="922" />
+<TGConnectingPoint num="20" id="923" />
+<TGConnectingPoint num="21" id="924" />
+<TGConnectingPoint num="22" id="925" />
+<TGConnectingPoint num="23" id="926" />
+<TGConnectingPoint num="24" id="927" />
+<TGConnectingPoint num="25" id="928" />
+<TGConnectingPoint num="26" id="929" />
+<TGConnectingPoint num="27" id="930" />
+<TGConnectingPoint num="28" id="931" />
+<TGConnectingPoint num="29" id="932" />
+<TGConnectingPoint num="30" id="933" />
+<TGConnectingPoint num="31" id="934" />
+<TGConnectingPoint num="32" id="935" />
+<TGConnectingPoint num="33" id="936" />
+<TGConnectingPoint num="34" id="937" />
+<TGConnectingPoint num="35" id="938" />
+<TGConnectingPoint num="36" id="939" />
+<TGConnectingPoint num="37" id="940" />
+<TGConnectingPoint num="38" id="941" />
+<TGConnectingPoint num="39" id="942" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="962" >
+<COMPONENT type="5100" id="945" >
<cdparam x="363" y="44" />
<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="961" />
+<TGConnectingPoint num="0" id="944" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="969" >
+<CONNECTOR type="5102" id="952" >
<cdparam x="691" y="288" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="968" />
-<P1 x="699" y="289" id="1107" />
-<P2 x="699" y="316" id="1079" />
+<TGConnectingPoint num="0" id="951" />
+<P1 x="699" y="289" id="1090" />
+<P2 x="699" y="316" id="1062" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="967" >
-<father id="969" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="950" >
+<father id="952" num="0" />
<cdparam x="691" y="328" />
<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="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="963" />
-<TGConnectingPoint num="1" id="964" />
-<TGConnectingPoint num="2" id="965" />
-<TGConnectingPoint num="3" id="966" />
+<TGConnectingPoint num="0" id="946" />
+<TGConnectingPoint num="1" id="947" />
+<TGConnectingPoint num="2" id="948" />
+<TGConnectingPoint num="3" id="949" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1805,25 +1805,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="976" >
+<CONNECTOR type="5102" id="959" >
<cdparam x="481" y="501" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="975" />
-<P1 x="437" y="525" id="1374" />
-<P2 x="323" y="748" id="1235" />
+<TGConnectingPoint num="0" id="958" />
+<P1 x="437" y="525" id="1292" />
+<P2 x="323" y="748" id="1218" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="974" >
-<father id="976" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="957" >
+<father id="959" num="0" />
<cdparam x="420" y="552" />
<sizeparam width="85" 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="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="970" />
-<TGConnectingPoint num="1" id="971" />
-<TGConnectingPoint num="2" id="972" />
-<TGConnectingPoint num="3" id="973" />
+<TGConnectingPoint num="0" id="953" />
+<TGConnectingPoint num="1" id="954" />
+<TGConnectingPoint num="2" id="955" />
+<TGConnectingPoint num="3" id="956" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1835,25 +1835,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="983" >
+<CONNECTOR type="5102" id="966" >
<cdparam x="555" y="559" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="982" />
-<P1 x="321" y="455" id="1323" />
-<P2 x="437" y="495" id="1373" />
+<TGConnectingPoint num="0" id="965" />
+<P1 x="321" y="455" id="1319" />
+<P2 x="437" y="495" id="1291" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="981" >
-<father id="983" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="964" >
+<father id="966" num="0" />
<cdparam x="395" y="448" />
<sizeparam width="94" 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="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="977" />
-<TGConnectingPoint num="1" id="978" />
-<TGConnectingPoint num="2" id="979" />
-<TGConnectingPoint num="3" id="980" />
+<TGConnectingPoint num="0" id="960" />
+<TGConnectingPoint num="1" id="961" />
+<TGConnectingPoint num="2" id="962" />
+<TGConnectingPoint num="3" id="963" />
<extraparam>
<guard value="[ ]" />
<afterMin value="coinDelay" />
@@ -1864,25 +1864,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="990" >
+<CONNECTOR type="5102" id="973" >
<cdparam x="355" y="545" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="989" />
-<P1 x="293" y="552" id="1309" />
-<P2 x="289" y="748" id="1227" />
+<TGConnectingPoint num="0" id="972" />
+<P1 x="293" y="552" id="1357" />
+<P2 x="289" y="748" id="1210" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="988" >
-<father id="990" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="971" >
+<father id="973" num="0" />
<cdparam x="284" y="594" />
<sizeparam width="228" height="45" 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="984" />
-<TGConnectingPoint num="1" id="985" />
-<TGConnectingPoint num="2" id="986" />
-<TGConnectingPoint num="3" id="987" />
+<TGConnectingPoint num="0" id="967" />
+<TGConnectingPoint num="1" id="968" />
+<TGConnectingPoint num="2" id="969" />
+<TGConnectingPoint num="3" id="970" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1895,25 +1895,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="997" >
+<CONNECTOR type="5102" id="980" >
<cdparam x="295" y="465" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="996" />
-<P1 x="288" y="475" id="1334" />
-<P2 x="293" y="522" id="1308" />
+<TGConnectingPoint num="0" id="979" />
+<P1 x="288" y="475" id="1330" />
+<P2 x="293" y="522" id="1356" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="995" >
-<father id="997" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="978" >
+<father id="980" num="0" />
<cdparam x="295" y="505" />
<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="991" />
-<TGConnectingPoint num="1" id="992" />
-<TGConnectingPoint num="2" id="993" />
-<TGConnectingPoint num="3" id="994" />
+<TGConnectingPoint num="0" id="974" />
+<TGConnectingPoint num="1" id="975" />
+<TGConnectingPoint num="2" id="976" />
+<TGConnectingPoint num="3" id="977" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1924,25 +1924,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1004" >
+<CONNECTOR type="5102" id="987" >
<cdparam x="148" y="549" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1003" />
-<P1 x="121" y="552" id="1363" />
-<P2 x="255" y="748" id="1234" />
+<TGConnectingPoint num="0" id="986" />
+<P1 x="121" y="552" id="1303" />
+<P2 x="255" y="748" id="1217" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1002" >
-<father id="1004" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="985" >
+<father id="987" num="0" />
<cdparam x="32" y="587" />
<sizeparam width="262" height="45" 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="998" />
-<TGConnectingPoint num="1" id="999" />
-<TGConnectingPoint num="2" id="1000" />
-<TGConnectingPoint num="3" id="1001" />
+<TGConnectingPoint num="0" id="981" />
+<TGConnectingPoint num="1" id="982" />
+<TGConnectingPoint num="2" id="983" />
+<TGConnectingPoint num="3" id="984" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1955,25 +1955,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1011" >
+<CONNECTOR type="5102" id="994" >
<cdparam x="229" y="465" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1010" />
-<P1 x="222" y="475" id="1333" />
-<P2 x="121" y="522" id="1362" />
+<TGConnectingPoint num="0" id="993" />
+<P1 x="222" y="475" id="1329" />
+<P2 x="121" y="522" id="1302" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1009" >
-<father id="1011" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="992" >
+<father id="994" num="0" />
<cdparam x="229" y="505" />
<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="1005" />
-<TGConnectingPoint num="1" id="1006" />
-<TGConnectingPoint num="2" id="1007" />
-<TGConnectingPoint num="3" id="1008" />
+<TGConnectingPoint num="0" id="988" />
+<TGConnectingPoint num="1" id="989" />
+<TGConnectingPoint num="2" id="990" />
+<TGConnectingPoint num="3" id="991" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -1984,25 +1984,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1018" >
+<CONNECTOR type="5102" id="1001" >
<cdparam x="280" y="420" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1017" />
-<P1 x="256" y="419" id="1360" />
-<P2 x="255" y="435" id="1320" />
+<TGConnectingPoint num="0" id="1000" />
+<P1 x="256" y="419" id="1313" />
+<P2 x="255" y="435" id="1316" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1016" >
-<father id="1018" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="999" >
+<father id="1001" num="0" />
<cdparam x="280" y="460" />
<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="1012" />
-<TGConnectingPoint num="1" id="1013" />
-<TGConnectingPoint num="2" id="1014" />
-<TGConnectingPoint num="3" id="1015" />
+<TGConnectingPoint num="0" id="995" />
+<TGConnectingPoint num="1" id="996" />
+<TGConnectingPoint num="2" id="997" />
+<TGConnectingPoint num="3" id="998" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2013,25 +2013,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1025" >
+<CONNECTOR type="5102" id="1008" >
<cdparam x="667" y="346" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1024" />
-<P1 x="699" y="346" id="1080" />
-<P2 x="699" y="381" id="1268" />
+<TGConnectingPoint num="0" id="1007" />
+<P1 x="699" y="346" id="1063" />
+<P2 x="699" y="381" id="1251" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1023" >
-<father id="1025" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1006" >
+<father id="1008" num="0" />
<cdparam x="707" y="368" />
<sizeparam width="85" 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="1019" />
-<TGConnectingPoint num="1" id="1020" />
-<TGConnectingPoint num="2" id="1021" />
-<TGConnectingPoint num="3" id="1022" />
+<TGConnectingPoint num="0" id="1002" />
+<TGConnectingPoint num="1" id="1003" />
+<TGConnectingPoint num="2" id="1004" />
+<TGConnectingPoint num="3" id="1005" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2043,25 +2043,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1032" >
+<CONNECTOR type="5102" id="1015" >
<cdparam x="348" y="228" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1031" />
-<P1 x="388" y="208" id="1146" />
-<P2 x="649" y="264" id="1104" />
+<TGConnectingPoint num="0" id="1014" />
+<P1 x="388" y="208" id="1129" />
+<P2 x="649" y="264" id="1087" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1030" >
-<father id="1032" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1013" >
+<father id="1015" num="0" />
<cdparam x="411" y="206" />
<sizeparam width="94" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1026" />
-<TGConnectingPoint num="1" id="1027" />
-<TGConnectingPoint num="2" id="1028" />
-<TGConnectingPoint num="3" id="1029" />
+<TGConnectingPoint num="0" id="1009" />
+<TGConnectingPoint num="1" id="1010" />
+<TGConnectingPoint num="2" id="1011" />
+<TGConnectingPoint num="3" id="1012" />
<extraparam>
<guard value="[ ]" />
<afterMin value="coinDelay" />
@@ -2072,25 +2072,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1039" >
+<CONNECTOR type="5102" id="1022" >
<cdparam x="243" y="319" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1038" />
-<P1 x="277" y="305" id="1091" />
-<P2 x="306" y="370" id="1385" />
+<TGConnectingPoint num="0" id="1021" />
+<P1 x="277" y="305" id="1074" />
+<P2 x="306" y="370" id="1368" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1037" >
-<father id="1039" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1020" >
+<father id="1022" num="0" />
<cdparam x="243" y="359" />
<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="1033" />
-<TGConnectingPoint num="1" id="1034" />
-<TGConnectingPoint num="2" id="1035" />
-<TGConnectingPoint num="3" id="1036" />
+<TGConnectingPoint num="0" id="1016" />
+<TGConnectingPoint num="1" id="1017" />
+<TGConnectingPoint num="2" id="1018" />
+<TGConnectingPoint num="3" id="1019" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2101,25 +2101,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1046" >
+<CONNECTOR type="5102" id="1029" >
<cdparam x="270" y="224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1045" />
-<P1 x="270" y="228" id="1156" />
-<P2 x="277" y="275" id="1090" />
+<TGConnectingPoint num="0" id="1028" />
+<P1 x="270" y="228" id="1139" />
+<P2 x="277" y="275" id="1073" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1044" >
-<father id="1046" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1027" >
+<father id="1029" num="0" />
<cdparam x="270" y="264" />
<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="1040" />
-<TGConnectingPoint num="1" id="1041" />
-<TGConnectingPoint num="2" id="1042" />
-<TGConnectingPoint num="3" id="1043" />
+<TGConnectingPoint num="0" id="1023" />
+<TGConnectingPoint num="1" id="1024" />
+<TGConnectingPoint num="2" id="1025" />
+<TGConnectingPoint num="3" id="1026" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2130,25 +2130,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1053" >
+<CONNECTOR type="5102" id="1036" >
<cdparam x="309" y="160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1052" />
-<P1 x="306" y="166" id="1069" />
-<P2 x="309" y="188" id="1143" />
+<TGConnectingPoint num="0" id="1035" />
+<P1 x="306" y="166" id="1052" />
+<P2 x="309" y="188" id="1126" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1051" >
-<father id="1053" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1034" >
+<father id="1036" num="0" />
<cdparam x="328" y="178" />
<sizeparam width="161" 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="1047" />
-<TGConnectingPoint num="1" id="1048" />
-<TGConnectingPoint num="2" id="1049" />
-<TGConnectingPoint num="3" id="1050" />
+<TGConnectingPoint num="0" id="1030" />
+<TGConnectingPoint num="1" id="1031" />
+<TGConnectingPoint num="2" id="1032" />
+<TGConnectingPoint num="3" id="1033" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2160,25 +2160,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1060" >
+<CONNECTOR type="5102" id="1043" >
<cdparam x="303" y="103" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1059" />
-<P1 x="303" y="103" id="1191" />
-<P2 x="306" y="136" id="1068" />
+<TGConnectingPoint num="0" id="1042" />
+<P1 x="303" y="103" id="1174" />
+<P2 x="306" y="136" id="1051" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1058" >
-<father id="1060" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1041" >
+<father id="1043" num="0" />
<cdparam x="303" y="143" />
<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="1054" />
-<TGConnectingPoint num="1" id="1055" />
-<TGConnectingPoint num="2" id="1056" />
-<TGConnectingPoint num="3" id="1057" />
+<TGConnectingPoint num="0" id="1037" />
+<TGConnectingPoint num="1" id="1038" />
+<TGConnectingPoint num="2" id="1039" />
+<TGConnectingPoint num="3" id="1040" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2189,25 +2189,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1067" >
+<CONNECTOR type="5102" id="1050" >
<cdparam x="303" y="40" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1066" />
-<P1 x="303" y="40" id="1183" />
-<P2 x="303" y="63" id="1186" />
+<TGConnectingPoint num="0" id="1049" />
+<P1 x="303" y="40" id="1166" />
+<P2 x="303" y="63" id="1169" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1065" >
-<father id="1067" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1048" >
+<father id="1050" num="0" />
<cdparam x="303" y="80" />
<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="1061" />
-<TGConnectingPoint num="1" id="1062" />
-<TGConnectingPoint num="2" id="1063" />
-<TGConnectingPoint num="3" id="1064" />
+<TGConnectingPoint num="0" id="1044" />
+<TGConnectingPoint num="1" id="1045" />
+<TGConnectingPoint num="2" id="1046" />
+<TGConnectingPoint num="3" id="1047" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2218,512 +2218,512 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5104" id="1078" >
+<COMPONENT type="5104" id="1061" >
<cdparam x="268" y="141" />
<sizeparam width="76" 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="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1068" />
-<TGConnectingPoint num="1" id="1069" />
-<TGConnectingPoint num="2" id="1070" />
-<TGConnectingPoint num="3" id="1071" />
-<TGConnectingPoint num="4" id="1072" />
-<TGConnectingPoint num="5" id="1073" />
-<TGConnectingPoint num="6" id="1074" />
-<TGConnectingPoint num="7" id="1075" />
-<TGConnectingPoint num="8" id="1076" />
-<TGConnectingPoint num="9" id="1077" />
+<TGConnectingPoint num="0" id="1051" />
+<TGConnectingPoint num="1" id="1052" />
+<TGConnectingPoint num="2" id="1053" />
+<TGConnectingPoint num="3" id="1054" />
+<TGConnectingPoint num="4" id="1055" />
+<TGConnectingPoint num="5" id="1056" />
+<TGConnectingPoint num="6" id="1057" />
+<TGConnectingPoint num="7" id="1058" />
+<TGConnectingPoint num="8" id="1059" />
+<TGConnectingPoint num="9" id="1060" />
</COMPONENT>
-<COMPONENT type="5103" id="1089" >
+<COMPONENT type="5103" id="1072" >
<cdparam x="634" y="321" />
<sizeparam width="130" 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="1400" />
<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1079" />
-<TGConnectingPoint num="1" id="1080" />
-<TGConnectingPoint num="2" id="1081" />
-<TGConnectingPoint num="3" id="1082" />
-<TGConnectingPoint num="4" id="1083" />
-<TGConnectingPoint num="5" id="1084" />
-<TGConnectingPoint num="6" id="1085" />
-<TGConnectingPoint num="7" id="1086" />
-<TGConnectingPoint num="8" id="1087" />
-<TGConnectingPoint num="9" id="1088" />
+<TGConnectingPoint num="0" id="1062" />
+<TGConnectingPoint num="1" id="1063" />
+<TGConnectingPoint num="2" id="1064" />
+<TGConnectingPoint num="3" id="1065" />
+<TGConnectingPoint num="4" id="1066" />
+<TGConnectingPoint num="5" id="1067" />
+<TGConnectingPoint num="6" id="1068" />
+<TGConnectingPoint num="7" id="1069" />
+<TGConnectingPoint num="8" id="1070" />
+<TGConnectingPoint num="9" id="1071" />
</COMPONENT>
-<COMPONENT type="5104" id="1100" >
+<COMPONENT type="5104" id="1083" >
<cdparam x="239" y="280" />
<sizeparam width="76" 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="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1090" />
-<TGConnectingPoint num="1" id="1091" />
-<TGConnectingPoint num="2" id="1092" />
-<TGConnectingPoint num="3" id="1093" />
-<TGConnectingPoint num="4" id="1094" />
-<TGConnectingPoint num="5" id="1095" />
-<TGConnectingPoint num="6" id="1096" />
-<TGConnectingPoint num="7" id="1097" />
-<TGConnectingPoint num="8" id="1098" />
-<TGConnectingPoint num="9" id="1099" />
+<TGConnectingPoint num="0" id="1073" />
+<TGConnectingPoint num="1" id="1074" />
+<TGConnectingPoint num="2" id="1075" />
+<TGConnectingPoint num="3" id="1076" />
+<TGConnectingPoint num="4" id="1077" />
+<TGConnectingPoint num="5" id="1078" />
+<TGConnectingPoint num="6" id="1079" />
+<TGConnectingPoint num="7" id="1080" />
+<TGConnectingPoint num="8" id="1081" />
+<TGConnectingPoint num="9" id="1082" />
<accessibility />
</COMPONENT>
-<COMPONENT type="5106" id="1141" >
+<COMPONENT type="5106" id="1124" >
<cdparam x="649" y="239" />
<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="1400" />
<infoparam name="state0" value="ejectState" />
-<TGConnectingPoint num="0" id="1101" />
-<TGConnectingPoint num="1" id="1102" />
-<TGConnectingPoint num="2" id="1103" />
-<TGConnectingPoint num="3" id="1104" />
-<TGConnectingPoint num="4" id="1105" />
-<TGConnectingPoint num="5" id="1106" />
-<TGConnectingPoint num="6" id="1107" />
-<TGConnectingPoint num="7" id="1108" />
-<TGConnectingPoint num="8" id="1109" />
-<TGConnectingPoint num="9" id="1110" />
-<TGConnectingPoint num="10" id="1111" />
-<TGConnectingPoint num="11" id="1112" />
-<TGConnectingPoint num="12" id="1113" />
-<TGConnectingPoint num="13" id="1114" />
-<TGConnectingPoint num="14" id="1115" />
-<TGConnectingPoint num="15" id="1116" />
-<TGConnectingPoint num="16" id="1117" />
-<TGConnectingPoint num="17" id="1118" />
-<TGConnectingPoint num="18" id="1119" />
-<TGConnectingPoint num="19" id="1120" />
-<TGConnectingPoint num="20" id="1121" />
-<TGConnectingPoint num="21" id="1122" />
-<TGConnectingPoint num="22" id="1123" />
-<TGConnectingPoint num="23" id="1124" />
-<TGConnectingPoint num="24" id="1125" />
-<TGConnectingPoint num="25" id="1126" />
-<TGConnectingPoint num="26" id="1127" />
-<TGConnectingPoint num="27" id="1128" />
-<TGConnectingPoint num="28" id="1129" />
-<TGConnectingPoint num="29" id="1130" />
-<TGConnectingPoint num="30" id="1131" />
-<TGConnectingPoint num="31" id="1132" />
-<TGConnectingPoint num="32" id="1133" />
-<TGConnectingPoint num="33" id="1134" />
-<TGConnectingPoint num="34" id="1135" />
-<TGConnectingPoint num="35" id="1136" />
-<TGConnectingPoint num="36" id="1137" />
-<TGConnectingPoint num="37" id="1138" />
-<TGConnectingPoint num="38" id="1139" />
-<TGConnectingPoint num="39" id="1140" />
+<TGConnectingPoint num="0" id="1084" />
+<TGConnectingPoint num="1" id="1085" />
+<TGConnectingPoint num="2" id="1086" />
+<TGConnectingPoint num="3" id="1087" />
+<TGConnectingPoint num="4" id="1088" />
+<TGConnectingPoint num="5" id="1089" />
+<TGConnectingPoint num="6" id="1090" />
+<TGConnectingPoint num="7" id="1091" />
+<TGConnectingPoint num="8" id="1092" />
+<TGConnectingPoint num="9" id="1093" />
+<TGConnectingPoint num="10" id="1094" />
+<TGConnectingPoint num="11" id="1095" />
+<TGConnectingPoint num="12" id="1096" />
+<TGConnectingPoint num="13" id="1097" />
+<TGConnectingPoint num="14" id="1098" />
+<TGConnectingPoint num="15" id="1099" />
+<TGConnectingPoint num="16" id="1100" />
+<TGConnectingPoint num="17" id="1101" />
+<TGConnectingPoint num="18" id="1102" />
+<TGConnectingPoint num="19" id="1103" />
+<TGConnectingPoint num="20" id="1104" />
+<TGConnectingPoint num="21" id="1105" />
+<TGConnectingPoint num="22" id="1106" />
+<TGConnectingPoint num="23" id="1107" />
+<TGConnectingPoint num="24" id="1108" />
+<TGConnectingPoint num="25" id="1109" />
+<TGConnectingPoint num="26" id="1110" />
+<TGConnectingPoint num="27" id="1111" />
+<TGConnectingPoint num="28" id="1112" />
+<TGConnectingPoint num="29" id="1113" />
+<TGConnectingPoint num="30" id="1114" />
+<TGConnectingPoint num="31" id="1115" />
+<TGConnectingPoint num="32" id="1116" />
+<TGConnectingPoint num="33" id="1117" />
+<TGConnectingPoint num="34" id="1118" />
+<TGConnectingPoint num="35" id="1119" />
+<TGConnectingPoint num="36" id="1120" />
+<TGConnectingPoint num="37" id="1121" />
+<TGConnectingPoint num="38" id="1122" />
+<TGConnectingPoint num="39" id="1123" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1182" >
+<COMPONENT type="5106" id="1165" >
<cdparam x="231" y="188" />
<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1142" />
-<TGConnectingPoint num="1" id="1143" />
-<TGConnectingPoint num="2" id="1144" />
-<TGConnectingPoint num="3" id="1145" />
-<TGConnectingPoint num="4" id="1146" />
-<TGConnectingPoint num="5" id="1147" />
-<TGConnectingPoint num="6" id="1148" />
-<TGConnectingPoint num="7" id="1149" />
-<TGConnectingPoint num="8" id="1150" />
-<TGConnectingPoint num="9" id="1151" />
-<TGConnectingPoint num="10" id="1152" />
-<TGConnectingPoint num="11" id="1153" />
-<TGConnectingPoint num="12" id="1154" />
-<TGConnectingPoint num="13" id="1155" />
-<TGConnectingPoint num="14" id="1156" />
-<TGConnectingPoint num="15" id="1157" />
-<TGConnectingPoint num="16" id="1158" />
-<TGConnectingPoint num="17" id="1159" />
-<TGConnectingPoint num="18" id="1160" />
-<TGConnectingPoint num="19" id="1161" />
-<TGConnectingPoint num="20" id="1162" />
-<TGConnectingPoint num="21" id="1163" />
-<TGConnectingPoint num="22" id="1164" />
-<TGConnectingPoint num="23" id="1165" />
-<TGConnectingPoint num="24" id="1166" />
-<TGConnectingPoint num="25" id="1167" />
-<TGConnectingPoint num="26" id="1168" />
-<TGConnectingPoint num="27" id="1169" />
-<TGConnectingPoint num="28" id="1170" />
-<TGConnectingPoint num="29" id="1171" />
-<TGConnectingPoint num="30" id="1172" />
-<TGConnectingPoint num="31" id="1173" />
-<TGConnectingPoint num="32" id="1174" />
-<TGConnectingPoint num="33" id="1175" />
-<TGConnectingPoint num="34" id="1176" />
-<TGConnectingPoint num="35" id="1177" />
-<TGConnectingPoint num="36" id="1178" />
-<TGConnectingPoint num="37" id="1179" />
-<TGConnectingPoint num="38" id="1180" />
-<TGConnectingPoint num="39" id="1181" />
+<TGConnectingPoint num="0" id="1125" />
+<TGConnectingPoint num="1" id="1126" />
+<TGConnectingPoint num="2" id="1127" />
+<TGConnectingPoint num="3" id="1128" />
+<TGConnectingPoint num="4" id="1129" />
+<TGConnectingPoint num="5" id="1130" />
+<TGConnectingPoint num="6" id="1131" />
+<TGConnectingPoint num="7" id="1132" />
+<TGConnectingPoint num="8" id="1133" />
+<TGConnectingPoint num="9" id="1134" />
+<TGConnectingPoint num="10" id="1135" />
+<TGConnectingPoint num="11" id="1136" />
+<TGConnectingPoint num="12" id="1137" />
+<TGConnectingPoint num="13" id="1138" />
+<TGConnectingPoint num="14" id="1139" />
+<TGConnectingPoint num="15" id="1140" />
+<TGConnectingPoint num="16" id="1141" />
+<TGConnectingPoint num="17" id="1142" />
+<TGConnectingPoint num="18" id="1143" />
+<TGConnectingPoint num="19" id="1144" />
+<TGConnectingPoint num="20" id="1145" />
+<TGConnectingPoint num="21" id="1146" />
+<TGConnectingPoint num="22" id="1147" />
+<TGConnectingPoint num="23" id="1148" />
+<TGConnectingPoint num="24" id="1149" />
+<TGConnectingPoint num="25" id="1150" />
+<TGConnectingPoint num="26" id="1151" />
+<TGConnectingPoint num="27" id="1152" />
+<TGConnectingPoint num="28" id="1153" />
+<TGConnectingPoint num="29" id="1154" />
+<TGConnectingPoint num="30" id="1155" />
+<TGConnectingPoint num="31" id="1156" />
+<TGConnectingPoint num="32" id="1157" />
+<TGConnectingPoint num="33" id="1158" />
+<TGConnectingPoint num="34" id="1159" />
+<TGConnectingPoint num="35" id="1160" />
+<TGConnectingPoint num="36" id="1161" />
+<TGConnectingPoint num="37" id="1162" />
+<TGConnectingPoint num="38" id="1163" />
+<TGConnectingPoint num="39" id="1164" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1184" >
+<COMPONENT type="5100" id="1167" >
<cdparam x="296" y="20" />
<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="1400" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1183" />
+<TGConnectingPoint num="0" id="1166" />
</COMPONENT>
-<COMPONENT type="5106" id="1225" >
+<COMPONENT type="5106" id="1208" >
<cdparam x="235" y="63" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1185" />
-<TGConnectingPoint num="1" id="1186" />
-<TGConnectingPoint num="2" id="1187" />
-<TGConnectingPoint num="3" id="1188" />
-<TGConnectingPoint num="4" id="1189" />
-<TGConnectingPoint num="5" id="1190" />
-<TGConnectingPoint num="6" id="1191" />
-<TGConnectingPoint num="7" id="1192" />
-<TGConnectingPoint num="8" id="1193" />
-<TGConnectingPoint num="9" id="1194" />
-<TGConnectingPoint num="10" id="1195" />
-<TGConnectingPoint num="11" id="1196" />
-<TGConnectingPoint num="12" id="1197" />
-<TGConnectingPoint num="13" id="1198" />
-<TGConnectingPoint num="14" id="1199" />
-<TGConnectingPoint num="15" id="1200" />
-<TGConnectingPoint num="16" id="1201" />
-<TGConnectingPoint num="17" id="1202" />
-<TGConnectingPoint num="18" id="1203" />
-<TGConnectingPoint num="19" id="1204" />
-<TGConnectingPoint num="20" id="1205" />
-<TGConnectingPoint num="21" id="1206" />
-<TGConnectingPoint num="22" id="1207" />
-<TGConnectingPoint num="23" id="1208" />
-<TGConnectingPoint num="24" id="1209" />
-<TGConnectingPoint num="25" id="1210" />
-<TGConnectingPoint num="26" id="1211" />
-<TGConnectingPoint num="27" id="1212" />
-<TGConnectingPoint num="28" id="1213" />
-<TGConnectingPoint num="29" id="1214" />
-<TGConnectingPoint num="30" id="1215" />
-<TGConnectingPoint num="31" id="1216" />
-<TGConnectingPoint num="32" id="1217" />
-<TGConnectingPoint num="33" id="1218" />
-<TGConnectingPoint num="34" id="1219" />
-<TGConnectingPoint num="35" id="1220" />
-<TGConnectingPoint num="36" id="1221" />
-<TGConnectingPoint num="37" id="1222" />
-<TGConnectingPoint num="38" id="1223" />
-<TGConnectingPoint num="39" id="1224" />
+<TGConnectingPoint num="0" id="1168" />
+<TGConnectingPoint num="1" id="1169" />
+<TGConnectingPoint num="2" id="1170" />
+<TGConnectingPoint num="3" id="1171" />
+<TGConnectingPoint num="4" id="1172" />
+<TGConnectingPoint num="5" id="1173" />
+<TGConnectingPoint num="6" id="1174" />
+<TGConnectingPoint num="7" id="1175" />
+<TGConnectingPoint num="8" id="1176" />
+<TGConnectingPoint num="9" id="1177" />
+<TGConnectingPoint num="10" id="1178" />
+<TGConnectingPoint num="11" id="1179" />
+<TGConnectingPoint num="12" id="1180" />
+<TGConnectingPoint num="13" id="1181" />
+<TGConnectingPoint num="14" id="1182" />
+<TGConnectingPoint num="15" id="1183" />
+<TGConnectingPoint num="16" id="1184" />
+<TGConnectingPoint num="17" id="1185" />
+<TGConnectingPoint num="18" id="1186" />
+<TGConnectingPoint num="19" id="1187" />
+<TGConnectingPoint num="20" id="1188" />
+<TGConnectingPoint num="21" id="1189" />
+<TGConnectingPoint num="22" id="1190" />
+<TGConnectingPoint num="23" id="1191" />
+<TGConnectingPoint num="24" id="1192" />
+<TGConnectingPoint num="25" id="1193" />
+<TGConnectingPoint num="26" id="1194" />
+<TGConnectingPoint num="27" id="1195" />
+<TGConnectingPoint num="28" id="1196" />
+<TGConnectingPoint num="29" id="1197" />
+<TGConnectingPoint num="30" id="1198" />
+<TGConnectingPoint num="31" id="1199" />
+<TGConnectingPoint num="32" id="1200" />
+<TGConnectingPoint num="33" id="1201" />
+<TGConnectingPoint num="34" id="1202" />
+<TGConnectingPoint num="35" id="1203" />
+<TGConnectingPoint num="36" id="1204" />
+<TGConnectingPoint num="37" id="1205" />
+<TGConnectingPoint num="38" id="1206" />
+<TGConnectingPoint num="39" id="1207" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1266" >
+<COMPONENT type="5106" id="1249" >
<cdparam x="221" y="748" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1226" />
-<TGConnectingPoint num="1" id="1227" />
-<TGConnectingPoint num="2" id="1228" />
-<TGConnectingPoint num="3" id="1229" />
-<TGConnectingPoint num="4" id="1230" />
-<TGConnectingPoint num="5" id="1231" />
-<TGConnectingPoint num="6" id="1232" />
-<TGConnectingPoint num="7" id="1233" />
-<TGConnectingPoint num="8" id="1234" />
-<TGConnectingPoint num="9" id="1235" />
-<TGConnectingPoint num="10" id="1236" />
-<TGConnectingPoint num="11" id="1237" />
-<TGConnectingPoint num="12" id="1238" />
-<TGConnectingPoint num="13" id="1239" />
-<TGConnectingPoint num="14" id="1240" />
-<TGConnectingPoint num="15" id="1241" />
-<TGConnectingPoint num="16" id="1242" />
-<TGConnectingPoint num="17" id="1243" />
-<TGConnectingPoint num="18" id="1244" />
-<TGConnectingPoint num="19" id="1245" />
-<TGConnectingPoint num="20" id="1246" />
-<TGConnectingPoint num="21" id="1247" />
-<TGConnectingPoint num="22" id="1248" />
-<TGConnectingPoint num="23" id="1249" />
-<TGConnectingPoint num="24" id="1250" />
-<TGConnectingPoint num="25" id="1251" />
-<TGConnectingPoint num="26" id="1252" />
-<TGConnectingPoint num="27" id="1253" />
-<TGConnectingPoint num="28" id="1254" />
-<TGConnectingPoint num="29" id="1255" />
-<TGConnectingPoint num="30" id="1256" />
-<TGConnectingPoint num="31" id="1257" />
-<TGConnectingPoint num="32" id="1258" />
-<TGConnectingPoint num="33" id="1259" />
-<TGConnectingPoint num="34" id="1260" />
-<TGConnectingPoint num="35" id="1261" />
-<TGConnectingPoint num="36" id="1262" />
-<TGConnectingPoint num="37" id="1263" />
-<TGConnectingPoint num="38" id="1264" />
-<TGConnectingPoint num="39" id="1265" />
+<TGConnectingPoint num="0" id="1209" />
+<TGConnectingPoint num="1" id="1210" />
+<TGConnectingPoint num="2" id="1211" />
+<TGConnectingPoint num="3" id="1212" />
+<TGConnectingPoint num="4" id="1213" />
+<TGConnectingPoint num="5" id="1214" />
+<TGConnectingPoint num="6" id="1215" />
+<TGConnectingPoint num="7" id="1216" />
+<TGConnectingPoint num="8" id="1217" />
+<TGConnectingPoint num="9" id="1218" />
+<TGConnectingPoint num="10" id="1219" />
+<TGConnectingPoint num="11" id="1220" />
+<TGConnectingPoint num="12" id="1221" />
+<TGConnectingPoint num="13" id="1222" />
+<TGConnectingPoint num="14" id="1223" />
+<TGConnectingPoint num="15" id="1224" />
+<TGConnectingPoint num="16" id="1225" />
+<TGConnectingPoint num="17" id="1226" />
+<TGConnectingPoint num="18" id="1227" />
+<TGConnectingPoint num="19" id="1228" />
+<TGConnectingPoint num="20" id="1229" />
+<TGConnectingPoint num="21" id="1230" />
+<TGConnectingPoint num="22" id="1231" />
+<TGConnectingPoint num="23" id="1232" />
+<TGConnectingPoint num="24" id="1233" />
+<TGConnectingPoint num="25" id="1234" />
+<TGConnectingPoint num="26" id="1235" />
+<TGConnectingPoint num="27" id="1236" />
+<TGConnectingPoint num="28" id="1237" />
+<TGConnectingPoint num="29" id="1238" />
+<TGConnectingPoint num="30" id="1239" />
+<TGConnectingPoint num="31" id="1240" />
+<TGConnectingPoint num="32" id="1241" />
+<TGConnectingPoint num="33" id="1242" />
+<TGConnectingPoint num="34" id="1243" />
+<TGConnectingPoint num="35" id="1244" />
+<TGConnectingPoint num="36" id="1245" />
+<TGConnectingPoint num="37" id="1246" />
+<TGConnectingPoint num="38" id="1247" />
+<TGConnectingPoint num="39" id="1248" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1307" >
+<COMPONENT type="5106" id="1290" >
<cdparam x="631" y="381" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1267" />
-<TGConnectingPoint num="1" id="1268" />
-<TGConnectingPoint num="2" id="1269" />
-<TGConnectingPoint num="3" id="1270" />
-<TGConnectingPoint num="4" id="1271" />
-<TGConnectingPoint num="5" id="1272" />
-<TGConnectingPoint num="6" id="1273" />
-<TGConnectingPoint num="7" id="1274" />
-<TGConnectingPoint num="8" id="1275" />
-<TGConnectingPoint num="9" id="1276" />
-<TGConnectingPoint num="10" id="1277" />
-<TGConnectingPoint num="11" id="1278" />
-<TGConnectingPoint num="12" id="1279" />
-<TGConnectingPoint num="13" id="1280" />
-<TGConnectingPoint num="14" id="1281" />
-<TGConnectingPoint num="15" id="1282" />
-<TGConnectingPoint num="16" id="1283" />
-<TGConnectingPoint num="17" id="1284" />
-<TGConnectingPoint num="18" id="1285" />
-<TGConnectingPoint num="19" id="1286" />
-<TGConnectingPoint num="20" id="1287" />
-<TGConnectingPoint num="21" id="1288" />
-<TGConnectingPoint num="22" id="1289" />
-<TGConnectingPoint num="23" id="1290" />
-<TGConnectingPoint num="24" id="1291" />
-<TGConnectingPoint num="25" id="1292" />
-<TGConnectingPoint num="26" id="1293" />
-<TGConnectingPoint num="27" id="1294" />
-<TGConnectingPoint num="28" id="1295" />
-<TGConnectingPoint num="29" id="1296" />
-<TGConnectingPoint num="30" id="1297" />
-<TGConnectingPoint num="31" id="1298" />
-<TGConnectingPoint num="32" id="1299" />
-<TGConnectingPoint num="33" id="1300" />
-<TGConnectingPoint num="34" id="1301" />
-<TGConnectingPoint num="35" id="1302" />
-<TGConnectingPoint num="36" id="1303" />
-<TGConnectingPoint num="37" id="1304" />
-<TGConnectingPoint num="38" id="1305" />
-<TGConnectingPoint num="39" id="1306" />
+<TGConnectingPoint num="0" id="1250" />
+<TGConnectingPoint num="1" id="1251" />
+<TGConnectingPoint num="2" id="1252" />
+<TGConnectingPoint num="3" id="1253" />
+<TGConnectingPoint num="4" id="1254" />
+<TGConnectingPoint num="5" id="1255" />
+<TGConnectingPoint num="6" id="1256" />
+<TGConnectingPoint num="7" id="1257" />
+<TGConnectingPoint num="8" id="1258" />
+<TGConnectingPoint num="9" id="1259" />
+<TGConnectingPoint num="10" id="1260" />
+<TGConnectingPoint num="11" id="1261" />
+<TGConnectingPoint num="12" id="1262" />
+<TGConnectingPoint num="13" id="1263" />
+<TGConnectingPoint num="14" id="1264" />
+<TGConnectingPoint num="15" id="1265" />
+<TGConnectingPoint num="16" id="1266" />
+<TGConnectingPoint num="17" id="1267" />
+<TGConnectingPoint num="18" id="1268" />
+<TGConnectingPoint num="19" id="1269" />
+<TGConnectingPoint num="20" id="1270" />
+<TGConnectingPoint num="21" id="1271" />
+<TGConnectingPoint num="22" id="1272" />
+<TGConnectingPoint num="23" id="1273" />
+<TGConnectingPoint num="24" id="1274" />
+<TGConnectingPoint num="25" id="1275" />
+<TGConnectingPoint num="26" id="1276" />
+<TGConnectingPoint num="27" id="1277" />
+<TGConnectingPoint num="28" id="1278" />
+<TGConnectingPoint num="29" id="1279" />
+<TGConnectingPoint num="30" id="1280" />
+<TGConnectingPoint num="31" id="1281" />
+<TGConnectingPoint num="32" id="1282" />
+<TGConnectingPoint num="33" id="1283" />
+<TGConnectingPoint num="34" id="1284" />
+<TGConnectingPoint num="35" id="1285" />
+<TGConnectingPoint num="36" id="1286" />
+<TGConnectingPoint num="37" id="1287" />
+<TGConnectingPoint num="38" id="1288" />
+<TGConnectingPoint num="39" id="1289" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1424" >
+<COMPONENT type="5106" id="1407" >
<cdparam x="18" y="370" />
<sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="Beverage" />
-<TGConnectingPoint num="0" id="1384" />
-<TGConnectingPoint num="1" id="1385" />
-<TGConnectingPoint num="2" id="1386" />
-<TGConnectingPoint num="3" id="1387" />
-<TGConnectingPoint num="4" id="1388" />
-<TGConnectingPoint num="5" id="1389" />
-<TGConnectingPoint num="6" id="1390" />
-<TGConnectingPoint num="7" id="1391" />
-<TGConnectingPoint num="8" id="1392" />
-<TGConnectingPoint num="9" id="1393" />
-<TGConnectingPoint num="10" id="1394" />
-<TGConnectingPoint num="11" id="1395" />
-<TGConnectingPoint num="12" id="1396" />
-<TGConnectingPoint num="13" id="1397" />
-<TGConnectingPoint num="14" id="1398" />
-<TGConnectingPoint num="15" id="1399" />
-<TGConnectingPoint num="16" id="1400" />
-<TGConnectingPoint num="17" id="1401" />
-<TGConnectingPoint num="18" id="1402" />
-<TGConnectingPoint num="19" id="1403" />
-<TGConnectingPoint num="20" id="1404" />
-<TGConnectingPoint num="21" id="1405" />
-<TGConnectingPoint num="22" id="1406" />
-<TGConnectingPoint num="23" id="1407" />
-<TGConnectingPoint num="24" id="1408" />
-<TGConnectingPoint num="25" id="1409" />
-<TGConnectingPoint num="26" id="1410" />
-<TGConnectingPoint num="27" id="1411" />
-<TGConnectingPoint num="28" id="1412" />
-<TGConnectingPoint num="29" id="1413" />
-<TGConnectingPoint num="30" id="1414" />
-<TGConnectingPoint num="31" id="1415" />
-<TGConnectingPoint num="32" id="1416" />
-<TGConnectingPoint num="33" id="1417" />
-<TGConnectingPoint num="34" id="1418" />
-<TGConnectingPoint num="35" id="1419" />
-<TGConnectingPoint num="36" id="1420" />
-<TGConnectingPoint num="37" id="1421" />
-<TGConnectingPoint num="38" id="1422" />
-<TGConnectingPoint num="39" id="1423" />
+<TGConnectingPoint num="0" id="1367" />
+<TGConnectingPoint num="1" id="1368" />
+<TGConnectingPoint num="2" id="1369" />
+<TGConnectingPoint num="3" id="1370" />
+<TGConnectingPoint num="4" id="1371" />
+<TGConnectingPoint num="5" id="1372" />
+<TGConnectingPoint num="6" id="1373" />
+<TGConnectingPoint num="7" id="1374" />
+<TGConnectingPoint num="8" id="1375" />
+<TGConnectingPoint num="9" id="1376" />
+<TGConnectingPoint num="10" id="1377" />
+<TGConnectingPoint num="11" id="1378" />
+<TGConnectingPoint num="12" id="1379" />
+<TGConnectingPoint num="13" id="1380" />
+<TGConnectingPoint num="14" id="1381" />
+<TGConnectingPoint num="15" id="1382" />
+<TGConnectingPoint num="16" id="1383" />
+<TGConnectingPoint num="17" id="1384" />
+<TGConnectingPoint num="18" id="1385" />
+<TGConnectingPoint num="19" id="1386" />
+<TGConnectingPoint num="20" id="1387" />
+<TGConnectingPoint num="21" id="1388" />
+<TGConnectingPoint num="22" id="1389" />
+<TGConnectingPoint num="23" id="1390" />
+<TGConnectingPoint num="24" id="1391" />
+<TGConnectingPoint num="25" id="1392" />
+<TGConnectingPoint num="26" id="1393" />
+<TGConnectingPoint num="27" id="1394" />
+<TGConnectingPoint num="28" id="1395" />
+<TGConnectingPoint num="29" id="1396" />
+<TGConnectingPoint num="30" id="1397" />
+<TGConnectingPoint num="31" id="1398" />
+<TGConnectingPoint num="32" id="1399" />
+<TGConnectingPoint num="33" id="1400" />
+<TGConnectingPoint num="34" id="1401" />
+<TGConnectingPoint num="35" id="1402" />
+<TGConnectingPoint num="36" id="1403" />
+<TGConnectingPoint num="37" id="1404" />
+<TGConnectingPoint num="38" id="1405" />
+<TGConnectingPoint num="39" id="1406" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5104" id="1318" >
-<father id="1424" num="0" />
-<cdparam x="237" y="527" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5103" id="1301" >
+<father id="1407" num="0" />
+<cdparam x="372" y="500" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="1308" />
-<TGConnectingPoint num="1" id="1309" />
-<TGConnectingPoint num="2" id="1310" />
-<TGConnectingPoint num="3" id="1311" />
-<TGConnectingPoint num="4" id="1312" />
-<TGConnectingPoint num="5" id="1313" />
-<TGConnectingPoint num="6" id="1314" />
-<TGConnectingPoint num="7" id="1315" />
-<TGConnectingPoint num="8" id="1316" />
-<TGConnectingPoint num="9" id="1317" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="1291" />
+<TGConnectingPoint num="1" id="1292" />
+<TGConnectingPoint num="2" id="1293" />
+<TGConnectingPoint num="3" id="1294" />
+<TGConnectingPoint num="4" id="1295" />
+<TGConnectingPoint num="5" id="1296" />
+<TGConnectingPoint num="6" id="1297" />
+<TGConnectingPoint num="7" id="1298" />
+<TGConnectingPoint num="8" id="1299" />
+<TGConnectingPoint num="9" id="1300" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1359" >
-<father id="1424" num="1" />
-<cdparam x="189" y="435" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="1312" >
+<father id="1407" num="1" />
+<cdparam x="58" y="527" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1319" />
-<TGConnectingPoint num="1" id="1320" />
-<TGConnectingPoint num="2" id="1321" />
-<TGConnectingPoint num="3" id="1322" />
-<TGConnectingPoint num="4" id="1323" />
-<TGConnectingPoint num="5" id="1324" />
-<TGConnectingPoint num="6" id="1325" />
-<TGConnectingPoint num="7" id="1326" />
-<TGConnectingPoint num="8" id="1327" />
-<TGConnectingPoint num="9" id="1328" />
-<TGConnectingPoint num="10" id="1329" />
-<TGConnectingPoint num="11" id="1330" />
-<TGConnectingPoint num="12" id="1331" />
-<TGConnectingPoint num="13" id="1332" />
-<TGConnectingPoint num="14" id="1333" />
-<TGConnectingPoint num="15" id="1334" />
-<TGConnectingPoint num="16" id="1335" />
-<TGConnectingPoint num="17" id="1336" />
-<TGConnectingPoint num="18" id="1337" />
-<TGConnectingPoint num="19" id="1338" />
-<TGConnectingPoint num="20" id="1339" />
-<TGConnectingPoint num="21" id="1340" />
-<TGConnectingPoint num="22" id="1341" />
-<TGConnectingPoint num="23" id="1342" />
-<TGConnectingPoint num="24" id="1343" />
-<TGConnectingPoint num="25" id="1344" />
-<TGConnectingPoint num="26" id="1345" />
-<TGConnectingPoint num="27" id="1346" />
-<TGConnectingPoint num="28" id="1347" />
-<TGConnectingPoint num="29" id="1348" />
-<TGConnectingPoint num="30" id="1349" />
-<TGConnectingPoint num="31" id="1350" />
-<TGConnectingPoint num="32" id="1351" />
-<TGConnectingPoint num="33" id="1352" />
-<TGConnectingPoint num="34" id="1353" />
-<TGConnectingPoint num="35" id="1354" />
-<TGConnectingPoint num="36" id="1355" />
-<TGConnectingPoint num="37" id="1356" />
-<TGConnectingPoint num="38" id="1357" />
-<TGConnectingPoint num="39" id="1358" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="1302" />
+<TGConnectingPoint num="1" id="1303" />
+<TGConnectingPoint num="2" id="1304" />
+<TGConnectingPoint num="3" id="1305" />
+<TGConnectingPoint num="4" id="1306" />
+<TGConnectingPoint num="5" id="1307" />
+<TGConnectingPoint num="6" id="1308" />
+<TGConnectingPoint num="7" id="1309" />
+<TGConnectingPoint num="8" id="1310" />
+<TGConnectingPoint num="9" id="1311" />
+<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1361" >
-<father id="1424" num="2" />
+<SUBCOMPONENT type="5100" id="1314" >
+<father id="1407" num="2" />
<cdparam x="249" y="399" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1360" />
+<TGConnectingPoint num="0" id="1313" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1372" >
-<father id="1424" num="3" />
-<cdparam x="58" y="527" />
-<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5106" id="1355" >
+<father id="1407" num="3" />
+<cdparam x="189" y="435" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="1362" />
-<TGConnectingPoint num="1" id="1363" />
-<TGConnectingPoint num="2" id="1364" />
-<TGConnectingPoint num="3" id="1365" />
-<TGConnectingPoint num="4" id="1366" />
-<TGConnectingPoint num="5" id="1367" />
-<TGConnectingPoint num="6" id="1368" />
-<TGConnectingPoint num="7" id="1369" />
-<TGConnectingPoint num="8" id="1370" />
-<TGConnectingPoint num="9" id="1371" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="1315" />
+<TGConnectingPoint num="1" id="1316" />
+<TGConnectingPoint num="2" id="1317" />
+<TGConnectingPoint num="3" id="1318" />
+<TGConnectingPoint num="4" id="1319" />
+<TGConnectingPoint num="5" id="1320" />
+<TGConnectingPoint num="6" id="1321" />
+<TGConnectingPoint num="7" id="1322" />
+<TGConnectingPoint num="8" id="1323" />
+<TGConnectingPoint num="9" id="1324" />
+<TGConnectingPoint num="10" id="1325" />
+<TGConnectingPoint num="11" id="1326" />
+<TGConnectingPoint num="12" id="1327" />
+<TGConnectingPoint num="13" id="1328" />
+<TGConnectingPoint num="14" id="1329" />
+<TGConnectingPoint num="15" id="1330" />
+<TGConnectingPoint num="16" id="1331" />
+<TGConnectingPoint num="17" id="1332" />
+<TGConnectingPoint num="18" id="1333" />
+<TGConnectingPoint num="19" id="1334" />
+<TGConnectingPoint num="20" id="1335" />
+<TGConnectingPoint num="21" id="1336" />
+<TGConnectingPoint num="22" id="1337" />
+<TGConnectingPoint num="23" id="1338" />
+<TGConnectingPoint num="24" id="1339" />
+<TGConnectingPoint num="25" id="1340" />
+<TGConnectingPoint num="26" id="1341" />
+<TGConnectingPoint num="27" id="1342" />
+<TGConnectingPoint num="28" id="1343" />
+<TGConnectingPoint num="29" id="1344" />
+<TGConnectingPoint num="30" id="1345" />
+<TGConnectingPoint num="31" id="1346" />
+<TGConnectingPoint num="32" id="1347" />
+<TGConnectingPoint num="33" id="1348" />
+<TGConnectingPoint num="34" id="1349" />
+<TGConnectingPoint num="35" id="1350" />
+<TGConnectingPoint num="36" id="1351" />
+<TGConnectingPoint num="37" id="1352" />
+<TGConnectingPoint num="38" id="1353" />
+<TGConnectingPoint num="39" id="1354" />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1383" >
-<father id="1424" num="4" />
-<cdparam x="372" y="500" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="1366" >
+<father id="1407" num="4" />
+<cdparam x="237" y="527" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1373" />
-<TGConnectingPoint num="1" id="1374" />
-<TGConnectingPoint num="2" id="1375" />
-<TGConnectingPoint num="3" id="1376" />
-<TGConnectingPoint num="4" id="1377" />
-<TGConnectingPoint num="5" id="1378" />
-<TGConnectingPoint num="6" id="1379" />
-<TGConnectingPoint num="7" id="1380" />
-<TGConnectingPoint num="8" id="1381" />
-<TGConnectingPoint num="9" id="1382" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
+<TGConnectingPoint num="0" id="1356" />
+<TGConnectingPoint num="1" id="1357" />
+<TGConnectingPoint num="2" id="1358" />
+<TGConnectingPoint num="3" id="1359" />
+<TGConnectingPoint num="4" id="1360" />
+<TGConnectingPoint num="5" id="1361" />
+<TGConnectingPoint num="6" id="1362" />
+<TGConnectingPoint num="7" id="1363" />
+<TGConnectingPoint num="8" id="1364" />
+<TGConnectingPoint num="9" id="1365" />
<accessibility />
</SUBCOMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1431" >
-<cdparam x="363" y="193" />
+<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1414" >
+<cdparam x="177" y="199" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1430" />
-<P1 x="363" y="204" id="1447" />
-<P2 x="362" y="257" id="1458" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1413" />
+<P1 x="340" y="233" id="1520" />
+<P2 x="353" y="252" id="1522" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1429" >
-<father id="1431" num="0" />
-<cdparam x="380" y="228" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1412" >
+<father id="1414" num="0" />
+<cdparam x="177" y="239" />
+<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="1425" />
-<TGConnectingPoint num="1" id="1426" />
-<TGConnectingPoint num="2" id="1427" />
-<TGConnectingPoint num="3" id="1428" />
+<TGConnectingPoint num="0" id="1408" />
+<TGConnectingPoint num="1" id="1409" />
+<TGConnectingPoint num="2" id="1410" />
+<TGConnectingPoint num="3" id="1411" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
+<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -2731,25 +2731,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1438" >
-<cdparam x="363" y="150" />
+<CONNECTOR type="5102" id="1421" >
+<cdparam x="322" y="69" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1437" />
-<P1 x="363" y="150" id="1504" />
-<P2 x="363" y="174" id="1446" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1420" />
+<P1 x="322" y="69" id="1518" />
+<P2 x="323" y="88" id="1478" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1436" >
-<father id="1438" num="0" />
-<cdparam x="363" y="190" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1419" >
+<father id="1421" num="0" />
+<cdparam x="322" y="109" />
<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="1432" />
-<TGConnectingPoint num="1" id="1433" />
-<TGConnectingPoint num="2" id="1434" />
-<TGConnectingPoint num="3" id="1435" />
+<TGConnectingPoint num="0" id="1415" />
+<TGConnectingPoint num="1" id="1416" />
+<TGConnectingPoint num="2" id="1417" />
+<TGConnectingPoint num="3" id="1418" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2760,25 +2760,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1445" >
-<cdparam x="362" y="101" />
+<CONNECTOR type="5102" id="1428" >
+<cdparam x="377" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1444" />
-<P1 x="362" y="101" id="1539" />
-<P2 x="363" y="120" id="1499" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1427" />
+<P1 x="323" y="118" id="1483" />
+<P2 x="356" y="174" id="1534" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1443" >
-<father id="1445" num="0" />
-<cdparam x="362" y="141" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1426" >
+<father id="1428" num="0" />
+<cdparam x="377" y="184" />
<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="1439" />
-<TGConnectingPoint num="1" id="1440" />
-<TGConnectingPoint num="2" id="1441" />
-<TGConnectingPoint num="3" id="1442" />
+<TGConnectingPoint num="0" id="1422" />
+<TGConnectingPoint num="1" id="1423" />
+<TGConnectingPoint num="2" id="1424" />
+<TGConnectingPoint num="3" id="1425" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2789,159 +2789,247 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="1456" >
-<cdparam x="340" y="179" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1435" >
+<cdparam x="377" y="187" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1434" />
+<P1 x="353" y="282" id="1523" />
+<P2 x="399" y="352" id="1437" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1433" >
+<father id="1435" num="0" />
+<cdparam x="417" y="335" />
+<sizeparam width="149" 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="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1446" />
-<TGConnectingPoint num="1" id="1447" />
-<TGConnectingPoint num="2" id="1448" />
-<TGConnectingPoint num="3" id="1449" />
-<TGConnectingPoint num="4" id="1450" />
-<TGConnectingPoint num="5" id="1451" />
-<TGConnectingPoint num="6" id="1452" />
-<TGConnectingPoint num="7" id="1453" />
-<TGConnectingPoint num="8" id="1454" />
-<TGConnectingPoint num="9" id="1455" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1429" />
+<TGConnectingPoint num="1" id="1430" />
+<TGConnectingPoint num="2" id="1431" />
+<TGConnectingPoint num="3" id="1432" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="mechanicalDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
-<COMPONENT type="5106" id="1497" >
-<cdparam x="337" y="257" />
+<COMPONENT type="5106" id="1476" >
+<cdparam x="374" y="352" />
<sizeparam width="50" height="30" 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="main" />
-<TGConnectingPoint num="0" id="1457" />
-<TGConnectingPoint num="1" id="1458" />
-<TGConnectingPoint num="2" id="1459" />
-<TGConnectingPoint num="3" id="1460" />
-<TGConnectingPoint num="4" id="1461" />
-<TGConnectingPoint num="5" id="1462" />
-<TGConnectingPoint num="6" id="1463" />
-<TGConnectingPoint num="7" id="1464" />
-<TGConnectingPoint num="8" id="1465" />
-<TGConnectingPoint num="9" id="1466" />
-<TGConnectingPoint num="10" id="1467" />
-<TGConnectingPoint num="11" id="1468" />
-<TGConnectingPoint num="12" id="1469" />
-<TGConnectingPoint num="13" id="1470" />
-<TGConnectingPoint num="14" id="1471" />
-<TGConnectingPoint num="15" id="1472" />
-<TGConnectingPoint num="16" id="1473" />
-<TGConnectingPoint num="17" id="1474" />
-<TGConnectingPoint num="18" id="1475" />
-<TGConnectingPoint num="19" id="1476" />
-<TGConnectingPoint num="20" id="1477" />
-<TGConnectingPoint num="21" id="1478" />
-<TGConnectingPoint num="22" id="1479" />
-<TGConnectingPoint num="23" id="1480" />
-<TGConnectingPoint num="24" id="1481" />
-<TGConnectingPoint num="25" id="1482" />
-<TGConnectingPoint num="26" id="1483" />
-<TGConnectingPoint num="27" id="1484" />
-<TGConnectingPoint num="28" id="1485" />
-<TGConnectingPoint num="29" id="1486" />
-<TGConnectingPoint num="30" id="1487" />
-<TGConnectingPoint num="31" id="1488" />
-<TGConnectingPoint num="32" id="1489" />
-<TGConnectingPoint num="33" id="1490" />
-<TGConnectingPoint num="34" id="1491" />
-<TGConnectingPoint num="35" id="1492" />
-<TGConnectingPoint num="36" id="1493" />
-<TGConnectingPoint num="37" id="1494" />
-<TGConnectingPoint num="38" id="1495" />
-<TGConnectingPoint num="39" id="1496" />
+<TGConnectingPoint num="0" id="1436" />
+<TGConnectingPoint num="1" id="1437" />
+<TGConnectingPoint num="2" id="1438" />
+<TGConnectingPoint num="3" id="1439" />
+<TGConnectingPoint num="4" id="1440" />
+<TGConnectingPoint num="5" id="1441" />
+<TGConnectingPoint num="6" id="1442" />
+<TGConnectingPoint num="7" id="1443" />
+<TGConnectingPoint num="8" id="1444" />
+<TGConnectingPoint num="9" id="1445" />
+<TGConnectingPoint num="10" id="1446" />
+<TGConnectingPoint num="11" id="1447" />
+<TGConnectingPoint num="12" id="1448" />
+<TGConnectingPoint num="13" id="1449" />
+<TGConnectingPoint num="14" id="1450" />
+<TGConnectingPoint num="15" id="1451" />
+<TGConnectingPoint num="16" id="1452" />
+<TGConnectingPoint num="17" id="1453" />
+<TGConnectingPoint num="18" id="1454" />
+<TGConnectingPoint num="19" id="1455" />
+<TGConnectingPoint num="20" id="1456" />
+<TGConnectingPoint num="21" id="1457" />
+<TGConnectingPoint num="22" id="1458" />
+<TGConnectingPoint num="23" id="1459" />
+<TGConnectingPoint num="24" id="1460" />
+<TGConnectingPoint num="25" id="1461" />
+<TGConnectingPoint num="26" id="1462" />
+<TGConnectingPoint num="27" id="1463" />
+<TGConnectingPoint num="28" id="1464" />
+<TGConnectingPoint num="29" id="1465" />
+<TGConnectingPoint num="30" id="1466" />
+<TGConnectingPoint num="31" id="1467" />
+<TGConnectingPoint num="32" id="1468" />
+<TGConnectingPoint num="33" id="1469" />
+<TGConnectingPoint num="34" id="1470" />
+<TGConnectingPoint num="35" id="1471" />
+<TGConnectingPoint num="36" id="1472" />
+<TGConnectingPoint num="37" id="1473" />
+<TGConnectingPoint num="38" id="1474" />
+<TGConnectingPoint num="39" id="1475" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1538" >
-<cdparam x="338" y="120" />
+<COMPONENT type="5106" id="1517" >
+<cdparam x="298" y="88" />
<sizeparam width="50" height="30" 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="main" />
-<TGConnectingPoint num="0" id="1498" />
-<TGConnectingPoint num="1" id="1499" />
-<TGConnectingPoint num="2" id="1500" />
-<TGConnectingPoint num="3" id="1501" />
-<TGConnectingPoint num="4" id="1502" />
-<TGConnectingPoint num="5" id="1503" />
-<TGConnectingPoint num="6" id="1504" />
-<TGConnectingPoint num="7" id="1505" />
-<TGConnectingPoint num="8" id="1506" />
-<TGConnectingPoint num="9" id="1507" />
-<TGConnectingPoint num="10" id="1508" />
-<TGConnectingPoint num="11" id="1509" />
-<TGConnectingPoint num="12" id="1510" />
-<TGConnectingPoint num="13" id="1511" />
-<TGConnectingPoint num="14" id="1512" />
-<TGConnectingPoint num="15" id="1513" />
-<TGConnectingPoint num="16" id="1514" />
-<TGConnectingPoint num="17" id="1515" />
-<TGConnectingPoint num="18" id="1516" />
-<TGConnectingPoint num="19" id="1517" />
-<TGConnectingPoint num="20" id="1518" />
-<TGConnectingPoint num="21" id="1519" />
-<TGConnectingPoint num="22" id="1520" />
-<TGConnectingPoint num="23" id="1521" />
-<TGConnectingPoint num="24" id="1522" />
-<TGConnectingPoint num="25" id="1523" />
-<TGConnectingPoint num="26" id="1524" />
-<TGConnectingPoint num="27" id="1525" />
-<TGConnectingPoint num="28" id="1526" />
-<TGConnectingPoint num="29" id="1527" />
-<TGConnectingPoint num="30" id="1528" />
-<TGConnectingPoint num="31" id="1529" />
-<TGConnectingPoint num="32" id="1530" />
-<TGConnectingPoint num="33" id="1531" />
-<TGConnectingPoint num="34" id="1532" />
-<TGConnectingPoint num="35" id="1533" />
-<TGConnectingPoint num="36" id="1534" />
-<TGConnectingPoint num="37" id="1535" />
-<TGConnectingPoint num="38" id="1536" />
-<TGConnectingPoint num="39" id="1537" />
+<TGConnectingPoint num="0" id="1477" />
+<TGConnectingPoint num="1" id="1478" />
+<TGConnectingPoint num="2" id="1479" />
+<TGConnectingPoint num="3" id="1480" />
+<TGConnectingPoint num="4" id="1481" />
+<TGConnectingPoint num="5" id="1482" />
+<TGConnectingPoint num="6" id="1483" />
+<TGConnectingPoint num="7" id="1484" />
+<TGConnectingPoint num="8" id="1485" />
+<TGConnectingPoint num="9" id="1486" />
+<TGConnectingPoint num="10" id="1487" />
+<TGConnectingPoint num="11" id="1488" />
+<TGConnectingPoint num="12" id="1489" />
+<TGConnectingPoint num="13" id="1490" />
+<TGConnectingPoint num="14" id="1491" />
+<TGConnectingPoint num="15" id="1492" />
+<TGConnectingPoint num="16" id="1493" />
+<TGConnectingPoint num="17" id="1494" />
+<TGConnectingPoint num="18" id="1495" />
+<TGConnectingPoint num="19" id="1496" />
+<TGConnectingPoint num="20" id="1497" />
+<TGConnectingPoint num="21" id="1498" />
+<TGConnectingPoint num="22" id="1499" />
+<TGConnectingPoint num="23" id="1500" />
+<TGConnectingPoint num="24" id="1501" />
+<TGConnectingPoint num="25" id="1502" />
+<TGConnectingPoint num="26" id="1503" />
+<TGConnectingPoint num="27" id="1504" />
+<TGConnectingPoint num="28" id="1505" />
+<TGConnectingPoint num="29" id="1506" />
+<TGConnectingPoint num="30" id="1507" />
+<TGConnectingPoint num="31" id="1508" />
+<TGConnectingPoint num="32" id="1509" />
+<TGConnectingPoint num="33" id="1510" />
+<TGConnectingPoint num="34" id="1511" />
+<TGConnectingPoint num="35" id="1512" />
+<TGConnectingPoint num="36" id="1513" />
+<TGConnectingPoint num="37" id="1514" />
+<TGConnectingPoint num="38" id="1515" />
+<TGConnectingPoint num="39" id="1516" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1540" >
-<cdparam x="355" y="81" />
+<COMPONENT type="5100" id="1519" >
+<cdparam x="315" y="49" />
<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="1539" />
+<TGConnectingPoint num="0" id="1518" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1573" >
+<cdparam x="264" y="174" />
+<sizeparam width="184" height="130" 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="1533" />
+<TGConnectingPoint num="1" id="1534" />
+<TGConnectingPoint num="2" id="1535" />
+<TGConnectingPoint num="3" id="1536" />
+<TGConnectingPoint num="4" id="1537" />
+<TGConnectingPoint num="5" id="1538" />
+<TGConnectingPoint num="6" id="1539" />
+<TGConnectingPoint num="7" id="1540" />
+<TGConnectingPoint num="8" id="1541" />
+<TGConnectingPoint num="9" id="1542" />
+<TGConnectingPoint num="10" id="1543" />
+<TGConnectingPoint num="11" id="1544" />
+<TGConnectingPoint num="12" id="1545" />
+<TGConnectingPoint num="13" id="1546" />
+<TGConnectingPoint num="14" id="1547" />
+<TGConnectingPoint num="15" id="1548" />
+<TGConnectingPoint num="16" id="1549" />
+<TGConnectingPoint num="17" id="1550" />
+<TGConnectingPoint num="18" id="1551" />
+<TGConnectingPoint num="19" id="1552" />
+<TGConnectingPoint num="20" id="1553" />
+<TGConnectingPoint num="21" id="1554" />
+<TGConnectingPoint num="22" id="1555" />
+<TGConnectingPoint num="23" id="1556" />
+<TGConnectingPoint num="24" id="1557" />
+<TGConnectingPoint num="25" id="1558" />
+<TGConnectingPoint num="26" id="1559" />
+<TGConnectingPoint num="27" id="1560" />
+<TGConnectingPoint num="28" id="1561" />
+<TGConnectingPoint num="29" id="1562" />
+<TGConnectingPoint num="30" id="1563" />
+<TGConnectingPoint num="31" id="1564" />
+<TGConnectingPoint num="32" id="1565" />
+<TGConnectingPoint num="33" id="1566" />
+<TGConnectingPoint num="34" id="1567" />
+<TGConnectingPoint num="35" id="1568" />
+<TGConnectingPoint num="36" id="1569" />
+<TGConnectingPoint num="37" id="1570" />
+<TGConnectingPoint num="38" id="1571" />
+<TGConnectingPoint num="39" id="1572" />
+<extraparam>
+</extraparam>
</COMPONENT>
+<SUBCOMPONENT type="5100" id="1521" >
+<father id="1573" num="0" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1520" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5103" id="1532" >
+<father id="1573" num="1" />
+<cdparam x="328" y="257" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1522" />
+<TGConnectingPoint num="1" id="1523" />
+<TGConnectingPoint num="2" id="1524" />
+<TGConnectingPoint num="3" id="1525" />
+<TGConnectingPoint num="4" id="1526" />
+<TGConnectingPoint num="5" id="1527" />
+<TGConnectingPoint num="6" id="1528" />
+<TGConnectingPoint num="7" id="1529" />
+<TGConnectingPoint num="8" id="1530" />
+<TGConnectingPoint num="9" id="1531" />
+</SUBCOMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1547" >
-<cdparam x="177" y="199" />
+<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1580" >
+<cdparam x="363" y="193" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1546" />
-<P1 x="340" y="233" id="1664" />
-<P2 x="353" y="252" id="1653" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1579" />
+<P1 x="363" y="204" id="1596" />
+<P2 x="362" y="257" id="1607" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1545" >
-<father id="1547" num="0" />
-<cdparam x="177" y="239" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1578" >
+<father id="1580" num="0" />
+<cdparam x="380" y="228" />
+<sizeparam width="135" 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="1541" />
-<TGConnectingPoint num="1" id="1542" />
-<TGConnectingPoint num="2" id="1543" />
-<TGConnectingPoint num="3" id="1544" />
+<TGConnectingPoint num="0" id="1574" />
+<TGConnectingPoint num="1" id="1575" />
+<TGConnectingPoint num="2" id="1576" />
+<TGConnectingPoint num="3" id="1577" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="mechanicalDelay" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -2949,25 +3037,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1554" >
-<cdparam x="322" y="69" />
+<CONNECTOR type="5102" id="1587" >
+<cdparam x="363" y="150" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1553" />
-<P1 x="322" y="69" id="1651" />
-<P2 x="323" y="88" id="1611" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1586" />
+<P1 x="363" y="150" id="1653" />
+<P2 x="363" y="174" id="1595" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1552" >
-<father id="1554" num="0" />
-<cdparam x="322" y="109" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1585" >
+<father id="1587" num="0" />
+<cdparam x="363" y="190" />
<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="1548" />
-<TGConnectingPoint num="1" id="1549" />
-<TGConnectingPoint num="2" id="1550" />
-<TGConnectingPoint num="3" id="1551" />
+<TGConnectingPoint num="0" id="1581" />
+<TGConnectingPoint num="1" id="1582" />
+<TGConnectingPoint num="2" id="1583" />
+<TGConnectingPoint num="3" id="1584" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2978,25 +3066,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1561" >
-<cdparam x="377" y="144" />
+<CONNECTOR type="5102" id="1594" >
+<cdparam x="362" y="101" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1560" />
-<P1 x="323" y="118" id="1616" />
-<P2 x="356" y="174" id="1667" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1593" />
+<P1 x="362" y="101" id="1688" />
+<P2 x="363" y="120" id="1648" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1559" >
-<father id="1561" num="0" />
-<cdparam x="377" y="184" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1592" >
+<father id="1594" num="0" />
+<cdparam x="362" y="141" />
<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="1555" />
-<TGConnectingPoint num="1" id="1556" />
-<TGConnectingPoint num="2" id="1557" />
-<TGConnectingPoint num="3" id="1558" />
+<TGConnectingPoint num="0" id="1588" />
+<TGConnectingPoint num="1" id="1589" />
+<TGConnectingPoint num="2" id="1590" />
+<TGConnectingPoint num="3" id="1591" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3007,221 +3095,133 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1568" >
-<cdparam x="377" y="187" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1567" />
-<P1 x="353" y="282" id="1654" />
-<P2 x="399" y="352" id="1570" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1566" >
-<father id="1568" num="0" />
-<cdparam x="417" y="335" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1605" >
+<cdparam x="340" y="179" />
+<sizeparam width="46" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1562" />
-<TGConnectingPoint num="1" id="1563" />
-<TGConnectingPoint num="2" id="1564" />
-<TGConnectingPoint num="3" id="1565" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1595" />
+<TGConnectingPoint num="1" id="1596" />
+<TGConnectingPoint num="2" id="1597" />
+<TGConnectingPoint num="3" id="1598" />
+<TGConnectingPoint num="4" id="1599" />
+<TGConnectingPoint num="5" id="1600" />
+<TGConnectingPoint num="6" id="1601" />
+<TGConnectingPoint num="7" id="1602" />
+<TGConnectingPoint num="8" id="1603" />
+<TGConnectingPoint num="9" id="1604" />
+</COMPONENT>
-<COMPONENT type="5106" id="1609" >
-<cdparam x="374" y="352" />
+<COMPONENT type="5106" id="1646" >
+<cdparam x="337" y="257" />
<sizeparam width="50" height="30" 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="main" />
-<TGConnectingPoint num="0" id="1569" />
-<TGConnectingPoint num="1" id="1570" />
-<TGConnectingPoint num="2" id="1571" />
-<TGConnectingPoint num="3" id="1572" />
-<TGConnectingPoint num="4" id="1573" />
-<TGConnectingPoint num="5" id="1574" />
-<TGConnectingPoint num="6" id="1575" />
-<TGConnectingPoint num="7" id="1576" />
-<TGConnectingPoint num="8" id="1577" />
-<TGConnectingPoint num="9" id="1578" />
-<TGConnectingPoint num="10" id="1579" />
-<TGConnectingPoint num="11" id="1580" />
-<TGConnectingPoint num="12" id="1581" />
-<TGConnectingPoint num="13" id="1582" />
-<TGConnectingPoint num="14" id="1583" />
-<TGConnectingPoint num="15" id="1584" />
-<TGConnectingPoint num="16" id="1585" />
-<TGConnectingPoint num="17" id="1586" />
-<TGConnectingPoint num="18" id="1587" />
-<TGConnectingPoint num="19" id="1588" />
-<TGConnectingPoint num="20" id="1589" />
-<TGConnectingPoint num="21" id="1590" />
-<TGConnectingPoint num="22" id="1591" />
-<TGConnectingPoint num="23" id="1592" />
-<TGConnectingPoint num="24" id="1593" />
-<TGConnectingPoint num="25" id="1594" />
-<TGConnectingPoint num="26" id="1595" />
-<TGConnectingPoint num="27" id="1596" />
-<TGConnectingPoint num="28" id="1597" />
-<TGConnectingPoint num="29" id="1598" />
-<TGConnectingPoint num="30" id="1599" />
-<TGConnectingPoint num="31" id="1600" />
-<TGConnectingPoint num="32" id="1601" />
-<TGConnectingPoint num="33" id="1602" />
-<TGConnectingPoint num="34" id="1603" />
-<TGConnectingPoint num="35" id="1604" />
-<TGConnectingPoint num="36" id="1605" />
-<TGConnectingPoint num="37" id="1606" />
-<TGConnectingPoint num="38" id="1607" />
-<TGConnectingPoint num="39" id="1608" />
+<TGConnectingPoint num="0" id="1606" />
+<TGConnectingPoint num="1" id="1607" />
+<TGConnectingPoint num="2" id="1608" />
+<TGConnectingPoint num="3" id="1609" />
+<TGConnectingPoint num="4" id="1610" />
+<TGConnectingPoint num="5" id="1611" />
+<TGConnectingPoint num="6" id="1612" />
+<TGConnectingPoint num="7" id="1613" />
+<TGConnectingPoint num="8" id="1614" />
+<TGConnectingPoint num="9" id="1615" />
+<TGConnectingPoint num="10" id="1616" />
+<TGConnectingPoint num="11" id="1617" />
+<TGConnectingPoint num="12" id="1618" />
+<TGConnectingPoint num="13" id="1619" />
+<TGConnectingPoint num="14" id="1620" />
+<TGConnectingPoint num="15" id="1621" />
+<TGConnectingPoint num="16" id="1622" />
+<TGConnectingPoint num="17" id="1623" />
+<TGConnectingPoint num="18" id="1624" />
+<TGConnectingPoint num="19" id="1625" />
+<TGConnectingPoint num="20" id="1626" />
+<TGConnectingPoint num="21" id="1627" />
+<TGConnectingPoint num="22" id="1628" />
+<TGConnectingPoint num="23" id="1629" />
+<TGConnectingPoint num="24" id="1630" />
+<TGConnectingPoint num="25" id="1631" />
+<TGConnectingPoint num="26" id="1632" />
+<TGConnectingPoint num="27" id="1633" />
+<TGConnectingPoint num="28" id="1634" />
+<TGConnectingPoint num="29" id="1635" />
+<TGConnectingPoint num="30" id="1636" />
+<TGConnectingPoint num="31" id="1637" />
+<TGConnectingPoint num="32" id="1638" />
+<TGConnectingPoint num="33" id="1639" />
+<TGConnectingPoint num="34" id="1640" />
+<TGConnectingPoint num="35" id="1641" />
+<TGConnectingPoint num="36" id="1642" />
+<TGConnectingPoint num="37" id="1643" />
+<TGConnectingPoint num="38" id="1644" />
+<TGConnectingPoint num="39" id="1645" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1650" >
-<cdparam x="298" y="88" />
+<COMPONENT type="5106" id="1687" >
+<cdparam x="338" y="120" />
<sizeparam width="50" height="30" 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="main" />
-<TGConnectingPoint num="0" id="1610" />
-<TGConnectingPoint num="1" id="1611" />
-<TGConnectingPoint num="2" id="1612" />
-<TGConnectingPoint num="3" id="1613" />
-<TGConnectingPoint num="4" id="1614" />
-<TGConnectingPoint num="5" id="1615" />
-<TGConnectingPoint num="6" id="1616" />
-<TGConnectingPoint num="7" id="1617" />
-<TGConnectingPoint num="8" id="1618" />
-<TGConnectingPoint num="9" id="1619" />
-<TGConnectingPoint num="10" id="1620" />
-<TGConnectingPoint num="11" id="1621" />
-<TGConnectingPoint num="12" id="1622" />
-<TGConnectingPoint num="13" id="1623" />
-<TGConnectingPoint num="14" id="1624" />
-<TGConnectingPoint num="15" id="1625" />
-<TGConnectingPoint num="16" id="1626" />
-<TGConnectingPoint num="17" id="1627" />
-<TGConnectingPoint num="18" id="1628" />
-<TGConnectingPoint num="19" id="1629" />
-<TGConnectingPoint num="20" id="1630" />
-<TGConnectingPoint num="21" id="1631" />
-<TGConnectingPoint num="22" id="1632" />
-<TGConnectingPoint num="23" id="1633" />
-<TGConnectingPoint num="24" id="1634" />
-<TGConnectingPoint num="25" id="1635" />
-<TGConnectingPoint num="26" id="1636" />
-<TGConnectingPoint num="27" id="1637" />
-<TGConnectingPoint num="28" id="1638" />
-<TGConnectingPoint num="29" id="1639" />
-<TGConnectingPoint num="30" id="1640" />
-<TGConnectingPoint num="31" id="1641" />
-<TGConnectingPoint num="32" id="1642" />
-<TGConnectingPoint num="33" id="1643" />
-<TGConnectingPoint num="34" id="1644" />
-<TGConnectingPoint num="35" id="1645" />
-<TGConnectingPoint num="36" id="1646" />
-<TGConnectingPoint num="37" id="1647" />
-<TGConnectingPoint num="38" id="1648" />
-<TGConnectingPoint num="39" id="1649" />
+<TGConnectingPoint num="0" id="1647" />
+<TGConnectingPoint num="1" id="1648" />
+<TGConnectingPoint num="2" id="1649" />
+<TGConnectingPoint num="3" id="1650" />
+<TGConnectingPoint num="4" id="1651" />
+<TGConnectingPoint num="5" id="1652" />
+<TGConnectingPoint num="6" id="1653" />
+<TGConnectingPoint num="7" id="1654" />
+<TGConnectingPoint num="8" id="1655" />
+<TGConnectingPoint num="9" id="1656" />
+<TGConnectingPoint num="10" id="1657" />
+<TGConnectingPoint num="11" id="1658" />
+<TGConnectingPoint num="12" id="1659" />
+<TGConnectingPoint num="13" id="1660" />
+<TGConnectingPoint num="14" id="1661" />
+<TGConnectingPoint num="15" id="1662" />
+<TGConnectingPoint num="16" id="1663" />
+<TGConnectingPoint num="17" id="1664" />
+<TGConnectingPoint num="18" id="1665" />
+<TGConnectingPoint num="19" id="1666" />
+<TGConnectingPoint num="20" id="1667" />
+<TGConnectingPoint num="21" id="1668" />
+<TGConnectingPoint num="22" id="1669" />
+<TGConnectingPoint num="23" id="1670" />
+<TGConnectingPoint num="24" id="1671" />
+<TGConnectingPoint num="25" id="1672" />
+<TGConnectingPoint num="26" id="1673" />
+<TGConnectingPoint num="27" id="1674" />
+<TGConnectingPoint num="28" id="1675" />
+<TGConnectingPoint num="29" id="1676" />
+<TGConnectingPoint num="30" id="1677" />
+<TGConnectingPoint num="31" id="1678" />
+<TGConnectingPoint num="32" id="1679" />
+<TGConnectingPoint num="33" id="1680" />
+<TGConnectingPoint num="34" id="1681" />
+<TGConnectingPoint num="35" id="1682" />
+<TGConnectingPoint num="36" id="1683" />
+<TGConnectingPoint num="37" id="1684" />
+<TGConnectingPoint num="38" id="1685" />
+<TGConnectingPoint num="39" id="1686" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1652" >
-<cdparam x="315" y="49" />
+<COMPONENT type="5100" id="1689" >
+<cdparam x="355" y="81" />
<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="1651" />
+<TGConnectingPoint num="0" id="1688" />
</COMPONENT>
-<COMPONENT type="5106" id="1706" >
-<cdparam x="264" y="174" />
-<sizeparam width="184" height="130" 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="1666" />
-<TGConnectingPoint num="1" id="1667" />
-<TGConnectingPoint num="2" id="1668" />
-<TGConnectingPoint num="3" id="1669" />
-<TGConnectingPoint num="4" id="1670" />
-<TGConnectingPoint num="5" id="1671" />
-<TGConnectingPoint num="6" id="1672" />
-<TGConnectingPoint num="7" id="1673" />
-<TGConnectingPoint num="8" id="1674" />
-<TGConnectingPoint num="9" id="1675" />
-<TGConnectingPoint num="10" id="1676" />
-<TGConnectingPoint num="11" id="1677" />
-<TGConnectingPoint num="12" id="1678" />
-<TGConnectingPoint num="13" id="1679" />
-<TGConnectingPoint num="14" id="1680" />
-<TGConnectingPoint num="15" id="1681" />
-<TGConnectingPoint num="16" id="1682" />
-<TGConnectingPoint num="17" id="1683" />
-<TGConnectingPoint num="18" id="1684" />
-<TGConnectingPoint num="19" id="1685" />
-<TGConnectingPoint num="20" id="1686" />
-<TGConnectingPoint num="21" id="1687" />
-<TGConnectingPoint num="22" id="1688" />
-<TGConnectingPoint num="23" id="1689" />
-<TGConnectingPoint num="24" id="1690" />
-<TGConnectingPoint num="25" id="1691" />
-<TGConnectingPoint num="26" id="1692" />
-<TGConnectingPoint num="27" id="1693" />
-<TGConnectingPoint num="28" id="1694" />
-<TGConnectingPoint num="29" id="1695" />
-<TGConnectingPoint num="30" id="1696" />
-<TGConnectingPoint num="31" id="1697" />
-<TGConnectingPoint num="32" id="1698" />
-<TGConnectingPoint num="33" id="1699" />
-<TGConnectingPoint num="34" id="1700" />
-<TGConnectingPoint num="35" id="1701" />
-<TGConnectingPoint num="36" id="1702" />
-<TGConnectingPoint num="37" id="1703" />
-<TGConnectingPoint num="38" id="1704" />
-<TGConnectingPoint num="39" id="1705" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5103" id="1663" >
-<father id="1706" num="0" />
-<cdparam x="330" y="257" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1653" />
-<TGConnectingPoint num="1" id="1654" />
-<TGConnectingPoint num="2" id="1655" />
-<TGConnectingPoint num="3" id="1656" />
-<TGConnectingPoint num="4" id="1657" />
-<TGConnectingPoint num="5" id="1658" />
-<TGConnectingPoint num="6" id="1659" />
-<TGConnectingPoint num="7" id="1660" />
-<TGConnectingPoint num="8" id="1661" />
-<TGConnectingPoint num="9" id="1662" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1665" >
-<father id="1706" num="1" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1664" />
-</SUBCOMPONENT>
-
</AVATARStateMachineDiagramPanel>
diff --git a/modeling/DIPLODOCUS/ZigBeeTutorial.xml b/modeling/DIPLODOCUS/ZigBeeTutorial.xml
index 8ddf09351a..ba2ca48c0a 100644
--- a/modeling/DIPLODOCUS/ZigBeeTutorial.xml
+++ b/modeling/DIPLODOCUS/ZigBeeTutorial.xml
@@ -29,11 +29,11 @@
</COMPONENT>
<SUBCOMPONENT type="6005" id="6" >
<father id="13" num="0" />
-<cdparam x="605" y="170" />
+<cdparam x="605" y="140" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="170" maxY="170" />
-<infoparam name="value " value="CP_Memory_Copy" />
+<cdrectangleparam minX="605" maxX="605" minY="140" maxY="140" />
+<infoparam name="value " value="DMA_transfer" />
</SUBCOMPONENT>
<SUBCOMPONENT type="6005" id="7" >
<father id="13" num="1" />
@@ -45,11 +45,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="6005" id="8" >
<father id="13" num="2" />
-<cdparam x="605" y="140" />
+<cdparam x="605" y="170" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="140" maxY="140" />
-<infoparam name="value " value="DMA_transfer" />
+<cdrectangleparam minX="605" maxX="605" minY="170" maxY="170" />
+<infoparam name="value " value="CP_Memory_Copy" />
</SUBCOMPONENT>
<COMPONENT type="6002" id="23" >
@@ -67,11 +67,11 @@
</COMPONENT>
<SUBCOMPONENT type="6005" id="14" >
<father id="23" num="0" />
-<cdparam x="605" y="370" />
+<cdparam x="605" y="340" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="370" maxY="370" />
-<infoparam name="value " value="Mapping_2" />
+<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
+<infoparam name="value " value="Mapping_0" />
</SUBCOMPONENT>
<SUBCOMPONENT type="6005" id="15" >
<father id="23" num="1" />
@@ -83,11 +83,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="6005" id="16" >
<father id="23" num="2" />
-<cdparam x="605" y="340" />
+<cdparam x="605" y="370" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
-<infoparam name="value " value="Mapping_0" />
+<cdrectangleparam minX="605" maxX="605" minY="370" maxY="370" />
+<infoparam name="value " value="Mapping_2" />
</SUBCOMPONENT>
<COMPONENT type="6001" id="29" >
@@ -171,7 +171,7 @@
<cdparam x="1409" y="343" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1397" y="380" id="685" />
+<P1 x="1410" y="393" id="772" />
<P2 x="1446" y="258" id="125" />
<Point x="1446" y="393" />
<AutomaticDrawing data="true" />
@@ -188,16 +188,16 @@
<cdparam x="1383" y="381" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1364" y="380" id="742" />
-<P2 x="1397" y="406" id="690" />
+<P1 x="1377" y="393" id="723" />
+<P2 x="1384" y="393" id="777" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="45" >
<cdparam x="1507" y="228" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1494" y="263" id="596" />
-<P2 x="1535" y="237" id="648" />
+<P1 x="1507" y="250" id="662" />
+<P2 x="1522" y="250" id="608" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="46" >
@@ -205,23 +205,23 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1463" y="250" id="120" />
-<P2 x="1494" y="237" id="591" />
+<P2 x="1481" y="250" id="657" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="47" >
<cdparam x="1507" y="420" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1494" y="423" id="615" />
-<P2 x="1536" y="397" id="665" />
+<P1 x="1507" y="410" id="643" />
+<P2 x="1523" y="410" id="591" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="50" >
<cdparam x="1409" y="471" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1397" y="510" id="704" />
-<P2 x="1494" y="397" id="610" />
+<P1 x="1410" y="523" id="753" />
+<P2 x="1481" y="410" id="638" />
<Point x="1432" y="523" />
<Point x="1432" y="410" />
<AutomaticDrawing data="true" />
@@ -246,24 +246,24 @@
<cdparam x="1379" y="511" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1362" y="510" id="757" />
-<P2 x="1397" y="536" id="709" />
+<P1 x="1375" y="523" id="708" />
+<P2 x="1384" y="523" id="758" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="52" >
<cdparam x="1507" y="344" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1494" y="367" id="634" />
-<P2 x="1536" y="341" id="661" />
+<P1 x="1507" y="354" id="624" />
+<P2 x="1523" y="354" id="595" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="55" >
<cdparam x="1413" y="226" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1400" y="249" id="800" />
-<P2 x="1494" y="341" id="629" />
+<P1 x="1413" y="262" id="887" />
+<P2 x="1481" y="354" id="619" />
<Point x="1430" y="262" />
<Point x="1430" y="354" />
<AutomaticDrawing data="true" />
@@ -288,15 +288,15 @@
<cdparam x="1388" y="262" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1365" y="249" id="872" />
-<P2 x="1400" y="275" id="805" />
+<P1 x="1378" y="262" id="823" />
+<P2 x="1387" y="262" id="892" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="58" >
<cdparam x="1413" y="97" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1400" y="111" id="887" />
+<P1 x="1413" y="124" id="800" />
<P2 x="1446" y="241" id="123" />
<Point x="1446" y="124" />
<AutomaticDrawing data="true" />
@@ -313,16 +313,16 @@
<cdparam x="1384" y="124" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1364" y="111" id="857" />
-<P2 x="1400" y="137" id="892" />
+<P1 x="1377" y="124" id="838" />
+<P2 x="1387" y="124" id="805" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="60" >
<cdparam x="1208" y="347" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1186" y="401" id="777" />
-<P2 x="1220" y="375" id="744" />
+<P1 x="1199" y="388" id="690" />
+<P2 x="1207" y="388" id="721" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="62" >
@@ -330,7 +330,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1133" y="251" id="141" />
-<P2 x="1186" y="375" id="772" />
+<P2 x="1173" y="388" id="685" />
<Point x="1133" y="388" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="61" >
@@ -346,7 +346,7 @@
<cdparam x="1105" y="254" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1046" y="230" id="563" />
+<P1 x="1059" y="243" id="455" />
<P2 x="1117" y="243" id="136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -354,16 +354,16 @@
<cdparam x="1068" y="239" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1010" y="230" id="495" />
-<P2 x="1046" y="256" id="568" />
+<P1 x="1023" y="243" id="531" />
+<P2 x="1033" y="243" id="460" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="67" >
<cdparam x="1105" y="374" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1046" y="363" id="455" />
-<P2 x="1186" y="249" id="838" />
+<P1 x="1059" y="376" id="563" />
+<P2 x="1173" y="262" id="849" />
<Point x="1103" y="376" />
<Point x="1103" y="262" />
<AutomaticDrawing data="true" />
@@ -388,24 +388,24 @@
<cdparam x="1065" y="372" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1008" y="363" id="510" />
-<P2 x="1046" y="389" id="460" />
+<P1 x="1021" y="376" id="516" />
+<P2 x="1033" y="376" id="568" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="69" >
<cdparam x="1208" y="499" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1186" y="513" id="728" />
-<P2 x="1224" y="487" id="759" />
+<P1 x="1199" y="500" id="739" />
+<P2 x="1211" y="500" id="706" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="72" >
<cdparam x="1105" y="408" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1046" y="395" id="474" />
-<P2 x="1186" y="487" id="723" />
+<P1 x="1059" y="408" id="544" />
+<P2 x="1173" y="500" id="734" />
<Point x="1101" y="408" />
<Point x="1101" y="500" />
<AutomaticDrawing data="true" />
@@ -430,160 +430,160 @@
<cdparam x="1065" y="404" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1008" y="395" id="514" />
-<P2 x="1046" y="421" id="479" />
+<P1 x="1021" y="408" id="512" />
+<P2 x="1033" y="408" id="549" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="74" >
<cdparam x="907" y="352" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="838" y="400" id="549" />
-<P2 x="874" y="374" id="508" />
+<P1 x="851" y="387" id="479" />
+<P2 x="861" y="387" id="518" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="75" >
<cdparam x="867" y="334" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="799" y="374" id="427" />
-<P2 x="838" y="374" id="544" />
+<P1 x="812" y="387" id="340" />
+<P2 x="825" y="387" id="474" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="76" >
<cdparam x="840" y="380" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="756" y="374" id="393" />
-<P2 x="799" y="400" id="432" />
+<P1 x="769" y="387" id="382" />
+<P2 x="786" y="387" id="345" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="77" >
<cdparam x="915" y="228" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="838" y="274" id="530" />
-<P2 x="876" y="248" id="493" />
+<P1 x="851" y="261" id="498" />
+<P2 x="863" y="261" id="533" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="78" >
<cdparam x="867" y="229" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="799" y="248" id="408" />
-<P2 x="838" y="248" id="525" />
+<P1 x="812" y="261" id="359" />
+<P2 x="825" y="261" id="493" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="79" >
<cdparam x="829" y="257" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="754" y="248" id="378" />
-<P2 x="799" y="274" id="413" />
+<P1 x="767" y="261" id="397" />
+<P2 x="786" y="261" id="364" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="80" >
<cdparam x="669" y="349" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="555" y="399" id="345" />
-<P2 x="597" y="373" id="395" />
+<P1 x="568" y="386" id="432" />
+<P2 x="584" y="386" id="380" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="81" >
<cdparam x="586" y="350" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="516" y="373" id="225" />
-<P2 x="555" y="373" id="340" />
+<P1 x="529" y="386" id="312" />
+<P2 x="542" y="386" id="427" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="82" >
<cdparam x="550" y="379" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="470" y="373" id="278" />
-<P2 x="516" y="399" id="230" />
+<P1 x="483" y="386" id="267" />
+<P2 x="503" y="386" id="317" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="83" >
<cdparam x="687" y="234" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="555" y="282" id="364" />
-<P2 x="598" y="256" id="380" />
+<P1 x="568" y="269" id="413" />
+<P2 x="585" y="269" id="395" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="84" >
<cdparam x="586" y="233" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="516" y="256" id="244" />
-<P2 x="555" y="256" id="359" />
+<P1 x="529" y="269" id="293" />
+<P2 x="542" y="269" id="408" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="85" >
<cdparam x="549" y="263" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="473" y="256" id="263" />
-<P2 x="516" y="282" id="249" />
+<P1 x="486" y="269" id="282" />
+<P2 x="503" y="269" id="298" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="86" >
<cdparam x="364" y="356" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="275" y="394" id="317" />
-<P2 x="316" y="368" id="280" />
+<P1 x="288" y="381" id="230" />
+<P2 x="303" y="381" id="265" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="87" >
<cdparam x="321" y="350" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="231" y="368" id="197" />
-<P2 x="275" y="368" id="312" />
+<P1 x="244" y="381" id="152" />
+<P2 x="262" y="381" id="225" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="88" >
<cdparam x="200" y="373" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="187" y="368" id="184" />
-<P2 x="231" y="394" id="202" />
+<P1 x="200" y="381" id="173" />
+<P2 x="218" y="381" id="157" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="89" >
<cdparam x="356" y="223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="275" y="271" id="298" />
-<P2 x="317" y="245" id="265" />
+<P1 x="288" y="258" id="249" />
+<P2 x="304" y="258" id="280" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="90" >
<cdparam x="314" y="221" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="231" y="245" id="152" />
-<P2 x="275" y="245" id="293" />
+<P1 x="244" y="258" id="197" />
+<P2 x="262" y="258" id="244" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="91" >
<cdparam x="175" y="251" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="154" y="245" id="171" />
-<P2 x="231" y="271" id="157" />
+<P1 x="167" y="258" id="186" />
+<P2 x="218" y="258" id="202" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="92" >
<cdparam x="1792" y="148" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1186" y="275" id="843" />
-<P2 x="1222" y="249" id="874" />
+<P1 x="1199" y="262" id="854" />
+<P2 x="1209" y="262" id="821" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="94" >
@@ -591,7 +591,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1133" y="234" id="139" />
-<P2 x="1186" y="110" id="819" />
+<P2 x="1173" y="123" id="868" />
<Point x="1133" y="123" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="93" >
@@ -607,64 +607,64 @@
<cdparam x="1792" y="8" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1186" y="136" id="824" />
-<P2 x="1220" y="110" id="859" />
+<P1 x="1199" y="123" id="873" />
+<P2 x="1207" y="123" id="836" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="96" >
<cdparam x="280" y="67" />
<sizeparam width="10" height="10" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1657" y="318" id="663" />
-<P2 x="1562" y="278" id="650" />
+<P1 x="1657" y="318" id="593" />
+<P2 x="1562" y="304" id="606" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="97" >
<cdparam x="390" y="97" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1333" y="181" id="876" />
-<P2 x="1257" y="145" id="861" />
+<P1 x="1333" y="181" id="819" />
+<P2 x="1257" y="171" id="834" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="98" >
<cdparam x="390" y="507" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1335" y="458" id="761" />
-<P2 x="1249" y="424" id="746" />
+<P1 x="1335" y="458" id="704" />
+<P2 x="1249" y="450" id="719" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="99" >
<cdparam x="1161" y="396" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="989" y="321" id="512" />
-<P2 x="912" y="285" id="497" />
+<P1 x="989" y="321" id="514" />
+<P2 x="912" y="311" id="529" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="100" >
<cdparam x="1160" y="500" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="729" y="327" id="397" />
-<P2 x="639" y="286" id="382" />
+<P1 x="729" y="327" id="378" />
+<P2 x="639" y="312" id="393" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="101" >
<cdparam x="755" y="498" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="442" y="319" id="282" />
-<P2 x="350" y="277" id="267" />
+<P1 x="442" y="319" id="263" />
+<P2 x="350" y="303" id="278" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="102" >
<cdparam x="217" y="495" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="108" y="320" id="186" />
-<P2 x="53" y="276" id="173" />
+<P1 x="108" y="320" id="171" />
+<P2 x="53" y="302" id="184" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="301" id="119" >
@@ -767,7 +767,7 @@ processing tasks
</COMPONENT>
<SUBCOMPONENT type="1201" id="170" >
<father id="224" num="0" />
-<cdparam x="218" y="245" />
+<cdparam x="218" y="368" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="218" minY="-13" maxY="241" />
@@ -793,11 +793,11 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1202" id="183" >
<father id="224" num="1" />
-<cdparam x="18" y="208" />
-<sizeparam width="136" height="81" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2" y="333" />
+<sizeparam width="185" height="74" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="95" minY="0" maxY="173" />
-<infoparam name="Primitive component" value="X_Source" />
+<cdrectangleparam minX="0" maxX="46" minY="0" maxY="180" />
+<infoparam name="Primitive component" value="F_Source" />
<TGConnectingPoint num="0" id="175" />
<TGConnectingPoint num="1" id="176" />
<TGConnectingPoint num="2" id="177" />
@@ -808,20 +808,20 @@ processing tasks
<TGConnectingPoint num="7" id="182" />
<extraparam>
<Data isAttacker="No" />
-<Attribute access="2" id="size" value="" type="0" typeOther="" />
+<Attribute access="2" id="size" value="127" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="172" >
<father id="183" num="0" />
-<cdparam x="141" y="245" />
+<cdparam x="95" y="320" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="123" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Channel Source_ch_out" />
+<cdrectangleparam minX="-13" maxX="172" minY="-13" maxY="61" />
+<infoparam name="Primitive port" value="Request source_req" />
<TGConnectingPoint num="0" id="171" />
<extraparam>
-<Prop commName="Source_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="true" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="Source_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="source_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -830,14 +830,14 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="174" >
<father id="183" num="1" />
-<cdparam x="40" y="276" />
+<cdparam x="174" y="368" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="123" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Request source_req" />
+<cdrectangleparam minX="-13" maxX="172" minY="-13" maxY="61" />
+<infoparam name="Primitive port" value="Event Source_evt_out" />
<TGConnectingPoint num="0" id="173" />
<extraparam>
-<Prop commName="source_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="Source_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -847,11 +847,11 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1202" id="196" >
<father id="224" num="2" />
-<cdparam x="2" y="333" />
-<sizeparam width="185" height="74" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="18" y="208" />
+<sizeparam width="136" height="81" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="46" minY="0" maxY="180" />
-<infoparam name="Primitive component" value="F_Source" />
+<cdrectangleparam minX="0" maxX="95" minY="0" maxY="173" />
+<infoparam name="Primitive component" value="X_Source" />
<TGConnectingPoint num="0" id="188" />
<TGConnectingPoint num="1" id="189" />
<TGConnectingPoint num="2" id="190" />
@@ -862,19 +862,19 @@ processing tasks
<TGConnectingPoint num="7" id="195" />
<extraparam>
<Data isAttacker="No" />
-<Attribute access="2" id="size" value="127" type="0" typeOther="" />
+<Attribute access="2" id="size" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="185" >
<father id="196" num="0" />
-<cdparam x="174" y="368" />
+<cdparam x="40" y="276" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="172" minY="-13" maxY="61" />
-<infoparam name="Primitive port" value="Event Source_evt_out" />
+<cdrectangleparam minX="-13" maxX="123" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Request source_req" />
<TGConnectingPoint num="0" id="184" />
<extraparam>
-<Prop commName="Source_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="source_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -884,15 +884,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="187" >
<father id="196" num="1" />
-<cdparam x="95" y="320" />
+<cdparam x="141" y="245" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="172" minY="-13" maxY="61" />
-<infoparam name="Primitive port" value="Request source_req" />
+<cdrectangleparam minX="-13" maxX="123" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Channel Source_ch_out" />
<TGConnectingPoint num="0" id="186" />
<extraparam>
-<Prop commName="source_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="Source_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="true" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="Source_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -901,7 +901,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="215" >
<father id="224" num="3" />
-<cdparam x="218" y="368" />
+<cdparam x="218" y="245" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="218" minY="-13" maxY="241" />
@@ -946,7 +946,7 @@ processing tasks
</COMPONENT>
<SUBCOMPONENT type="1201" id="243" >
<father id="339" num="0" />
-<cdparam x="503" y="373" />
+<cdparam x="262" y="368" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="228" minY="-13" maxY="246" />
@@ -972,7 +972,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="262" >
<father id="339" num="1" />
-<cdparam x="503" y="256" />
+<cdparam x="262" y="245" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="228" minY="-13" maxY="246" />
@@ -998,11 +998,11 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1202" id="277" >
<father id="339" num="2" />
-<cdparam x="317" y="208" />
-<sizeparam width="156" height="82" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="316" y="332" />
+<sizeparam width="154" height="81" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="85" minY="0" maxY="177" />
-<infoparam name="Primitive component" value="X_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="87" minY="0" maxY="178" />
+<infoparam name="Primitive component" value="F_Symbol2ChipSeq" />
<TGConnectingPoint num="0" id="269" />
<TGConnectingPoint num="1" id="270" />
<TGConnectingPoint num="2" id="271" />
@@ -1018,15 +1018,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="264" >
<father id="277" num="0" />
-<cdparam x="460" y="256" />
+<cdparam x="429" y="319" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="69" />
-<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_out" />
+<cdrectangleparam minX="-13" maxX="141" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Request bit2chip_req" />
<TGConnectingPoint num="0" id="263" />
<extraparam>
-<Prop commName="symbol2ChipSeq_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="bit2chip_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1035,15 +1035,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="266" >
<father id="277" num="1" />
-<cdparam x="304" y="245" />
+<cdparam x="303" y="368" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="69" />
-<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_in" />
+<cdrectangleparam minX="-13" maxX="141" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Event bit2symbol_evt_in" />
<TGConnectingPoint num="0" id="265" />
<extraparam>
-<Prop commName="symbol2ChipSeq_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="bit2symbol_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1052,14 +1052,14 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="268" >
<father id="277" num="2" />
-<cdparam x="337" y="277" />
+<cdparam x="457" y="373" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="69" />
-<infoparam name="Primitive port" value="Request bit2chip_req" />
+<cdrectangleparam minX="-13" maxX="141" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Event bit2symbol_evt_out" />
<TGConnectingPoint num="0" id="267" />
<extraparam>
-<Prop commName="bit2chip_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="bit2symbol_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1069,11 +1069,11 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1202" id="292" >
<father id="339" num="3" />
-<cdparam x="316" y="332" />
-<sizeparam width="154" height="81" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="317" y="208" />
+<sizeparam width="156" height="82" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="87" minY="0" maxY="178" />
-<infoparam name="Primitive component" value="F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="85" minY="0" maxY="177" />
+<infoparam name="Primitive component" value="X_Symbol2ChipSeq" />
<TGConnectingPoint num="0" id="284" />
<TGConnectingPoint num="1" id="285" />
<TGConnectingPoint num="2" id="286" />
@@ -1089,14 +1089,14 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="279" >
<father id="292" num="0" />
-<cdparam x="457" y="373" />
+<cdparam x="337" y="277" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="141" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Event bit2symbol_evt_out" />
+<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="69" />
+<infoparam name="Primitive port" value="Request bit2chip_req" />
<TGConnectingPoint num="0" id="278" />
<extraparam>
-<Prop commName="bit2symbol_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="bit2chip_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1106,15 +1106,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="281" >
<father id="292" num="1" />
-<cdparam x="303" y="368" />
+<cdparam x="304" y="245" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="141" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Event bit2symbol_evt_in" />
+<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="69" />
+<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_in" />
<TGConnectingPoint num="0" id="280" />
<extraparam>
-<Prop commName="bit2symbol_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="symbol2ChipSeq_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1123,15 +1123,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="283" >
<father id="292" num="2" />
-<cdparam x="429" y="319" />
+<cdparam x="460" y="256" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="141" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Request bit2chip_req" />
+<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="69" />
+<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_out" />
<TGConnectingPoint num="0" id="282" />
<extraparam>
-<Prop commName="bit2chip_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="symbol2ChipSeq_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1140,7 +1140,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="311" >
<father id="339" num="4" />
-<cdparam x="262" y="245" />
+<cdparam x="503" y="256" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="228" minY="-13" maxY="246" />
@@ -1166,7 +1166,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="330" >
<father id="339" num="5" />
-<cdparam x="262" y="368" />
+<cdparam x="503" y="373" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="228" minY="-13" maxY="246" />
@@ -1211,7 +1211,7 @@ processing tasks
</COMPONENT>
<SUBCOMPONENT type="1201" id="358" >
<father id="454" num="0" />
-<cdparam x="542" y="373" />
+<cdparam x="786" y="374" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="231" minY="-13" maxY="249" />
@@ -1237,7 +1237,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="377" >
<father id="454" num="1" />
-<cdparam x="542" y="256" />
+<cdparam x="786" y="248" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="231" minY="-13" maxY="249" />
@@ -1263,11 +1263,11 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1202" id="392" >
<father id="454" num="2" />
-<cdparam x="598" y="214" />
-<sizeparam width="156" height="85" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="597" y="340" />
+<sizeparam width="159" height="73" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="88" minY="0" maxY="177" />
-<infoparam name="Primitive component" value="X_Chip2Octet" />
+<cdrectangleparam minX="0" maxX="85" minY="0" maxY="189" />
+<infoparam name="Primitive component" value="F_Chip2Octet" />
<TGConnectingPoint num="0" id="384" />
<TGConnectingPoint num="1" id="385" />
<TGConnectingPoint num="2" id="386" />
@@ -1283,15 +1283,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="379" >
<father id="392" num="0" />
-<cdparam x="741" y="248" />
+<cdparam x="716" y="327" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="72" />
-<infoparam name="Primitive port" value="Channel chip2octet_ch_out" />
+<cdrectangleparam minX="-13" maxX="146" minY="-13" maxY="60" />
+<infoparam name="Primitive port" value="Request chip2octet_req" />
<TGConnectingPoint num="0" id="378" />
<extraparam>
-<Prop commName="chip2octet_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="chip2octet_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1300,15 +1300,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="381" >
<father id="392" num="1" />
-<cdparam x="585" y="256" />
+<cdparam x="584" y="373" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="72" />
-<infoparam name="Primitive port" value="Channel chip2octet_ch_in" />
+<cdrectangleparam minX="-13" maxX="146" minY="-13" maxY="60" />
+<infoparam name="Primitive port" value="Event chip2octet_evt_in" />
<TGConnectingPoint num="0" id="380" />
<extraparam>
-<Prop commName="chip2octet_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="chip2octet_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1317,14 +1317,14 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="383" >
<father id="392" num="2" />
-<cdparam x="626" y="286" />
+<cdparam x="743" y="374" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="72" />
-<infoparam name="Primitive port" value="Request chip2octet_req" />
+<cdrectangleparam minX="-13" maxX="146" minY="-13" maxY="60" />
+<infoparam name="Primitive port" value="Event chip2octet_evt_out" />
<TGConnectingPoint num="0" id="382" />
<extraparam>
-<Prop commName="chip2octet_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="chip2octet_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1334,11 +1334,11 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1202" id="407" >
<father id="454" num="3" />
-<cdparam x="597" y="340" />
-<sizeparam width="159" height="73" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="598" y="214" />
+<sizeparam width="156" height="85" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="85" minY="0" maxY="189" />
-<infoparam name="Primitive component" value="F_Chip2Octet" />
+<cdrectangleparam minX="0" maxX="88" minY="0" maxY="177" />
+<infoparam name="Primitive component" value="X_Chip2Octet" />
<TGConnectingPoint num="0" id="399" />
<TGConnectingPoint num="1" id="400" />
<TGConnectingPoint num="2" id="401" />
@@ -1354,14 +1354,14 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="394" >
<father id="407" num="0" />
-<cdparam x="743" y="374" />
+<cdparam x="626" y="286" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="146" minY="-13" maxY="60" />
-<infoparam name="Primitive port" value="Event chip2octet_evt_out" />
+<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="72" />
+<infoparam name="Primitive port" value="Request chip2octet_req" />
<TGConnectingPoint num="0" id="393" />
<extraparam>
-<Prop commName="chip2octet_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="chip2octet_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1371,15 +1371,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="396" >
<father id="407" num="1" />
-<cdparam x="584" y="373" />
+<cdparam x="585" y="256" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="146" minY="-13" maxY="60" />
-<infoparam name="Primitive port" value="Event chip2octet_evt_in" />
+<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="72" />
+<infoparam name="Primitive port" value="Channel chip2octet_ch_in" />
<TGConnectingPoint num="0" id="395" />
<extraparam>
-<Prop commName="chip2octet_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chip2octet_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1388,15 +1388,15 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="398" >
<father id="407" num="2" />
-<cdparam x="716" y="327" />
+<cdparam x="741" y="248" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="146" minY="-13" maxY="60" />
-<infoparam name="Primitive port" value="Request chip2octet_req" />
+<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="72" />
+<infoparam name="Primitive port" value="Channel chip2octet_ch_out" />
<TGConnectingPoint num="0" id="397" />
<extraparam>
-<Prop commName="chip2octet_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chip2octet_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1405,7 +1405,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="426" >
<father id="454" num="4" />
-<cdparam x="786" y="248" />
+<cdparam x="542" y="256" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="231" minY="-13" maxY="249" />
@@ -1431,7 +1431,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="445" >
<father id="454" num="5" />
-<cdparam x="786" y="374" />
+<cdparam x="542" y="373" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="231" minY="-13" maxY="249" />
@@ -1476,7 +1476,7 @@ processing tasks
</COMPONENT>
<SUBCOMPONENT type="1201" id="473" >
<father id="590" num="0" />
-<cdparam x="1033" y="363" />
+<cdparam x="1033" y="230" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="268" />
@@ -1502,7 +1502,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="492" >
<father id="590" num="1" />
-<cdparam x="1033" y="395" />
+<cdparam x="825" y="374" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="268" />
@@ -1526,70 +1526,96 @@ processing tasks
<TGConnectingPoint num="16" id="490" />
<TGConnectingPoint num="17" id="491" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="507" >
+<SUBCOMPONENT type="1201" id="511" >
<father id="590" num="2" />
-<cdparam x="876" y="202" />
-<sizeparam width="134" height="96" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="825" y="248" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="74" minY="0" maxY="185" />
-<infoparam name="Primitive component" value="X_CWL" />
-<TGConnectingPoint num="0" id="499" />
-<TGConnectingPoint num="1" id="500" />
-<TGConnectingPoint num="2" id="501" />
-<TGConnectingPoint num="3" id="502" />
-<TGConnectingPoint num="4" id="503" />
-<TGConnectingPoint num="5" id="504" />
-<TGConnectingPoint num="6" id="505" />
-<TGConnectingPoint num="7" id="506" />
-<extraparam>
-<Data isAttacker="No" />
+<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="268" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="493" />
+<TGConnectingPoint num="1" id="494" />
+<TGConnectingPoint num="2" id="495" />
+<TGConnectingPoint num="3" id="496" />
+<TGConnectingPoint num="4" id="497" />
+<TGConnectingPoint num="5" id="498" />
+<TGConnectingPoint num="6" id="499" />
+<TGConnectingPoint num="7" id="500" />
+<TGConnectingPoint num="8" id="501" />
+<TGConnectingPoint num="9" id="502" />
+<TGConnectingPoint num="10" id="503" />
+<TGConnectingPoint num="11" id="504" />
+<TGConnectingPoint num="12" id="505" />
+<TGConnectingPoint num="13" id="506" />
+<TGConnectingPoint num="14" id="507" />
+<TGConnectingPoint num="15" id="508" />
+<TGConnectingPoint num="16" id="509" />
+<TGConnectingPoint num="17" id="510" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="528" >
+<father id="590" num="3" />
+<cdparam x="874" y="334" />
+<sizeparam width="134" height="92" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="74" minY="0" maxY="189" />
+<infoparam name="Primitive component" value="F_CWL" />
+<TGConnectingPoint num="0" id="520" />
+<TGConnectingPoint num="1" id="521" />
+<TGConnectingPoint num="2" id="522" />
+<TGConnectingPoint num="3" id="523" />
+<TGConnectingPoint num="4" id="524" />
+<TGConnectingPoint num="5" id="525" />
+<TGConnectingPoint num="6" id="526" />
+<TGConnectingPoint num="7" id="527" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="size" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="494" >
-<father id="507" num="0" />
-<cdparam x="863" y="248" />
+<SUBCOMPONENT type="1203" id="513" >
+<father id="528" num="0" />
+<cdparam x="995" y="395" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="83" />
-<infoparam name="Primitive port" value="Channel cwl_ch_in" />
-<TGConnectingPoint num="0" id="493" />
+<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="79" />
+<infoparam name="Primitive port" value="Event cwl_evt_out_1" />
+<TGConnectingPoint num="0" id="512" />
<extraparam>
-<Prop commName="cwl_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwl_evt_out_1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="496" >
-<father id="507" num="1" />
-<cdparam x="997" y="230" />
+<SUBCOMPONENT type="1203" id="515" >
+<father id="528" num="1" />
+<cdparam x="976" y="321" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="83" />
-<infoparam name="Primitive port" value="Channel cwl_ch_out" />
-<TGConnectingPoint num="0" id="495" />
+<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="79" />
+<infoparam name="Primitive port" value="Request cwl_req" />
+<TGConnectingPoint num="0" id="514" />
<extraparam>
-<Prop commName="cwl_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwl_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="498" >
-<father id="507" num="2" />
-<cdparam x="899" y="285" />
+<SUBCOMPONENT type="1203" id="517" >
+<father id="528" num="2" />
+<cdparam x="995" y="363" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="83" />
-<infoparam name="Primitive port" value="Request cwl_req" />
-<TGConnectingPoint num="0" id="497" />
+<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="79" />
+<infoparam name="Primitive port" value="Event cwl_evt_out" />
+<TGConnectingPoint num="0" id="516" />
<extraparam>
-<Prop commName="cwl_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwl_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1597,34 +1623,14 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="524" >
-<father id="590" num="3" />
-<cdparam x="874" y="334" />
-<sizeparam width="134" height="92" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="74" minY="0" maxY="189" />
-<infoparam name="Primitive component" value="F_CWL" />
-<TGConnectingPoint num="0" id="516" />
-<TGConnectingPoint num="1" id="517" />
-<TGConnectingPoint num="2" id="518" />
-<TGConnectingPoint num="3" id="519" />
-<TGConnectingPoint num="4" id="520" />
-<TGConnectingPoint num="5" id="521" />
-<TGConnectingPoint num="6" id="522" />
-<TGConnectingPoint num="7" id="523" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="size" value="" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="509" >
-<father id="524" num="0" />
+<SUBCOMPONENT type="1203" id="519" >
+<father id="528" num="3" />
<cdparam x="861" y="374" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="79" />
<infoparam name="Primitive port" value="Event cwl_evt_in" />
-<TGConnectingPoint num="0" id="508" />
+<TGConnectingPoint num="0" id="518" />
<extraparam>
<Prop commName="cwl_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
@@ -1634,16 +1640,36 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="511" >
-<father id="524" num="1" />
-<cdparam x="995" y="363" />
+<SUBCOMPONENT type="1202" id="543" >
+<father id="590" num="4" />
+<cdparam x="876" y="202" />
+<sizeparam width="134" height="96" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="74" minY="0" maxY="185" />
+<infoparam name="Primitive component" value="X_CWL" />
+<TGConnectingPoint num="0" id="535" />
+<TGConnectingPoint num="1" id="536" />
+<TGConnectingPoint num="2" id="537" />
+<TGConnectingPoint num="3" id="538" />
+<TGConnectingPoint num="4" id="539" />
+<TGConnectingPoint num="5" id="540" />
+<TGConnectingPoint num="6" id="541" />
+<TGConnectingPoint num="7" id="542" />
+<extraparam>
+<Data isAttacker="No" />
+<Attribute access="2" id="size" value="" type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="530" >
+<father id="543" num="0" />
+<cdparam x="899" y="285" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="79" />
-<infoparam name="Primitive port" value="Event cwl_evt_out" />
-<TGConnectingPoint num="0" id="510" />
+<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="83" />
+<infoparam name="Primitive port" value="Request cwl_req" />
+<TGConnectingPoint num="0" id="529" />
<extraparam>
-<Prop commName="cwl_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwl_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1651,69 +1677,43 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="513" >
-<father id="524" num="2" />
-<cdparam x="976" y="321" />
+<SUBCOMPONENT type="1203" id="532" >
+<father id="543" num="1" />
+<cdparam x="997" y="230" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="79" />
-<infoparam name="Primitive port" value="Request cwl_req" />
-<TGConnectingPoint num="0" id="512" />
+<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="83" />
+<infoparam name="Primitive port" value="Channel cwl_ch_out" />
+<TGConnectingPoint num="0" id="531" />
<extraparam>
-<Prop commName="cwl_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwl_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="515" >
-<father id="524" num="3" />
-<cdparam x="995" y="395" />
+<SUBCOMPONENT type="1203" id="534" >
+<father id="543" num="2" />
+<cdparam x="863" y="248" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="79" />
-<infoparam name="Primitive port" value="Event cwl_evt_out_1" />
-<TGConnectingPoint num="0" id="514" />
+<cdrectangleparam minX="-13" maxX="121" minY="-13" maxY="83" />
+<infoparam name="Primitive port" value="Channel cwl_ch_in" />
+<TGConnectingPoint num="0" id="533" />
<extraparam>
-<Prop commName="cwl_evt_out_1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwl_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="543" >
-<father id="590" num="4" />
-<cdparam x="825" y="248" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="268" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="525" />
-<TGConnectingPoint num="1" id="526" />
-<TGConnectingPoint num="2" id="527" />
-<TGConnectingPoint num="3" id="528" />
-<TGConnectingPoint num="4" id="529" />
-<TGConnectingPoint num="5" id="530" />
-<TGConnectingPoint num="6" id="531" />
-<TGConnectingPoint num="7" id="532" />
-<TGConnectingPoint num="8" id="533" />
-<TGConnectingPoint num="9" id="534" />
-<TGConnectingPoint num="10" id="535" />
-<TGConnectingPoint num="11" id="536" />
-<TGConnectingPoint num="12" id="537" />
-<TGConnectingPoint num="13" id="538" />
-<TGConnectingPoint num="14" id="539" />
-<TGConnectingPoint num="15" id="540" />
-<TGConnectingPoint num="16" id="541" />
-<TGConnectingPoint num="17" id="542" />
-</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="562" >
<father id="590" num="5" />
-<cdparam x="825" y="374" />
+<cdparam x="1033" y="395" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="268" />
@@ -1739,7 +1739,7 @@ processing tasks
</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="581" >
<father id="590" num="6" />
-<cdparam x="1033" y="230" />
+<cdparam x="1033" y="363" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="268" />
@@ -1782,131 +1782,54 @@ processing tasks
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1201" id="609" >
+<SUBCOMPONENT type="1202" id="605" >
<father id="684" num="0" />
-<cdparam x="1481" y="237" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="269" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="591" />
-<TGConnectingPoint num="1" id="592" />
-<TGConnectingPoint num="2" id="593" />
-<TGConnectingPoint num="3" id="594" />
-<TGConnectingPoint num="4" id="595" />
-<TGConnectingPoint num="5" id="596" />
-<TGConnectingPoint num="6" id="597" />
-<TGConnectingPoint num="7" id="598" />
-<TGConnectingPoint num="8" id="599" />
-<TGConnectingPoint num="9" id="600" />
-<TGConnectingPoint num="10" id="601" />
-<TGConnectingPoint num="11" id="602" />
-<TGConnectingPoint num="12" id="603" />
-<TGConnectingPoint num="13" id="604" />
-<TGConnectingPoint num="14" id="605" />
-<TGConnectingPoint num="15" id="606" />
-<TGConnectingPoint num="16" id="607" />
-<TGConnectingPoint num="17" id="608" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="628" >
-<father id="684" num="1" />
-<cdparam x="1481" y="397" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="269" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="610" />
-<TGConnectingPoint num="1" id="611" />
-<TGConnectingPoint num="2" id="612" />
-<TGConnectingPoint num="3" id="613" />
-<TGConnectingPoint num="4" id="614" />
-<TGConnectingPoint num="5" id="615" />
-<TGConnectingPoint num="6" id="616" />
-<TGConnectingPoint num="7" id="617" />
-<TGConnectingPoint num="8" id="618" />
-<TGConnectingPoint num="9" id="619" />
-<TGConnectingPoint num="10" id="620" />
-<TGConnectingPoint num="11" id="621" />
-<TGConnectingPoint num="12" id="622" />
-<TGConnectingPoint num="13" id="623" />
-<TGConnectingPoint num="14" id="624" />
-<TGConnectingPoint num="15" id="625" />
-<TGConnectingPoint num="16" id="626" />
-<TGConnectingPoint num="17" id="627" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="647" >
-<father id="684" num="2" />
-<cdparam x="1481" y="341" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="269" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="629" />
-<TGConnectingPoint num="1" id="630" />
-<TGConnectingPoint num="2" id="631" />
-<TGConnectingPoint num="3" id="632" />
-<TGConnectingPoint num="4" id="633" />
-<TGConnectingPoint num="5" id="634" />
-<TGConnectingPoint num="6" id="635" />
-<TGConnectingPoint num="7" id="636" />
-<TGConnectingPoint num="8" id="637" />
-<TGConnectingPoint num="9" id="638" />
-<TGConnectingPoint num="10" id="639" />
-<TGConnectingPoint num="11" id="640" />
-<TGConnectingPoint num="12" id="641" />
-<TGConnectingPoint num="13" id="642" />
-<TGConnectingPoint num="14" id="643" />
-<TGConnectingPoint num="15" id="644" />
-<TGConnectingPoint num="16" id="645" />
-<TGConnectingPoint num="17" id="646" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="660" >
-<father id="684" num="3" />
-<cdparam x="1535" y="205" />
-<sizeparam width="148" height="86" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1536" y="331" />
+<sizeparam width="153" height="94" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="60" minY="0" maxY="196" />
-<infoparam name="Primitive component" value="X_Sink" />
-<TGConnectingPoint num="0" id="652" />
-<TGConnectingPoint num="1" id="653" />
-<TGConnectingPoint num="2" id="654" />
-<TGConnectingPoint num="3" id="655" />
-<TGConnectingPoint num="4" id="656" />
-<TGConnectingPoint num="5" id="657" />
-<TGConnectingPoint num="6" id="658" />
-<TGConnectingPoint num="7" id="659" />
+<cdrectangleparam minX="0" maxX="55" minY="0" maxY="188" />
+<infoparam name="Primitive component" value="F_Sink" />
+<TGConnectingPoint num="0" id="597" />
+<TGConnectingPoint num="1" id="598" />
+<TGConnectingPoint num="2" id="599" />
+<TGConnectingPoint num="3" id="600" />
+<TGConnectingPoint num="4" id="601" />
+<TGConnectingPoint num="5" id="602" />
+<TGConnectingPoint num="6" id="603" />
+<TGConnectingPoint num="7" id="604" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="size" value="" type="0" typeOther="" />
+<Attribute access="2" id="size_1" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="649" >
-<father id="660" num="0" />
-<cdparam x="1522" y="237" />
+<SUBCOMPONENT type="1203" id="592" >
+<father id="605" num="0" />
+<cdparam x="1523" y="397" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="135" minY="-13" maxY="73" />
-<infoparam name="Primitive port" value="Channel sink_ch_in" />
-<TGConnectingPoint num="0" id="648" />
+<cdrectangleparam minX="-13" maxX="140" minY="-13" maxY="81" />
+<infoparam name="Primitive port" value="Event sink_evt_in_1" />
+<TGConnectingPoint num="0" id="591" />
<extraparam>
-<Prop commName="sink_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="true" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="sink_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="sink_evt_in_1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="651" >
-<father id="660" num="1" />
-<cdparam x="1549" y="278" />
+<SUBCOMPONENT type="1203" id="594" >
+<father id="605" num="1" />
+<cdparam x="1644" y="318" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="135" minY="-13" maxY="73" />
+<cdrectangleparam minX="-13" maxX="140" minY="-13" maxY="81" />
<infoparam name="Primitive port" value="Request sink_req" />
-<TGConnectingPoint num="0" id="650" />
+<TGConnectingPoint num="0" id="593" />
<extraparam>
-<Prop commName="sink_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sink_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1914,35 +1837,14 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="675" >
-<father id="684" num="4" />
-<cdparam x="1536" y="331" />
-<sizeparam width="153" height="94" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="55" minY="0" maxY="188" />
-<infoparam name="Primitive component" value="F_Sink" />
-<TGConnectingPoint num="0" id="667" />
-<TGConnectingPoint num="1" id="668" />
-<TGConnectingPoint num="2" id="669" />
-<TGConnectingPoint num="3" id="670" />
-<TGConnectingPoint num="4" id="671" />
-<TGConnectingPoint num="5" id="672" />
-<TGConnectingPoint num="6" id="673" />
-<TGConnectingPoint num="7" id="674" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="size" value="" type="0" typeOther="" />
-<Attribute access="2" id="size_1" value="" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="662" >
-<father id="675" num="0" />
+<SUBCOMPONENT type="1203" id="596" >
+<father id="605" num="2" />
<cdparam x="1523" y="341" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="140" minY="-13" maxY="81" />
<infoparam name="Primitive port" value="Event sink_evt_in" />
-<TGConnectingPoint num="0" id="661" />
+<TGConnectingPoint num="0" id="595" />
<extraparam>
<Prop commName="sink_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
@@ -1952,16 +1854,36 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="664" >
-<father id="675" num="1" />
-<cdparam x="1644" y="318" />
+<SUBCOMPONENT type="1202" id="618" >
+<father id="684" num="1" />
+<cdparam x="1535" y="205" />
+<sizeparam width="148" height="86" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="60" minY="0" maxY="196" />
+<infoparam name="Primitive component" value="X_Sink" />
+<TGConnectingPoint num="0" id="610" />
+<TGConnectingPoint num="1" id="611" />
+<TGConnectingPoint num="2" id="612" />
+<TGConnectingPoint num="3" id="613" />
+<TGConnectingPoint num="4" id="614" />
+<TGConnectingPoint num="5" id="615" />
+<TGConnectingPoint num="6" id="616" />
+<TGConnectingPoint num="7" id="617" />
+<extraparam>
+<Data isAttacker="No" />
+<Attribute access="2" id="size" value="" type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="607" >
+<father id="618" num="0" />
+<cdparam x="1549" y="278" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="140" minY="-13" maxY="81" />
+<cdrectangleparam minX="-13" maxX="135" minY="-13" maxY="73" />
<infoparam name="Primitive port" value="Request sink_req" />
-<TGConnectingPoint num="0" id="663" />
+<TGConnectingPoint num="0" id="606" />
<extraparam>
-<Prop commName="sink_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sink_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1969,23 +1891,101 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="666" >
-<father id="675" num="2" />
-<cdparam x="1523" y="397" />
+<SUBCOMPONENT type="1203" id="609" >
+<father id="618" num="1" />
+<cdparam x="1522" y="237" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="140" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Event sink_evt_in_1" />
-<TGConnectingPoint num="0" id="665" />
+<cdrectangleparam minX="-13" maxX="135" minY="-13" maxY="73" />
+<infoparam name="Primitive port" value="Channel sink_ch_in" />
+<TGConnectingPoint num="0" id="608" />
<extraparam>
-<Prop commName="sink_evt_in_1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sink_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="true" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="sink_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="637" >
+<father id="684" num="2" />
+<cdparam x="1481" y="341" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="269" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="619" />
+<TGConnectingPoint num="1" id="620" />
+<TGConnectingPoint num="2" id="621" />
+<TGConnectingPoint num="3" id="622" />
+<TGConnectingPoint num="4" id="623" />
+<TGConnectingPoint num="5" id="624" />
+<TGConnectingPoint num="6" id="625" />
+<TGConnectingPoint num="7" id="626" />
+<TGConnectingPoint num="8" id="627" />
+<TGConnectingPoint num="9" id="628" />
+<TGConnectingPoint num="10" id="629" />
+<TGConnectingPoint num="11" id="630" />
+<TGConnectingPoint num="12" id="631" />
+<TGConnectingPoint num="13" id="632" />
+<TGConnectingPoint num="14" id="633" />
+<TGConnectingPoint num="15" id="634" />
+<TGConnectingPoint num="16" id="635" />
+<TGConnectingPoint num="17" id="636" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="656" >
+<father id="684" num="3" />
+<cdparam x="1481" y="397" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="269" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="638" />
+<TGConnectingPoint num="1" id="639" />
+<TGConnectingPoint num="2" id="640" />
+<TGConnectingPoint num="3" id="641" />
+<TGConnectingPoint num="4" id="642" />
+<TGConnectingPoint num="5" id="643" />
+<TGConnectingPoint num="6" id="644" />
+<TGConnectingPoint num="7" id="645" />
+<TGConnectingPoint num="8" id="646" />
+<TGConnectingPoint num="9" id="647" />
+<TGConnectingPoint num="10" id="648" />
+<TGConnectingPoint num="11" id="649" />
+<TGConnectingPoint num="12" id="650" />
+<TGConnectingPoint num="13" id="651" />
+<TGConnectingPoint num="14" id="652" />
+<TGConnectingPoint num="15" id="653" />
+<TGConnectingPoint num="16" id="654" />
+<TGConnectingPoint num="17" id="655" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="675" >
+<father id="684" num="4" />
+<cdparam x="1481" y="237" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="195" minY="-13" maxY="269" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="657" />
+<TGConnectingPoint num="1" id="658" />
+<TGConnectingPoint num="2" id="659" />
+<TGConnectingPoint num="3" id="660" />
+<TGConnectingPoint num="4" id="661" />
+<TGConnectingPoint num="5" id="662" />
+<TGConnectingPoint num="6" id="663" />
+<TGConnectingPoint num="7" id="664" />
+<TGConnectingPoint num="8" id="665" />
+<TGConnectingPoint num="9" id="666" />
+<TGConnectingPoint num="10" id="667" />
+<TGConnectingPoint num="11" id="668" />
+<TGConnectingPoint num="12" id="669" />
+<TGConnectingPoint num="13" id="670" />
+<TGConnectingPoint num="14" id="671" />
+<TGConnectingPoint num="15" id="672" />
+<TGConnectingPoint num="16" id="673" />
+<TGConnectingPoint num="17" id="674" />
+</SUBCOMPONENT>
<COMPONENT type="1200" id="799" >
<cdparam x="1186" y="309" />
@@ -2007,7 +2007,7 @@ processing tasks
</COMPONENT>
<SUBCOMPONENT type="1201" id="703" >
<father id="799" num="0" />
-<cdparam x="1384" y="380" />
+<cdparam x="1173" y="375" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="198" minY="-13" maxY="241" />
@@ -2031,122 +2031,70 @@ processing tasks
<TGConnectingPoint num="16" id="701" />
<TGConnectingPoint num="17" id="702" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="722" >
+<SUBCOMPONENT type="1202" id="718" >
<father id="799" num="1" />
-<cdparam x="1384" y="510" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="198" minY="-13" maxY="241" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="704" />
-<TGConnectingPoint num="1" id="705" />
-<TGConnectingPoint num="2" id="706" />
-<TGConnectingPoint num="3" id="707" />
-<TGConnectingPoint num="4" id="708" />
-<TGConnectingPoint num="5" id="709" />
-<TGConnectingPoint num="6" id="710" />
-<TGConnectingPoint num="7" id="711" />
-<TGConnectingPoint num="8" id="712" />
-<TGConnectingPoint num="9" id="713" />
-<TGConnectingPoint num="10" id="714" />
-<TGConnectingPoint num="11" id="715" />
-<TGConnectingPoint num="12" id="716" />
-<TGConnectingPoint num="13" id="717" />
-<TGConnectingPoint num="14" id="718" />
-<TGConnectingPoint num="15" id="719" />
-<TGConnectingPoint num="16" id="720" />
-<TGConnectingPoint num="17" id="721" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="741" >
-<father id="799" num="2" />
-<cdparam x="1173" y="487" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="198" minY="-13" maxY="241" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="723" />
-<TGConnectingPoint num="1" id="724" />
-<TGConnectingPoint num="2" id="725" />
-<TGConnectingPoint num="3" id="726" />
-<TGConnectingPoint num="4" id="727" />
-<TGConnectingPoint num="5" id="728" />
-<TGConnectingPoint num="6" id="729" />
-<TGConnectingPoint num="7" id="730" />
-<TGConnectingPoint num="8" id="731" />
-<TGConnectingPoint num="9" id="732" />
-<TGConnectingPoint num="10" id="733" />
-<TGConnectingPoint num="11" id="734" />
-<TGConnectingPoint num="12" id="735" />
-<TGConnectingPoint num="13" id="736" />
-<TGConnectingPoint num="14" id="737" />
-<TGConnectingPoint num="15" id="738" />
-<TGConnectingPoint num="16" id="739" />
-<TGConnectingPoint num="17" id="740" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="756" >
-<father id="799" num="3" />
-<cdparam x="1220" y="353" />
-<sizeparam width="144" height="84" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1224" y="471" />
+<sizeparam width="138" height="82" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="67" minY="0" maxY="170" />
-<infoparam name="Primitive component" value="X_CWP_Q" />
-<TGConnectingPoint num="0" id="748" />
-<TGConnectingPoint num="1" id="749" />
-<TGConnectingPoint num="2" id="750" />
-<TGConnectingPoint num="3" id="751" />
-<TGConnectingPoint num="4" id="752" />
-<TGConnectingPoint num="5" id="753" />
-<TGConnectingPoint num="6" id="754" />
-<TGConnectingPoint num="7" id="755" />
+<cdrectangleparam minX="0" maxX="73" minY="0" maxY="172" />
+<infoparam name="Primitive component" value="F_CWP_Q" />
+<TGConnectingPoint num="0" id="710" />
+<TGConnectingPoint num="1" id="711" />
+<TGConnectingPoint num="2" id="712" />
+<TGConnectingPoint num="3" id="713" />
+<TGConnectingPoint num="4" id="714" />
+<TGConnectingPoint num="5" id="715" />
+<TGConnectingPoint num="6" id="716" />
+<TGConnectingPoint num="7" id="717" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="size" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="743" >
-<father id="756" num="0" />
-<cdparam x="1351" y="380" />
+<SUBCOMPONENT type="1203" id="705" >
+<father id="718" num="0" />
+<cdparam x="1322" y="458" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="71" />
-<infoparam name="Primitive port" value="Channel cwpQ_ch_out" />
-<TGConnectingPoint num="0" id="742" />
+<cdrectangleparam minX="-13" maxX="125" minY="-13" maxY="69" />
+<infoparam name="Primitive port" value="Request cwpQ_req" />
+<TGConnectingPoint num="0" id="704" />
<extraparam>
-<Prop commName="cwpQ_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpQ_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="745" >
-<father id="756" num="1" />
-<cdparam x="1207" y="375" />
+<SUBCOMPONENT type="1203" id="707" >
+<father id="718" num="1" />
+<cdparam x="1211" y="487" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="71" />
-<infoparam name="Primitive port" value="Channel cwpQ_ch_in" />
-<TGConnectingPoint num="0" id="744" />
+<cdrectangleparam minX="-13" maxX="125" minY="-13" maxY="69" />
+<infoparam name="Primitive port" value="Event cwpQ_evt_in" />
+<TGConnectingPoint num="0" id="706" />
<extraparam>
-<Prop commName="cwpQ_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpQ_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="747" >
-<father id="756" num="2" />
-<cdparam x="1236" y="424" />
+<SUBCOMPONENT type="1203" id="709" >
+<father id="718" num="2" />
+<cdparam x="1349" y="510" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="71" />
-<infoparam name="Primitive port" value="Request cwpQ_req" />
-<TGConnectingPoint num="0" id="746" />
+<cdrectangleparam minX="-13" maxX="125" minY="-13" maxY="69" />
+<infoparam name="Primitive port" value="Event cwpQ_evt_out" />
+<TGConnectingPoint num="0" id="708" />
<extraparam>
-<Prop commName="cwpQ_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpQ_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2154,36 +2102,36 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="771" >
-<father id="799" num="4" />
-<cdparam x="1224" y="471" />
-<sizeparam width="138" height="82" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="733" >
+<father id="799" num="2" />
+<cdparam x="1220" y="353" />
+<sizeparam width="144" height="84" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="73" minY="0" maxY="172" />
-<infoparam name="Primitive component" value="F_CWP_Q" />
-<TGConnectingPoint num="0" id="763" />
-<TGConnectingPoint num="1" id="764" />
-<TGConnectingPoint num="2" id="765" />
-<TGConnectingPoint num="3" id="766" />
-<TGConnectingPoint num="4" id="767" />
-<TGConnectingPoint num="5" id="768" />
-<TGConnectingPoint num="6" id="769" />
-<TGConnectingPoint num="7" id="770" />
+<cdrectangleparam minX="0" maxX="67" minY="0" maxY="170" />
+<infoparam name="Primitive component" value="X_CWP_Q" />
+<TGConnectingPoint num="0" id="725" />
+<TGConnectingPoint num="1" id="726" />
+<TGConnectingPoint num="2" id="727" />
+<TGConnectingPoint num="3" id="728" />
+<TGConnectingPoint num="4" id="729" />
+<TGConnectingPoint num="5" id="730" />
+<TGConnectingPoint num="6" id="731" />
+<TGConnectingPoint num="7" id="732" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="size" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="758" >
-<father id="771" num="0" />
-<cdparam x="1349" y="510" />
+<SUBCOMPONENT type="1203" id="720" >
+<father id="733" num="0" />
+<cdparam x="1236" y="424" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="125" minY="-13" maxY="69" />
-<infoparam name="Primitive port" value="Event cwpQ_evt_out" />
-<TGConnectingPoint num="0" id="757" />
+<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="71" />
+<infoparam name="Primitive port" value="Request cwpQ_req" />
+<TGConnectingPoint num="0" id="719" />
<extraparam>
-<Prop commName="cwpQ_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpQ_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2191,43 +2139,95 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="760" >
-<father id="771" num="1" />
-<cdparam x="1211" y="487" />
+<SUBCOMPONENT type="1203" id="722" >
+<father id="733" num="1" />
+<cdparam x="1207" y="375" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="125" minY="-13" maxY="69" />
-<infoparam name="Primitive port" value="Event cwpQ_evt_in" />
-<TGConnectingPoint num="0" id="759" />
+<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="71" />
+<infoparam name="Primitive port" value="Channel cwpQ_ch_in" />
+<TGConnectingPoint num="0" id="721" />
<extraparam>
-<Prop commName="cwpQ_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpQ_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="762" >
-<father id="771" num="2" />
-<cdparam x="1322" y="458" />
+<SUBCOMPONENT type="1203" id="724" >
+<father id="733" num="2" />
+<cdparam x="1351" y="380" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="125" minY="-13" maxY="69" />
-<infoparam name="Primitive port" value="Request cwpQ_req" />
-<TGConnectingPoint num="0" id="761" />
+<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="71" />
+<infoparam name="Primitive port" value="Channel cwpQ_ch_out" />
+<TGConnectingPoint num="0" id="723" />
<extraparam>
-<Prop commName="cwpQ_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpQ_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="752" >
+<father id="799" num="3" />
+<cdparam x="1173" y="487" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="198" minY="-13" maxY="241" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="734" />
+<TGConnectingPoint num="1" id="735" />
+<TGConnectingPoint num="2" id="736" />
+<TGConnectingPoint num="3" id="737" />
+<TGConnectingPoint num="4" id="738" />
+<TGConnectingPoint num="5" id="739" />
+<TGConnectingPoint num="6" id="740" />
+<TGConnectingPoint num="7" id="741" />
+<TGConnectingPoint num="8" id="742" />
+<TGConnectingPoint num="9" id="743" />
+<TGConnectingPoint num="10" id="744" />
+<TGConnectingPoint num="11" id="745" />
+<TGConnectingPoint num="12" id="746" />
+<TGConnectingPoint num="13" id="747" />
+<TGConnectingPoint num="14" id="748" />
+<TGConnectingPoint num="15" id="749" />
+<TGConnectingPoint num="16" id="750" />
+<TGConnectingPoint num="17" id="751" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="771" >
+<father id="799" num="4" />
+<cdparam x="1384" y="510" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="198" minY="-13" maxY="241" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="753" />
+<TGConnectingPoint num="1" id="754" />
+<TGConnectingPoint num="2" id="755" />
+<TGConnectingPoint num="3" id="756" />
+<TGConnectingPoint num="4" id="757" />
+<TGConnectingPoint num="5" id="758" />
+<TGConnectingPoint num="6" id="759" />
+<TGConnectingPoint num="7" id="760" />
+<TGConnectingPoint num="8" id="761" />
+<TGConnectingPoint num="9" id="762" />
+<TGConnectingPoint num="10" id="763" />
+<TGConnectingPoint num="11" id="764" />
+<TGConnectingPoint num="12" id="765" />
+<TGConnectingPoint num="13" id="766" />
+<TGConnectingPoint num="14" id="767" />
+<TGConnectingPoint num="15" id="768" />
+<TGConnectingPoint num="16" id="769" />
+<TGConnectingPoint num="17" id="770" />
+</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="790" >
<father id="799" num="5" />
-<cdparam x="1173" y="375" />
+<cdparam x="1384" y="380" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="198" minY="-13" maxY="241" />
@@ -2272,7 +2272,7 @@ processing tasks
</COMPONENT>
<SUBCOMPONENT type="1201" id="818" >
<father id="914" num="0" />
-<cdparam x="1387" y="249" />
+<cdparam x="1387" y="111" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="201" minY="-13" maxY="267" />
@@ -2296,122 +2296,70 @@ processing tasks
<TGConnectingPoint num="16" id="816" />
<TGConnectingPoint num="17" id="817" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="837" >
+<SUBCOMPONENT type="1202" id="833" >
<father id="914" num="1" />
-<cdparam x="1173" y="110" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="201" minY="-13" maxY="267" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="819" />
-<TGConnectingPoint num="1" id="820" />
-<TGConnectingPoint num="2" id="821" />
-<TGConnectingPoint num="3" id="822" />
-<TGConnectingPoint num="4" id="823" />
-<TGConnectingPoint num="5" id="824" />
-<TGConnectingPoint num="6" id="825" />
-<TGConnectingPoint num="7" id="826" />
-<TGConnectingPoint num="8" id="827" />
-<TGConnectingPoint num="9" id="828" />
-<TGConnectingPoint num="10" id="829" />
-<TGConnectingPoint num="11" id="830" />
-<TGConnectingPoint num="12" id="831" />
-<TGConnectingPoint num="13" id="832" />
-<TGConnectingPoint num="14" id="833" />
-<TGConnectingPoint num="15" id="834" />
-<TGConnectingPoint num="16" id="835" />
-<TGConnectingPoint num="17" id="836" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="856" >
-<father id="914" num="2" />
-<cdparam x="1173" y="249" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="201" minY="-13" maxY="267" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="838" />
-<TGConnectingPoint num="1" id="839" />
-<TGConnectingPoint num="2" id="840" />
-<TGConnectingPoint num="3" id="841" />
-<TGConnectingPoint num="4" id="842" />
-<TGConnectingPoint num="5" id="843" />
-<TGConnectingPoint num="6" id="844" />
-<TGConnectingPoint num="7" id="845" />
-<TGConnectingPoint num="8" id="846" />
-<TGConnectingPoint num="9" id="847" />
-<TGConnectingPoint num="10" id="848" />
-<TGConnectingPoint num="11" id="849" />
-<TGConnectingPoint num="12" id="850" />
-<TGConnectingPoint num="13" id="851" />
-<TGConnectingPoint num="14" id="852" />
-<TGConnectingPoint num="15" id="853" />
-<TGConnectingPoint num="16" id="854" />
-<TGConnectingPoint num="17" id="855" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="871" >
-<father id="914" num="3" />
-<cdparam x="1220" y="62" />
-<sizeparam width="144" height="96" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1222" y="194" />
+<sizeparam width="143" height="86" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="70" minY="0" maxY="184" />
-<infoparam name="Primitive component" value="X_CWP_I" />
-<TGConnectingPoint num="0" id="863" />
-<TGConnectingPoint num="1" id="864" />
-<TGConnectingPoint num="2" id="865" />
-<TGConnectingPoint num="3" id="866" />
-<TGConnectingPoint num="4" id="867" />
-<TGConnectingPoint num="5" id="868" />
-<TGConnectingPoint num="6" id="869" />
-<TGConnectingPoint num="7" id="870" />
+<cdrectangleparam minX="0" maxX="71" minY="0" maxY="194" />
+<infoparam name="Primitive component" value="F_CWP_I" />
+<TGConnectingPoint num="0" id="825" />
+<TGConnectingPoint num="1" id="826" />
+<TGConnectingPoint num="2" id="827" />
+<TGConnectingPoint num="3" id="828" />
+<TGConnectingPoint num="4" id="829" />
+<TGConnectingPoint num="5" id="830" />
+<TGConnectingPoint num="6" id="831" />
+<TGConnectingPoint num="7" id="832" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="size" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="858" >
-<father id="871" num="0" />
-<cdparam x="1351" y="111" />
+<SUBCOMPONENT type="1203" id="820" >
+<father id="833" num="0" />
+<cdparam x="1320" y="181" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="83" />
-<infoparam name="Primitive port" value="Channel cwpI_ch_out" />
-<TGConnectingPoint num="0" id="857" />
+<cdrectangleparam minX="-13" maxX="130" minY="-13" maxY="73" />
+<infoparam name="Primitive port" value="Request cwpI_req" />
+<TGConnectingPoint num="0" id="819" />
<extraparam>
-<Prop commName="cwpI_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpI_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="860" >
-<father id="871" num="1" />
-<cdparam x="1207" y="110" />
+<SUBCOMPONENT type="1203" id="822" >
+<father id="833" num="1" />
+<cdparam x="1209" y="249" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="83" />
-<infoparam name="Primitive port" value="Channel cwpI_ch_in" />
-<TGConnectingPoint num="0" id="859" />
+<cdrectangleparam minX="-13" maxX="130" minY="-13" maxY="73" />
+<infoparam name="Primitive port" value="Event cwpI_evt_in" />
+<TGConnectingPoint num="0" id="821" />
<extraparam>
-<Prop commName="cwpI_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpI_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="862" >
-<father id="871" num="2" />
-<cdparam x="1244" y="145" />
+<SUBCOMPONENT type="1203" id="824" >
+<father id="833" num="2" />
+<cdparam x="1352" y="249" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="83" />
-<infoparam name="Primitive port" value="Request cwpI_req" />
-<TGConnectingPoint num="0" id="861" />
+<cdrectangleparam minX="-13" maxX="130" minY="-13" maxY="73" />
+<infoparam name="Primitive port" value="Event cwpI_evt_out" />
+<TGConnectingPoint num="0" id="823" />
<extraparam>
-<Prop commName="cwpI_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpI_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2419,36 +2367,36 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="886" >
-<father id="914" num="4" />
-<cdparam x="1222" y="194" />
-<sizeparam width="143" height="86" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="848" >
+<father id="914" num="2" />
+<cdparam x="1220" y="62" />
+<sizeparam width="144" height="96" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="71" minY="0" maxY="194" />
-<infoparam name="Primitive component" value="F_CWP_I" />
-<TGConnectingPoint num="0" id="878" />
-<TGConnectingPoint num="1" id="879" />
-<TGConnectingPoint num="2" id="880" />
-<TGConnectingPoint num="3" id="881" />
-<TGConnectingPoint num="4" id="882" />
-<TGConnectingPoint num="5" id="883" />
-<TGConnectingPoint num="6" id="884" />
-<TGConnectingPoint num="7" id="885" />
+<cdrectangleparam minX="0" maxX="70" minY="0" maxY="184" />
+<infoparam name="Primitive component" value="X_CWP_I" />
+<TGConnectingPoint num="0" id="840" />
+<TGConnectingPoint num="1" id="841" />
+<TGConnectingPoint num="2" id="842" />
+<TGConnectingPoint num="3" id="843" />
+<TGConnectingPoint num="4" id="844" />
+<TGConnectingPoint num="5" id="845" />
+<TGConnectingPoint num="6" id="846" />
+<TGConnectingPoint num="7" id="847" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="size" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="873" >
-<father id="886" num="0" />
-<cdparam x="1352" y="249" />
+<SUBCOMPONENT type="1203" id="835" >
+<father id="848" num="0" />
+<cdparam x="1244" y="145" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="130" minY="-13" maxY="73" />
-<infoparam name="Primitive port" value="Event cwpI_evt_out" />
-<TGConnectingPoint num="0" id="872" />
+<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="83" />
+<infoparam name="Primitive port" value="Request cwpI_req" />
+<TGConnectingPoint num="0" id="834" />
<extraparam>
-<Prop commName="cwpI_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpI_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2456,43 +2404,95 @@ processing tasks
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="875" >
-<father id="886" num="1" />
-<cdparam x="1209" y="249" />
+<SUBCOMPONENT type="1203" id="837" >
+<father id="848" num="1" />
+<cdparam x="1207" y="110" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="130" minY="-13" maxY="73" />
-<infoparam name="Primitive port" value="Event cwpI_evt_in" />
-<TGConnectingPoint num="0" id="874" />
+<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="83" />
+<infoparam name="Primitive port" value="Channel cwpI_ch_in" />
+<TGConnectingPoint num="0" id="836" />
<extraparam>
-<Prop commName="cwpI_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpI_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="877" >
-<father id="886" num="2" />
-<cdparam x="1320" y="181" />
+<SUBCOMPONENT type="1203" id="839" >
+<father id="848" num="2" />
+<cdparam x="1351" y="111" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="130" minY="-13" maxY="73" />
-<infoparam name="Primitive port" value="Request cwpI_req" />
-<TGConnectingPoint num="0" id="876" />
+<cdrectangleparam minX="-13" maxX="131" minY="-13" maxY="83" />
+<infoparam name="Primitive port" value="Channel cwpI_ch_out" />
+<TGConnectingPoint num="0" id="838" />
<extraparam>
-<Prop commName="cwpI_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpI_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="867" >
+<father id="914" num="3" />
+<cdparam x="1173" y="249" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="201" minY="-13" maxY="267" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="849" />
+<TGConnectingPoint num="1" id="850" />
+<TGConnectingPoint num="2" id="851" />
+<TGConnectingPoint num="3" id="852" />
+<TGConnectingPoint num="4" id="853" />
+<TGConnectingPoint num="5" id="854" />
+<TGConnectingPoint num="6" id="855" />
+<TGConnectingPoint num="7" id="856" />
+<TGConnectingPoint num="8" id="857" />
+<TGConnectingPoint num="9" id="858" />
+<TGConnectingPoint num="10" id="859" />
+<TGConnectingPoint num="11" id="860" />
+<TGConnectingPoint num="12" id="861" />
+<TGConnectingPoint num="13" id="862" />
+<TGConnectingPoint num="14" id="863" />
+<TGConnectingPoint num="15" id="864" />
+<TGConnectingPoint num="16" id="865" />
+<TGConnectingPoint num="17" id="866" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="886" >
+<father id="914" num="4" />
+<cdparam x="1173" y="110" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="201" minY="-13" maxY="267" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="868" />
+<TGConnectingPoint num="1" id="869" />
+<TGConnectingPoint num="2" id="870" />
+<TGConnectingPoint num="3" id="871" />
+<TGConnectingPoint num="4" id="872" />
+<TGConnectingPoint num="5" id="873" />
+<TGConnectingPoint num="6" id="874" />
+<TGConnectingPoint num="7" id="875" />
+<TGConnectingPoint num="8" id="876" />
+<TGConnectingPoint num="9" id="877" />
+<TGConnectingPoint num="10" id="878" />
+<TGConnectingPoint num="11" id="879" />
+<TGConnectingPoint num="12" id="880" />
+<TGConnectingPoint num="13" id="881" />
+<TGConnectingPoint num="14" id="882" />
+<TGConnectingPoint num="15" id="883" />
+<TGConnectingPoint num="16" id="884" />
+<TGConnectingPoint num="17" id="885" />
+</SUBCOMPONENT>
<SUBCOMPONENT type="1201" id="905" >
<father id="914" num="5" />
-<cdparam x="1387" y="111" />
+<cdparam x="1387" y="249" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="201" minY="-13" maxY="267" />
@@ -2520,110 +2520,18 @@ processing tasks
</TMLComponentTaskDiagramPanel>
-<TMLActivityDiagramPanel name="F_Source" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="916" >
-<cdparam x="397" y="338" />
-<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="915" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="919" >
-<cdparam x="338" y="262" />
-<sizeparam width="139" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="Source_evt_out(size)" />
-<TGConnectingPoint num="0" id="917" />
-<TGConnectingPoint num="1" id="918" />
-<extraparam>
-<Data eventName="Source_evt_out" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1007" id="922" >
-<cdparam x="351" y="188" />
-<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="source_req(size)" />
-<TGConnectingPoint num="0" id="920" />
-<TGConnectingPoint num="1" id="921" />
-<extraparam>
-<Data requestName="source_req" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="925" >
-<cdparam x="370" y="116" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="action state" value="size = 127" />
-<TGConnectingPoint num="0" id="923" />
-<TGConnectingPoint num="1" id="924" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="927" >
-<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="926" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="928" >
-<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" />
-<P1 x="407" y="70" id="926" />
-<P2 x="407" y="111" id="923" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="929" >
-<cdparam x="407" y="141" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="141" id="924" />
-<P2 x="407" y="183" id="920" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="930" >
-<cdparam x="407" y="213" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="213" id="921" />
-<P2 x="407" y="257" id="917" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="931" >
-<cdparam x="407" y="287" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="287" id="918" />
-<P2 x="407" y="333" id="915" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
<TMLActivityDiagramPanel name="X_Source" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="935" >
+<COMPONENT type="1013" id="918" >
<cdparam x="402" y="189" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="933" />
-<TGConnectingPoint num="1" id="934" />
+<TGConnectingPoint num="0" id="916" />
+<TGConnectingPoint num="1" id="917" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="932" >
-<father id="935" num="0" />
+<SUBCOMPONENT type="-1" id="915" >
+<father id="918" num="0" />
<cdparam x="417" y="209" />
<sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2631,196 +2539,191 @@ processing tasks
<infoparam name="value of the delay" value="size" />
</SUBCOMPONENT>
-<COMPONENT type="1001" id="937" >
+<COMPONENT type="1001" id="920" >
<cdparam x="397" y="342" />
<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="936" />
+<TGConnectingPoint num="0" id="919" />
</COMPONENT>
-<COMPONENT type="1006" id="940" >
+<COMPONENT type="1006" id="923" >
<cdparam x="346" y="270" />
<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="Source_ch_out(size)" />
-<TGConnectingPoint num="0" id="938" />
-<TGConnectingPoint num="1" id="939" />
+<TGConnectingPoint num="0" id="921" />
+<TGConnectingPoint num="1" id="922" />
<accessibility />
<extraparam>
<Data channelName="Source_ch_out" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1034" id="943" >
+<COMPONENT type="1034" id="926" >
<cdparam x="354" y="113" />
<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="941" />
-<TGConnectingPoint num="1" id="942" />
+<TGConnectingPoint num="0" id="924" />
+<TGConnectingPoint num="1" id="925" />
<extraparam>
<Data nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="945" >
+<COMPONENT type="1000" id="928" >
<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="944" />
+<TGConnectingPoint num="0" id="927" />
</COMPONENT>
-<CONNECTOR type="115" id="946" >
+<CONNECTOR type="115" id="929" >
<cdparam x="462" y="222" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="224" id="934" />
-<P2 x="407" y="265" id="938" />
+<P1 x="407" y="224" id="917" />
+<P2 x="407" y="265" id="921" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="947" >
+<CONNECTOR type="115" id="930" >
<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" />
-<P1 x="407" y="70" id="944" />
-<P2 x="407" y="108" id="941" />
+<P1 x="407" y="70" id="927" />
+<P2 x="407" y="108" id="924" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="948" >
+<CONNECTOR type="115" id="931" >
<cdparam x="402" y="256" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="295" id="939" />
-<P2 x="407" y="337" id="936" />
+<P1 x="407" y="295" id="922" />
+<P2 x="407" y="337" id="919" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="949" >
+<CONNECTOR type="115" id="932" >
<cdparam x="407" y="155" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="138" id="942" />
-<P2 x="407" y="184" id="933" />
+<P1 x="407" y="138" id="925" />
+<P2 x="407" y="184" id="916" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="F_Symbol2ChipSeq" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="952" >
-<cdparam x="321" y="132" />
-<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="bit2symbol_evt_in(size) " />
-<TGConnectingPoint num="0" id="950" />
-<TGConnectingPoint num="1" id="951" />
-<extraparam>
-<Data eventName="bit2symbol_evt_in" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="954" >
-<cdparam x="385" y="354" />
+<TMLActivityDiagramPanel name="F_Source" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1001" id="934" >
+<cdparam x="397" y="338" />
<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="953" />
+<TGConnectingPoint num="0" id="933" />
</COMPONENT>
-<COMPONENT type="1008" id="957" >
-<cdparam x="319" y="278" />
-<sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="937" >
+<cdparam x="338" y="262" />
+<sizeparam width="139" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="bit2symbol_evt_out(size)" />
-<TGConnectingPoint num="0" id="955" />
-<TGConnectingPoint num="1" id="956" />
-<accessibility />
+<infoparam name="send event" value="Source_evt_out(size)" />
+<TGConnectingPoint num="0" id="935" />
+<TGConnectingPoint num="1" id="936" />
<extraparam>
-<Data eventName="bit2symbol_evt_out" nbOfParams="5" />
+<Data eventName="Source_evt_out" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="960" >
-<cdparam x="338" y="204" />
-<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="940" >
+<cdparam x="351" y="188" />
+<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="bit2chip_req(size)" />
-<TGConnectingPoint num="0" id="958" />
-<TGConnectingPoint num="1" id="959" />
+<infoparam name="send request" value="source_req(size)" />
+<TGConnectingPoint num="0" id="938" />
+<TGConnectingPoint num="1" id="939" />
<extraparam>
-<Data requestName="bit2chip_req" nbOfParams="5" />
+<Data requestName="source_req" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="962" >
-<cdparam x="388" y="66" />
+<COMPONENT type="1011" id="943" >
+<cdparam x="370" y="116" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="action state" value="size = 127" />
+<TGConnectingPoint num="0" id="941" />
+<TGConnectingPoint num="1" id="942" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="945" >
+<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="961" />
+<TGConnectingPoint num="0" id="944" />
</COMPONENT>
-<CONNECTOR type="115" id="963" >
-<cdparam x="395" y="229" />
+<CONNECTOR type="115" id="946" >
+<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" />
-<P1 x="395" y="229" id="959" />
-<P2 x="395" y="273" id="955" />
+<P1 x="407" y="70" id="944" />
+<P2 x="407" y="111" id="941" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="964" >
-<cdparam x="395" y="303" />
+<CONNECTOR type="115" id="947" >
+<cdparam x="407" y="141" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="395" y="303" id="956" />
-<P2 x="395" y="349" id="953" />
+<P1 x="407" y="141" id="942" />
+<P2 x="407" y="183" id="938" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="965" >
-<cdparam x="395" y="86" />
+<CONNECTOR type="115" id="948" >
+<cdparam x="407" y="213" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="395" y="86" id="961" />
-<P2 x="395" y="127" id="950" />
+<P1 x="407" y="213" id="939" />
+<P2 x="407" y="257" id="935" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="966" >
-<cdparam x="435" y="149" />
+<CONNECTOR type="115" id="949" >
+<cdparam x="407" y="287" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="395" y="157" id="951" />
-<P2 x="395" y="199" id="958" />
+<P1 x="407" y="287" id="936" />
+<P2 x="407" y="333" id="933" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="X_Symbol2ChipSeq" minX="10" maxX="495" minY="10" maxY="467" >
-<COMPONENT type="1021" id="970" >
+<COMPONENT type="1021" id="953" >
<cdparam x="393" y="289" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="495" minY="10" maxY="467" />
<infoparam name="execC" value="null" />
-<TGConnectingPoint num="0" id="968" />
-<TGConnectingPoint num="1" id="969" />
+<TGConnectingPoint num="0" id="951" />
+<TGConnectingPoint num="1" id="952" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="967" >
-<father id="970" num="0" />
+<SUBCOMPONENT type="-1" id="950" >
+<father id="953" num="0" />
<cdparam x="408" y="309" />
<sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2828,215 +2731,216 @@ processing tasks
<infoparam name="value of the delay" value="size" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="973" >
+<COMPONENT type="1009" id="956" >
<cdparam x="310" y="213" />
<sizeparam width="176" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="495" minY="10" maxY="467" />
<infoparam name="read channel" value="symbol2ChipSeq_ch_in(size) " />
-<TGConnectingPoint num="0" id="971" />
-<TGConnectingPoint num="1" id="972" />
+<TGConnectingPoint num="0" id="954" />
+<TGConnectingPoint num="1" id="955" />
<extraparam>
<Data channelName="symbol2ChipSeq_ch_in" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="975" >
+<COMPONENT type="1001" id="958" >
<cdparam x="388" y="447" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="495" minY="10" maxY="467" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="974" />
+<TGConnectingPoint num="0" id="957" />
</COMPONENT>
-<COMPONENT type="1006" id="978" >
+<COMPONENT type="1006" id="961" >
<cdparam x="308" y="375" />
<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="495" minY="10" maxY="467" />
<infoparam name="write channel" value="symbol2ChipSeq_ch_out(size)" />
-<TGConnectingPoint num="0" id="976" />
-<TGConnectingPoint num="1" id="977" />
+<TGConnectingPoint num="0" id="959" />
+<TGConnectingPoint num="1" id="960" />
<extraparam>
<Data channelName="symbol2ChipSeq_ch_out" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1034" id="981" >
+<COMPONENT type="1034" id="964" >
<cdparam x="345" y="137" />
<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="495" minY="10" maxY="467" />
<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="979" />
-<TGConnectingPoint num="1" id="980" />
+<TGConnectingPoint num="0" id="962" />
+<TGConnectingPoint num="1" id="963" />
<extraparam>
<Data nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="983" >
+<COMPONENT type="1000" id="966" >
<cdparam x="391" y="74" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="495" minY="10" maxY="467" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="982" />
+<TGConnectingPoint num="0" id="965" />
</COMPONENT>
-<CONNECTOR type="115" id="984" >
+<CONNECTOR type="115" id="967" >
<cdparam x="541" y="169" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="398" y="238" id="972" />
-<P2 x="398" y="284" id="968" />
+<P1 x="398" y="238" id="955" />
+<P2 x="398" y="284" id="951" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="985" >
+<CONNECTOR type="115" id="968" >
<cdparam x="453" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="398" y="324" id="969" />
-<P2 x="398" y="370" id="976" />
+<P1 x="398" y="324" id="952" />
+<P2 x="398" y="370" id="959" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="986" >
+<CONNECTOR type="115" id="969" >
<cdparam x="398" y="94" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="398" y="94" id="982" />
-<P2 x="398" y="132" id="979" />
+<P1 x="398" y="94" id="965" />
+<P2 x="398" y="132" id="962" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="987" >
+<CONNECTOR type="115" id="970" >
<cdparam x="393" y="361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="398" y="400" id="977" />
-<P2 x="398" y="442" id="974" />
+<P1 x="398" y="400" id="960" />
+<P2 x="398" y="442" id="957" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="988" >
+<CONNECTOR type="115" id="971" >
<cdparam x="398" y="179" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="398" y="162" id="980" />
-<P2 x="398" y="208" id="971" />
+<P1 x="398" y="162" id="963" />
+<P2 x="398" y="208" id="954" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="F_Chip2Octet" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="991" >
-<cdparam x="333" y="128" />
-<sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_Symbol2ChipSeq" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="974" >
+<cdparam x="321" y="132" />
+<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="chip2octet_evt_in(size) " />
-<TGConnectingPoint num="0" id="989" />
-<TGConnectingPoint num="1" id="990" />
+<infoparam name="wait event" value="bit2symbol_evt_in(size) " />
+<TGConnectingPoint num="0" id="972" />
+<TGConnectingPoint num="1" id="973" />
<extraparam>
-<Data eventName="chip2octet_evt_in" nbOfParams="5" />
+<Data eventName="bit2symbol_evt_in" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="993" >
-<cdparam x="401" y="350" />
+<COMPONENT type="1001" id="976" >
+<cdparam x="385" y="354" />
<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="992" />
+<TGConnectingPoint num="0" id="975" />
</COMPONENT>
-<COMPONENT type="1008" id="996" >
-<cdparam x="330" y="274" />
-<sizeparam width="162" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="979" >
+<cdparam x="319" y="278" />
+<sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="chip2octet_evt_out(size)" />
-<TGConnectingPoint num="0" id="994" />
-<TGConnectingPoint num="1" id="995" />
+<infoparam name="send event" value="bit2symbol_evt_out(size)" />
+<TGConnectingPoint num="0" id="977" />
+<TGConnectingPoint num="1" id="978" />
+<accessibility />
<extraparam>
-<Data eventName="chip2octet_evt_out" nbOfParams="5" />
+<Data eventName="bit2symbol_evt_out" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="999" >
-<cdparam x="343" y="200" />
-<sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="982" >
+<cdparam x="338" y="204" />
+<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="chip2octet_req(size)" />
-<TGConnectingPoint num="0" id="997" />
-<TGConnectingPoint num="1" id="998" />
+<infoparam name="send request" value="bit2chip_req(size)" />
+<TGConnectingPoint num="0" id="980" />
+<TGConnectingPoint num="1" id="981" />
<extraparam>
-<Data requestName="chip2octet_req" nbOfParams="5" />
+<Data requestName="bit2chip_req" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1001" >
-<cdparam x="404" y="62" />
+<COMPONENT type="1000" id="984" >
+<cdparam x="388" y="66" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1000" />
+<TGConnectingPoint num="0" id="983" />
</COMPONENT>
-<CONNECTOR type="115" id="1002" >
-<cdparam x="411" y="225" />
+<CONNECTOR type="115" id="985" >
+<cdparam x="395" y="229" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="411" y="225" id="998" />
-<P2 x="411" y="269" id="994" />
+<P1 x="395" y="229" id="981" />
+<P2 x="395" y="273" id="977" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1003" >
-<cdparam x="411" y="299" />
+<CONNECTOR type="115" id="986" >
+<cdparam x="395" y="303" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="411" y="299" id="995" />
-<P2 x="411" y="345" id="992" />
+<P1 x="395" y="303" id="978" />
+<P2 x="395" y="349" id="975" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1004" >
-<cdparam x="411" y="82" />
+<CONNECTOR type="115" id="987" >
+<cdparam x="395" y="86" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="411" y="82" id="1000" />
-<P2 x="411" y="123" id="989" />
+<P1 x="395" y="86" id="983" />
+<P2 x="395" y="127" id="972" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1005" >
-<cdparam x="451" y="145" />
+<CONNECTOR type="115" id="988" >
+<cdparam x="435" y="149" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="411" y="153" id="990" />
-<P2 x="411" y="195" id="997" />
+<P1 x="395" y="157" id="973" />
+<P2 x="395" y="199" id="980" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="X_Chip2Octet" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1021" id="1009" >
+<COMPONENT type="1021" id="992" >
<cdparam x="377" y="300" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execC" value="null" />
-<TGConnectingPoint num="0" id="1007" />
-<TGConnectingPoint num="1" id="1008" />
+<TGConnectingPoint num="0" id="990" />
+<TGConnectingPoint num="1" id="991" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1006" >
-<father id="1009" num="0" />
+<SUBCOMPONENT type="-1" id="989" >
+<father id="992" num="0" />
<cdparam x="392" y="320" />
<sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3044,237 +2948,215 @@ processing tasks
<infoparam name="value of the delay" value="size" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="1012" >
+<COMPONENT type="1009" id="995" >
<cdparam x="312" y="215" />
<sizeparam width="140" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="chip2octet_ch_in(size) " />
-<TGConnectingPoint num="0" id="1010" />
-<TGConnectingPoint num="1" id="1011" />
+<TGConnectingPoint num="0" id="993" />
+<TGConnectingPoint num="1" id="994" />
<extraparam>
<Data channelName="chip2octet_ch_in" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1014" >
+<COMPONENT type="1001" id="997" >
<cdparam x="372" y="449" />
<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="1013" />
+<TGConnectingPoint num="0" id="996" />
</COMPONENT>
-<COMPONENT type="1006" id="1017" >
+<COMPONENT type="1006" id="1000" >
<cdparam x="310" y="377" />
<sizeparam width="144" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="chip2octet_ch_out(size)" />
-<TGConnectingPoint num="0" id="1015" />
-<TGConnectingPoint num="1" id="1016" />
+<TGConnectingPoint num="0" id="998" />
+<TGConnectingPoint num="1" id="999" />
<extraparam>
<Data channelName="chip2octet_ch_out" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1034" id="1020" >
+<COMPONENT type="1034" id="1003" >
<cdparam x="329" y="139" />
<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="1018" />
-<TGConnectingPoint num="1" id="1019" />
+<TGConnectingPoint num="0" id="1001" />
+<TGConnectingPoint num="1" id="1002" />
<extraparam>
<Data nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1022" >
+<COMPONENT type="1000" id="1005" >
<cdparam x="375" y="76" />
<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="1021" />
+<TGConnectingPoint num="0" id="1004" />
</COMPONENT>
-<CONNECTOR type="115" id="1023" >
+<CONNECTOR type="115" id="1006" >
<cdparam x="525" y="171" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="382" y="240" id="1011" />
-<P2 x="382" y="295" id="1007" />
+<P1 x="382" y="240" id="994" />
+<P2 x="382" y="295" id="990" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1024" >
+<CONNECTOR type="115" id="1007" >
<cdparam x="437" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="382" y="335" id="1008" />
-<P2 x="382" y="372" id="1015" />
+<P1 x="382" y="335" id="991" />
+<P2 x="382" y="372" id="998" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1025" >
+<CONNECTOR type="115" id="1008" >
<cdparam x="382" y="96" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="382" y="96" id="1021" />
-<P2 x="382" y="134" id="1018" />
+<P1 x="382" y="96" id="1004" />
+<P2 x="382" y="134" id="1001" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1026" >
+<CONNECTOR type="115" id="1009" >
<cdparam x="377" y="363" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="382" y="402" id="1016" />
-<P2 x="382" y="444" id="1013" />
+<P1 x="382" y="402" id="999" />
+<P2 x="382" y="444" id="996" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1027" >
+<CONNECTOR type="115" id="1010" >
<cdparam x="382" y="181" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="382" y="164" id="1019" />
-<P2 x="382" y="210" id="1010" />
+<P1 x="382" y="164" id="1002" />
+<P2 x="382" y="210" id="993" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="F_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="1030" >
-<cdparam x="363" y="134" />
-<sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_Chip2Octet" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="1013" >
+<cdparam x="333" y="128" />
+<sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="cwl_evt_in(size) " />
-<TGConnectingPoint num="0" id="1028" />
-<TGConnectingPoint num="1" id="1029" />
+<infoparam name="wait event" value="chip2octet_evt_in(size) " />
+<TGConnectingPoint num="0" id="1011" />
+<TGConnectingPoint num="1" id="1012" />
<extraparam>
-<Data eventName="cwl_evt_in" nbOfParams="5" />
+<Data eventName="chip2octet_evt_in" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1032" >
-<cdparam x="407" y="397" />
+<COMPONENT type="1001" id="1015" >
+<cdparam x="401" y="350" />
<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="1031" />
+<TGConnectingPoint num="0" id="1014" />
</COMPONENT>
-<COMPONENT type="1007" id="1035" >
-<cdparam x="372" y="206" />
-<sizeparam width="85" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1018" >
+<cdparam x="330" y="274" />
+<sizeparam width="162" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="cwl_req(size)" />
-<TGConnectingPoint num="0" id="1033" />
-<TGConnectingPoint num="1" id="1034" />
+<infoparam name="send event" value="chip2octet_evt_out(size)" />
+<TGConnectingPoint num="0" id="1016" />
+<TGConnectingPoint num="1" id="1017" />
<extraparam>
-<Data requestName="cwl_req" nbOfParams="5" />
+<Data eventName="chip2octet_evt_out" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1037" >
-<cdparam x="407" y="68" />
-<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="1036" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="1040" >
-<cdparam x="356" y="333" />
-<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1021" >
+<cdparam x="343" y="200" />
+<sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwl_evt_out_1(size)" />
-<TGConnectingPoint num="0" id="1038" />
-<TGConnectingPoint num="1" id="1039" />
+<infoparam name="send request" value="chip2octet_req(size)" />
+<TGConnectingPoint num="0" id="1019" />
+<TGConnectingPoint num="1" id="1020" />
<extraparam>
-<Data eventName="cwl_evt_out_1" nbOfParams="5" />
+<Data requestName="chip2octet_req" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1043" >
-<cdparam x="361" y="280" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="1023" >
+<cdparam x="404" y="62" />
+<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="send event" value="cwl_evt_out(size)" />
-<TGConnectingPoint num="0" id="1041" />
-<TGConnectingPoint num="1" id="1042" />
-<extraparam>
-<Data eventName="cwl_evt_out" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1022" />
</COMPONENT>
-<CONNECTOR type="115" id="1044" >
-<cdparam x="416" y="358" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="416" y="358" id="1039" />
-<P2 x="417" y="392" id="1031" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1045" >
-<cdparam x="414" y="231" />
+<CONNECTOR type="115" id="1024" >
+<cdparam x="411" y="225" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="231" id="1034" />
-<P2 x="414" y="275" id="1041" />
+<P1 x="411" y="225" id="1020" />
+<P2 x="411" y="269" id="1016" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1046" >
-<cdparam x="414" y="305" />
+<CONNECTOR type="115" id="1025" >
+<cdparam x="411" y="299" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="305" id="1042" />
-<P2 x="416" y="328" id="1038" />
+<P1 x="411" y="299" id="1017" />
+<P2 x="411" y="345" id="1014" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1047" >
-<cdparam x="414" y="88" />
+<CONNECTOR type="115" id="1026" >
+<cdparam x="411" y="82" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="88" id="1036" />
-<P2 x="414" y="129" id="1028" />
+<P1 x="411" y="82" id="1022" />
+<P2 x="411" y="123" id="1011" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1048" >
-<cdparam x="454" y="151" />
+<CONNECTOR type="115" id="1027" >
+<cdparam x="451" y="145" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="159" id="1029" />
-<P2 x="414" y="201" id="1033" />
+<P1 x="411" y="153" id="1012" />
+<P2 x="411" y="195" id="1019" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="X_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="1052" >
+<COMPONENT type="1013" id="1031" >
<cdparam x="402" y="277" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1050" />
-<TGConnectingPoint num="1" id="1051" />
+<TGConnectingPoint num="0" id="1029" />
+<TGConnectingPoint num="1" id="1030" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1049" >
-<father id="1052" num="0" />
+<SUBCOMPONENT type="-1" id="1028" >
+<father id="1031" num="0" />
<cdparam x="417" y="297" />
<sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3282,215 +3164,237 @@ processing tasks
<infoparam name="value of the delay" value="size" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="1055" >
+<COMPONENT type="1009" id="1034" >
<cdparam x="355" y="196" />
<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="cwl_ch_in(size) " />
-<TGConnectingPoint num="0" id="1053" />
-<TGConnectingPoint num="1" id="1054" />
+<TGConnectingPoint num="0" id="1032" />
+<TGConnectingPoint num="1" id="1033" />
<extraparam>
<Data channelName="cwl_ch_in" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1057" >
+<COMPONENT type="1001" id="1036" >
<cdparam x="397" y="430" />
<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="1056" />
+<TGConnectingPoint num="0" id="1035" />
</COMPONENT>
-<COMPONENT type="1006" id="1060" >
+<COMPONENT type="1006" id="1039" >
<cdparam x="352" y="358" />
<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="cwl_ch_out(size)" />
-<TGConnectingPoint num="0" id="1058" />
-<TGConnectingPoint num="1" id="1059" />
+<TGConnectingPoint num="0" id="1037" />
+<TGConnectingPoint num="1" id="1038" />
<extraparam>
<Data channelName="cwl_ch_out" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1034" id="1063" >
+<COMPONENT type="1034" id="1042" >
<cdparam x="351" y="120" />
<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="1061" />
-<TGConnectingPoint num="1" id="1062" />
+<TGConnectingPoint num="0" id="1040" />
+<TGConnectingPoint num="1" id="1041" />
<extraparam>
<Data nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1065" >
+<COMPONENT type="1000" id="1044" >
<cdparam x="400" y="57" />
<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="1064" />
+<TGConnectingPoint num="0" id="1043" />
</COMPONENT>
-<CONNECTOR type="115" id="1066" >
+<CONNECTOR type="115" id="1045" >
<cdparam x="550" y="152" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="221" id="1054" />
-<P2 x="407" y="272" id="1050" />
+<P1 x="407" y="221" id="1033" />
+<P2 x="407" y="272" id="1029" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1067" >
+<CONNECTOR type="115" id="1046" >
<cdparam x="462" y="310" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="312" id="1051" />
-<P2 x="407" y="353" id="1058" />
+<P1 x="407" y="312" id="1030" />
+<P2 x="407" y="353" id="1037" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1068" >
+<CONNECTOR type="115" id="1047" >
<cdparam x="407" y="77" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="77" id="1064" />
-<P2 x="407" y="115" id="1061" />
+<P1 x="407" y="77" id="1043" />
+<P2 x="407" y="115" id="1040" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1069" >
+<CONNECTOR type="115" id="1048" >
<cdparam x="402" y="344" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="383" id="1059" />
-<P2 x="407" y="425" id="1056" />
+<P1 x="407" y="383" id="1038" />
+<P2 x="407" y="425" id="1035" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1070" >
+<CONNECTOR type="115" id="1049" >
<cdparam x="407" y="162" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="145" id="1062" />
-<P2 x="407" y="191" id="1053" />
+<P1 x="407" y="145" id="1041" />
+<P2 x="407" y="191" id="1032" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="F_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1072" >
-<cdparam x="396" y="355" />
+<TMLActivityDiagramPanel name="F_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="1052" >
+<cdparam x="363" y="134" />
+<sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="cwl_evt_in(size) " />
+<TGConnectingPoint num="0" id="1050" />
+<TGConnectingPoint num="1" id="1051" />
+<extraparam>
+<Data eventName="cwl_evt_in" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1054" >
+<cdparam x="407" y="397" />
<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="1071" />
+<TGConnectingPoint num="0" id="1053" />
</COMPONENT>
-<COMPONENT type="1007" id="1075" >
-<cdparam x="334" y="265" />
-<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1057" >
+<cdparam x="372" y="206" />
+<sizeparam width="85" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="sink_req(size + size_1)" />
-<TGConnectingPoint num="0" id="1073" />
-<TGConnectingPoint num="1" id="1074" />
+<infoparam name="send request" value="cwl_req(size)" />
+<TGConnectingPoint num="0" id="1055" />
+<TGConnectingPoint num="1" id="1056" />
<extraparam>
-<Data requestName="sink_req" nbOfParams="5" />
-<Param index="0" value="size + size_1" />
+<Data requestName="cwl_req" nbOfParams="5" />
+<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1077" >
-<cdparam x="400" y="73" />
+<COMPONENT type="1000" id="1059" >
+<cdparam x="407" y="68" />
<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="1076" />
+<TGConnectingPoint num="0" id="1058" />
</COMPONENT>
-<COMPONENT type="1010" id="1080" >
-<cdparam x="340" y="187" />
-<sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1062" >
+<cdparam x="356" y="333" />
+<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="sink_evt_in_1(size_1) " />
-<TGConnectingPoint num="0" id="1078" />
-<TGConnectingPoint num="1" id="1079" />
+<infoparam name="send event" value="cwl_evt_out_1(size)" />
+<TGConnectingPoint num="0" id="1060" />
+<TGConnectingPoint num="1" id="1061" />
<extraparam>
-<Data eventName="sink_evt_in_1" nbOfParams="5" />
-<Param index="0" value="size_1" />
+<Data eventName="cwl_evt_out_1" nbOfParams="5" />
+<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1083" >
-<cdparam x="354" y="139" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1065" >
+<cdparam x="361" y="280" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="sink_evt_in(size) " />
-<TGConnectingPoint num="0" id="1081" />
-<TGConnectingPoint num="1" id="1082" />
+<infoparam name="send event" value="cwl_evt_out(size)" />
+<TGConnectingPoint num="0" id="1063" />
+<TGConnectingPoint num="1" id="1064" />
<extraparam>
-<Data eventName="sink_evt_in" nbOfParams="5" />
+<Data eventName="cwl_evt_out" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="1084" >
-<cdparam x="407" y="212" />
+<CONNECTOR type="115" id="1066" >
+<cdparam x="416" y="358" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="416" y="358" id="1061" />
+<P2 x="417" y="392" id="1053" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1067" >
+<cdparam x="414" y="231" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="212" id="1079" />
-<P2 x="406" y="260" id="1073" />
+<P1 x="414" y="231" id="1056" />
+<P2 x="414" y="275" id="1063" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1085" >
-<cdparam x="406" y="290" />
+<CONNECTOR type="115" id="1068" >
+<cdparam x="414" y="305" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="406" y="290" id="1074" />
-<P2 x="406" y="350" id="1071" />
+<P1 x="414" y="305" id="1064" />
+<P2 x="416" y="328" id="1060" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1086" >
-<cdparam x="407" y="93" />
+<CONNECTOR type="115" id="1069" >
+<cdparam x="414" y="88" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="93" id="1076" />
-<P2 x="407" y="134" id="1081" />
+<P1 x="414" y="88" id="1058" />
+<P2 x="414" y="129" id="1050" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1087" >
-<cdparam x="447" y="156" />
+<CONNECTOR type="115" id="1070" >
+<cdparam x="454" y="151" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="164" id="1082" />
-<P2 x="407" y="182" id="1078" />
+<P1 x="414" y="159" id="1051" />
+<P2 x="414" y="201" id="1055" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="X_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="1091" >
+<COMPONENT type="1013" id="1074" >
<cdparam x="445" y="298" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1089" />
-<TGConnectingPoint num="1" id="1090" />
+<TGConnectingPoint num="0" id="1072" />
+<TGConnectingPoint num="1" id="1073" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1088" >
-<father id="1091" num="0" />
+<SUBCOMPONENT type="-1" id="1071" >
+<father id="1074" num="0" />
<cdparam x="460" y="318" />
<sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3498,194 +3402,194 @@ processing tasks
<infoparam name="value of the delay" value="size" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="1094" >
+<COMPONENT type="1009" id="1077" >
<cdparam x="395" y="217" />
<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="sink_ch_in(size) " />
-<TGConnectingPoint num="0" id="1092" />
-<TGConnectingPoint num="1" id="1093" />
+<TGConnectingPoint num="0" id="1075" />
+<TGConnectingPoint num="1" id="1076" />
<extraparam>
<Data channelName="sink_ch_in" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1096" >
+<COMPONENT type="1001" id="1079" >
<cdparam x="440" y="384" />
<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="1095" />
+<TGConnectingPoint num="0" id="1078" />
</COMPONENT>
-<COMPONENT type="1034" id="1099" >
+<COMPONENT type="1034" id="1082" >
<cdparam x="394" y="141" />
<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="1097" />
-<TGConnectingPoint num="1" id="1098" />
+<TGConnectingPoint num="0" id="1080" />
+<TGConnectingPoint num="1" id="1081" />
<extraparam>
<Data nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1101" >
+<COMPONENT type="1000" id="1084" >
<cdparam x="443" y="78" />
<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="1100" />
+<TGConnectingPoint num="0" id="1083" />
</COMPONENT>
-<CONNECTOR type="115" id="1102" >
+<CONNECTOR type="115" id="1085" >
<cdparam x="450" y="333" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="450" y="333" id="1090" />
-<P2 x="450" y="379" id="1095" />
+<P1 x="450" y="333" id="1073" />
+<P2 x="450" y="379" id="1078" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1103" >
+<CONNECTOR type="115" id="1086" >
<cdparam x="593" y="173" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="450" y="242" id="1093" />
-<P2 x="450" y="293" id="1089" />
+<P1 x="450" y="242" id="1076" />
+<P2 x="450" y="293" id="1072" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1104" >
+<CONNECTOR type="115" id="1087" >
<cdparam x="450" y="98" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="450" y="98" id="1100" />
-<P2 x="450" y="136" id="1097" />
+<P1 x="450" y="98" id="1083" />
+<P2 x="450" y="136" id="1080" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1105" >
+<CONNECTOR type="115" id="1088" >
<cdparam x="450" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="450" y="166" id="1098" />
-<P2 x="450" y="212" id="1092" />
+<P1 x="450" y="166" id="1081" />
+<P2 x="450" y="212" id="1075" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="F_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="1108" >
-<cdparam x="342" y="117" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1001" id="1090" >
+<cdparam x="396" y="355" />
+<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="wait event" value="cwpQ_evt_in(size) " />
-<TGConnectingPoint num="0" id="1106" />
-<TGConnectingPoint num="1" id="1107" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1089" />
+</COMPONENT>
+
+<COMPONENT type="1007" id="1093" >
+<cdparam x="334" y="265" />
+<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send request" value="sink_req(size + size_1)" />
+<TGConnectingPoint num="0" id="1091" />
+<TGConnectingPoint num="1" id="1092" />
<extraparam>
-<Data eventName="cwpQ_evt_in" nbOfParams="5" />
-<Param index="0" value="size" />
+<Data requestName="sink_req" nbOfParams="5" />
+<Param index="0" value="size + size_1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1110" >
-<cdparam x="393" y="339" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="1095" >
+<cdparam x="400" y="73" />
+<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="stop state" value="null" />
-<TGConnectingPoint num="0" id="1109" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1094" />
</COMPONENT>
-<COMPONENT type="1008" id="1113" >
-<cdparam x="339" y="263" />
-<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="1098" >
+<cdparam x="340" y="187" />
+<sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwpQ_evt_out(size)" />
-<TGConnectingPoint num="0" id="1111" />
-<TGConnectingPoint num="1" id="1112" />
+<infoparam name="wait event" value="sink_evt_in_1(size_1) " />
+<TGConnectingPoint num="0" id="1096" />
+<TGConnectingPoint num="1" id="1097" />
<extraparam>
-<Data eventName="cwpQ_evt_out" nbOfParams="5" />
-<Param index="0" value="size" />
+<Data eventName="sink_evt_in_1" nbOfParams="5" />
+<Param index="0" value="size_1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="1116" >
-<cdparam x="352" y="189" />
-<sizeparam width="103" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="1101" >
+<cdparam x="354" y="139" />
+<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="cwpQ_req(size)" />
-<TGConnectingPoint num="0" id="1114" />
-<TGConnectingPoint num="1" id="1115" />
+<infoparam name="wait event" value="sink_evt_in(size) " />
+<TGConnectingPoint num="0" id="1099" />
+<TGConnectingPoint num="1" id="1100" />
<extraparam>
-<Data requestName="cwpQ_req" nbOfParams="5" />
+<Data eventName="sink_evt_in" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1118" >
-<cdparam x="396" y="51" />
-<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="1117" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="1119" >
-<cdparam x="403" y="214" />
+<CONNECTOR type="115" id="1102" >
+<cdparam x="407" y="212" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="214" id="1115" />
-<P2 x="403" y="258" id="1111" />
+<P1 x="407" y="212" id="1097" />
+<P2 x="406" y="260" id="1091" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1120" >
-<cdparam x="403" y="288" />
+<CONNECTOR type="115" id="1103" >
+<cdparam x="406" y="290" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="288" id="1112" />
-<P2 x="403" y="334" id="1109" />
+<P1 x="406" y="290" id="1092" />
+<P2 x="406" y="350" id="1089" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1121" >
-<cdparam x="403" y="71" />
+<CONNECTOR type="115" id="1104" >
+<cdparam x="407" y="93" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="71" id="1117" />
-<P2 x="403" y="112" id="1106" />
+<P1 x="407" y="93" id="1094" />
+<P2 x="407" y="134" id="1099" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1122" >
-<cdparam x="443" y="134" />
+<CONNECTOR type="115" id="1105" >
+<cdparam x="447" y="156" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="142" id="1107" />
-<P2 x="403" y="184" id="1114" />
+<P1 x="407" y="164" id="1100" />
+<P2 x="407" y="182" id="1096" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="X_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="1126" >
+<COMPONENT type="1013" id="1109" >
<cdparam x="365" y="275" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1124" />
-<TGConnectingPoint num="1" id="1125" />
+<TGConnectingPoint num="0" id="1107" />
+<TGConnectingPoint num="1" id="1108" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1123" >
-<father id="1126" num="0" />
+<SUBCOMPONENT type="-1" id="1106" >
+<father id="1109" num="0" />
<cdparam x="380" y="295" />
<sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3693,215 +3597,215 @@ processing tasks
<infoparam name="value of the delay" value="size" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="1129" >
+<COMPONENT type="1009" id="1112" >
<cdparam x="314" y="194" />
<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="cwpQ_ch_in(size) " />
-<TGConnectingPoint num="0" id="1127" />
-<TGConnectingPoint num="1" id="1128" />
+<TGConnectingPoint num="0" id="1110" />
+<TGConnectingPoint num="1" id="1111" />
<extraparam>
<Data channelName="cwpQ_ch_in" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1131" >
+<COMPONENT type="1001" id="1114" >
<cdparam x="360" y="428" />
<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="1130" />
+<TGConnectingPoint num="0" id="1113" />
</COMPONENT>
-<COMPONENT type="1006" id="1134" >
+<COMPONENT type="1006" id="1117" >
<cdparam x="312" y="356" />
<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="cwpQ_ch_out(size)" />
-<TGConnectingPoint num="0" id="1132" />
-<TGConnectingPoint num="1" id="1133" />
+<TGConnectingPoint num="0" id="1115" />
+<TGConnectingPoint num="1" id="1116" />
<extraparam>
<Data channelName="cwpQ_ch_out" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1034" id="1137" >
+<COMPONENT type="1034" id="1120" >
<cdparam x="317" y="118" />
<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="1135" />
-<TGConnectingPoint num="1" id="1136" />
+<TGConnectingPoint num="0" id="1118" />
+<TGConnectingPoint num="1" id="1119" />
<extraparam>
<Data nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1139" >
+<COMPONENT type="1000" id="1122" >
<cdparam x="363" y="55" />
<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="1138" />
+<TGConnectingPoint num="0" id="1121" />
</COMPONENT>
-<CONNECTOR type="115" id="1140" >
+<CONNECTOR type="115" id="1123" >
<cdparam x="513" y="150" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="370" y="219" id="1128" />
-<P2 x="370" y="270" id="1124" />
+<P1 x="370" y="219" id="1111" />
+<P2 x="370" y="270" id="1107" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1141" >
+<CONNECTOR type="115" id="1124" >
<cdparam x="425" y="308" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="370" y="310" id="1125" />
-<P2 x="370" y="351" id="1132" />
+<P1 x="370" y="310" id="1108" />
+<P2 x="370" y="351" id="1115" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1142" >
+<CONNECTOR type="115" id="1125" >
<cdparam x="370" y="75" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="370" y="75" id="1138" />
-<P2 x="370" y="113" id="1135" />
+<P1 x="370" y="75" id="1121" />
+<P2 x="370" y="113" id="1118" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1143" >
+<CONNECTOR type="115" id="1126" >
<cdparam x="365" y="342" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="370" y="381" id="1133" />
-<P2 x="370" y="423" id="1130" />
+<P1 x="370" y="381" id="1116" />
+<P2 x="370" y="423" id="1113" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1144" >
+<CONNECTOR type="115" id="1127" >
<cdparam x="370" y="160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="370" y="143" id="1136" />
-<P2 x="370" y="189" id="1127" />
+<P1 x="370" y="143" id="1119" />
+<P2 x="370" y="189" id="1110" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="F_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="1147" >
-<cdparam x="324" y="132" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="1130" >
+<cdparam x="342" y="117" />
+<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="cwpI_evt_in(size) " />
-<TGConnectingPoint num="0" id="1145" />
-<TGConnectingPoint num="1" id="1146" />
+<infoparam name="wait event" value="cwpQ_evt_in(size) " />
+<TGConnectingPoint num="0" id="1128" />
+<TGConnectingPoint num="1" id="1129" />
<extraparam>
-<Data eventName="cwpI_evt_in" nbOfParams="5" />
+<Data eventName="cwpQ_evt_in" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1149" >
-<cdparam x="369" y="354" />
+<COMPONENT type="1001" id="1132" >
+<cdparam x="393" y="339" />
<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="1148" />
+<TGConnectingPoint num="0" id="1131" />
</COMPONENT>
-<COMPONENT type="1008" id="1152" >
-<cdparam x="322" y="278" />
-<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1135" >
+<cdparam x="339" y="263" />
+<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwpI_evt_out(size)" />
-<TGConnectingPoint num="0" id="1150" />
-<TGConnectingPoint num="1" id="1151" />
+<infoparam name="send event" value="cwpQ_evt_out(size)" />
+<TGConnectingPoint num="0" id="1133" />
+<TGConnectingPoint num="1" id="1134" />
<extraparam>
-<Data eventName="cwpI_evt_out" nbOfParams="5" />
+<Data eventName="cwpQ_evt_out" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="1155" >
-<cdparam x="333" y="204" />
-<sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1138" >
+<cdparam x="352" y="189" />
+<sizeparam width="103" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="cwpI_req(size)" />
-<TGConnectingPoint num="0" id="1153" />
-<TGConnectingPoint num="1" id="1154" />
+<infoparam name="send request" value="cwpQ_req(size)" />
+<TGConnectingPoint num="0" id="1136" />
+<TGConnectingPoint num="1" id="1137" />
<extraparam>
-<Data requestName="cwpI_req" nbOfParams="5" />
+<Data requestName="cwpQ_req" nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1157" >
-<cdparam x="372" y="66" />
+<COMPONENT type="1000" id="1140" >
+<cdparam x="396" y="51" />
<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="1156" />
+<TGConnectingPoint num="0" id="1139" />
</COMPONENT>
-<CONNECTOR type="115" id="1158" >
-<cdparam x="379" y="229" />
+<CONNECTOR type="115" id="1141" >
+<cdparam x="403" y="214" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="379" y="229" id="1154" />
-<P2 x="379" y="273" id="1150" />
+<P1 x="403" y="214" id="1137" />
+<P2 x="403" y="258" id="1133" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1159" >
-<cdparam x="379" y="303" />
+<CONNECTOR type="115" id="1142" >
+<cdparam x="403" y="288" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="379" y="303" id="1151" />
-<P2 x="379" y="349" id="1148" />
+<P1 x="403" y="288" id="1134" />
+<P2 x="403" y="334" id="1131" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1160" >
-<cdparam x="379" y="86" />
+<CONNECTOR type="115" id="1143" >
+<cdparam x="403" y="71" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="379" y="86" id="1156" />
-<P2 x="379" y="127" id="1145" />
+<P1 x="403" y="71" id="1139" />
+<P2 x="403" y="112" id="1128" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1161" >
-<cdparam x="419" y="149" />
+<CONNECTOR type="115" id="1144" >
+<cdparam x="443" y="134" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="379" y="157" id="1146" />
-<P2 x="379" y="199" id="1153" />
+<P1 x="403" y="142" id="1129" />
+<P2 x="403" y="184" id="1136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="X_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="1165" >
+<COMPONENT type="1013" id="1148" >
<cdparam x="369" y="290" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1163" />
-<TGConnectingPoint num="1" id="1164" />
+<TGConnectingPoint num="0" id="1146" />
+<TGConnectingPoint num="1" id="1147" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1162" >
-<father id="1165" num="0" />
+<SUBCOMPONENT type="-1" id="1145" >
+<father id="1148" num="0" />
<cdparam x="384" y="310" />
<sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3909,102 +3813,198 @@ processing tasks
<infoparam name="value of the delay" value="size" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="1168" >
+<COMPONENT type="1009" id="1151" >
<cdparam x="318" y="209" />
<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="cwpI_ch_in(size) " />
-<TGConnectingPoint num="0" id="1166" />
-<TGConnectingPoint num="1" id="1167" />
+<TGConnectingPoint num="0" id="1149" />
+<TGConnectingPoint num="1" id="1150" />
<extraparam>
<Data channelName="cwpI_ch_in" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1170" >
+<COMPONENT type="1001" id="1153" >
<cdparam x="364" y="443" />
<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="1169" />
+<TGConnectingPoint num="0" id="1152" />
</COMPONENT>
-<COMPONENT type="1006" id="1173" >
+<COMPONENT type="1006" id="1156" >
<cdparam x="315" y="371" />
<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="cwpI_ch_out(size)" />
-<TGConnectingPoint num="0" id="1171" />
-<TGConnectingPoint num="1" id="1172" />
+<TGConnectingPoint num="0" id="1154" />
+<TGConnectingPoint num="1" id="1155" />
<extraparam>
<Data channelName="cwpI_ch_out" nbOfSamples="size" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1034" id="1176" >
+<COMPONENT type="1034" id="1159" >
<cdparam x="318" y="133" />
<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="1174" />
-<TGConnectingPoint num="1" id="1175" />
+<TGConnectingPoint num="0" id="1157" />
+<TGConnectingPoint num="1" id="1158" />
<extraparam>
<Data nbOfParams="5" />
<Param index="0" value="size" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1178" >
+<COMPONENT type="1000" id="1161" >
<cdparam x="367" y="70" />
<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="1177" />
+<TGConnectingPoint num="0" id="1160" />
</COMPONENT>
-<CONNECTOR type="115" id="1179" >
+<CONNECTOR type="115" id="1162" >
<cdparam x="517" y="165" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="374" y="234" id="1167" />
-<P2 x="374" y="285" id="1163" />
+<P1 x="374" y="234" id="1150" />
+<P2 x="374" y="285" id="1146" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1180" >
+<CONNECTOR type="115" id="1163" >
<cdparam x="429" y="323" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="374" y="325" id="1164" />
-<P2 x="374" y="366" id="1171" />
+<P1 x="374" y="325" id="1147" />
+<P2 x="374" y="366" id="1154" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1181" >
+<CONNECTOR type="115" id="1164" >
<cdparam x="374" y="90" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="374" y="90" id="1177" />
-<P2 x="374" y="128" id="1174" />
+<P1 x="374" y="90" id="1160" />
+<P2 x="374" y="128" id="1157" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1182" >
+<CONNECTOR type="115" id="1165" >
<cdparam x="369" y="357" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="374" y="396" id="1172" />
-<P2 x="374" y="438" id="1169" />
+<P1 x="374" y="396" id="1155" />
+<P2 x="374" y="438" id="1152" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1183" >
+<CONNECTOR type="115" id="1166" >
<cdparam x="374" y="175" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="374" y="158" id="1175" />
-<P2 x="374" y="204" id="1166" />
+<P1 x="374" y="158" id="1158" />
+<P2 x="374" y="204" id="1149" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="F_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="1169" >
+<cdparam x="324" y="132" />
+<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="cwpI_evt_in(size) " />
+<TGConnectingPoint num="0" id="1167" />
+<TGConnectingPoint num="1" id="1168" />
+<extraparam>
+<Data eventName="cwpI_evt_in" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1171" >
+<cdparam x="369" y="354" />
+<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="1170" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="1174" >
+<cdparam x="322" y="278" />
+<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="cwpI_evt_out(size)" />
+<TGConnectingPoint num="0" id="1172" />
+<TGConnectingPoint num="1" id="1173" />
+<extraparam>
+<Data eventName="cwpI_evt_out" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1007" id="1177" >
+<cdparam x="333" y="204" />
+<sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send request" value="cwpI_req(size)" />
+<TGConnectingPoint num="0" id="1175" />
+<TGConnectingPoint num="1" id="1176" />
+<extraparam>
+<Data requestName="cwpI_req" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1000" id="1179" >
+<cdparam x="372" y="66" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1178" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="1180" >
+<cdparam x="379" y="229" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="379" y="229" id="1176" />
+<P2 x="379" y="273" id="1172" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1181" >
+<cdparam x="379" y="303" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="379" y="303" id="1173" />
+<P2 x="379" y="349" id="1170" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1182" >
+<cdparam x="379" y="86" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="379" y="86" id="1178" />
+<P2 x="379" y="127" id="1167" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1183" >
+<cdparam x="419" y="149" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="379" y="157" id="1168" />
+<P2 x="379" y="199" id="1175" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -10956,11 +10956,11 @@ sequence diagram.
</COMPONENT>
<SUBCOMPONENT type="1101" id="5178" >
<father id="5266" num="0" />
-<cdparam x="1465" y="339" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1686" y="522" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
+<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
<TGConnectingPoint num="0" id="5170" />
<TGConnectingPoint num="1" id="5171" />
<TGConnectingPoint num="2" id="5172" />
@@ -10970,16 +10970,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="5176" />
<TGConnectingPoint num="7" id="5177" />
<extraparam>
-<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5187" >
<father id="5266" num="1" />
-<cdparam x="1466" y="395" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1685" y="459" />
+<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
+<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
<TGConnectingPoint num="0" id="5179" />
<TGConnectingPoint num="1" id="5180" />
<TGConnectingPoint num="2" id="5181" />
@@ -10989,16 +10989,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="5185" />
<TGConnectingPoint num="7" id="5186" />
<extraparam>
-<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5196" >
<father id="5266" num="2" />
-<cdparam x="1466" y="456" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1691" y="345" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
<TGConnectingPoint num="0" id="5188" />
<TGConnectingPoint num="1" id="5189" />
<TGConnectingPoint num="2" id="5190" />
@@ -11008,16 +11008,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="5194" />
<TGConnectingPoint num="7" id="5195" />
<extraparam>
-<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5205" >
<father id="5266" num="3" />
-<cdparam x="1466" y="518" />
-<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1688" y="405" />
+<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="228" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_Chip2Octet" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
<TGConnectingPoint num="0" id="5197" />
<TGConnectingPoint num="1" id="5198" />
<TGConnectingPoint num="2" id="5199" />
@@ -11027,16 +11027,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="5203" />
<TGConnectingPoint num="7" id="5204" />
<extraparam>
-<info value="Zigbee_TX::X_Chip2Octet" taskName="X_Chip2Octet" referenceTaskName="Zigbee_TX" priority="0" operation="X_Chip2Octet" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5214" >
<father id="5266" num="4" />
-<cdparam x="1688" y="405" />
-<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="518" />
+<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
+<cdrectangleparam minX="0" maxX="228" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_Chip2Octet" />
<TGConnectingPoint num="0" id="5206" />
<TGConnectingPoint num="1" id="5207" />
<TGConnectingPoint num="2" id="5208" />
@@ -11046,16 +11046,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="5212" />
<TGConnectingPoint num="7" id="5213" />
<extraparam>
-<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
+<info value="Zigbee_TX::X_Chip2Octet" taskName="X_Chip2Octet" referenceTaskName="Zigbee_TX" priority="0" operation="X_Chip2Octet" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5223" >
<father id="5266" num="5" />
-<cdparam x="1691" y="345" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="456" />
+<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
+<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
<TGConnectingPoint num="0" id="5215" />
<TGConnectingPoint num="1" id="5216" />
<TGConnectingPoint num="2" id="5217" />
@@ -11065,16 +11065,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="5221" />
<TGConnectingPoint num="7" id="5222" />
<extraparam>
-<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5232" >
<father id="5266" num="6" />
-<cdparam x="1685" y="459" />
-<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="395" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
<TGConnectingPoint num="0" id="5224" />
<TGConnectingPoint num="1" id="5225" />
<TGConnectingPoint num="2" id="5226" />
@@ -11084,16 +11084,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="5230" />
<TGConnectingPoint num="7" id="5231" />
<extraparam>
-<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
+<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5241" >
<father id="5266" num="7" />
-<cdparam x="1686" y="522" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1465" y="339" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
<TGConnectingPoint num="0" id="5233" />
<TGConnectingPoint num="1" id="5234" />
<TGConnectingPoint num="2" id="5235" />
@@ -11103,7 +11103,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="5239" />
<TGConnectingPoint num="7" id="5240" />
<extraparam>
-<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -11523,11 +11523,11 @@ sequence diagram.
</COMPONENT>
<SUBCOMPONENT type="1101" id="5534" >
<father id="5577" num="0" />
-<cdparam x="732" y="283" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="700" y="233" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
+<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
<TGConnectingPoint num="0" id="5526" />
<TGConnectingPoint num="1" id="5527" />
<TGConnectingPoint num="2" id="5528" />
@@ -11537,7 +11537,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="5532" />
<TGConnectingPoint num="7" id="5533" />
<extraparam>
-<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5543" >
@@ -11561,11 +11561,11 @@ sequence diagram.
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5552" >
<father id="5577" num="2" />
-<cdparam x="700" y="233" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="732" y="283" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
+<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
<TGConnectingPoint num="0" id="5544" />
<TGConnectingPoint num="1" id="5545" />
<TGConnectingPoint num="2" id="5546" />
@@ -11575,7 +11575,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="5550" />
<TGConnectingPoint num="7" id="5551" />
<extraparam>
-<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
</extraparam>
</SUBCOMPONENT>
@@ -12666,11 +12666,11 @@ sequence diagram.
</COMPONENT>
<SUBCOMPONENT type="1101" id="6029" >
<father id="6117" num="0" />
-<cdparam x="1686" y="522" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1465" y="339" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
<TGConnectingPoint num="0" id="6021" />
<TGConnectingPoint num="1" id="6022" />
<TGConnectingPoint num="2" id="6023" />
@@ -12680,16 +12680,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6027" />
<TGConnectingPoint num="7" id="6028" />
<extraparam>
-<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6038" >
<father id="6117" num="1" />
-<cdparam x="1696" y="456" />
-<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="395" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
<TGConnectingPoint num="0" id="6030" />
<TGConnectingPoint num="1" id="6031" />
<TGConnectingPoint num="2" id="6032" />
@@ -12699,16 +12699,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6036" />
<TGConnectingPoint num="7" id="6037" />
<extraparam>
-<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
+<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6047" >
<father id="6117" num="2" />
-<cdparam x="1691" y="345" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="456" />
+<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
+<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
<TGConnectingPoint num="0" id="6039" />
<TGConnectingPoint num="1" id="6040" />
<TGConnectingPoint num="2" id="6041" />
@@ -12718,16 +12718,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6045" />
<TGConnectingPoint num="7" id="6046" />
<extraparam>
-<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6056" >
<father id="6117" num="3" />
-<cdparam x="1688" y="405" />
-<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="518" />
+<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
+<cdrectangleparam minX="0" maxX="228" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Chip2Octet" />
<TGConnectingPoint num="0" id="6048" />
<TGConnectingPoint num="1" id="6049" />
<TGConnectingPoint num="2" id="6050" />
@@ -12737,16 +12737,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6054" />
<TGConnectingPoint num="7" id="6055" />
<extraparam>
-<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Chip2Octet" taskName="F_Chip2Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip2Octet" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6065" >
<father id="6117" num="4" />
-<cdparam x="1466" y="518" />
-<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1688" y="405" />
+<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="228" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Chip2Octet" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
<TGConnectingPoint num="0" id="6057" />
<TGConnectingPoint num="1" id="6058" />
<TGConnectingPoint num="2" id="6059" />
@@ -12756,16 +12756,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6063" />
<TGConnectingPoint num="7" id="6064" />
<extraparam>
-<info value="Zigbee_TX::F_Chip2Octet" taskName="F_Chip2Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip2Octet" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6074" >
<father id="6117" num="5" />
-<cdparam x="1466" y="456" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1691" y="345" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
<TGConnectingPoint num="0" id="6066" />
<TGConnectingPoint num="1" id="6067" />
<TGConnectingPoint num="2" id="6068" />
@@ -12775,16 +12775,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6072" />
<TGConnectingPoint num="7" id="6073" />
<extraparam>
-<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6083" >
<father id="6117" num="6" />
-<cdparam x="1466" y="395" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1696" y="456" />
+<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
+<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
<TGConnectingPoint num="0" id="6075" />
<TGConnectingPoint num="1" id="6076" />
<TGConnectingPoint num="2" id="6077" />
@@ -12794,16 +12794,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6081" />
<TGConnectingPoint num="7" id="6082" />
<extraparam>
-<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6092" >
<father id="6117" num="7" />
-<cdparam x="1465" y="339" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1686" y="522" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
+<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
<TGConnectingPoint num="0" id="6084" />
<TGConnectingPoint num="1" id="6085" />
<TGConnectingPoint num="2" id="6086" />
@@ -12813,7 +12813,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="6090" />
<TGConnectingPoint num="7" id="6091" />
<extraparam>
-<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -13233,11 +13233,11 @@ sequence diagram.
</COMPONENT>
<SUBCOMPONENT type="1101" id="6385" >
<father id="6428" num="0" />
-<cdparam x="639" y="239" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="671" y="289" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
+<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
<TGConnectingPoint num="0" id="6377" />
<TGConnectingPoint num="1" id="6378" />
<TGConnectingPoint num="2" id="6379" />
@@ -13247,7 +13247,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="6383" />
<TGConnectingPoint num="7" id="6384" />
<extraparam>
-<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6394" >
@@ -13271,11 +13271,11 @@ sequence diagram.
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6403" >
<father id="6428" num="2" />
-<cdparam x="671" y="289" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="639" y="239" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
+<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
<TGConnectingPoint num="0" id="6395" />
<TGConnectingPoint num="1" id="6396" />
<TGConnectingPoint num="2" id="6397" />
@@ -13285,7 +13285,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="6401" />
<TGConnectingPoint num="7" id="6402" />
<extraparam>
-<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
</extraparam>
</SUBCOMPONENT>
@@ -14375,11 +14375,11 @@ sequence diagram.
</COMPONENT>
<SUBCOMPONENT type="1101" id="6880" >
<father id="6968" num="0" />
-<cdparam x="1465" y="339" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1686" y="522" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
+<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
<TGConnectingPoint num="0" id="6872" />
<TGConnectingPoint num="1" id="6873" />
<TGConnectingPoint num="2" id="6874" />
@@ -14389,16 +14389,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6878" />
<TGConnectingPoint num="7" id="6879" />
<extraparam>
-<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6889" >
<father id="6968" num="1" />
-<cdparam x="1466" y="395" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1685" y="459" />
+<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
+<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
<TGConnectingPoint num="0" id="6881" />
<TGConnectingPoint num="1" id="6882" />
<TGConnectingPoint num="2" id="6883" />
@@ -14408,16 +14408,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6887" />
<TGConnectingPoint num="7" id="6888" />
<extraparam>
-<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6898" >
<father id="6968" num="2" />
-<cdparam x="1466" y="456" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1691" y="345" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
<TGConnectingPoint num="0" id="6890" />
<TGConnectingPoint num="1" id="6891" />
<TGConnectingPoint num="2" id="6892" />
@@ -14427,16 +14427,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6896" />
<TGConnectingPoint num="7" id="6897" />
<extraparam>
-<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6907" >
<father id="6968" num="3" />
-<cdparam x="1466" y="518" />
-<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1688" y="405" />
+<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="228" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Chip2Octet" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
<TGConnectingPoint num="0" id="6899" />
<TGConnectingPoint num="1" id="6900" />
<TGConnectingPoint num="2" id="6901" />
@@ -14446,16 +14446,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6905" />
<TGConnectingPoint num="7" id="6906" />
<extraparam>
-<info value="Zigbee_TX::F_Chip2Octet" taskName="F_Chip2Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip2Octet" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6916" >
<father id="6968" num="4" />
-<cdparam x="1688" y="405" />
-<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="518" />
+<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
+<cdrectangleparam minX="0" maxX="228" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Chip2Octet" />
<TGConnectingPoint num="0" id="6908" />
<TGConnectingPoint num="1" id="6909" />
<TGConnectingPoint num="2" id="6910" />
@@ -14465,16 +14465,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6914" />
<TGConnectingPoint num="7" id="6915" />
<extraparam>
-<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Chip2Octet" taskName="F_Chip2Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip2Octet" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6925" >
<father id="6968" num="5" />
-<cdparam x="1691" y="345" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="456" />
+<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
+<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
<TGConnectingPoint num="0" id="6917" />
<TGConnectingPoint num="1" id="6918" />
<TGConnectingPoint num="2" id="6919" />
@@ -14484,16 +14484,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6923" />
<TGConnectingPoint num="7" id="6924" />
<extraparam>
-<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6934" >
<father id="6968" num="6" />
-<cdparam x="1685" y="459" />
-<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="395" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
<TGConnectingPoint num="0" id="6926" />
<TGConnectingPoint num="1" id="6927" />
<TGConnectingPoint num="2" id="6928" />
@@ -14503,16 +14503,16 @@ sequence diagram.
<TGConnectingPoint num="6" id="6932" />
<TGConnectingPoint num="7" id="6933" />
<extraparam>
-<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
+<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="6943" >
<father id="6968" num="7" />
-<cdparam x="1686" y="522" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1465" y="339" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
<TGConnectingPoint num="0" id="6935" />
<TGConnectingPoint num="1" id="6936" />
<TGConnectingPoint num="2" id="6937" />
@@ -14522,7 +14522,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="6941" />
<TGConnectingPoint num="7" id="6942" />
<extraparam>
-<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -14942,11 +14942,11 @@ sequence diagram.
</COMPONENT>
<SUBCOMPONENT type="1101" id="7236" >
<father id="7279" num="0" />
-<cdparam x="671" y="289" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="639" y="239" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
+<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
<TGConnectingPoint num="0" id="7228" />
<TGConnectingPoint num="1" id="7229" />
<TGConnectingPoint num="2" id="7230" />
@@ -14956,7 +14956,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="7234" />
<TGConnectingPoint num="7" id="7235" />
<extraparam>
-<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="7245" >
@@ -14980,11 +14980,11 @@ sequence diagram.
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="7254" >
<father id="7279" num="2" />
-<cdparam x="639" y="239" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="671" y="289" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
+<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
<TGConnectingPoint num="0" id="7246" />
<TGConnectingPoint num="1" id="7247" />
<TGConnectingPoint num="2" id="7248" />
@@ -14994,7 +14994,7 @@ sequence diagram.
<TGConnectingPoint num="6" id="7252" />
<TGConnectingPoint num="7" id="7253" />
<extraparam>
-<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
</extraparam>
</SUBCOMPONENT>
diff --git a/src/main/java/ui/avatarpd/AvatarPDProperty.java b/src/main/java/ui/avatarpd/AvatarPDProperty.java
index 52df0fac39..d1e1193873 100644
--- a/src/main/java/ui/avatarpd/AvatarPDProperty.java
+++ b/src/main/java/ui/avatarpd/AvatarPDProperty.java
@@ -245,7 +245,7 @@ public class AvatarPDProperty extends TGCScalableWithInternalComponent implement
String oldValue = value;
JDialogAvatarProperty jdap = new JDialogAvatarProperty(frame, value, kind, not);
// jdap.setSize(300, 280);
- GraphicLib.centerOnParent(jdap, 300, 280);
+ GraphicLib.centerOnParent(jdap, 400, 280);
jdap.setVisible(true); // blocked until dialog has been closed
if (jdap.hasBeenCancelled()) {
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index 26b1fab3a5..7fde2f61a8 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -422,7 +422,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
JDialogRequirement jdr = new JDialogRequirement(tdp.getGUI().getFrame(), "Setting attributes of Requirement " + getRequirementName(), id, text, kind, criticality, va, reqType, atn, referenceElements);
// jdr.setSize(750, 400);
- GraphicLib.centerOnParent(jdr, 750, 400);
+ GraphicLib.centerOnParent(jdr, 800, 400);
jdr.setVisible(true);
if (!jdr.isRegularClose()) {
diff --git a/src/main/java/ui/tmlcp/TMLCPForLoop.java b/src/main/java/ui/tmlcp/TMLCPForLoop.java
index 2f25ac9e78..19808cab1d 100755
--- a/src/main/java/ui/tmlcp/TMLCPForLoop.java
+++ b/src/main/java/ui/tmlcp/TMLCPForLoop.java
@@ -37,8 +37,6 @@
*/
-
-
package ui.tmlcp;
import myutil.GraphicLib;
@@ -57,13 +55,14 @@ import java.awt.geom.Line2D;
* Class TMLCPForLoop
* For loop of a TML activity diagram
* Creation: 03/06/2015
- * @version 1.0 03/06/2015
+ *
* @author Ludovic APVRILLE
+ * @version 1.0 03/06/2015
*/
public class TMLCPForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, BasicErrorHighlight {
protected int lineLength = 5;
- protected int textX = 5;
- protected int textY = 15;
+ protected int textX = 5;
+ protected int textY = 15;
protected int arc = 5;
protected String init = "i=0";
@@ -72,7 +71,7 @@ public class TMLCPForLoop extends TGCWithoutInternalComponent implements Embedde
protected int stateOfError = 0; // Not yet checked
- public TMLCPForLoop(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ public TMLCPForLoop(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
width = 30;
@@ -97,38 +96,38 @@ public class TMLCPForLoop extends TGCWithoutInternalComponent implements Embedde
}
public void internalDrawing(Graphics g) {
- final int textWidth = g.getFontMetrics().stringWidth(value);
+ final int textWidth = g.getFontMetrics().stringWidth(value);
int w1 = Math.max(minWidth, textWidth + 2 * textX);
if ((w1 != width) & (!tdp.isScaled())) {
- setCd(x + width/2 - w1/2, y);
+ setCd(x + width / 2 - w1 / 2, y);
width = w1;
//updateConnectingPoints();
}
- if (stateOfError > 0) {
+ if (stateOfError > 0) {
Color c = g.getColor();
- switch(stateOfError) {
- case ErrorHighlight.OK:
- g.setColor(ColorManager.FOR);
- break;
- default:
- g.setColor(ColorManager.UNKNOWN_BOX_ACTION);
+ switch (stateOfError) {
+ case ErrorHighlight.OK:
+ g.setColor(ColorManager.FOR);
+ break;
+ default:
+ g.setColor(ColorManager.UNKNOWN_BOX_ACTION);
}
g.fillRoundRect(x, y, width, height, arc, arc);
g.setColor(c);
}
g.drawRoundRect(x, y, width, height, arc, arc);
- g.drawLine(x+(width/2), y, x+(width/2), y - lineLength);
- g.drawLine(x+(width/2), y+height, x+(width/2), y + lineLength + height);
- g.drawLine(x+width, y+height/2, x+width +lineLength, y+height/2);
+ g.drawLine(x + (width / 2), y, x + (width / 2), y - lineLength);
+ g.drawLine(x + (width / 2), y + height, x + (width / 2), y + lineLength + height);
+ g.drawLine(x + width, y + height / 2, x + width + lineLength, y + height / 2);
- g.drawString(value, x + (width - textWidth) / 2 , y + textY);
+ g.drawString(value, x + (width - textWidth) / 2, y + textY);
}
public boolean editOndoubleClick(JFrame frame) {
- String [] labels = new String[3];
- String [] values = new String[3];
+ String[] labels = new String[3];
+ String[] values = new String[3];
labels[0] = "Initialisation of variable";
values[0] = init;
labels[1] = "Condition to stay in loop";
@@ -138,9 +137,9 @@ public class TMLCPForLoop extends TGCWithoutInternalComponent implements Embedde
JDialogMultiString jdms = new JDialogMultiString(frame, "Setting loop's properties", 3, labels, values);
- // jdms.setSize(400, 300);
+ // jdms.setSize(400, 300);
GraphicLib.centerOnParent(jdms, 400, 300);
- jdms.setVisible( true ); // blocked until dialog has been closed
+ jdms.setVisible(true); // blocked until dialog has been closed
if (jdms.hasBeenSet()) {
init = jdms.getString(0);
@@ -160,11 +159,11 @@ public class TMLCPForLoop extends TGCWithoutInternalComponent implements Embedde
return this;
}
- if ((int)(Line2D.ptSegDistSq(x+(width/2), y-lineLength, x+(width/2), y + lineLength + height, _x, _y)) < distanceSelected) {
+ if ((int) (Line2D.ptSegDistSq(x + (width / 2), y - lineLength, x + (width / 2), y + lineLength + height, _x, _y)) < distanceSelected) {
return this;
}
- if ((int)(Line2D.ptSegDistSq(x+width, y+height/2, x+width +lineLength, y+height/2, _x, _y)) < distanceSelected) {
+ if ((int) (Line2D.ptSegDistSq(x + width, y + height / 2, x + width + lineLength, y + height / 2, _x, _y)) < distanceSelected) {
return this;
}
@@ -205,7 +204,7 @@ public class TMLCPForLoop extends TGCWithoutInternalComponent implements Embedde
}
@Override
- public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+ public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException {
//System.out.println("*** load extra synchro *** " + getId());
try {
@@ -218,12 +217,12 @@ public class TMLCPForLoop extends TGCWithoutInternalComponent implements Embedde
//System.out.println("Loading Synchronization gates");
//System.out.println(nl.toString());
- for(int i=0; i<nl.getLength(); i++) {
+ for (int i = 0; i < nl.getLength(); i++) {
n1 = nl.item(i);
//System.out.println(n1);
if (n1.getNodeType() == Node.ELEMENT_NODE) {
nli = n1.getChildNodes();
- for(int j=0; j<nli.getLength(); j++) {
+ for (int j = 0; j < nli.getLength(); j++) {
n2 = nli.item(j);
//System.out.println(n2);
if (n2.getNodeType() == Node.ELEMENT_NODE) {
@@ -251,7 +250,7 @@ public class TMLCPForLoop extends TGCWithoutInternalComponent implements Embedde
}
public int getDefaultConnector() {
- return TGComponentManager.CONNECTOR_TMLCP;
+ return TGComponentManager.CONNECTOR_TMLCP;
}
public void setStateAction(int _stateAction) {
diff --git a/src/main/java/ui/window/JDialogAvatarProperty.java b/src/main/java/ui/window/JDialogAvatarProperty.java
index fc1259647f..2fc830f1e9 100755
--- a/src/main/java/ui/window/JDialogAvatarProperty.java
+++ b/src/main/java/ui/window/JDialogAvatarProperty.java
@@ -162,6 +162,7 @@ public class JDialogAvatarProperty extends JDialogBase implements ActionListener
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c0.fill = GridBagConstraints.BOTH;
c.add(panel1, c0);
diff --git a/src/main/java/ui/window/JDialogAvatarState.java b/src/main/java/ui/window/JDialogAvatarState.java
index 807e052e7a..9f5ada18d7 100755
--- a/src/main/java/ui/window/JDialogAvatarState.java
+++ b/src/main/java/ui/window/JDialogAvatarState.java
@@ -201,6 +201,7 @@ public class JDialogAvatarState extends JDialogBase implements ActionListener {
jtp.setPreferredSize( new Dimension( 400, 450 ) );
jtp.add("General", panel11);
jtp.add("Prototyping", panel2);
+ c0.fill = GridBagConstraints.BOTH;
c.add(jtp, c0);
c0.gridwidth = 1;
diff --git a/src/main/java/ui/window/JDialogBase.java b/src/main/java/ui/window/JDialogBase.java
index 2d39b04d28..4e4dd62806 100644
--- a/src/main/java/ui/window/JDialogBase.java
+++ b/src/main/java/ui/window/JDialogBase.java
@@ -46,20 +46,37 @@ public class JDialogBase extends JDialog {
protected void initButtons(GridBagConstraints c0, Container c,
ActionListener al) {
+ initMainButtons(c0, c, al, false, "Save and Close", "Cancel");
+ }
+
+ protected void initMainButtons(GridBagConstraints c0, Container c,
+ ActionListener al, boolean isInverse, String closeButtonStr, String cancelButtonStr) {
//Close Button
- closeButton = new JButton("Save and Close", IconManager.imgic25);
- closeButton.addActionListener(al);
- c.add(closeButton, c0);
-
- c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-
- //Cancel Button
- cancelButton = new JButton("Cancel", IconManager.imgic27);
- cancelButton.addActionListener(al);
- c.add(cancelButton, c0);
-
- //Add closeButton's behaviour on Enter key
- this.getRootPane().setDefaultButton(closeButton);
+ if (isInverse) {
+ closeButton = new JButton(closeButtonStr, IconManager.imgic25);
+ closeButton.addActionListener(al);
+ c.add(closeButton, c0);
+
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+ //Cancel Button
+ cancelButton = new JButton(cancelButtonStr, IconManager.imgic27);
+ cancelButton.addActionListener(al);
+ c.add(cancelButton, c0);
+ } else {
+ cancelButton = new JButton(cancelButtonStr, IconManager.imgic27);
+ cancelButton.addActionListener(al);
+ c.add(cancelButton, c0);
+
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+ closeButton = new JButton(closeButtonStr, IconManager.imgic25);
+ closeButton.addActionListener(al);
+ c.add(closeButton, c0);
+ }
+
+ //Add closeButton's behaviour on Enter key
+ this.getRootPane().setDefaultButton(closeButton);
}
diff --git a/src/main/java/ui/window/JDialogConstraint.java b/src/main/java/ui/window/JDialogConstraint.java
index f4e8428a5d..32408717b1 100755
--- a/src/main/java/ui/window/JDialogConstraint.java
+++ b/src/main/java/ui/window/JDialogConstraint.java
@@ -125,6 +125,7 @@ public class JDialogConstraint extends JDialogBase implements ActionListener {
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c0.fill = GridBagConstraints.BOTH;
c.add(panel2, c0);
c0.gridwidth = 1;
diff --git a/src/main/java/ui/window/JDialogModelChecking.java b/src/main/java/ui/window/JDialogModelChecking.java
index aaf1595a55..aa649c5d59 100755
--- a/src/main/java/ui/window/JDialogModelChecking.java
+++ b/src/main/java/ui/window/JDialogModelChecking.java
@@ -37,13 +37,11 @@
*/
-
-
package ui.window;
-import ui.util.IconManager;
import ui.TClassInterface;
import ui.TGComponent;
+import ui.util.IconManager;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -55,13 +53,14 @@ import java.util.Iterator;
import java.util.LinkedList;
/**
- * Class JDialogModelChecking
- * Dialog for managing Tclasses to be validated
- * Creation: 13/12/2003
- * @version 1.0 13/12/2003
- * @author Ludovic APVRILLE
+ * Class JDialogModelChecking
+ * Dialog for managing Tclasses to be validated
+ * Creation: 13/12/2003
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 13/12/2003
*/
-public class JDialogModelChecking extends JDialogBase implements ActionListener, ListSelectionListener {
+public class JDialogModelChecking extends JDialogBase implements ActionListener, ListSelectionListener {
public static java.util.List<TClassInterface> validated, ignored;
private static boolean overideSyntaxChecking = false;
@@ -77,7 +76,9 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
private JButton allIgnored;
protected JCheckBox syntax;
- /** Creates new form */
+ /**
+ * Creates new form
+ */
public JDialogModelChecking(Frame f, LinkedList<TClassInterface> _back, java.util.List<TGComponent> componentList, String title) {
super(f, title, true);
@@ -86,7 +87,7 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
if ((validated == null) || (ignored == null)) {
val = makeNewVal(componentList);
//System.out.println("Val size: " + val.size() + "component list:" + componentList.size());
- ign = new LinkedList<TClassInterface> ();
+ ign = new LinkedList<TClassInterface>();
} else {
val = validated;
ign = ignored;
@@ -101,28 +102,28 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
}
private java.util.List<TClassInterface> makeNewVal(java.util.List<TGComponent> list) {
- java.util.List<TClassInterface> v = new LinkedList<TClassInterface> ();
+ java.util.List<TClassInterface> v = new LinkedList<TClassInterface>();
- for (TGComponent tgc: list)
+ for (TGComponent tgc : list)
if (tgc instanceof TClassInterface)
- v.add ((TClassInterface) tgc);
+ v.add((TClassInterface) tgc);
return v;
}
private void checkTClasses(java.util.List<TClassInterface> tobeChecked, java.util.List<TGComponent> source) {
- Iterator<TClassInterface> iter = tobeChecked.iterator ();
- while (iter.hasNext ()) {
- TClassInterface t = iter.next ();
+ Iterator<TClassInterface> iter = tobeChecked.iterator();
+ while (iter.hasNext()) {
+ TClassInterface t = iter.next();
if (!source.contains(t))
- iter.remove ();
+ iter.remove();
}
}
public void addNewTclasses(java.util.List<TClassInterface> added, java.util.List<TGComponent> source, java.util.List<TClassInterface> notSource) {
- for (TGComponent tgc: source)
+ for (TGComponent tgc : source)
if ((tgc instanceof TClassInterface) && (!added.contains(tgc)) && (!notSource.contains(tgc)))
- added.add ((TClassInterface) tgc);
+ added.add((TClassInterface) tgc);
}
private void myInitComponents() {
@@ -133,35 +134,39 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
Container c = getContentPane();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c1 = new GridBagConstraints();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
setFont(new Font("Helvetica", Font.PLAIN, 14));
- c.setLayout(new BorderLayout());
+ //c.setLayout(new BorderLayout());
+ c.setLayout(gridbag0);
+ JPanel mainPanel = new JPanel(new BorderLayout());
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
// ignored list
panel1 = new JPanel();
panel1.setLayout(new BorderLayout());
panel1.setBorder(new javax.swing.border.TitledBorder("Ignored"));
- listIgnored = new JList<TClassInterface> (ign.toArray (new TClassInterface[0]));
+ listIgnored = new JList<TClassInterface>(ign.toArray(new TClassInterface[0]));
//listIgnored.setPreferredSize(new Dimension(200, 250));
- listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listIgnored.addListSelectionListener(this);
JScrollPane scrollPane1 = new JScrollPane(listIgnored);
panel1.add(scrollPane1, BorderLayout.CENTER);
panel1.setPreferredSize(new Dimension(200, 250));
- c.add(panel1, BorderLayout.WEST);
+ mainPanel.add(panel1, BorderLayout.WEST);
// validated list
panel2 = new JPanel();
panel2.setLayout(new BorderLayout());
panel2.setBorder(new javax.swing.border.TitledBorder("Taken into account"));
- listValidated = new JList<TClassInterface> (val.toArray (new TClassInterface[0]));
+ listValidated = new JList<TClassInterface>(val.toArray(new TClassInterface[0]));
//listValidated.setPreferredSize(new Dimension(200, 250));
- listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listValidated.addListSelectionListener(this);
JScrollPane scrollPane2 = new JScrollPane(listValidated);
panel2.add(scrollPane2, BorderLayout.CENTER);
panel2.setPreferredSize(new Dimension(200, 250));
- c.add(panel2, BorderLayout.EAST);
+ mainPanel.add(panel2, BorderLayout.EAST);
// central buttons
panel3 = new JPanel();
@@ -199,9 +204,15 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
allIgnored.setActionCommand("allIgnored");
panel3.add(allIgnored, c1);
- c.add(panel3, BorderLayout.CENTER);
+ mainPanel.add(panel3, BorderLayout.CENTER);
// main panel;
+ c0.gridwidth = 1;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c0.fill = GridBagConstraints.BOTH;
panel6 = new JPanel();
panel6.setLayout(new BorderLayout());
@@ -229,19 +240,20 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
panel6.add(panel5, BorderLayout.NORTH);
panel6.add(panel4, BorderLayout.SOUTH);
- c.add(panel6, BorderLayout.SOUTH);
+ c.add(mainPanel, c0);
+ c.add(panel6, c0);
}
- public void actionPerformed(ActionEvent evt) {
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
// Compare the action command to the known actions.
- if (command.equals("Start Syntax Analysis")) {
+ if (command.equals("Start Syntax Analysis")) {
closeDialog();
} else if (command.equals("Cancel")) {
cancelDialog();
- } else if (command.equals("addOneIgnored")) {
+ } else if (command.equals("addOneIgnored")) {
addOneIgnored();
} else if (command.equals("addOneValidated")) {
addOneValidated();
@@ -254,48 +266,48 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
private void addOneIgnored() {
- for (TClassInterface c: this.listValidated.getSelectedValuesList ()) {
- ign.add (c);
- val.remove (c);
+ for (TClassInterface c : this.listValidated.getSelectedValuesList()) {
+ ign.add(c);
+ val.remove(c);
}
- listIgnored.setListData(ign.toArray (new TClassInterface [0]));
- listValidated.setListData(val.toArray (new TClassInterface [0]));
+ listIgnored.setListData(ign.toArray(new TClassInterface[0]));
+ listValidated.setListData(val.toArray(new TClassInterface[0]));
this.setButtons();
}
private void addOneValidated() {
- for (TClassInterface c: this.listIgnored.getSelectedValuesList ()) {
- ign.remove (c);
- val.add (c);
+ for (TClassInterface c : this.listIgnored.getSelectedValuesList()) {
+ ign.remove(c);
+ val.add(c);
}
- listIgnored.setListData(ign.toArray (new TClassInterface [0]));
- listValidated.setListData(val.toArray (new TClassInterface [0]));
+ listIgnored.setListData(ign.toArray(new TClassInterface[0]));
+ listValidated.setListData(val.toArray(new TClassInterface[0]));
setButtons();
}
private void allValidated() {
- val.addAll (ign);
- ign.clear ();
- listIgnored.setListData(ign.toArray (new TClassInterface[0]));
- listValidated.setListData(val.toArray (new TClassInterface[0]));
+ val.addAll(ign);
+ ign.clear();
+ listIgnored.setListData(ign.toArray(new TClassInterface[0]));
+ listValidated.setListData(val.toArray(new TClassInterface[0]));
this.setButtons();
}
private void allIgnored() {
ign.addAll(val);
- val.clear ();
- listIgnored.setListData(ign.toArray (new TClassInterface[0]));
- listValidated.setListData(val.toArray (new TClassInterface[0]));
+ val.clear();
+ listIgnored.setListData(ign.toArray(new TClassInterface[0]));
+ listValidated.setListData(val.toArray(new TClassInterface[0]));
setButtons();
}
public void closeDialog() {
- back.clear ();
- for(int i=0; i<val.size(); i++) {
- back.add (val.get (i));
+ back.clear();
+ for (int i = 0; i < val.size(); i++) {
+ back.add(val.get(i));
}
validated = val;
ignored = ign;
@@ -325,13 +337,13 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
//listIgnored.clearSelection();
}
- if (ign.size() ==0) {
+ if (ign.size() == 0) {
allValidated.setEnabled(false);
} else {
allValidated.setEnabled(true);
}
- if (val.size() ==0) {
+ if (val.size() == 0) {
allIgnored.setEnabled(false);
closeButton.setEnabled(false);
} else {
@@ -346,9 +358,9 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
public int nbStart() {
int cpt = 0;
- for (TClassInterface t: val)
+ for (TClassInterface t : val)
if (t.isStart())
- cpt ++;
+ cpt++;
return cpt;
}
diff --git a/src/main/java/ui/window/JDialogMultiString.java b/src/main/java/ui/window/JDialogMultiString.java
index 5b15a85594..102f2ca047 100755
--- a/src/main/java/ui/window/JDialogMultiString.java
+++ b/src/main/java/ui/window/JDialogMultiString.java
@@ -37,12 +37,8 @@
*/
-
-
package ui.window;
-import ui.util.IconManager;
-
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
@@ -51,16 +47,17 @@ import java.util.ArrayList;
import java.util.HashMap;
/**
- * Class JDialogMultiString
- * Dialog for managing several string components
- * Creation: 18/11/2005
- * @version 1.0 18/11/2005
- * @author Ludovic APVRILLE
+ * Class JDialogMultiString
+ * Dialog for managing several string components
+ * Creation: 18/11/2005
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 18/11/2005
*/
-public class JDialogMultiString extends JDialogBase implements ActionListener {
+public class JDialogMultiString extends JDialogBase implements ActionListener {
- private String [] labels;
- private String [] values;
+ private String[] labels;
+ private String[] values;
private int nbString;
@@ -69,14 +66,16 @@ public class JDialogMultiString extends JDialogBase implements ActionListener {
private JPanel panel1;
// Panel1
- private JTextField [] texts;
+ private JTextField[] texts;
private JButton inserts[];
private HashMap<Integer, JComboBox<String>> helps;
private ArrayList<String[]> possibleValues = null;
- /** Creates new form */
+ /**
+ * Creates new form
+ */
// arrayDelay: [0] -> minDelay ; [1] -> maxDelay
public JDialogMultiString(Frame f, String title, int _nbString, String[] _labels, String[] _values) {
@@ -87,7 +86,6 @@ public class JDialogMultiString extends JDialogBase implements ActionListener {
values = _values;
-
texts = new JTextField[nbString];
initComponents();
@@ -116,8 +114,8 @@ public class JDialogMultiString extends JDialogBase implements ActionListener {
}
private void initComponents() {
- inserts = new JButton[labels.length];
- helps = new HashMap<>();
+ inserts = new JButton[labels.length];
+ helps = new HashMap<>();
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
@@ -155,24 +153,24 @@ public class JDialogMultiString extends JDialogBase implements ActionListener {
c1.anchor = GridBagConstraints.CENTER;
// String1
- for(int i=0; i<nbString; i++) {
- c1.gridwidth = 1;
+ for (int i = 0; i < nbString; i++) {
+ c1.gridwidth = 1;
panel1.add(new JLabel(labels[i] + " = "), c1);
-
+
if (possibleValues != null) {
if (i < possibleValues.size()) {
- String [] tmp = possibleValues.get(i);
+ String[] tmp = possibleValues.get(i);
if (tmp != null) {
helps.put(i, new JComboBox<>(tmp));
panel1.add(helps.get(i), c1);
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- inserts[i] = new JButton("Use");
- inserts[i].addActionListener(this);
- panel1.add(inserts[i], c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ inserts[i] = new JButton("Use");
+ inserts[i].addActionListener(this);
+ panel1.add(inserts[i], c1);
}
}
}
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
texts[i] = new JTextField(values[i], 15);
panel1.add(texts[i], c1);
}
@@ -184,31 +182,31 @@ public class JDialogMultiString extends JDialogBase implements ActionListener {
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-
+ c0.fill = GridBagConstraints.BOTH;
c.add(panel1, c0);
c0.gridwidth = 1;
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
-
+
initButtons(c0, c, this);
}
- public void actionPerformed(ActionEvent evt) {
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
// Compare the action command to the known actions.
- if (command.equals("Save and Close")) {
+ if (command.equals("Save and Close")) {
closeDialog();
} else if (command.equals("Cancel")) {
cancelDialog();
} else if (inserts != null) {
- for(int i=0; i<inserts.length; i++) {
- if (evt.getSource() == inserts[i]) {
- texts[i].setText(helps.get(i).getSelectedItem().toString());
- }
- }
- }
+ for (int i = 0; i < inserts.length; i++) {
+ if (evt.getSource() == inserts[i]) {
+ texts[i].setText(helps.get(i).getSelectedItem().toString());
+ }
+ }
+ }
}
diff --git a/src/main/java/ui/window/JDialogMultiStringCP.java b/src/main/java/ui/window/JDialogMultiStringCP.java
index b65c0f2257..a1f6c7427a 100755
--- a/src/main/java/ui/window/JDialogMultiStringCP.java
+++ b/src/main/java/ui/window/JDialogMultiStringCP.java
@@ -37,12 +37,8 @@
*/
-
-
package ui.window;
-import ui.util.IconManager;
-
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
@@ -52,63 +48,66 @@ import java.awt.event.ActionListener;
* Class JDialogMultiStringCP
* Dialog for managing several string components
* Creation: 18/11/2005
- * @version 1.0 18/11/2005
+ *
* @author Ludovic APVRILLE
+ * @version 1.0 18/11/2005
*/
-public class JDialogMultiStringCP extends JDialogBase implements ActionListener {
-
- private String [] labels;
- private String [] values;
-
+public class JDialogMultiStringCP extends JDialogBase implements ActionListener {
+
+ private String[] labels;
+ private String[] values;
+
private int nbString;
-
+
private boolean set = false;
-
+
private JPanel panel1;
-
+
// Panel1
- private JTextField [] texts;
-
- /** Creates new form */
+ private JTextField[] texts;
+
+ /**
+ * Creates new form
+ */
// arrayDelay: [0] -> minDelay ; [1] -> maxDelay
public JDialogMultiStringCP(Frame f, String title, int _nbString, String[] _labels, String[] _values) {
-
+
super(f, title, true);
-
+
nbString = _nbString;
labels = _labels;
values = _values;
-
+
texts = new JTextField[nbString];
-
+
initComponents();
myInitComponents();
pack();
}
-
-
+
+
private void myInitComponents() {
}
-
+
private void initComponents() {
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c0 = new GridBagConstraints();
GridBagConstraints c1 = new GridBagConstraints();
-
+
setFont(new Font("Helvetica", Font.PLAIN, 14));
c.setLayout(gridbag0);
-
+
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
+
panel1 = new JPanel();
panel1.setLayout(gridbag1);
-
+
panel1.setBorder(new javax.swing.border.TitledBorder("Properties"));
-
+
panel1.setPreferredSize(new Dimension(300, 200));
-
+
// first line panel1
c1.weighty = 1.0;
c1.weightx = 1.0;
@@ -116,7 +115,7 @@ public class JDialogMultiStringCP extends JDialogBase implements ActionListener
c1.fill = GridBagConstraints.BOTH;
c1.gridheight = 1;
panel1.add(new JLabel(" "), c1);
-
+
// second line panel1
c1.gridwidth = 1;
c1.gridheight = 1;
@@ -125,62 +124,63 @@ public class JDialogMultiStringCP extends JDialogBase implements ActionListener
c1.anchor = GridBagConstraints.CENTER;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.anchor = GridBagConstraints.CENTER;
-
+
// String1
- for(int i=0; i<nbString; i++) {
+ for (int i = 0; i < nbString; i++) {
panel1.add(new JLabel(labels[i] + " = "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
texts[i] = new JTextField(values[i], 15);
panel1.add(texts[i], c1);
}
-
-
+
+
// main panel;
c0.gridwidth = 1;
c0.gridheight = 10;
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-
+ c0.fill = GridBagConstraints.BOTH;
+
c.add(panel1, c0);
-
+
c0.gridwidth = 1;
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
-
+
initButtons(c0, c, this);
}
-
- public void actionPerformed(ActionEvent evt) {
+
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
-
+
// Compare the action command to the known actions.
- if (command.equals("Save and Close")) {
+ if (command.equals("Save and Close")) {
closeDialog();
} else if (command.equals("Cancel")) {
cancelDialog();
}
}
-
-
+
+
public void closeDialog() {
set = true;
dispose();
}
-
+
public String getString(int i) {
return texts[i].getText();
}
-
- public boolean hasValidString(int i) {
+
+ public boolean hasValidString(int i) {
return texts[i].getText().length() > 0;
}
-
-
+
+
public boolean hasBeenSet() {
return set;
}
-
+
public void cancelDialog() {
dispose();
}
diff --git a/src/main/java/ui/window/JDialogRequirement.java b/src/main/java/ui/window/JDialogRequirement.java
index 8501fc651c..d9dc61a6c5 100755
--- a/src/main/java/ui/window/JDialogRequirement.java
+++ b/src/main/java/ui/window/JDialogRequirement.java
@@ -157,6 +157,7 @@ public class JDialogRequirement extends JDialogBase implements ActionListener {
c1.gridheight = 1;
c1.weighty = 1.0;
c1.weightx = 1.0;
+ c1.fill = GridBagConstraints.BOTH;
jta = new JTextArea();
jta.setEditable(true);
jta.setMargin(new Insets(10, 10, 10, 10));
@@ -165,8 +166,8 @@ public class JDialogRequirement extends JDialogBase implements ActionListener {
jta.setFont(new Font("times", Font.PLAIN, 12));
JScrollPane jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
- jsp.setPreferredSize(new Dimension(300, 200));
- panel1.add(jsp);
+ //jsp.setPreferredSize(new Dimension(300, 200));
+ panel1.add(jsp, c1);
//}
// Panel2
@@ -282,6 +283,7 @@ public class JDialogRequirement extends JDialogBase implements ActionListener {
c0.gridheight = 10;
c0.weighty = 1.0;
c0.weightx = 1.0;
+ c0.fill = GridBagConstraints.BOTH;
c.add(panel1, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
diff --git a/src/main/java/ui/window/JDialogSelectAvatarBlock.java b/src/main/java/ui/window/JDialogSelectAvatarBlock.java
index 03e65caa0c..98cb245ad0 100755
--- a/src/main/java/ui/window/JDialogSelectAvatarBlock.java
+++ b/src/main/java/ui/window/JDialogSelectAvatarBlock.java
@@ -37,12 +37,10 @@
*/
-
-
package ui.window;
-import ui.util.IconManager;
import ui.avatarbd.AvatarBDStateMachineOwner;
+import ui.util.IconManager;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -58,10 +56,11 @@ import java.util.LinkedList;
* Class JDialogSelectAvatarBlock
* Dialog for managing blocks to be validated
* Creation: 18/05/2010
- * @version 1.0 18/05/2010
+ *
* @author Ludovic APVRILLE
+ * @version 1.0 18/05/2010
*/
-public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListener, ListSelectionListener {
+public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListener, ListSelectionListener {
public LinkedList<AvatarBDStateMachineOwner> validated, ignored;
private boolean optimized = true;
@@ -77,8 +76,10 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
private boolean hasBeenCancelled = true;
- /** Creates new form */
- public JDialogSelectAvatarBlock(Frame f, LinkedList<AvatarBDStateMachineOwner> _back, LinkedList<AvatarBDStateMachineOwner> componentList, String title, LinkedList <AvatarBDStateMachineOwner> _validated, LinkedList <AvatarBDStateMachineOwner> _ignored, boolean _optimized) {
+ /**
+ * Creates new form
+ */
+ public JDialogSelectAvatarBlock(Frame f, LinkedList<AvatarBDStateMachineOwner> _back, LinkedList<AvatarBDStateMachineOwner> componentList, String title, LinkedList<AvatarBDStateMachineOwner> _validated, LinkedList<AvatarBDStateMachineOwner> _ignored, boolean _optimized) {
super(f, title, true);
back = _back;
@@ -88,7 +89,7 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
if ((validated == null) || (ignored == null)) {
val = new LinkedList<>(componentList);
- ign = new LinkedList<> ();
+ ign = new LinkedList<>();
} else {
val = validated;
ign = ignored;
@@ -103,19 +104,19 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
}
private void checkTask(LinkedList<AvatarBDStateMachineOwner> tobeChecked, LinkedList<AvatarBDStateMachineOwner> source) {
- Iterator<AvatarBDStateMachineOwner> iterator = tobeChecked.iterator ();
-
- while (iterator.hasNext ()) {
- AvatarBDStateMachineOwner t = iterator.next ();
+ Iterator<AvatarBDStateMachineOwner> iterator = tobeChecked.iterator();
+
+ while (iterator.hasNext()) {
+ AvatarBDStateMachineOwner t = iterator.next();
if (!source.contains(t))
- iterator.remove ();
+ iterator.remove();
}
}
private void addNewTask(LinkedList<AvatarBDStateMachineOwner> added, LinkedList<AvatarBDStateMachineOwner> source, LinkedList<AvatarBDStateMachineOwner> notSource) {
- for (AvatarBDStateMachineOwner tgc: source)
+ for (AvatarBDStateMachineOwner tgc : source)
if (!added.contains(tgc) && !notSource.contains(tgc))
- added.add (tgc);
+ added.add(tgc);
}
private void myInitComponents() {
@@ -126,33 +127,33 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
Container c = getContentPane();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c1 = new GridBagConstraints();
- GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c2 = new GridBagConstraints();
setFont(new Font("Helvetica", Font.PLAIN, 14));
//c.setLayout(new BorderLayout());
- c.setLayout(gridbag2);
+ c.setLayout(gridbag2);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
- c2.weighty = 1.0;
+ c2.weighty = 1.0;
c2.weightx = 1.0;
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.gridwidth = 1;
+ c2.fill = GridBagConstraints.BOTH;
c2.gridheight = 1;
// ignored list
JPanel panel1 = new JPanel();
panel1.setLayout(new BorderLayout());
panel1.setBorder(new javax.swing.border.TitledBorder("Blocks ignored"));
- listIgnored = new JList<> (ign.toArray (new AvatarBDStateMachineOwner [0]));
+ listIgnored = new JList<>(ign.toArray(new AvatarBDStateMachineOwner[0]));
//listIgnored.setPreferredSize(new Dimension(200, 250));
- listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listIgnored.addListSelectionListener(this);
JScrollPane scrollPane1 = new JScrollPane(listIgnored);
panel1.add(scrollPane1, BorderLayout.CENTER);
panel1.setPreferredSize(new Dimension(200, 250));
c.add(panel1, c2);
-
+
// central buttons
JPanel panel3 = new JPanel();
panel3.setLayout(gridbag1);
@@ -192,23 +193,45 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
c.add(panel3, c2);
- // validated list
+ // validated list
JPanel panel2 = new JPanel();
panel2.setLayout(new BorderLayout());
panel2.setBorder(new javax.swing.border.TitledBorder("Blocks taken into account"));
- listValidated = new JList<> (val.toArray (new AvatarBDStateMachineOwner [0]));
+ listValidated = new JList<>(val.toArray(new AvatarBDStateMachineOwner[0]));
//listValidated.setPreferredSize(new Dimension(200, 250));
- listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listValidated.addListSelectionListener(this);
JScrollPane scrollPane2 = new JScrollPane(listValidated);
panel2.add(scrollPane2, BorderLayout.CENTER);
panel2.setPreferredSize(new Dimension(200, 250));
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
c.add(panel2, c2);
+ optimize = new JCheckBox("Optimize specification");
+ optimize.setSelected(optimized);
+ c.add(optimize, c2);
+ c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.gridwidth = 1; //end row
+ initMainButtons(c2, c, this, false, "Check syntax", "Cancel");
+
+ /*closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
+ //closeButton.setPreferredSize(new Dimension(600, 50));
+ closeButton.addActionListener(this);
+ closeButton.setPreferredSize(new Dimension(200, 30));
+
+ JPanel panel4 = new JPanel();
+ panel4.setLayout(new FlowLayout());
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
+ cancelButton.addActionListener(this);
+ cancelButton.setPreferredSize(new Dimension(200, 30));
+ panel4.add(cancelButton);
+ panel4.add(closeButton);
+ c.add(panel4, c2);*/
+
+
// main panel;
- JPanel panel6 = new JPanel();
+ /*JPanel panel6 = new JPanel();
panel6.setLayout(new BorderLayout());
JPanel panel5 = new JPanel();
@@ -235,21 +258,25 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
panel6.add(panel5, BorderLayout.NORTH);
panel6.add(panel4, BorderLayout.SOUTH);
- c.add(panel6, c2);
+ c.add(panel6, c2);*/
}
- public void actionPerformed(ActionEvent evt) {
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
+ if (evt.getSource() == closeButton) {
+ closeDialog();
+ return;
+ } else if (evt.getSource() == cancelButton) {
+ cancelDialog();
+ return;
+ }
+
+
+
// Compare the action command to the known actions.
switch (command) {
- case "Start Syntax Analysis":
- closeDialog();
- break;
- case "Cancel":
- cancelDialog();
- break;
case "addOneIgnored":
addOneIgnored();
break;
@@ -267,45 +294,45 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
private void addOneIgnored() {
- for (AvatarBDStateMachineOwner o: this.listValidated.getSelectedValuesList ()) {
- ign.add (o);
- val.remove (o);
+ for (AvatarBDStateMachineOwner o : this.listValidated.getSelectedValuesList()) {
+ ign.add(o);
+ val.remove(o);
}
- listIgnored.setListData(ign.toArray (new AvatarBDStateMachineOwner[0]));
- listValidated.setListData(val.toArray (new AvatarBDStateMachineOwner[0]));
+ listIgnored.setListData(ign.toArray(new AvatarBDStateMachineOwner[0]));
+ listValidated.setListData(val.toArray(new AvatarBDStateMachineOwner[0]));
setButtons();
}
private void addOneValidated() {
- for (AvatarBDStateMachineOwner o: this.listIgnored.getSelectedValuesList ()) {
- val.add (o);
- ign.remove (o);
+ for (AvatarBDStateMachineOwner o : this.listIgnored.getSelectedValuesList()) {
+ val.add(o);
+ ign.remove(o);
}
- listIgnored.setListData(ign.toArray (new AvatarBDStateMachineOwner [0]));
- listValidated.setListData(val.toArray (new AvatarBDStateMachineOwner [0]));
+ listIgnored.setListData(ign.toArray(new AvatarBDStateMachineOwner[0]));
+ listValidated.setListData(val.toArray(new AvatarBDStateMachineOwner[0]));
setButtons();
}
private void allValidated() {
val.addAll(ign);
- ign.clear ();
- listIgnored.setListData(ign.toArray (new AvatarBDStateMachineOwner [0]));
- listValidated.setListData(val.toArray (new AvatarBDStateMachineOwner [0]));
+ ign.clear();
+ listIgnored.setListData(ign.toArray(new AvatarBDStateMachineOwner[0]));
+ listValidated.setListData(val.toArray(new AvatarBDStateMachineOwner[0]));
setButtons();
}
private void allIgnored() {
ign.addAll(val);
val.clear();
- listIgnored.setListData(ign.toArray (new AvatarBDStateMachineOwner [0]));
- listValidated.setListData(val.toArray (new AvatarBDStateMachineOwner [0]));
+ listIgnored.setListData(ign.toArray(new AvatarBDStateMachineOwner[0]));
+ listValidated.setListData(val.toArray(new AvatarBDStateMachineOwner[0]));
setButtons();
}
public void closeDialog() {
- back.clear ();
+ back.clear();
back.addAll(val);
validated = val;
@@ -338,13 +365,13 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
//listIgnored.clearSelection();
}
- if (ign.size() ==0) {
+ if (ign.size() == 0) {
allValidated.setEnabled(false);
} else {
allValidated.setEnabled(true);
}
- if (val.size() ==0) {
+ if (val.size() == 0) {
allIgnored.setEnabled(false);
closeButton.setEnabled(false);
} else {
diff --git a/src/main/java/ui/window/JDialogSelectTMLComponent.java b/src/main/java/ui/window/JDialogSelectTMLComponent.java
index d3c5252b81..ab82329086 100755
--- a/src/main/java/ui/window/JDialogSelectTMLComponent.java
+++ b/src/main/java/ui/window/JDialogSelectTMLComponent.java
@@ -37,15 +37,13 @@
*/
-
-
package ui.window;
-import ui.util.IconManager;
import ui.TGComponent;
import ui.tmlcompd.TMLCCompositeComponent;
import ui.tmlcompd.TMLCPrimitiveComponent;
import ui.tmlcompd.TMLCRemoteCompositeComponent;
+import ui.util.IconManager;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -59,13 +57,14 @@ import java.util.Vector;
/**
- * Class JDialogSelectTMLComponent
- * Dialog for managing primitive components to be validated
- * Creation: 28/03/2008
- * @version 1.0 28/03/2008
- * @author Ludovic APVRILLE
+ * Class JDialogSelectTMLComponent
+ * Dialog for managing primitive components to be validated
+ * Creation: 28/03/2008
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 28/03/2008
*/
-public class JDialogSelectTMLComponent extends JDialogBase implements ActionListener, ListSelectionListener {
+public class JDialogSelectTMLComponent extends JDialogBase implements ActionListener, ListSelectionListener {
public static Vector<TGComponent> validated, ignored;
private static boolean optimized = true;
@@ -82,7 +81,9 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
private JButton allIgnored;
protected JCheckBox optimize;
- /** Creates new form */
+ /**
+ * Creates new form
+ */
public JDialogSelectTMLComponent(Frame f, Vector<TGComponent> _back, List<TGComponent> componentList, String title) {
super(f, title, true);
@@ -111,10 +112,10 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
TGComponent tgc;
TMLCCompositeComponent ccomp;
- for(int i=0; i<lcs.size(); i++) {
+ for (int i = 0; i < lcs.size(); i++) {
tgc = lcs.get(i);
if (tgc instanceof TMLCCompositeComponent) {
- ccomp = (TMLCCompositeComponent)tgc;
+ ccomp = (TMLCCompositeComponent) tgc;
cs.addAll(ccomp.getAllPrimitiveComponents());
}
if (tgc instanceof TMLCPrimitiveComponent) {
@@ -122,16 +123,16 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
}
if (tgc instanceof TMLCRemoteCompositeComponent) {
- cs.addAll(((TMLCRemoteCompositeComponent)tgc).getAllPrimitiveComponents());
+ cs.addAll(((TMLCRemoteCompositeComponent) tgc).getAllPrimitiveComponents());
}
}
}
- private Vector<TGComponent> makeNewVal( List<TGComponent> list) {
+ private Vector<TGComponent> makeNewVal(List<TGComponent> list) {
Vector<TGComponent> v = new Vector<TGComponent>();
TGComponent tgc;
- for(int i=0; i<list.size(); i++) {
+ for (int i = 0; i < list.size(); i++) {
tgc = list.get(i);
//System.out.println(tgc);
if (tgc instanceof TMLCPrimitiveComponent) {
@@ -142,11 +143,11 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
}
private void checkTask(Vector<? extends TGComponent> tobeChecked, List<TGComponent> source) {
- TGComponent t;
+ TGComponent t;
- for(int i=0; i<tobeChecked.size(); i++) {
+ for (int i = 0; i < tobeChecked.size(); i++) {
t = tobeChecked.elementAt(i);
-
+
if (!source.contains(t)) {
tobeChecked.removeElementAt(i);
i--;
@@ -157,11 +158,11 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
public void addNewTask(Vector<TGComponent> added, List<TGComponent> source, Vector<TGComponent> notSource) {
TGComponent tgc;
- for(int i=0; i<source.size(); i++) {
+ for (int i = 0; i < source.size(); i++) {
tgc = source.get(i);
-
- if ((tgc instanceof TMLCPrimitiveComponent) && (!added.contains(tgc)) && (!notSource.contains(tgc))){
- added.addElement( tgc ) ;
+
+ if ((tgc instanceof TMLCPrimitiveComponent) && (!added.contains(tgc)) && (!notSource.contains(tgc))) {
+ added.addElement(tgc);
//System.out.println("New element");
}
}
@@ -175,17 +176,17 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
Container c = getContentPane();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c1 = new GridBagConstraints();
- GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c2 = new GridBagConstraints();
setFont(new Font("Helvetica", Font.PLAIN, 14));
- c.setLayout(gridbag2);
+ c.setLayout(gridbag2);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
- c2.weighty = 1.0;
+ c2.weighty = 1.0;
c2.weightx = 1.0;
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.gridwidth = 1;
+ c2.fill = GridBagConstraints.BOTH;
c2.gridheight = 1;
// ignored list
@@ -194,7 +195,7 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
panel1.setBorder(new javax.swing.border.TitledBorder("Ignored components"));
listIgnored = new JList<TGComponent>(ign);
//listIgnored.setPreferredSize(new Dimension(200, 250));
- listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listIgnored.addListSelectionListener(this);
JScrollPane scrollPane1 = new JScrollPane(listIgnored);
panel1.add(scrollPane1, BorderLayout.CENTER);
@@ -202,7 +203,6 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
c.add(panel1, c2);
-
// central buttons
panel3 = new JPanel();
panel3.setLayout(gridbag1);
@@ -238,25 +238,33 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
allIgnored.setPreferredSize(new Dimension(50, 25));
allIgnored.setActionCommand("allIgnored");
panel3.add(allIgnored, c1);
-
+
c.add(panel3, c2);
- // validated list
+ // validated list
panel2 = new JPanel();
panel2.setLayout(new BorderLayout());
panel2.setBorder(new javax.swing.border.TitledBorder("Used components"));
listValidated = new JList<TGComponent>(val);
//listValidated.setPreferredSize(new Dimension(200, 250));
- listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listValidated.addListSelectionListener(this);
JScrollPane scrollPane2 = new JScrollPane(listValidated);
panel2.add(scrollPane2, BorderLayout.CENTER);
panel2.setPreferredSize(new Dimension(200, 250));
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
c.add(panel2, c2);
+ optimize = new JCheckBox("Optimize TML specification");
+ optimize.setSelected(optimized);
+ c.add(optimize, c2);
+ c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.gridwidth = 1; //end row
+ initMainButtons(c2, c, this, false, "Check syntax", "Cancel");
+
+
// main panel;
- panel6 = new JPanel();
+ /*panel6 = new JPanel();
panel6.setLayout(new BorderLayout());
panel5 = new JPanel();
@@ -283,15 +291,15 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
panel6.add(panel5, BorderLayout.NORTH);
panel6.add(panel4, BorderLayout.SOUTH);
- c.add(panel6, c2);
+ c.add(panel6, c2);*/
}
- public void actionPerformed(ActionEvent evt) {
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
// Compare the action command to the known actions.
- if (command.equals("Start Syntax Analysis")) {
+ if (command.equals("Start Syntax Analysis")) {
closeDialog();
} else if (command.equals("Cancel")) {
cancelDialog();
@@ -308,10 +316,10 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
private void addOneIgnored() {
- int [] list = listValidated.getSelectedIndices();
+ int[] list = listValidated.getSelectedIndices();
Vector<TGComponent> v = new Vector<TGComponent>();
TGComponent o;
- for (int i=0; i<list.length; i++){
+ for (int i = 0; i < list.length; i++) {
o = val.elementAt(list[i]);
ign.addElement(o);
v.addElement(o);
@@ -324,10 +332,10 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
}
private void addOneValidated() {
- int [] list = listIgnored.getSelectedIndices();
+ int[] list = listIgnored.getSelectedIndices();
Vector<TGComponent> v = new Vector<TGComponent>();
TGComponent o;
- for (int i=0; i<list.length; i++){
+ for (int i = 0; i < list.length; i++) {
o = ign.elementAt(list[i]);
val.addElement(o);
v.addElement(o);
@@ -358,7 +366,7 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
public void closeDialog() {
back.removeAllElements();
- for(int i=0; i<val.size(); i++) {
+ for (int i = 0; i < val.size(); i++) {
back.addElement(val.elementAt(i));
}
validated = val;
@@ -389,13 +397,13 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
//listIgnored.clearSelection();
}
- if (ign.size() ==0) {
+ if (ign.size() == 0) {
allValidated.setEnabled(false);
} else {
allValidated.setEnabled(true);
}
- if (val.size() ==0) {
+ if (val.size() == 0) {
allIgnored.setEnabled(false);
closeButton.setEnabled(false);
} else {
diff --git a/src/main/java/ui/window/JDialogSelectTMLNodes.java b/src/main/java/ui/window/JDialogSelectTMLNodes.java
index 30da97e514..24109e7dc9 100755
--- a/src/main/java/ui/window/JDialogSelectTMLNodes.java
+++ b/src/main/java/ui/window/JDialogSelectTMLNodes.java
@@ -37,13 +37,12 @@
*/
-
-
package ui.window;
-import ui.*;
-import ui.util.IconManager;
+import ui.TGComponent;
+import ui.TGComponentPlugin;
import ui.tmldd.TMLArchiNode;
+import ui.util.IconManager;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -55,13 +54,14 @@ import java.util.Vector;
/**
- * Class JDialogSelectTMLNodes
- * Dialog for managing nodes to be validated
- * Creation: 19/09/2007
- * @version 1.0 19/09/2007
- * @author Ludovic APVRILLE
+ * Class JDialogSelectTMLNodes
+ * Dialog for managing nodes to be validated
+ * Creation: 19/09/2007
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 19/09/2007
*/
-public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener, ListSelectionListener {
+public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener, ListSelectionListener {
public static Vector<TGComponent> validated, ignored;
private static boolean optimized = true;
@@ -80,7 +80,9 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
protected JCheckBox optimize;
protected JTextField clockField;
- /** Creates new form */
+ /**
+ * Creates new form
+ */
public JDialogSelectTMLNodes(Frame f, Vector<TGComponent> _back, java.util.List<TGComponent> componentList, String title, int _clock) {
super(f, title, true);
@@ -104,30 +106,30 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
pack();
}
- private Vector<TGComponent> makeNewVal( java.util.List<TGComponent> list) {
+ private Vector<TGComponent> makeNewVal(java.util.List<TGComponent> list) {
Vector<TGComponent> v = new Vector<TGComponent>();
TGComponent tgc;
- for(int i=0; i<list.size(); i++) {
+ for (int i = 0; i < list.size(); i++) {
tgc = list.get(i);
//System.out.println(tgc);
if (tgc instanceof TMLArchiNode) {
v.addElement(tgc);
}
- if (tgc instanceof TGComponentPlugin) {
- v.addElement(tgc);
- }
+ if (tgc instanceof TGComponentPlugin) {
+ v.addElement(tgc);
+ }
}
-
+
return v;
}
private void checkNode(Vector<TGComponent> tobeChecked, java.util.List<TGComponent> source) {
- TGComponent t;
+ TGComponent t;
- for(int i=0; i<tobeChecked.size(); i++) {
+ for (int i = 0; i < tobeChecked.size(); i++) {
t = tobeChecked.elementAt(i);
-
+
if (!source.contains(t)) {
tobeChecked.removeElementAt(i);
i--;
@@ -138,10 +140,10 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
public void addNewNode(Vector<TGComponent> added, java.util.List<TGComponent> source, Vector<TGComponent> notSource) {
TGComponent tgc;
- for(int i=0; i<source.size(); i++) {
+ for (int i = 0; i < source.size(); i++) {
tgc = source.get(i);
-
- if (((tgc instanceof TMLArchiNode) || (tgc instanceof TGComponentPlugin)) && (!added.contains(tgc)) && (!notSource.contains(tgc))){
+
+ if (((tgc instanceof TMLArchiNode) || (tgc instanceof TGComponentPlugin)) && (!added.contains(tgc)) && (!notSource.contains(tgc))) {
added.addElement(tgc);
//System.out.println("New element");
}
@@ -156,16 +158,16 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
Container c = getContentPane();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c1 = new GridBagConstraints();
- GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c2 = new GridBagConstraints();
setFont(new Font("Helvetica", Font.PLAIN, 14));
c.setLayout(gridbag2);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- c2.weighty = 1.0;
+
+ c2.weighty = 1.0;
c2.weightx = 1.0;
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.gridwidth = 1;
+ c2.fill = GridBagConstraints.BOTH;
c2.gridheight = 1;
// ignored list
@@ -174,7 +176,7 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
panel1.setBorder(new javax.swing.border.TitledBorder("Nodes ignored"));
listIgnored = new JList<TGComponent>(ign);
//listIgnored.setPreferredSize(new Dimension(200, 250));
- listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listIgnored.addListSelectionListener(this);
JScrollPane scrollPane1 = new JScrollPane(listIgnored);
panel1.add(scrollPane1, BorderLayout.CENTER);
@@ -182,7 +184,6 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
c.add(panel1, c2);
-
// central buttons
panel3 = new JPanel();
panel3.setLayout(gridbag1);
@@ -221,22 +222,37 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
c.add(panel3, c2);
- // validated list
+ // validated list
panel2 = new JPanel();
panel2.setLayout(new BorderLayout());
panel2.setBorder(new javax.swing.border.TitledBorder("Nodes taken into account"));
listValidated = new JList<TGComponent>(val);
//listValidated.setPreferredSize(new Dimension(200, 250));
- listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listValidated.addListSelectionListener(this);
JScrollPane scrollPane2 = new JScrollPane(listValidated);
panel2.add(scrollPane2, BorderLayout.CENTER);
panel2.setPreferredSize(new Dimension(200, 250));
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
c.add(panel2, c2);
+
+ optimize = new JCheckBox("Optimize TML specification");
+ optimize.setSelected(optimized);
+ c.add(optimize, c2);
+ c2.gridwidth = 1; //end row
+ c.add(new JLabel("Master clock (in MHz)"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ clockField = new JTextField("" + clock);
+ c.add(clockField, c2);
+
+ c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.gridwidth = 1; //end row
+ initMainButtons(c2, c, this, false, "Check syntax", "Cancel");
+
+
// main panel;
- panel6 = new JPanel();
+ /*panel6 = new JPanel();
panel6.setLayout(new BorderLayout());
panel5 = new JPanel();
@@ -277,15 +293,15 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
panel6.add(panel5, BorderLayout.NORTH);
panel6.add(panel4, BorderLayout.SOUTH);
- c.add(panel6, c2);
+ c.add(panel6, c2);*/
}
- public void actionPerformed(ActionEvent evt) {
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
// Compare the action command to the known actions.
- if (command.equals("Start Syntax Analysis")) {
+ if (command.equals("Start Syntax Analysis")) {
closeDialog();
} else if (command.equals("Cancel")) {
cancelDialog();
@@ -302,10 +318,10 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
private void addOneIgnored() {
- int [] list = listValidated.getSelectedIndices();
+ int[] list = listValidated.getSelectedIndices();
Vector<TGComponent> v = new Vector<TGComponent>();
TGComponent o;
- for (int i=0; i<list.length; i++){
+ for (int i = 0; i < list.length; i++) {
o = val.elementAt(list[i]);
ign.addElement(o);
v.addElement(o);
@@ -318,11 +334,11 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
}
private void addOneValidated() {
- int [] list = listIgnored.getSelectedIndices();
+ int[] list = listIgnored.getSelectedIndices();
Vector<TGComponent> v = new Vector<TGComponent>();
TGComponent o;
-
- for (int i=0; i<list.length; i++){
+
+ for (int i = 0; i < list.length; i++) {
o = ign.elementAt(list[i]);
val.addElement(o);
v.addElement(o);
@@ -353,7 +369,7 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
public void closeDialog() {
back.removeAllElements();
- for(int i=0; i<val.size(); i++) {
+ for (int i = 0; i < val.size(); i++) {
back.addElement(val.elementAt(i));
}
validated = val;
@@ -383,13 +399,13 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
//listIgnored.clearSelection();
}
- if (ign.size() ==0) {
+ if (ign.size() == 0) {
allValidated.setEnabled(false);
} else {
allValidated.setEnabled(true);
}
- if (val.size() ==0) {
+ if (val.size() == 0) {
allIgnored.setEnabled(false);
closeButton.setEnabled(false);
} else {
--
GitLab