From 61980806ca157b1d2f2db0a20499d34152065fa9 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Wed, 19 Aug 2020 19:26:46 +0200
Subject: [PATCH] Update on Avatar relations
---
modeling/AVATAR/CoffeeMachine_Avatar.xml | 560 +++---
modeling/AVATAR/testMC.xml | 1570 +++++++++++------
modeling/DIPLODOCUS/SmartCardProtocol.xml | 1250 ++++++-------
.../testModelCheckerAvatar/testClocks.xml | 4 +-
.../avatartranslator/AvatarComposedGuard.java | 3 +-
.../avatartranslator/AvatarSpecification.java | 4 +-
.../avatartranslator/AvatarStateMachine.java | 8 +-
.../java/avatartranslator/AvatarTuple.java | 2 +-
.../avatartranslator/AvatarUnaryGuard.java | 6 +-
.../modelchecker/AvatarModelChecker.java | 3 +
.../toavatar/FullTML2Avatar.java | 13 +-
src/main/java/ui/GTURTLEModeling.java | 12 +-
src/main/java/ui/MainGUI.java | 7 +-
.../ui/avatarbd/AvatarBDPortConnector.java | 2 +-
14 files changed, 1940 insertions(+), 1504 deletions(-)
diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 54f0dbbee3..1b9da9da50 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -643,7 +643,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="373" />
-<P1 x="302" y="261" id="417" />
+<P1 x="302" y="261" id="404" />
<P2 x="361" y="261" id="392" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -661,7 +661,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="377" />
-<P1 x="305" y="211" id="404" />
+<P1 x="305" y="211" id="417" />
<P2 x="361" y="211" id="391" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -750,11 +750,11 @@
</COMPONENT>
<SUBCOMPONENT type="5304" id="414" >
<father id="452" num="0" />
-<cdparam x="166" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="154" y="241" />
+<sizeparam width="148" height="40" minWidth="100" minHeight="1" 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="20" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
<TGConnectingPoint num="0" id="402" />
<TGConnectingPoint num="1" id="403" />
<TGConnectingPoint num="2" id="404" />
@@ -770,11 +770,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5304" id="427" >
<father id="452" num="1" />
-<cdparam x="154" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="166" y="191" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" 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="29" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
<TGConnectingPoint num="0" id="415" />
<TGConnectingPoint num="1" id="416" />
<TGConnectingPoint num="2" id="417" />
@@ -904,7 +904,7 @@
<TGConnectingPoint num="0" id="511" />
<TGConnectingPoint num="1" id="512" />
<TGConnectingPoint num="2" id="513" />
-<P1 x="581" y="154" id="587" />
+<P1 x="581" y="154" id="600" />
<P2 x="546" y="305" id="657" />
<Point x="518" y="154" />
<Point x="518" y="305" />
@@ -932,7 +932,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="516" />
<TGConnectingPoint num="1" id="517" />
-<P1 x="631" y="164" id="582" />
+<P1 x="631" y="164" id="595" />
<P2 x="667" y="310" id="644" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
@@ -960,7 +960,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="522" />
<TGConnectingPoint num="1" id="523" />
-<P1 x="721" y="158" id="593" />
+<P1 x="721" y="158" id="580" />
<P2 x="700" y="204" id="634" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
@@ -1115,13 +1115,13 @@
<TGConnectingPoint num="22" id="627" />
<TGConnectingPoint num="23" id="628" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="591" >
+<SUBCOMPONENT type="5303" id="591" >
<father id="629" num="0" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="1" 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="579" />
<TGConnectingPoint num="1" id="580" />
<TGConnectingPoint num="2" id="581" />
@@ -1134,14 +1134,17 @@
<TGConnectingPoint num="9" id="588" />
<TGConnectingPoint num="10" id="589" />
<TGConnectingPoint num="11" id="590" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="604" >
+<SUBCOMPONENT type="5304" id="604" >
<father id="629" num="1" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="1" 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="592" />
<TGConnectingPoint num="1" id="593" />
<TGConnectingPoint num="2" id="594" />
@@ -1154,9 +1157,6 @@
<TGConnectingPoint num="9" id="601" />
<TGConnectingPoint num="10" id="602" />
<TGConnectingPoint num="11" id="603" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5306" id="641" >
@@ -1274,7 +1274,7 @@
<Modeling type="AVATAR Design" nameTab="AVATAR Design" tabs="Block Diagram$CoffeeButton$TeaButton$CoffeeMachine$Wallet" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="6" maxX="896" minY="6" maxY="576" zoom="0.6400000000000001" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="8" maxX="1120" minY="8" maxY="720" zoom="0.8000000000000002" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
@@ -1283,12 +1283,12 @@
<Ignored value="" />
<CONNECTOR type="5002" id="695" >
-<cdparam x="205" y="362" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="640" maxHeight="1280" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="256" y="452" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="694" />
-<P1 x="357" y="224" id="773" />
-<P2 x="357" y="241" id="806" />
+<P1 x="446" y="279" id="748" />
+<P2 x="447" y="301" id="806" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushCoffeeButton()" />
@@ -1297,12 +1297,12 @@
</extraparam>
</CONNECTOR>
<CONNECTOR type="5002" id="697" >
-<cdparam x="176" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="640" maxHeight="1280" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="220" y="90" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
<TGConnectingPoint num="0" id="696" />
-<P1 x="195" y="69" id="728" />
-<P2 x="284" y="69" id="802" />
+<P1 x="243" y="86" id="728" />
+<P2 x="355" y="86" id="802" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in getCoin(int nbOfCoins)" />
@@ -1313,12 +1313,12 @@
</extraparam>
</CONNECTOR>
<CONNECTOR type="5002" id="699" >
-<cdparam x="398" y="361" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="640" maxHeight="1280" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="497" y="451" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="698" />
-<P1 x="505" y="223" id="748" />
-<P2 x="505" y="241" id="807" />
+<P1 x="631" y="278" id="773" />
+<P2 x="631" y="301" id="807" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushTeaButton()" />
@@ -1327,8 +1327,8 @@
</extraparam>
</CONNECTOR>
<COMPONENT type="303" id="716" >
-<cdparam x="33" y="272" />
-<sizeparam width="441" height="148" minWidth="51" minHeight="6" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="41" y="340" />
+<sizeparam width="562" height="181" minWidth="27" minHeight="3" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="UPPAAL Pragma" value="A[] CoffeeMachine.nbOfCoins<=2
@@ -1387,8 +1387,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</COMPONENT>
<COMPONENT type="5000" id="741" >
-<cdparam x="67" y="35" />
-<sizeparam width="128" height="139" minWidth="3" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="83" y="43" />
+<sizeparam width="160" height="173" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="Block0" value="Wallet" />
@@ -1430,8 +1430,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</COMPONENT>
<COMPONENT type="5000" id="816" >
-<cdparam x="284" y="12" />
-<sizeparam width="295" height="229" minWidth="3" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="355" y="15" />
+<sizeparam width="368" height="286" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="Block0" value="CoffeeMachine" />
@@ -1478,11 +1478,11 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</COMPONENT>
<SUBCOMPONENT type="5000" id="766" >
<father id="816" num="0" />
-<cdparam x="445" y="158" />
-<sizeparam width="120" height="65" minWidth="3" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="371" y="198" />
+<sizeparam width="151" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="175" minY="0" maxY="164" />
-<infoparam name="Block1" value="TeaButton" />
+<cdrectangleparam minX="0" maxX="217" minY="0" maxY="205" />
+<infoparam name="Block1" value="CoffeeButton" />
<TGConnectingPoint num="0" id="742" />
<TGConnectingPoint num="1" id="743" />
<TGConnectingPoint num="2" id="744" />
@@ -1516,11 +1516,11 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="791" >
<father id="816" num="1" />
-<cdparam x="297" y="159" />
-<sizeparam width="121" height="65" minWidth="3" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="556" y="197" />
+<sizeparam width="150" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="174" minY="0" maxY="164" />
-<infoparam name="Block1" value="CoffeeButton" />
+<cdrectangleparam minX="0" maxX="218" minY="0" maxY="205" />
+<infoparam name="Block1" value="TeaButton" />
<TGConnectingPoint num="0" id="767" />
<TGConnectingPoint num="1" id="768" />
<TGConnectingPoint num="2" id="769" />
@@ -1562,8 +1562,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="822" />
-<P1 x="340" y="233" id="993" />
-<P2 x="353" y="252" id="995" />
+<P1 x="340" y="233" id="1004" />
+<P2 x="353" y="252" id="993" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="821" >
<father id="823" num="0" />
@@ -1661,7 +1661,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="843" />
-<P1 x="353" y="282" id="996" />
+<P1 x="353" y="282" id="994" />
<P2 x="399" y="352" id="846" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="842" >
@@ -1946,33 +1946,33 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5100" id="994" >
+<SUBCOMPONENT type="5103" id="1003" >
<father id="1078" num="0" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="993" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1005" >
-<father id="1078" num="1" />
<cdparam x="330" y="257" />
<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="995" />
-<TGConnectingPoint num="1" id="996" />
-<TGConnectingPoint num="2" id="997" />
-<TGConnectingPoint num="3" id="998" />
-<TGConnectingPoint num="4" id="999" />
-<TGConnectingPoint num="5" id="1000" />
-<TGConnectingPoint num="6" id="1001" />
-<TGConnectingPoint num="7" id="1002" />
-<TGConnectingPoint num="8" id="1003" />
-<TGConnectingPoint num="9" id="1004" />
+<TGConnectingPoint num="0" id="993" />
+<TGConnectingPoint num="1" id="994" />
+<TGConnectingPoint num="2" id="995" />
+<TGConnectingPoint num="3" id="996" />
+<TGConnectingPoint num="4" id="997" />
+<TGConnectingPoint num="5" id="998" />
+<TGConnectingPoint num="6" id="999" />
+<TGConnectingPoint num="7" id="1000" />
+<TGConnectingPoint num="8" id="1001" />
+<TGConnectingPoint num="9" id="1002" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="1005" >
+<father id="1078" num="1" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1004" />
</SUBCOMPONENT>
@@ -2548,8 +2548,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="1320" />
-<P1 x="261" y="421" id="1966" />
-<P2 x="260" y="437" id="1969" />
+<P1 x="261" y="421" id="1955" />
+<P2 x="260" y="437" id="1883" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1319" >
<father id="1321" num="0" />
@@ -2581,8 +2581,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="1327" />
-<P1 x="227" y="477" id="1982" />
-<P2 x="126" y="524" id="1955" />
+<P1 x="227" y="477" id="1896" />
+<P2 x="126" y="524" id="1957" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1326" >
<father id="1328" num="0" />
@@ -2614,8 +2614,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="1334" />
-<P1 x="126" y="554" id="1956" />
-<P2 x="126" y="653" id="1872" />
+<P1 x="126" y="554" id="1958" />
+<P2 x="126" y="653" id="1980" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1333" >
<father id="1335" num="0" />
@@ -2649,8 +2649,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="1341" />
-<P1 x="293" y="477" id="1983" />
-<P2 x="298" y="524" id="2041" />
+<P1 x="293" y="477" id="1897" />
+<P2 x="298" y="524" id="1871" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1340" >
<father id="1342" num="0" />
@@ -2682,7 +2682,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="1348" />
-<P1 x="298" y="554" id="2042" />
+<P1 x="298" y="554" id="1872" />
<P2 x="296" y="650" id="1799" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1347" >
@@ -2717,8 +2717,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<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="1355" />
-<P1 x="326" y="457" id="1972" />
-<P2 x="442" y="497" id="1944" />
+<P1 x="326" y="457" id="1886" />
+<P2 x="442" y="497" id="1968" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1354" >
<father id="1356" num="0" />
@@ -2751,7 +2751,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="1363" />
<TGConnectingPoint num="1" id="1364" />
-<P1 x="442" y="527" id="1945" />
+<P1 x="442" y="527" id="1969" />
<P2 x="323" y="748" id="1661" />
<Point x="442" y="737" />
<AutomaticDrawing data="true" />
@@ -2835,7 +2835,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="1379" />
-<P1 x="126" y="702" id="1877" />
+<P1 x="126" y="702" id="1985" />
<P2 x="221" y="758" id="1662" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1378" >
@@ -3539,14 +3539,14 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5106" id="1943" >
+<SUBCOMPONENT type="5104" id="1881" >
<father id="2124" num="0" />
-<cdparam x="53" y="653" />
-<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="242" y="529" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
-<infoparam name="state0" value="CoffeeDelivered" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
<TGConnectingPoint num="0" id="1871" />
<TGConnectingPoint num="1" id="1872" />
<TGConnectingPoint num="2" id="1873" />
@@ -3557,128 +3557,129 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<TGConnectingPoint num="7" id="1878" />
<TGConnectingPoint num="8" id="1879" />
<TGConnectingPoint num="9" id="1880" />
-<TGConnectingPoint num="10" id="1881" />
-<TGConnectingPoint num="11" id="1882" />
-<TGConnectingPoint num="12" id="1883" />
-<TGConnectingPoint num="13" id="1884" />
-<TGConnectingPoint num="14" id="1885" />
-<TGConnectingPoint num="15" id="1886" />
-<TGConnectingPoint num="16" id="1887" />
-<TGConnectingPoint num="17" id="1888" />
-<TGConnectingPoint num="18" id="1889" />
-<TGConnectingPoint num="19" id="1890" />
-<TGConnectingPoint num="20" id="1891" />
-<TGConnectingPoint num="21" id="1892" />
-<TGConnectingPoint num="22" id="1893" />
-<TGConnectingPoint num="23" id="1894" />
-<TGConnectingPoint num="24" id="1895" />
-<TGConnectingPoint num="25" id="1896" />
-<TGConnectingPoint num="26" id="1897" />
-<TGConnectingPoint num="27" id="1898" />
-<TGConnectingPoint num="28" id="1899" />
-<TGConnectingPoint num="29" id="1900" />
-<TGConnectingPoint num="30" id="1901" />
-<TGConnectingPoint num="31" id="1902" />
-<TGConnectingPoint num="32" id="1903" />
-<TGConnectingPoint num="33" id="1904" />
-<TGConnectingPoint num="34" id="1905" />
-<TGConnectingPoint num="35" id="1906" />
-<TGConnectingPoint num="36" id="1907" />
-<TGConnectingPoint num="37" id="1908" />
-<TGConnectingPoint num="38" id="1909" />
-<TGConnectingPoint num="39" id="1910" />
-<TGConnectingPoint num="40" id="1911" />
-<TGConnectingPoint num="41" id="1912" />
-<TGConnectingPoint num="42" id="1913" />
-<TGConnectingPoint num="43" id="1914" />
-<TGConnectingPoint num="44" id="1915" />
-<TGConnectingPoint num="45" id="1916" />
-<TGConnectingPoint num="46" id="1917" />
-<TGConnectingPoint num="47" id="1918" />
-<TGConnectingPoint num="48" id="1919" />
-<TGConnectingPoint num="49" id="1920" />
-<TGConnectingPoint num="50" id="1921" />
-<TGConnectingPoint num="51" id="1922" />
-<TGConnectingPoint num="52" id="1923" />
-<TGConnectingPoint num="53" id="1924" />
-<TGConnectingPoint num="54" id="1925" />
-<TGConnectingPoint num="55" id="1926" />
-<TGConnectingPoint num="56" id="1927" />
-<TGConnectingPoint num="57" id="1928" />
-<TGConnectingPoint num="58" id="1929" />
-<TGConnectingPoint num="59" id="1930" />
-<TGConnectingPoint num="60" id="1931" />
-<TGConnectingPoint num="61" id="1932" />
-<TGConnectingPoint num="62" id="1933" />
-<TGConnectingPoint num="63" id="1934" />
-<TGConnectingPoint num="64" id="1935" />
-<TGConnectingPoint num="65" id="1936" />
-<TGConnectingPoint num="66" id="1937" />
-<TGConnectingPoint num="67" id="1938" />
-<TGConnectingPoint num="68" id="1939" />
-<TGConnectingPoint num="69" id="1940" />
-<TGConnectingPoint num="70" id="1941" />
-<TGConnectingPoint num="71" id="1942" />
-<extraparam>
-</extraparam>
+<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1954" >
+<SUBCOMPONENT type="5106" id="1954" >
<father id="2124" num="1" />
-<cdparam x="377" y="502" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="194" y="437" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1944" />
-<TGConnectingPoint num="1" id="1945" />
-<TGConnectingPoint num="2" id="1946" />
-<TGConnectingPoint num="3" id="1947" />
-<TGConnectingPoint num="4" id="1948" />
-<TGConnectingPoint num="5" id="1949" />
-<TGConnectingPoint num="6" id="1950" />
-<TGConnectingPoint num="7" id="1951" />
-<TGConnectingPoint num="8" id="1952" />
-<TGConnectingPoint num="9" id="1953" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="1882" />
+<TGConnectingPoint num="1" id="1883" />
+<TGConnectingPoint num="2" id="1884" />
+<TGConnectingPoint num="3" id="1885" />
+<TGConnectingPoint num="4" id="1886" />
+<TGConnectingPoint num="5" id="1887" />
+<TGConnectingPoint num="6" id="1888" />
+<TGConnectingPoint num="7" id="1889" />
+<TGConnectingPoint num="8" id="1890" />
+<TGConnectingPoint num="9" id="1891" />
+<TGConnectingPoint num="10" id="1892" />
+<TGConnectingPoint num="11" id="1893" />
+<TGConnectingPoint num="12" id="1894" />
+<TGConnectingPoint num="13" id="1895" />
+<TGConnectingPoint num="14" id="1896" />
+<TGConnectingPoint num="15" id="1897" />
+<TGConnectingPoint num="16" id="1898" />
+<TGConnectingPoint num="17" id="1899" />
+<TGConnectingPoint num="18" id="1900" />
+<TGConnectingPoint num="19" id="1901" />
+<TGConnectingPoint num="20" id="1902" />
+<TGConnectingPoint num="21" id="1903" />
+<TGConnectingPoint num="22" id="1904" />
+<TGConnectingPoint num="23" id="1905" />
+<TGConnectingPoint num="24" id="1906" />
+<TGConnectingPoint num="25" id="1907" />
+<TGConnectingPoint num="26" id="1908" />
+<TGConnectingPoint num="27" id="1909" />
+<TGConnectingPoint num="28" id="1910" />
+<TGConnectingPoint num="29" id="1911" />
+<TGConnectingPoint num="30" id="1912" />
+<TGConnectingPoint num="31" id="1913" />
+<TGConnectingPoint num="32" id="1914" />
+<TGConnectingPoint num="33" id="1915" />
+<TGConnectingPoint num="34" id="1916" />
+<TGConnectingPoint num="35" id="1917" />
+<TGConnectingPoint num="36" id="1918" />
+<TGConnectingPoint num="37" id="1919" />
+<TGConnectingPoint num="38" id="1920" />
+<TGConnectingPoint num="39" id="1921" />
+<TGConnectingPoint num="40" id="1922" />
+<TGConnectingPoint num="41" id="1923" />
+<TGConnectingPoint num="42" id="1924" />
+<TGConnectingPoint num="43" id="1925" />
+<TGConnectingPoint num="44" id="1926" />
+<TGConnectingPoint num="45" id="1927" />
+<TGConnectingPoint num="46" id="1928" />
+<TGConnectingPoint num="47" id="1929" />
+<TGConnectingPoint num="48" id="1930" />
+<TGConnectingPoint num="49" id="1931" />
+<TGConnectingPoint num="50" id="1932" />
+<TGConnectingPoint num="51" id="1933" />
+<TGConnectingPoint num="52" id="1934" />
+<TGConnectingPoint num="53" id="1935" />
+<TGConnectingPoint num="54" id="1936" />
+<TGConnectingPoint num="55" id="1937" />
+<TGConnectingPoint num="56" id="1938" />
+<TGConnectingPoint num="57" id="1939" />
+<TGConnectingPoint num="58" id="1940" />
+<TGConnectingPoint num="59" id="1941" />
+<TGConnectingPoint num="60" id="1942" />
+<TGConnectingPoint num="61" id="1943" />
+<TGConnectingPoint num="62" id="1944" />
+<TGConnectingPoint num="63" id="1945" />
+<TGConnectingPoint num="64" id="1946" />
+<TGConnectingPoint num="65" id="1947" />
+<TGConnectingPoint num="66" id="1948" />
+<TGConnectingPoint num="67" id="1949" />
+<TGConnectingPoint num="68" id="1950" />
+<TGConnectingPoint num="69" id="1951" />
+<TGConnectingPoint num="70" id="1952" />
+<TGConnectingPoint num="71" id="1953" />
+<latencyCheck />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1965" >
+<SUBCOMPONENT type="5100" id="1956" >
<father id="2124" num="2" />
+<cdparam x="254" y="401" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1955" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5104" id="1967" >
+<father id="2124" num="3" />
<cdparam x="63" y="529" />
<sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
<infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="1955" />
-<TGConnectingPoint num="1" id="1956" />
-<TGConnectingPoint num="2" id="1957" />
-<TGConnectingPoint num="3" id="1958" />
-<TGConnectingPoint num="4" id="1959" />
-<TGConnectingPoint num="5" id="1960" />
-<TGConnectingPoint num="6" id="1961" />
-<TGConnectingPoint num="7" id="1962" />
-<TGConnectingPoint num="8" id="1963" />
-<TGConnectingPoint num="9" id="1964" />
+<TGConnectingPoint num="0" id="1957" />
+<TGConnectingPoint num="1" id="1958" />
+<TGConnectingPoint num="2" id="1959" />
+<TGConnectingPoint num="3" id="1960" />
+<TGConnectingPoint num="4" id="1961" />
+<TGConnectingPoint num="5" id="1962" />
+<TGConnectingPoint num="6" id="1963" />
+<TGConnectingPoint num="7" id="1964" />
+<TGConnectingPoint num="8" id="1965" />
+<TGConnectingPoint num="9" id="1966" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1967" >
-<father id="2124" num="3" />
-<cdparam x="254" y="401" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1966" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2040" >
+<SUBCOMPONENT type="5103" id="1978" >
<father id="2124" num="4" />
-<cdparam x="194" y="437" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="377" y="502" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
<TGConnectingPoint num="0" id="1968" />
<TGConnectingPoint num="1" id="1969" />
<TGConnectingPoint num="2" id="1970" />
@@ -3689,91 +3690,90 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<TGConnectingPoint num="7" id="1975" />
<TGConnectingPoint num="8" id="1976" />
<TGConnectingPoint num="9" id="1977" />
-<TGConnectingPoint num="10" id="1978" />
-<TGConnectingPoint num="11" id="1979" />
-<TGConnectingPoint num="12" id="1980" />
-<TGConnectingPoint num="13" id="1981" />
-<TGConnectingPoint num="14" id="1982" />
-<TGConnectingPoint num="15" id="1983" />
-<TGConnectingPoint num="16" id="1984" />
-<TGConnectingPoint num="17" id="1985" />
-<TGConnectingPoint num="18" id="1986" />
-<TGConnectingPoint num="19" id="1987" />
-<TGConnectingPoint num="20" id="1988" />
-<TGConnectingPoint num="21" id="1989" />
-<TGConnectingPoint num="22" id="1990" />
-<TGConnectingPoint num="23" id="1991" />
-<TGConnectingPoint num="24" id="1992" />
-<TGConnectingPoint num="25" id="1993" />
-<TGConnectingPoint num="26" id="1994" />
-<TGConnectingPoint num="27" id="1995" />
-<TGConnectingPoint num="28" id="1996" />
-<TGConnectingPoint num="29" id="1997" />
-<TGConnectingPoint num="30" id="1998" />
-<TGConnectingPoint num="31" id="1999" />
-<TGConnectingPoint num="32" id="2000" />
-<TGConnectingPoint num="33" id="2001" />
-<TGConnectingPoint num="34" id="2002" />
-<TGConnectingPoint num="35" id="2003" />
-<TGConnectingPoint num="36" id="2004" />
-<TGConnectingPoint num="37" id="2005" />
-<TGConnectingPoint num="38" id="2006" />
-<TGConnectingPoint num="39" id="2007" />
-<TGConnectingPoint num="40" id="2008" />
-<TGConnectingPoint num="41" id="2009" />
-<TGConnectingPoint num="42" id="2010" />
-<TGConnectingPoint num="43" id="2011" />
-<TGConnectingPoint num="44" id="2012" />
-<TGConnectingPoint num="45" id="2013" />
-<TGConnectingPoint num="46" id="2014" />
-<TGConnectingPoint num="47" id="2015" />
-<TGConnectingPoint num="48" id="2016" />
-<TGConnectingPoint num="49" id="2017" />
-<TGConnectingPoint num="50" id="2018" />
-<TGConnectingPoint num="51" id="2019" />
-<TGConnectingPoint num="52" id="2020" />
-<TGConnectingPoint num="53" id="2021" />
-<TGConnectingPoint num="54" id="2022" />
-<TGConnectingPoint num="55" id="2023" />
-<TGConnectingPoint num="56" id="2024" />
-<TGConnectingPoint num="57" id="2025" />
-<TGConnectingPoint num="58" id="2026" />
-<TGConnectingPoint num="59" id="2027" />
-<TGConnectingPoint num="60" id="2028" />
-<TGConnectingPoint num="61" id="2029" />
-<TGConnectingPoint num="62" id="2030" />
-<TGConnectingPoint num="63" id="2031" />
-<TGConnectingPoint num="64" id="2032" />
-<TGConnectingPoint num="65" id="2033" />
-<TGConnectingPoint num="66" id="2034" />
-<TGConnectingPoint num="67" id="2035" />
-<TGConnectingPoint num="68" id="2036" />
-<TGConnectingPoint num="69" id="2037" />
-<TGConnectingPoint num="70" id="2038" />
-<TGConnectingPoint num="71" id="2039" />
-<latencyCheck />
-<extraparam>
-</extraparam>
+<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2051" >
+<SUBCOMPONENT type="5106" id="2051" >
<father id="2124" num="5" />
-<cdparam x="242" y="529" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="53" y="653" />
+<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="2041" />
-<TGConnectingPoint num="1" id="2042" />
-<TGConnectingPoint num="2" id="2043" />
-<TGConnectingPoint num="3" id="2044" />
-<TGConnectingPoint num="4" id="2045" />
-<TGConnectingPoint num="5" id="2046" />
-<TGConnectingPoint num="6" id="2047" />
-<TGConnectingPoint num="7" id="2048" />
-<TGConnectingPoint num="8" id="2049" />
-<TGConnectingPoint num="9" id="2050" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
+<infoparam name="state0" value="CoffeeDelivered" />
+<TGConnectingPoint num="0" id="1979" />
+<TGConnectingPoint num="1" id="1980" />
+<TGConnectingPoint num="2" id="1981" />
+<TGConnectingPoint num="3" id="1982" />
+<TGConnectingPoint num="4" id="1983" />
+<TGConnectingPoint num="5" id="1984" />
+<TGConnectingPoint num="6" id="1985" />
+<TGConnectingPoint num="7" id="1986" />
+<TGConnectingPoint num="8" id="1987" />
+<TGConnectingPoint num="9" id="1988" />
+<TGConnectingPoint num="10" id="1989" />
+<TGConnectingPoint num="11" id="1990" />
+<TGConnectingPoint num="12" id="1991" />
+<TGConnectingPoint num="13" id="1992" />
+<TGConnectingPoint num="14" id="1993" />
+<TGConnectingPoint num="15" id="1994" />
+<TGConnectingPoint num="16" id="1995" />
+<TGConnectingPoint num="17" id="1996" />
+<TGConnectingPoint num="18" id="1997" />
+<TGConnectingPoint num="19" id="1998" />
+<TGConnectingPoint num="20" id="1999" />
+<TGConnectingPoint num="21" id="2000" />
+<TGConnectingPoint num="22" id="2001" />
+<TGConnectingPoint num="23" id="2002" />
+<TGConnectingPoint num="24" id="2003" />
+<TGConnectingPoint num="25" id="2004" />
+<TGConnectingPoint num="26" id="2005" />
+<TGConnectingPoint num="27" id="2006" />
+<TGConnectingPoint num="28" id="2007" />
+<TGConnectingPoint num="29" id="2008" />
+<TGConnectingPoint num="30" id="2009" />
+<TGConnectingPoint num="31" id="2010" />
+<TGConnectingPoint num="32" id="2011" />
+<TGConnectingPoint num="33" id="2012" />
+<TGConnectingPoint num="34" id="2013" />
+<TGConnectingPoint num="35" id="2014" />
+<TGConnectingPoint num="36" id="2015" />
+<TGConnectingPoint num="37" id="2016" />
+<TGConnectingPoint num="38" id="2017" />
+<TGConnectingPoint num="39" id="2018" />
+<TGConnectingPoint num="40" id="2019" />
+<TGConnectingPoint num="41" id="2020" />
+<TGConnectingPoint num="42" id="2021" />
+<TGConnectingPoint num="43" id="2022" />
+<TGConnectingPoint num="44" id="2023" />
+<TGConnectingPoint num="45" id="2024" />
+<TGConnectingPoint num="46" id="2025" />
+<TGConnectingPoint num="47" id="2026" />
+<TGConnectingPoint num="48" id="2027" />
+<TGConnectingPoint num="49" id="2028" />
+<TGConnectingPoint num="50" id="2029" />
+<TGConnectingPoint num="51" id="2030" />
+<TGConnectingPoint num="52" id="2031" />
+<TGConnectingPoint num="53" id="2032" />
+<TGConnectingPoint num="54" id="2033" />
+<TGConnectingPoint num="55" id="2034" />
+<TGConnectingPoint num="56" id="2035" />
+<TGConnectingPoint num="57" id="2036" />
+<TGConnectingPoint num="58" id="2037" />
+<TGConnectingPoint num="59" id="2038" />
+<TGConnectingPoint num="60" id="2039" />
+<TGConnectingPoint num="61" id="2040" />
+<TGConnectingPoint num="62" id="2041" />
+<TGConnectingPoint num="63" id="2042" />
+<TGConnectingPoint num="64" id="2043" />
+<TGConnectingPoint num="65" id="2044" />
+<TGConnectingPoint num="66" id="2045" />
+<TGConnectingPoint num="67" id="2046" />
+<TGConnectingPoint num="68" id="2047" />
+<TGConnectingPoint num="69" id="2048" />
+<TGConnectingPoint num="70" id="2049" />
+<TGConnectingPoint num="71" id="2050" />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
diff --git a/modeling/AVATAR/testMC.xml b/modeling/AVATAR/testMC.xml
index e2ec4ce3de..749678fb80 100644
--- a/modeling/AVATAR/testMC.xml
+++ b/modeling/AVATAR/testMC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="1">
<Modeling type="AVATAR Design" nameTab="Design" tabs="Block Diagram$Block0$Block1" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -8,43 +8,16 @@
<MainCode value="}"/>
<Optimized value="true" />
<considerTimingOperators value="true" />
-<Validated value="Block1;Block0;" />
+<Validated value="" />
<Ignored value="" />
-<COMPONENT type="303" id="527" >
-<cdparam x="371" y="436" />
-<sizeparam width="221" height="45" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="UPPAAL Pragma" value="F A[] Block0.x >= 10" />
-<TGConnectingPoint num="0" id="528" />
-<TGConnectingPoint num="1" id="529" />
-<TGConnectingPoint num="2" id="530" />
-<TGConnectingPoint num="3" id="531" />
-<TGConnectingPoint num="4" id="532" />
-<TGConnectingPoint num="5" id="533" />
-<TGConnectingPoint num="6" id="534" />
-<TGConnectingPoint num="7" id="535" />
-<TGConnectingPoint num="8" id="536" />
-<TGConnectingPoint num="9" id="537" />
-<TGConnectingPoint num="10" id="538" />
-<TGConnectingPoint num="11" id="539" />
-<TGConnectingPoint num="12" id="540" />
-<TGConnectingPoint num="13" id="541" />
-<TGConnectingPoint num="14" id="542" />
-<TGConnectingPoint num="15" id="543" />
-<extraparam>
-<Line value="F A[] Block0.x >= 10" />
-</extraparam>
-</COMPONENT>
-
<CONNECTOR type="5002" id="2" >
<cdparam x="422" y="247" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="1" />
-<P1 x="371" y="234" id="32" />
-<P2 x="671" y="251" id="6" />
+<P1 x="371" y="234" id="49" />
+<P2 x="671" y="251" id="23" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in exchange(int x)" />
@@ -52,12 +25,13 @@
<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="true" ams="false" />
</extraparam>
</CONNECTOR>
-<COMPONENT type="5000" id="27" >
-<cdparam x="671" y="151" />
-<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="303" id="19" >
+<cdparam x="371" y="436" />
+<sizeparam width="221" height="45" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Block1" value="Block1" />
+<infoparam name="UPPAAL Pragma" value="F A[] Block0.x >= 10
+" />
<TGConnectingPoint num="0" id="3" />
<TGConnectingPoint num="1" id="4" />
<TGConnectingPoint num="2" id="5" />
@@ -74,14 +48,41 @@
<TGConnectingPoint num="13" id="16" />
<TGConnectingPoint num="14" id="17" />
<TGConnectingPoint num="15" id="18" />
-<TGConnectingPoint num="16" id="19" />
-<TGConnectingPoint num="17" id="20" />
-<TGConnectingPoint num="18" id="21" />
-<TGConnectingPoint num="19" id="22" />
-<TGConnectingPoint num="20" id="23" />
-<TGConnectingPoint num="21" id="24" />
-<TGConnectingPoint num="22" id="25" />
-<TGConnectingPoint num="23" id="26" />
+<extraparam>
+<Line value="F A[] Block0.x >= 10" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5000" id="44" >
+<cdparam x="671" y="151" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block1" value="Block1" />
+<TGConnectingPoint num="0" id="20" />
+<TGConnectingPoint num="1" id="21" />
+<TGConnectingPoint num="2" id="22" />
+<TGConnectingPoint num="3" id="23" />
+<TGConnectingPoint num="4" id="24" />
+<TGConnectingPoint num="5" id="25" />
+<TGConnectingPoint num="6" id="26" />
+<TGConnectingPoint num="7" id="27" />
+<TGConnectingPoint num="8" id="28" />
+<TGConnectingPoint num="9" id="29" />
+<TGConnectingPoint num="10" id="30" />
+<TGConnectingPoint num="11" id="31" />
+<TGConnectingPoint num="12" id="32" />
+<TGConnectingPoint num="13" id="33" />
+<TGConnectingPoint num="14" id="34" />
+<TGConnectingPoint num="15" id="35" />
+<TGConnectingPoint num="16" id="36" />
+<TGConnectingPoint num="17" id="37" />
+<TGConnectingPoint num="18" id="38" />
+<TGConnectingPoint num="19" id="39" />
+<TGConnectingPoint num="20" id="40" />
+<TGConnectingPoint num="21" id="41" />
+<TGConnectingPoint num="22" id="42" />
+<TGConnectingPoint num="23" id="43" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -90,36 +91,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="52" >
+<COMPONENT type="5000" id="69" >
<cdparam x="121" y="134" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Block0" />
-<TGConnectingPoint num="0" id="28" />
-<TGConnectingPoint num="1" id="29" />
-<TGConnectingPoint num="2" id="30" />
-<TGConnectingPoint num="3" id="31" />
-<TGConnectingPoint num="4" id="32" />
-<TGConnectingPoint num="5" id="33" />
-<TGConnectingPoint num="6" id="34" />
-<TGConnectingPoint num="7" id="35" />
-<TGConnectingPoint num="8" id="36" />
-<TGConnectingPoint num="9" id="37" />
-<TGConnectingPoint num="10" id="38" />
-<TGConnectingPoint num="11" id="39" />
-<TGConnectingPoint num="12" id="40" />
-<TGConnectingPoint num="13" id="41" />
-<TGConnectingPoint num="14" id="42" />
-<TGConnectingPoint num="15" id="43" />
-<TGConnectingPoint num="16" id="44" />
-<TGConnectingPoint num="17" id="45" />
-<TGConnectingPoint num="18" id="46" />
-<TGConnectingPoint num="19" id="47" />
-<TGConnectingPoint num="20" id="48" />
-<TGConnectingPoint num="21" id="49" />
-<TGConnectingPoint num="22" id="50" />
-<TGConnectingPoint num="23" id="51" />
+<TGConnectingPoint num="0" id="45" />
+<TGConnectingPoint num="1" id="46" />
+<TGConnectingPoint num="2" id="47" />
+<TGConnectingPoint num="3" id="48" />
+<TGConnectingPoint num="4" id="49" />
+<TGConnectingPoint num="5" id="50" />
+<TGConnectingPoint num="6" id="51" />
+<TGConnectingPoint num="7" id="52" />
+<TGConnectingPoint num="8" id="53" />
+<TGConnectingPoint num="9" id="54" />
+<TGConnectingPoint num="10" id="55" />
+<TGConnectingPoint num="11" id="56" />
+<TGConnectingPoint num="12" id="57" />
+<TGConnectingPoint num="13" id="58" />
+<TGConnectingPoint num="14" id="59" />
+<TGConnectingPoint num="15" id="60" />
+<TGConnectingPoint num="16" id="61" />
+<TGConnectingPoint num="17" id="62" />
+<TGConnectingPoint num="18" id="63" />
+<TGConnectingPoint num="19" id="64" />
+<TGConnectingPoint num="20" id="65" />
+<TGConnectingPoint num="21" id="66" />
+<TGConnectingPoint num="22" id="67" />
+<TGConnectingPoint num="23" id="68" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -132,56 +133,56 @@
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="Block0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="65" >
+<CONNECTOR type="5102" id="82" >
<cdparam x="437" y="385" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="61" />
-<TGConnectingPoint num="1" id="62" />
-<TGConnectingPoint num="2" id="63" />
-<TGConnectingPoint num="3" id="64" />
-<P1 x="437" y="385" id="93" />
-<P2 x="480" y="154" id="197" />
+<TGConnectingPoint num="0" id="78" />
+<TGConnectingPoint num="1" id="79" />
+<TGConnectingPoint num="2" id="80" />
+<TGConnectingPoint num="3" id="81" />
+<P1 x="437" y="385" id="110" />
+<P2 x="480" y="154" id="214" />
<Point x="437" y="463" />
<Point x="639" y="480" />
<Point x="592" y="90" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="53" >
-<father id="65" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="70" >
+<father id="82" num="0" />
<cdparam x="437" y="463" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="54" >
-<father id="65" num="1" />
+<SUBCOMPONENT type="-1" id="71" >
+<father id="82" num="1" />
<cdparam x="639" y="480" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="55" >
-<father id="65" num="2" />
+<SUBCOMPONENT type="-1" id="72" >
+<father id="82" num="2" />
<cdparam x="592" y="90" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="60" >
-<father id="65" num="3" />
+<SUBCOMPONENT type="-1" id="77" >
+<father id="82" num="3" />
<cdparam x="623" y="241" />
<sizeparam width="58" height="45" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="56" />
-<TGConnectingPoint num="1" id="57" />
-<TGConnectingPoint num="2" id="58" />
-<TGConnectingPoint num="3" id="59" />
+<TGConnectingPoint num="0" id="73" />
+<TGConnectingPoint num="1" id="74" />
+<TGConnectingPoint num="2" id="75" />
+<TGConnectingPoint num="3" id="76" />
<extraparam>
<guard value="[ x>0]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -197,26 +198,26 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="72" >
+<CONNECTOR type="5102" id="89" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="71" />
-<P1 x="407" y="70" id="244" />
-<P2 x="392" y="123" id="219" />
+<TGConnectingPoint num="0" id="88" />
+<P1 x="407" y="70" id="261" />
+<P2 x="392" y="123" id="236" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="70" >
-<father id="72" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="87" >
+<father id="89" num="0" />
<cdparam x="405" y="86" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="66" />
-<TGConnectingPoint num="1" id="67" />
-<TGConnectingPoint num="2" id="68" />
-<TGConnectingPoint num="3" id="69" />
+<TGConnectingPoint num="0" id="83" />
+<TGConnectingPoint num="1" id="84" />
+<TGConnectingPoint num="2" id="85" />
+<TGConnectingPoint num="3" id="86" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -230,26 +231,26 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="79" >
+<CONNECTOR type="5102" id="96" >
<cdparam x="417" y="173" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="78" />
-<P1 x="417" y="173" id="232" />
-<P2 x="418" y="222" id="160" />
+<TGConnectingPoint num="0" id="95" />
+<P1 x="417" y="173" id="249" />
+<P2 x="418" y="222" id="177" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="77" >
-<father id="79" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="94" >
+<father id="96" num="0" />
<cdparam x="417" y="197" />
<sizeparam width="54" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="73" />
-<TGConnectingPoint num="1" id="74" />
-<TGConnectingPoint num="2" id="75" />
-<TGConnectingPoint num="3" id="76" />
+<TGConnectingPoint num="0" id="90" />
+<TGConnectingPoint num="1" id="91" />
+<TGConnectingPoint num="2" id="92" />
+<TGConnectingPoint num="3" id="93" />
<extraparam>
<guard value="[ x < 11]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -263,26 +264,26 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="86" >
+<CONNECTOR type="5102" id="103" >
<cdparam x="418" y="252" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="85" />
-<P1 x="418" y="252" id="161" />
-<P2 x="424" y="335" id="136" />
+<TGConnectingPoint num="0" id="102" />
+<P1 x="418" y="252" id="178" />
+<P2 x="424" y="335" id="153" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="84" >
-<father id="86" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="101" >
+<father id="103" num="0" />
<cdparam x="421" y="293" />
<sizeparam width="58" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="80" />
-<TGConnectingPoint num="1" id="81" />
-<TGConnectingPoint num="2" id="82" />
-<TGConnectingPoint num="3" id="83" />
+<TGConnectingPoint num="0" id="97" />
+<TGConnectingPoint num="1" id="98" />
+<TGConnectingPoint num="2" id="99" />
+<TGConnectingPoint num="3" id="100" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -297,224 +298,224 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="159" >
+<COMPONENT type="5106" id="176" >
<cdparam x="387" y="335" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="87" />
-<TGConnectingPoint num="1" id="88" />
-<TGConnectingPoint num="2" id="89" />
-<TGConnectingPoint num="3" id="90" />
-<TGConnectingPoint num="4" id="91" />
-<TGConnectingPoint num="5" id="92" />
-<TGConnectingPoint num="6" id="93" />
-<TGConnectingPoint num="7" id="94" />
-<TGConnectingPoint num="8" id="95" />
-<TGConnectingPoint num="9" id="96" />
-<TGConnectingPoint num="10" id="97" />
-<TGConnectingPoint num="11" id="98" />
-<TGConnectingPoint num="12" id="99" />
-<TGConnectingPoint num="13" id="100" />
-<TGConnectingPoint num="14" id="101" />
-<TGConnectingPoint num="15" id="102" />
-<TGConnectingPoint num="16" id="103" />
-<TGConnectingPoint num="17" id="104" />
-<TGConnectingPoint num="18" id="105" />
-<TGConnectingPoint num="19" id="106" />
-<TGConnectingPoint num="20" id="107" />
-<TGConnectingPoint num="21" id="108" />
-<TGConnectingPoint num="22" id="109" />
-<TGConnectingPoint num="23" id="110" />
-<TGConnectingPoint num="24" id="111" />
-<TGConnectingPoint num="25" id="112" />
-<TGConnectingPoint num="26" id="113" />
-<TGConnectingPoint num="27" id="114" />
-<TGConnectingPoint num="28" id="115" />
-<TGConnectingPoint num="29" id="116" />
-<TGConnectingPoint num="30" id="117" />
-<TGConnectingPoint num="31" id="118" />
-<TGConnectingPoint num="32" id="119" />
-<TGConnectingPoint num="33" id="120" />
-<TGConnectingPoint num="34" id="121" />
-<TGConnectingPoint num="35" id="122" />
-<TGConnectingPoint num="36" id="123" />
-<TGConnectingPoint num="37" id="124" />
-<TGConnectingPoint num="38" id="125" />
-<TGConnectingPoint num="39" id="126" />
-<TGConnectingPoint num="40" id="127" />
-<TGConnectingPoint num="41" id="128" />
-<TGConnectingPoint num="42" id="129" />
-<TGConnectingPoint num="43" id="130" />
-<TGConnectingPoint num="44" id="131" />
-<TGConnectingPoint num="45" id="132" />
-<TGConnectingPoint num="46" id="133" />
-<TGConnectingPoint num="47" id="134" />
-<TGConnectingPoint num="48" id="135" />
-<TGConnectingPoint num="49" id="136" />
-<TGConnectingPoint num="50" id="137" />
-<TGConnectingPoint num="51" id="138" />
-<TGConnectingPoint num="52" id="139" />
-<TGConnectingPoint num="53" id="140" />
-<TGConnectingPoint num="54" id="141" />
-<TGConnectingPoint num="55" id="142" />
-<TGConnectingPoint num="56" id="143" />
-<TGConnectingPoint num="57" id="144" />
-<TGConnectingPoint num="58" id="145" />
-<TGConnectingPoint num="59" id="146" />
-<TGConnectingPoint num="60" id="147" />
-<TGConnectingPoint num="61" id="148" />
-<TGConnectingPoint num="62" id="149" />
-<TGConnectingPoint num="63" id="150" />
-<TGConnectingPoint num="64" id="151" />
-<TGConnectingPoint num="65" id="152" />
-<TGConnectingPoint num="66" id="153" />
-<TGConnectingPoint num="67" id="154" />
-<TGConnectingPoint num="68" id="155" />
-<TGConnectingPoint num="69" id="156" />
-<TGConnectingPoint num="70" id="157" />
-<TGConnectingPoint num="71" id="158" />
+<TGConnectingPoint num="0" id="104" />
+<TGConnectingPoint num="1" id="105" />
+<TGConnectingPoint num="2" id="106" />
+<TGConnectingPoint num="3" id="107" />
+<TGConnectingPoint num="4" id="108" />
+<TGConnectingPoint num="5" id="109" />
+<TGConnectingPoint num="6" id="110" />
+<TGConnectingPoint num="7" id="111" />
+<TGConnectingPoint num="8" id="112" />
+<TGConnectingPoint num="9" id="113" />
+<TGConnectingPoint num="10" id="114" />
+<TGConnectingPoint num="11" id="115" />
+<TGConnectingPoint num="12" id="116" />
+<TGConnectingPoint num="13" id="117" />
+<TGConnectingPoint num="14" id="118" />
+<TGConnectingPoint num="15" id="119" />
+<TGConnectingPoint num="16" id="120" />
+<TGConnectingPoint num="17" id="121" />
+<TGConnectingPoint num="18" id="122" />
+<TGConnectingPoint num="19" id="123" />
+<TGConnectingPoint num="20" id="124" />
+<TGConnectingPoint num="21" id="125" />
+<TGConnectingPoint num="22" id="126" />
+<TGConnectingPoint num="23" id="127" />
+<TGConnectingPoint num="24" id="128" />
+<TGConnectingPoint num="25" id="129" />
+<TGConnectingPoint num="26" id="130" />
+<TGConnectingPoint num="27" id="131" />
+<TGConnectingPoint num="28" id="132" />
+<TGConnectingPoint num="29" id="133" />
+<TGConnectingPoint num="30" id="134" />
+<TGConnectingPoint num="31" id="135" />
+<TGConnectingPoint num="32" id="136" />
+<TGConnectingPoint num="33" id="137" />
+<TGConnectingPoint num="34" id="138" />
+<TGConnectingPoint num="35" id="139" />
+<TGConnectingPoint num="36" id="140" />
+<TGConnectingPoint num="37" id="141" />
+<TGConnectingPoint num="38" id="142" />
+<TGConnectingPoint num="39" id="143" />
+<TGConnectingPoint num="40" id="144" />
+<TGConnectingPoint num="41" id="145" />
+<TGConnectingPoint num="42" id="146" />
+<TGConnectingPoint num="43" id="147" />
+<TGConnectingPoint num="44" id="148" />
+<TGConnectingPoint num="45" id="149" />
+<TGConnectingPoint num="46" id="150" />
+<TGConnectingPoint num="47" id="151" />
+<TGConnectingPoint num="48" id="152" />
+<TGConnectingPoint num="49" id="153" />
+<TGConnectingPoint num="50" id="154" />
+<TGConnectingPoint num="51" id="155" />
+<TGConnectingPoint num="52" id="156" />
+<TGConnectingPoint num="53" id="157" />
+<TGConnectingPoint num="54" id="158" />
+<TGConnectingPoint num="55" id="159" />
+<TGConnectingPoint num="56" id="160" />
+<TGConnectingPoint num="57" id="161" />
+<TGConnectingPoint num="58" id="162" />
+<TGConnectingPoint num="59" id="163" />
+<TGConnectingPoint num="60" id="164" />
+<TGConnectingPoint num="61" id="165" />
+<TGConnectingPoint num="62" id="166" />
+<TGConnectingPoint num="63" id="167" />
+<TGConnectingPoint num="64" id="168" />
+<TGConnectingPoint num="65" id="169" />
+<TGConnectingPoint num="66" id="170" />
+<TGConnectingPoint num="67" id="171" />
+<TGConnectingPoint num="68" id="172" />
+<TGConnectingPoint num="69" id="173" />
+<TGConnectingPoint num="70" id="174" />
+<TGConnectingPoint num="71" id="175" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5103" id="170" >
+<COMPONENT type="5103" id="187" >
<cdparam x="378" y="227" />
<sizeparam width="80" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Send signal" value="exchange(x)" />
-<TGConnectingPoint num="0" id="160" />
-<TGConnectingPoint num="1" id="161" />
-<TGConnectingPoint num="2" id="162" />
-<TGConnectingPoint num="3" id="163" />
-<TGConnectingPoint num="4" id="164" />
-<TGConnectingPoint num="5" id="165" />
-<TGConnectingPoint num="6" id="166" />
-<TGConnectingPoint num="7" id="167" />
-<TGConnectingPoint num="8" id="168" />
-<TGConnectingPoint num="9" id="169" />
+<TGConnectingPoint num="0" id="177" />
+<TGConnectingPoint num="1" id="178" />
+<TGConnectingPoint num="2" id="179" />
+<TGConnectingPoint num="3" id="180" />
+<TGConnectingPoint num="4" id="181" />
+<TGConnectingPoint num="5" id="182" />
+<TGConnectingPoint num="6" id="183" />
+<TGConnectingPoint num="7" id="184" />
+<TGConnectingPoint num="8" id="185" />
+<TGConnectingPoint num="9" id="186" />
</COMPONENT>
-<COMPONENT type="5106" id="243" >
+<COMPONENT type="5106" id="260" >
<cdparam x="380" y="123" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="state0" value="Main0" />
-<TGConnectingPoint num="0" id="171" />
-<TGConnectingPoint num="1" id="172" />
-<TGConnectingPoint num="2" id="173" />
-<TGConnectingPoint num="3" id="174" />
-<TGConnectingPoint num="4" id="175" />
-<TGConnectingPoint num="5" id="176" />
-<TGConnectingPoint num="6" id="177" />
-<TGConnectingPoint num="7" id="178" />
-<TGConnectingPoint num="8" id="179" />
-<TGConnectingPoint num="9" id="180" />
-<TGConnectingPoint num="10" id="181" />
-<TGConnectingPoint num="11" id="182" />
-<TGConnectingPoint num="12" id="183" />
-<TGConnectingPoint num="13" id="184" />
-<TGConnectingPoint num="14" id="185" />
-<TGConnectingPoint num="15" id="186" />
-<TGConnectingPoint num="16" id="187" />
-<TGConnectingPoint num="17" id="188" />
-<TGConnectingPoint num="18" id="189" />
-<TGConnectingPoint num="19" id="190" />
-<TGConnectingPoint num="20" id="191" />
-<TGConnectingPoint num="21" id="192" />
-<TGConnectingPoint num="22" id="193" />
-<TGConnectingPoint num="23" id="194" />
-<TGConnectingPoint num="24" id="195" />
-<TGConnectingPoint num="25" id="196" />
-<TGConnectingPoint num="26" id="197" />
-<TGConnectingPoint num="27" id="198" />
-<TGConnectingPoint num="28" id="199" />
-<TGConnectingPoint num="29" id="200" />
-<TGConnectingPoint num="30" id="201" />
-<TGConnectingPoint num="31" id="202" />
-<TGConnectingPoint num="32" id="203" />
-<TGConnectingPoint num="33" id="204" />
-<TGConnectingPoint num="34" id="205" />
-<TGConnectingPoint num="35" id="206" />
-<TGConnectingPoint num="36" id="207" />
-<TGConnectingPoint num="37" id="208" />
-<TGConnectingPoint num="38" id="209" />
-<TGConnectingPoint num="39" id="210" />
-<TGConnectingPoint num="40" id="211" />
-<TGConnectingPoint num="41" id="212" />
-<TGConnectingPoint num="42" id="213" />
-<TGConnectingPoint num="43" id="214" />
-<TGConnectingPoint num="44" id="215" />
-<TGConnectingPoint num="45" id="216" />
-<TGConnectingPoint num="46" id="217" />
-<TGConnectingPoint num="47" id="218" />
-<TGConnectingPoint num="48" id="219" />
-<TGConnectingPoint num="49" id="220" />
-<TGConnectingPoint num="50" id="221" />
-<TGConnectingPoint num="51" id="222" />
-<TGConnectingPoint num="52" id="223" />
-<TGConnectingPoint num="53" id="224" />
-<TGConnectingPoint num="54" id="225" />
-<TGConnectingPoint num="55" id="226" />
-<TGConnectingPoint num="56" id="227" />
-<TGConnectingPoint num="57" id="228" />
-<TGConnectingPoint num="58" id="229" />
-<TGConnectingPoint num="59" id="230" />
-<TGConnectingPoint num="60" id="231" />
-<TGConnectingPoint num="61" id="232" />
-<TGConnectingPoint num="62" id="233" />
-<TGConnectingPoint num="63" id="234" />
-<TGConnectingPoint num="64" id="235" />
-<TGConnectingPoint num="65" id="236" />
-<TGConnectingPoint num="66" id="237" />
-<TGConnectingPoint num="67" id="238" />
-<TGConnectingPoint num="68" id="239" />
-<TGConnectingPoint num="69" id="240" />
-<TGConnectingPoint num="70" id="241" />
-<TGConnectingPoint num="71" id="242" />
+<TGConnectingPoint num="0" id="188" />
+<TGConnectingPoint num="1" id="189" />
+<TGConnectingPoint num="2" id="190" />
+<TGConnectingPoint num="3" id="191" />
+<TGConnectingPoint num="4" id="192" />
+<TGConnectingPoint num="5" id="193" />
+<TGConnectingPoint num="6" id="194" />
+<TGConnectingPoint num="7" id="195" />
+<TGConnectingPoint num="8" id="196" />
+<TGConnectingPoint num="9" id="197" />
+<TGConnectingPoint num="10" id="198" />
+<TGConnectingPoint num="11" id="199" />
+<TGConnectingPoint num="12" id="200" />
+<TGConnectingPoint num="13" id="201" />
+<TGConnectingPoint num="14" id="202" />
+<TGConnectingPoint num="15" id="203" />
+<TGConnectingPoint num="16" id="204" />
+<TGConnectingPoint num="17" id="205" />
+<TGConnectingPoint num="18" id="206" />
+<TGConnectingPoint num="19" id="207" />
+<TGConnectingPoint num="20" id="208" />
+<TGConnectingPoint num="21" id="209" />
+<TGConnectingPoint num="22" id="210" />
+<TGConnectingPoint num="23" id="211" />
+<TGConnectingPoint num="24" id="212" />
+<TGConnectingPoint num="25" id="213" />
+<TGConnectingPoint num="26" id="214" />
+<TGConnectingPoint num="27" id="215" />
+<TGConnectingPoint num="28" id="216" />
+<TGConnectingPoint num="29" id="217" />
+<TGConnectingPoint num="30" id="218" />
+<TGConnectingPoint num="31" id="219" />
+<TGConnectingPoint num="32" id="220" />
+<TGConnectingPoint num="33" id="221" />
+<TGConnectingPoint num="34" id="222" />
+<TGConnectingPoint num="35" id="223" />
+<TGConnectingPoint num="36" id="224" />
+<TGConnectingPoint num="37" id="225" />
+<TGConnectingPoint num="38" id="226" />
+<TGConnectingPoint num="39" id="227" />
+<TGConnectingPoint num="40" id="228" />
+<TGConnectingPoint num="41" id="229" />
+<TGConnectingPoint num="42" id="230" />
+<TGConnectingPoint num="43" id="231" />
+<TGConnectingPoint num="44" id="232" />
+<TGConnectingPoint num="45" id="233" />
+<TGConnectingPoint num="46" id="234" />
+<TGConnectingPoint num="47" id="235" />
+<TGConnectingPoint num="48" id="236" />
+<TGConnectingPoint num="49" id="237" />
+<TGConnectingPoint num="50" id="238" />
+<TGConnectingPoint num="51" id="239" />
+<TGConnectingPoint num="52" id="240" />
+<TGConnectingPoint num="53" id="241" />
+<TGConnectingPoint num="54" id="242" />
+<TGConnectingPoint num="55" id="243" />
+<TGConnectingPoint num="56" id="244" />
+<TGConnectingPoint num="57" id="245" />
+<TGConnectingPoint num="58" id="246" />
+<TGConnectingPoint num="59" id="247" />
+<TGConnectingPoint num="60" id="248" />
+<TGConnectingPoint num="61" id="249" />
+<TGConnectingPoint num="62" id="250" />
+<TGConnectingPoint num="63" id="251" />
+<TGConnectingPoint num="64" id="252" />
+<TGConnectingPoint num="65" id="253" />
+<TGConnectingPoint num="66" id="254" />
+<TGConnectingPoint num="67" id="255" />
+<TGConnectingPoint num="68" id="256" />
+<TGConnectingPoint num="69" id="257" />
+<TGConnectingPoint num="70" id="258" />
+<TGConnectingPoint num="71" id="259" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="245" >
+<COMPONENT type="5100" id="262" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="244" />
+<TGConnectingPoint num="0" id="261" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="Block1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="252" >
+<CONNECTOR type="5102" id="269" >
<cdparam x="444" y="411" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="251" />
-<P1 x="444" y="411" id="384" />
-<P2 x="485" y="486" id="310" />
+<TGConnectingPoint num="0" id="268" />
+<P1 x="444" y="411" id="401" />
+<P2 x="485" y="486" id="327" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="250" >
-<father id="252" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="267" >
+<father id="269" num="0" />
<cdparam x="406" y="460" />
<sizeparam width="49" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="246" />
-<TGConnectingPoint num="1" id="247" />
-<TGConnectingPoint num="2" id="248" />
-<TGConnectingPoint num="3" id="249" />
+<TGConnectingPoint num="0" id="263" />
+<TGConnectingPoint num="1" id="264" />
+<TGConnectingPoint num="2" id="265" />
+<TGConnectingPoint num="3" id="266" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -529,56 +530,56 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="265" >
+<CONNECTOR type="5102" id="282" >
<cdparam x="535" y="535" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="261" />
-<TGConnectingPoint num="1" id="262" />
-<TGConnectingPoint num="2" id="263" />
-<TGConnectingPoint num="3" id="264" />
-<P1 x="535" y="535" id="324" />
-<P2 x="446" y="195" id="474" />
+<TGConnectingPoint num="0" id="278" />
+<TGConnectingPoint num="1" id="279" />
+<TGConnectingPoint num="2" id="280" />
+<TGConnectingPoint num="3" id="281" />
+<P1 x="535" y="535" id="341" />
+<P2 x="446" y="195" id="491" />
<Point x="554" y="583" />
<Point x="656" y="581" />
<Point x="625" y="174" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="253" >
-<father id="265" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="270" >
+<father id="282" num="0" />
<cdparam x="554" y="583" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="254" >
-<father id="265" num="1" />
+<SUBCOMPONENT type="-1" id="271" >
+<father id="282" num="1" />
<cdparam x="656" y="581" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="255" >
-<father id="265" num="2" />
+<SUBCOMPONENT type="-1" id="272" >
+<father id="282" num="2" />
<cdparam x="625" y="174" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="260" >
-<father id="265" num="3" />
+<SUBCOMPONENT type="-1" id="277" >
+<father id="282" num="3" />
<cdparam x="490" y="365" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="256" />
-<TGConnectingPoint num="1" id="257" />
-<TGConnectingPoint num="2" id="258" />
-<TGConnectingPoint num="3" id="259" />
+<TGConnectingPoint num="0" id="273" />
+<TGConnectingPoint num="1" id="274" />
+<TGConnectingPoint num="2" id="275" />
+<TGConnectingPoint num="3" id="276" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -592,26 +593,26 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="272" >
+<CONNECTOR type="5102" id="289" >
<cdparam x="394" y="120" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="271" />
-<P1 x="394" y="120" id="524" />
-<P2 x="383" y="177" id="500" />
+<TGConnectingPoint num="0" id="288" />
+<P1 x="394" y="120" id="541" />
+<P2 x="383" y="177" id="517" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="270" >
-<father id="272" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="287" >
+<father id="289" num="0" />
<cdparam x="395" y="145" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="266" />
-<TGConnectingPoint num="1" id="267" />
-<TGConnectingPoint num="2" id="268" />
-<TGConnectingPoint num="3" id="269" />
+<TGConnectingPoint num="0" id="283" />
+<TGConnectingPoint num="1" id="284" />
+<TGConnectingPoint num="2" id="285" />
+<TGConnectingPoint num="3" id="286" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -625,26 +626,26 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="279" >
+<CONNECTOR type="5102" id="296" >
<cdparam x="408" y="227" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="278" />
-<P1 x="408" y="227" id="513" />
-<P2 x="404" y="271" id="367" />
+<TGConnectingPoint num="0" id="295" />
+<P1 x="408" y="227" id="530" />
+<P2 x="404" y="271" id="384" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="277" >
-<father id="279" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="294" >
+<father id="296" num="0" />
<cdparam x="406" y="249" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="273" />
-<TGConnectingPoint num="1" id="274" />
-<TGConnectingPoint num="2" id="275" />
-<TGConnectingPoint num="3" id="276" />
+<TGConnectingPoint num="0" id="290" />
+<TGConnectingPoint num="1" id="291" />
+<TGConnectingPoint num="2" id="292" />
+<TGConnectingPoint num="3" id="293" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -658,26 +659,26 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="286" >
+<CONNECTOR type="5102" id="303" >
<cdparam x="404" y="301" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="285" />
-<P1 x="404" y="301" id="368" />
-<P2 x="406" y="361" id="426" />
+<TGConnectingPoint num="0" id="302" />
+<P1 x="404" y="301" id="385" />
+<P2 x="406" y="361" id="443" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="284" >
-<father id="286" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="301" >
+<father id="303" num="0" />
<cdparam x="405" y="331" />
<sizeparam width="56" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="280" />
-<TGConnectingPoint num="1" id="281" />
-<TGConnectingPoint num="2" id="282" />
-<TGConnectingPoint num="3" id="283" />
+<TGConnectingPoint num="0" id="297" />
+<TGConnectingPoint num="1" id="298" />
+<TGConnectingPoint num="2" id="299" />
+<TGConnectingPoint num="3" id="300" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -692,26 +693,26 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="293" >
+<CONNECTOR type="5102" id="310" >
<cdparam x="494" y="411" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="292" />
-<P1 x="494" y="411" id="417" />
-<P2 x="498" y="486" id="334" />
+<TGConnectingPoint num="0" id="309" />
+<P1 x="494" y="411" id="434" />
+<P2 x="498" y="486" id="351" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="291" >
-<father id="293" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="308" >
+<father id="310" num="0" />
<cdparam x="496" y="448" />
<sizeparam width="53" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="287" />
-<TGConnectingPoint num="1" id="288" />
-<TGConnectingPoint num="2" id="289" />
-<TGConnectingPoint num="3" id="290" />
+<TGConnectingPoint num="0" id="304" />
+<TGConnectingPoint num="1" id="305" />
+<TGConnectingPoint num="2" id="306" />
+<TGConnectingPoint num="3" id="307" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -726,281 +727,696 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="366" >
+<COMPONENT type="5106" id="383" >
<cdparam x="473" y="486" />
<sizeparam width="100" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="294" />
-<TGConnectingPoint num="1" id="295" />
-<TGConnectingPoint num="2" id="296" />
-<TGConnectingPoint num="3" id="297" />
-<TGConnectingPoint num="4" id="298" />
-<TGConnectingPoint num="5" id="299" />
-<TGConnectingPoint num="6" id="300" />
-<TGConnectingPoint num="7" id="301" />
-<TGConnectingPoint num="8" id="302" />
-<TGConnectingPoint num="9" id="303" />
-<TGConnectingPoint num="10" id="304" />
-<TGConnectingPoint num="11" id="305" />
-<TGConnectingPoint num="12" id="306" />
-<TGConnectingPoint num="13" id="307" />
-<TGConnectingPoint num="14" id="308" />
-<TGConnectingPoint num="15" id="309" />
-<TGConnectingPoint num="16" id="310" />
-<TGConnectingPoint num="17" id="311" />
-<TGConnectingPoint num="18" id="312" />
-<TGConnectingPoint num="19" id="313" />
-<TGConnectingPoint num="20" id="314" />
-<TGConnectingPoint num="21" id="315" />
-<TGConnectingPoint num="22" id="316" />
-<TGConnectingPoint num="23" id="317" />
-<TGConnectingPoint num="24" id="318" />
-<TGConnectingPoint num="25" id="319" />
-<TGConnectingPoint num="26" id="320" />
-<TGConnectingPoint num="27" id="321" />
-<TGConnectingPoint num="28" id="322" />
-<TGConnectingPoint num="29" id="323" />
-<TGConnectingPoint num="30" id="324" />
-<TGConnectingPoint num="31" id="325" />
-<TGConnectingPoint num="32" id="326" />
-<TGConnectingPoint num="33" id="327" />
-<TGConnectingPoint num="34" id="328" />
-<TGConnectingPoint num="35" id="329" />
-<TGConnectingPoint num="36" id="330" />
-<TGConnectingPoint num="37" id="331" />
-<TGConnectingPoint num="38" id="332" />
-<TGConnectingPoint num="39" id="333" />
-<TGConnectingPoint num="40" id="334" />
-<TGConnectingPoint num="41" id="335" />
-<TGConnectingPoint num="42" id="336" />
-<TGConnectingPoint num="43" id="337" />
-<TGConnectingPoint num="44" id="338" />
-<TGConnectingPoint num="45" id="339" />
-<TGConnectingPoint num="46" id="340" />
-<TGConnectingPoint num="47" id="341" />
-<TGConnectingPoint num="48" id="342" />
-<TGConnectingPoint num="49" id="343" />
-<TGConnectingPoint num="50" id="344" />
-<TGConnectingPoint num="51" id="345" />
-<TGConnectingPoint num="52" id="346" />
-<TGConnectingPoint num="53" id="347" />
-<TGConnectingPoint num="54" id="348" />
-<TGConnectingPoint num="55" id="349" />
-<TGConnectingPoint num="56" id="350" />
-<TGConnectingPoint num="57" id="351" />
-<TGConnectingPoint num="58" id="352" />
-<TGConnectingPoint num="59" id="353" />
-<TGConnectingPoint num="60" id="354" />
-<TGConnectingPoint num="61" id="355" />
-<TGConnectingPoint num="62" id="356" />
-<TGConnectingPoint num="63" id="357" />
-<TGConnectingPoint num="64" id="358" />
-<TGConnectingPoint num="65" id="359" />
-<TGConnectingPoint num="66" id="360" />
-<TGConnectingPoint num="67" id="361" />
-<TGConnectingPoint num="68" id="362" />
-<TGConnectingPoint num="69" id="363" />
-<TGConnectingPoint num="70" id="364" />
-<TGConnectingPoint num="71" id="365" />
+<TGConnectingPoint num="0" id="311" />
+<TGConnectingPoint num="1" id="312" />
+<TGConnectingPoint num="2" id="313" />
+<TGConnectingPoint num="3" id="314" />
+<TGConnectingPoint num="4" id="315" />
+<TGConnectingPoint num="5" id="316" />
+<TGConnectingPoint num="6" id="317" />
+<TGConnectingPoint num="7" id="318" />
+<TGConnectingPoint num="8" id="319" />
+<TGConnectingPoint num="9" id="320" />
+<TGConnectingPoint num="10" id="321" />
+<TGConnectingPoint num="11" id="322" />
+<TGConnectingPoint num="12" id="323" />
+<TGConnectingPoint num="13" id="324" />
+<TGConnectingPoint num="14" id="325" />
+<TGConnectingPoint num="15" id="326" />
+<TGConnectingPoint num="16" id="327" />
+<TGConnectingPoint num="17" id="328" />
+<TGConnectingPoint num="18" id="329" />
+<TGConnectingPoint num="19" id="330" />
+<TGConnectingPoint num="20" id="331" />
+<TGConnectingPoint num="21" id="332" />
+<TGConnectingPoint num="22" id="333" />
+<TGConnectingPoint num="23" id="334" />
+<TGConnectingPoint num="24" id="335" />
+<TGConnectingPoint num="25" id="336" />
+<TGConnectingPoint num="26" id="337" />
+<TGConnectingPoint num="27" id="338" />
+<TGConnectingPoint num="28" id="339" />
+<TGConnectingPoint num="29" id="340" />
+<TGConnectingPoint num="30" id="341" />
+<TGConnectingPoint num="31" id="342" />
+<TGConnectingPoint num="32" id="343" />
+<TGConnectingPoint num="33" id="344" />
+<TGConnectingPoint num="34" id="345" />
+<TGConnectingPoint num="35" id="346" />
+<TGConnectingPoint num="36" id="347" />
+<TGConnectingPoint num="37" id="348" />
+<TGConnectingPoint num="38" id="349" />
+<TGConnectingPoint num="39" id="350" />
+<TGConnectingPoint num="40" id="351" />
+<TGConnectingPoint num="41" id="352" />
+<TGConnectingPoint num="42" id="353" />
+<TGConnectingPoint num="43" id="354" />
+<TGConnectingPoint num="44" id="355" />
+<TGConnectingPoint num="45" id="356" />
+<TGConnectingPoint num="46" id="357" />
+<TGConnectingPoint num="47" id="358" />
+<TGConnectingPoint num="48" id="359" />
+<TGConnectingPoint num="49" id="360" />
+<TGConnectingPoint num="50" id="361" />
+<TGConnectingPoint num="51" id="362" />
+<TGConnectingPoint num="52" id="363" />
+<TGConnectingPoint num="53" id="364" />
+<TGConnectingPoint num="54" id="365" />
+<TGConnectingPoint num="55" id="366" />
+<TGConnectingPoint num="56" id="367" />
+<TGConnectingPoint num="57" id="368" />
+<TGConnectingPoint num="58" id="369" />
+<TGConnectingPoint num="59" id="370" />
+<TGConnectingPoint num="60" id="371" />
+<TGConnectingPoint num="61" id="372" />
+<TGConnectingPoint num="62" id="373" />
+<TGConnectingPoint num="63" id="374" />
+<TGConnectingPoint num="64" id="375" />
+<TGConnectingPoint num="65" id="376" />
+<TGConnectingPoint num="66" id="377" />
+<TGConnectingPoint num="67" id="378" />
+<TGConnectingPoint num="68" id="379" />
+<TGConnectingPoint num="69" id="380" />
+<TGConnectingPoint num="70" id="381" />
+<TGConnectingPoint num="71" id="382" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5104" id="377" >
+<COMPONENT type="5104" id="394" >
<cdparam x="361" y="276" />
<sizeparam width="87" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Receive signal" value="exchange(y)" />
-<TGConnectingPoint num="0" id="367" />
-<TGConnectingPoint num="1" id="368" />
-<TGConnectingPoint num="2" id="369" />
-<TGConnectingPoint num="3" id="370" />
-<TGConnectingPoint num="4" id="371" />
-<TGConnectingPoint num="5" id="372" />
-<TGConnectingPoint num="6" id="373" />
-<TGConnectingPoint num="7" id="374" />
-<TGConnectingPoint num="8" id="375" />
-<TGConnectingPoint num="9" id="376" />
+<TGConnectingPoint num="0" id="384" />
+<TGConnectingPoint num="1" id="385" />
+<TGConnectingPoint num="2" id="386" />
+<TGConnectingPoint num="3" id="387" />
+<TGConnectingPoint num="4" id="388" />
+<TGConnectingPoint num="5" id="389" />
+<TGConnectingPoint num="6" id="390" />
+<TGConnectingPoint num="7" id="391" />
+<TGConnectingPoint num="8" id="392" />
+<TGConnectingPoint num="9" id="393" />
</COMPONENT>
-<COMPONENT type="5106" id="450" >
+<COMPONENT type="5106" id="467" >
<cdparam x="394" y="361" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="state0" value="useless" />
-<TGConnectingPoint num="0" id="378" />
-<TGConnectingPoint num="1" id="379" />
-<TGConnectingPoint num="2" id="380" />
-<TGConnectingPoint num="3" id="381" />
-<TGConnectingPoint num="4" id="382" />
-<TGConnectingPoint num="5" id="383" />
-<TGConnectingPoint num="6" id="384" />
-<TGConnectingPoint num="7" id="385" />
-<TGConnectingPoint num="8" id="386" />
-<TGConnectingPoint num="9" id="387" />
-<TGConnectingPoint num="10" id="388" />
-<TGConnectingPoint num="11" id="389" />
-<TGConnectingPoint num="12" id="390" />
-<TGConnectingPoint num="13" id="391" />
-<TGConnectingPoint num="14" id="392" />
-<TGConnectingPoint num="15" id="393" />
-<TGConnectingPoint num="16" id="394" />
-<TGConnectingPoint num="17" id="395" />
-<TGConnectingPoint num="18" id="396" />
-<TGConnectingPoint num="19" id="397" />
-<TGConnectingPoint num="20" id="398" />
-<TGConnectingPoint num="21" id="399" />
-<TGConnectingPoint num="22" id="400" />
-<TGConnectingPoint num="23" id="401" />
-<TGConnectingPoint num="24" id="402" />
-<TGConnectingPoint num="25" id="403" />
-<TGConnectingPoint num="26" id="404" />
-<TGConnectingPoint num="27" id="405" />
-<TGConnectingPoint num="28" id="406" />
-<TGConnectingPoint num="29" id="407" />
-<TGConnectingPoint num="30" id="408" />
-<TGConnectingPoint num="31" id="409" />
-<TGConnectingPoint num="32" id="410" />
-<TGConnectingPoint num="33" id="411" />
-<TGConnectingPoint num="34" id="412" />
-<TGConnectingPoint num="35" id="413" />
-<TGConnectingPoint num="36" id="414" />
-<TGConnectingPoint num="37" id="415" />
-<TGConnectingPoint num="38" id="416" />
-<TGConnectingPoint num="39" id="417" />
-<TGConnectingPoint num="40" id="418" />
-<TGConnectingPoint num="41" id="419" />
-<TGConnectingPoint num="42" id="420" />
-<TGConnectingPoint num="43" id="421" />
-<TGConnectingPoint num="44" id="422" />
-<TGConnectingPoint num="45" id="423" />
-<TGConnectingPoint num="46" id="424" />
-<TGConnectingPoint num="47" id="425" />
-<TGConnectingPoint num="48" id="426" />
-<TGConnectingPoint num="49" id="427" />
-<TGConnectingPoint num="50" id="428" />
-<TGConnectingPoint num="51" id="429" />
-<TGConnectingPoint num="52" id="430" />
-<TGConnectingPoint num="53" id="431" />
-<TGConnectingPoint num="54" id="432" />
-<TGConnectingPoint num="55" id="433" />
-<TGConnectingPoint num="56" id="434" />
-<TGConnectingPoint num="57" id="435" />
-<TGConnectingPoint num="58" id="436" />
-<TGConnectingPoint num="59" id="437" />
-<TGConnectingPoint num="60" id="438" />
-<TGConnectingPoint num="61" id="439" />
-<TGConnectingPoint num="62" id="440" />
-<TGConnectingPoint num="63" id="441" />
-<TGConnectingPoint num="64" id="442" />
-<TGConnectingPoint num="65" id="443" />
-<TGConnectingPoint num="66" id="444" />
-<TGConnectingPoint num="67" id="445" />
-<TGConnectingPoint num="68" id="446" />
-<TGConnectingPoint num="69" id="447" />
-<TGConnectingPoint num="70" id="448" />
-<TGConnectingPoint num="71" id="449" />
+<TGConnectingPoint num="0" id="395" />
+<TGConnectingPoint num="1" id="396" />
+<TGConnectingPoint num="2" id="397" />
+<TGConnectingPoint num="3" id="398" />
+<TGConnectingPoint num="4" id="399" />
+<TGConnectingPoint num="5" id="400" />
+<TGConnectingPoint num="6" id="401" />
+<TGConnectingPoint num="7" id="402" />
+<TGConnectingPoint num="8" id="403" />
+<TGConnectingPoint num="9" id="404" />
+<TGConnectingPoint num="10" id="405" />
+<TGConnectingPoint num="11" id="406" />
+<TGConnectingPoint num="12" id="407" />
+<TGConnectingPoint num="13" id="408" />
+<TGConnectingPoint num="14" id="409" />
+<TGConnectingPoint num="15" id="410" />
+<TGConnectingPoint num="16" id="411" />
+<TGConnectingPoint num="17" id="412" />
+<TGConnectingPoint num="18" id="413" />
+<TGConnectingPoint num="19" id="414" />
+<TGConnectingPoint num="20" id="415" />
+<TGConnectingPoint num="21" id="416" />
+<TGConnectingPoint num="22" id="417" />
+<TGConnectingPoint num="23" id="418" />
+<TGConnectingPoint num="24" id="419" />
+<TGConnectingPoint num="25" id="420" />
+<TGConnectingPoint num="26" id="421" />
+<TGConnectingPoint num="27" id="422" />
+<TGConnectingPoint num="28" id="423" />
+<TGConnectingPoint num="29" id="424" />
+<TGConnectingPoint num="30" id="425" />
+<TGConnectingPoint num="31" id="426" />
+<TGConnectingPoint num="32" id="427" />
+<TGConnectingPoint num="33" id="428" />
+<TGConnectingPoint num="34" id="429" />
+<TGConnectingPoint num="35" id="430" />
+<TGConnectingPoint num="36" id="431" />
+<TGConnectingPoint num="37" id="432" />
+<TGConnectingPoint num="38" id="433" />
+<TGConnectingPoint num="39" id="434" />
+<TGConnectingPoint num="40" id="435" />
+<TGConnectingPoint num="41" id="436" />
+<TGConnectingPoint num="42" id="437" />
+<TGConnectingPoint num="43" id="438" />
+<TGConnectingPoint num="44" id="439" />
+<TGConnectingPoint num="45" id="440" />
+<TGConnectingPoint num="46" id="441" />
+<TGConnectingPoint num="47" id="442" />
+<TGConnectingPoint num="48" id="443" />
+<TGConnectingPoint num="49" id="444" />
+<TGConnectingPoint num="50" id="445" />
+<TGConnectingPoint num="51" id="446" />
+<TGConnectingPoint num="52" id="447" />
+<TGConnectingPoint num="53" id="448" />
+<TGConnectingPoint num="54" id="449" />
+<TGConnectingPoint num="55" id="450" />
+<TGConnectingPoint num="56" id="451" />
+<TGConnectingPoint num="57" id="452" />
+<TGConnectingPoint num="58" id="453" />
+<TGConnectingPoint num="59" id="454" />
+<TGConnectingPoint num="60" id="455" />
+<TGConnectingPoint num="61" id="456" />
+<TGConnectingPoint num="62" id="457" />
+<TGConnectingPoint num="63" id="458" />
+<TGConnectingPoint num="64" id="459" />
+<TGConnectingPoint num="65" id="460" />
+<TGConnectingPoint num="66" id="461" />
+<TGConnectingPoint num="67" id="462" />
+<TGConnectingPoint num="68" id="463" />
+<TGConnectingPoint num="69" id="464" />
+<TGConnectingPoint num="70" id="465" />
+<TGConnectingPoint num="71" id="466" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="523" >
+<COMPONENT type="5106" id="540" >
<cdparam x="346" y="177" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="state0" value="Main" />
-<TGConnectingPoint num="0" id="451" />
-<TGConnectingPoint num="1" id="452" />
-<TGConnectingPoint num="2" id="453" />
-<TGConnectingPoint num="3" id="454" />
-<TGConnectingPoint num="4" id="455" />
-<TGConnectingPoint num="5" id="456" />
-<TGConnectingPoint num="6" id="457" />
-<TGConnectingPoint num="7" id="458" />
-<TGConnectingPoint num="8" id="459" />
-<TGConnectingPoint num="9" id="460" />
-<TGConnectingPoint num="10" id="461" />
-<TGConnectingPoint num="11" id="462" />
-<TGConnectingPoint num="12" id="463" />
-<TGConnectingPoint num="13" id="464" />
-<TGConnectingPoint num="14" id="465" />
-<TGConnectingPoint num="15" id="466" />
-<TGConnectingPoint num="16" id="467" />
-<TGConnectingPoint num="17" id="468" />
-<TGConnectingPoint num="18" id="469" />
-<TGConnectingPoint num="19" id="470" />
-<TGConnectingPoint num="20" id="471" />
-<TGConnectingPoint num="21" id="472" />
-<TGConnectingPoint num="22" id="473" />
-<TGConnectingPoint num="23" id="474" />
-<TGConnectingPoint num="24" id="475" />
-<TGConnectingPoint num="25" id="476" />
-<TGConnectingPoint num="26" id="477" />
-<TGConnectingPoint num="27" id="478" />
-<TGConnectingPoint num="28" id="479" />
-<TGConnectingPoint num="29" id="480" />
-<TGConnectingPoint num="30" id="481" />
-<TGConnectingPoint num="31" id="482" />
-<TGConnectingPoint num="32" id="483" />
-<TGConnectingPoint num="33" id="484" />
-<TGConnectingPoint num="34" id="485" />
-<TGConnectingPoint num="35" id="486" />
-<TGConnectingPoint num="36" id="487" />
-<TGConnectingPoint num="37" id="488" />
-<TGConnectingPoint num="38" id="489" />
-<TGConnectingPoint num="39" id="490" />
-<TGConnectingPoint num="40" id="491" />
-<TGConnectingPoint num="41" id="492" />
-<TGConnectingPoint num="42" id="493" />
-<TGConnectingPoint num="43" id="494" />
-<TGConnectingPoint num="44" id="495" />
-<TGConnectingPoint num="45" id="496" />
-<TGConnectingPoint num="46" id="497" />
-<TGConnectingPoint num="47" id="498" />
-<TGConnectingPoint num="48" id="499" />
-<TGConnectingPoint num="49" id="500" />
-<TGConnectingPoint num="50" id="501" />
-<TGConnectingPoint num="51" id="502" />
-<TGConnectingPoint num="52" id="503" />
-<TGConnectingPoint num="53" id="504" />
-<TGConnectingPoint num="54" id="505" />
-<TGConnectingPoint num="55" id="506" />
-<TGConnectingPoint num="56" id="507" />
-<TGConnectingPoint num="57" id="508" />
-<TGConnectingPoint num="58" id="509" />
-<TGConnectingPoint num="59" id="510" />
-<TGConnectingPoint num="60" id="511" />
-<TGConnectingPoint num="61" id="512" />
-<TGConnectingPoint num="62" id="513" />
-<TGConnectingPoint num="63" id="514" />
-<TGConnectingPoint num="64" id="515" />
-<TGConnectingPoint num="65" id="516" />
-<TGConnectingPoint num="66" id="517" />
-<TGConnectingPoint num="67" id="518" />
-<TGConnectingPoint num="68" id="519" />
-<TGConnectingPoint num="69" id="520" />
-<TGConnectingPoint num="70" id="521" />
-<TGConnectingPoint num="71" id="522" />
+<TGConnectingPoint num="0" id="468" />
+<TGConnectingPoint num="1" id="469" />
+<TGConnectingPoint num="2" id="470" />
+<TGConnectingPoint num="3" id="471" />
+<TGConnectingPoint num="4" id="472" />
+<TGConnectingPoint num="5" id="473" />
+<TGConnectingPoint num="6" id="474" />
+<TGConnectingPoint num="7" id="475" />
+<TGConnectingPoint num="8" id="476" />
+<TGConnectingPoint num="9" id="477" />
+<TGConnectingPoint num="10" id="478" />
+<TGConnectingPoint num="11" id="479" />
+<TGConnectingPoint num="12" id="480" />
+<TGConnectingPoint num="13" id="481" />
+<TGConnectingPoint num="14" id="482" />
+<TGConnectingPoint num="15" id="483" />
+<TGConnectingPoint num="16" id="484" />
+<TGConnectingPoint num="17" id="485" />
+<TGConnectingPoint num="18" id="486" />
+<TGConnectingPoint num="19" id="487" />
+<TGConnectingPoint num="20" id="488" />
+<TGConnectingPoint num="21" id="489" />
+<TGConnectingPoint num="22" id="490" />
+<TGConnectingPoint num="23" id="491" />
+<TGConnectingPoint num="24" id="492" />
+<TGConnectingPoint num="25" id="493" />
+<TGConnectingPoint num="26" id="494" />
+<TGConnectingPoint num="27" id="495" />
+<TGConnectingPoint num="28" id="496" />
+<TGConnectingPoint num="29" id="497" />
+<TGConnectingPoint num="30" id="498" />
+<TGConnectingPoint num="31" id="499" />
+<TGConnectingPoint num="32" id="500" />
+<TGConnectingPoint num="33" id="501" />
+<TGConnectingPoint num="34" id="502" />
+<TGConnectingPoint num="35" id="503" />
+<TGConnectingPoint num="36" id="504" />
+<TGConnectingPoint num="37" id="505" />
+<TGConnectingPoint num="38" id="506" />
+<TGConnectingPoint num="39" id="507" />
+<TGConnectingPoint num="40" id="508" />
+<TGConnectingPoint num="41" id="509" />
+<TGConnectingPoint num="42" id="510" />
+<TGConnectingPoint num="43" id="511" />
+<TGConnectingPoint num="44" id="512" />
+<TGConnectingPoint num="45" id="513" />
+<TGConnectingPoint num="46" id="514" />
+<TGConnectingPoint num="47" id="515" />
+<TGConnectingPoint num="48" id="516" />
+<TGConnectingPoint num="49" id="517" />
+<TGConnectingPoint num="50" id="518" />
+<TGConnectingPoint num="51" id="519" />
+<TGConnectingPoint num="52" id="520" />
+<TGConnectingPoint num="53" id="521" />
+<TGConnectingPoint num="54" id="522" />
+<TGConnectingPoint num="55" id="523" />
+<TGConnectingPoint num="56" id="524" />
+<TGConnectingPoint num="57" id="525" />
+<TGConnectingPoint num="58" id="526" />
+<TGConnectingPoint num="59" id="527" />
+<TGConnectingPoint num="60" id="528" />
+<TGConnectingPoint num="61" id="529" />
+<TGConnectingPoint num="62" id="530" />
+<TGConnectingPoint num="63" id="531" />
+<TGConnectingPoint num="64" id="532" />
+<TGConnectingPoint num="65" id="533" />
+<TGConnectingPoint num="66" id="534" />
+<TGConnectingPoint num="67" id="535" />
+<TGConnectingPoint num="68" id="536" />
+<TGConnectingPoint num="69" id="537" />
+<TGConnectingPoint num="70" id="538" />
+<TGConnectingPoint num="71" id="539" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="525" >
+<COMPONENT type="5100" id="542" >
<cdparam x="387" y="100" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="524" />
+<TGConnectingPoint num="0" id="541" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="AVATAR Design" nameTab="Design" tabs="Block Diagram$Block0" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<considerTimingOperators value="true" />
+<Validated value="Block0;" />
+<Ignored value="" />
+
+<COMPONENT type="5000" id="567" >
+<cdparam x="296" y="88" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block0" value="Block0" />
+<TGConnectingPoint num="0" id="543" />
+<TGConnectingPoint num="1" id="544" />
+<TGConnectingPoint num="2" id="545" />
+<TGConnectingPoint num="3" id="546" />
+<TGConnectingPoint num="4" id="547" />
+<TGConnectingPoint num="5" id="548" />
+<TGConnectingPoint num="6" id="549" />
+<TGConnectingPoint num="7" id="550" />
+<TGConnectingPoint num="8" id="551" />
+<TGConnectingPoint num="9" id="552" />
+<TGConnectingPoint num="10" id="553" />
+<TGConnectingPoint num="11" id="554" />
+<TGConnectingPoint num="12" id="555" />
+<TGConnectingPoint num="13" id="556" />
+<TGConnectingPoint num="14" id="557" />
+<TGConnectingPoint num="15" id="558" />
+<TGConnectingPoint num="16" id="559" />
+<TGConnectingPoint num="17" id="560" />
+<TGConnectingPoint num="18" id="561" />
+<TGConnectingPoint num="19" id="562" />
+<TGConnectingPoint num="20" id="563" />
+<TGConnectingPoint num="21" id="564" />
+<TGConnectingPoint num="22" id="565" />
+<TGConnectingPoint num="23" id="566" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="b" value="false" type="4" typeOther="" />
+</extraparam>
+</COMPONENT>
+
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Block0" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="574" >
+<cdparam x="377" y="91" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="573" />
+<P1 x="377" y="91" id="808" />
+<P2 x="380" y="116" id="784" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="572" >
+<father id="574" num="0" />
+<cdparam x="378" y="103" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="568" />
+<TGConnectingPoint num="1" id="569" />
+<TGConnectingPoint num="2" id="570" />
+<TGConnectingPoint num="3" id="571" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="581" >
+<cdparam x="343" y="166" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="580" />
+<P1 x="343" y="166" id="772" />
+<P2 x="334" y="245" id="713" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="579" >
+<father id="581" num="0" />
+<cdparam x="236" y="206" />
+<sizeparam width="97" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="575" />
+<TGConnectingPoint num="1" id="576" />
+<TGConnectingPoint num="2" id="577" />
+<TGConnectingPoint num="3" id="578" />
+<extraparam>
+<guard value="[ (b == true)]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="588" >
+<cdparam x="443" y="166" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="587" />
+<P1 x="443" y="166" id="774" />
+<P2 x="478" y="241" id="621" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="586" >
+<father id="588" num="0" />
+<cdparam x="460" y="203" />
+<sizeparam width="39" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="582" />
+<TGConnectingPoint num="1" id="583" />
+<TGConnectingPoint num="2" id="584" />
+<TGConnectingPoint num="3" id="585" />
+<extraparam>
+<guard value="[ else ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5106" id="661" >
+<cdparam x="478" y="241" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state2" value="state2" />
+<TGConnectingPoint num="0" id="589" />
+<TGConnectingPoint num="1" id="590" />
+<TGConnectingPoint num="2" id="591" />
+<TGConnectingPoint num="3" id="592" />
+<TGConnectingPoint num="4" id="593" />
+<TGConnectingPoint num="5" id="594" />
+<TGConnectingPoint num="6" id="595" />
+<TGConnectingPoint num="7" id="596" />
+<TGConnectingPoint num="8" id="597" />
+<TGConnectingPoint num="9" id="598" />
+<TGConnectingPoint num="10" id="599" />
+<TGConnectingPoint num="11" id="600" />
+<TGConnectingPoint num="12" id="601" />
+<TGConnectingPoint num="13" id="602" />
+<TGConnectingPoint num="14" id="603" />
+<TGConnectingPoint num="15" id="604" />
+<TGConnectingPoint num="16" id="605" />
+<TGConnectingPoint num="17" id="606" />
+<TGConnectingPoint num="18" id="607" />
+<TGConnectingPoint num="19" id="608" />
+<TGConnectingPoint num="20" id="609" />
+<TGConnectingPoint num="21" id="610" />
+<TGConnectingPoint num="22" id="611" />
+<TGConnectingPoint num="23" id="612" />
+<TGConnectingPoint num="24" id="613" />
+<TGConnectingPoint num="25" id="614" />
+<TGConnectingPoint num="26" id="615" />
+<TGConnectingPoint num="27" id="616" />
+<TGConnectingPoint num="28" id="617" />
+<TGConnectingPoint num="29" id="618" />
+<TGConnectingPoint num="30" id="619" />
+<TGConnectingPoint num="31" id="620" />
+<TGConnectingPoint num="32" id="621" />
+<TGConnectingPoint num="33" id="622" />
+<TGConnectingPoint num="34" id="623" />
+<TGConnectingPoint num="35" id="624" />
+<TGConnectingPoint num="36" id="625" />
+<TGConnectingPoint num="37" id="626" />
+<TGConnectingPoint num="38" id="627" />
+<TGConnectingPoint num="39" id="628" />
+<TGConnectingPoint num="40" id="629" />
+<TGConnectingPoint num="41" id="630" />
+<TGConnectingPoint num="42" id="631" />
+<TGConnectingPoint num="43" id="632" />
+<TGConnectingPoint num="44" id="633" />
+<TGConnectingPoint num="45" id="634" />
+<TGConnectingPoint num="46" id="635" />
+<TGConnectingPoint num="47" id="636" />
+<TGConnectingPoint num="48" id="637" />
+<TGConnectingPoint num="49" id="638" />
+<TGConnectingPoint num="50" id="639" />
+<TGConnectingPoint num="51" id="640" />
+<TGConnectingPoint num="52" id="641" />
+<TGConnectingPoint num="53" id="642" />
+<TGConnectingPoint num="54" id="643" />
+<TGConnectingPoint num="55" id="644" />
+<TGConnectingPoint num="56" id="645" />
+<TGConnectingPoint num="57" id="646" />
+<TGConnectingPoint num="58" id="647" />
+<TGConnectingPoint num="59" id="648" />
+<TGConnectingPoint num="60" id="649" />
+<TGConnectingPoint num="61" id="650" />
+<TGConnectingPoint num="62" id="651" />
+<TGConnectingPoint num="63" id="652" />
+<TGConnectingPoint num="64" id="653" />
+<TGConnectingPoint num="65" id="654" />
+<TGConnectingPoint num="66" id="655" />
+<TGConnectingPoint num="67" id="656" />
+<TGConnectingPoint num="68" id="657" />
+<TGConnectingPoint num="69" id="658" />
+<TGConnectingPoint num="70" id="659" />
+<TGConnectingPoint num="71" id="660" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="734" >
+<cdparam x="247" y="245" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state1" value="state1" />
+<TGConnectingPoint num="0" id="662" />
+<TGConnectingPoint num="1" id="663" />
+<TGConnectingPoint num="2" id="664" />
+<TGConnectingPoint num="3" id="665" />
+<TGConnectingPoint num="4" id="666" />
+<TGConnectingPoint num="5" id="667" />
+<TGConnectingPoint num="6" id="668" />
+<TGConnectingPoint num="7" id="669" />
+<TGConnectingPoint num="8" id="670" />
+<TGConnectingPoint num="9" id="671" />
+<TGConnectingPoint num="10" id="672" />
+<TGConnectingPoint num="11" id="673" />
+<TGConnectingPoint num="12" id="674" />
+<TGConnectingPoint num="13" id="675" />
+<TGConnectingPoint num="14" id="676" />
+<TGConnectingPoint num="15" id="677" />
+<TGConnectingPoint num="16" id="678" />
+<TGConnectingPoint num="17" id="679" />
+<TGConnectingPoint num="18" id="680" />
+<TGConnectingPoint num="19" id="681" />
+<TGConnectingPoint num="20" id="682" />
+<TGConnectingPoint num="21" id="683" />
+<TGConnectingPoint num="22" id="684" />
+<TGConnectingPoint num="23" id="685" />
+<TGConnectingPoint num="24" id="686" />
+<TGConnectingPoint num="25" id="687" />
+<TGConnectingPoint num="26" id="688" />
+<TGConnectingPoint num="27" id="689" />
+<TGConnectingPoint num="28" id="690" />
+<TGConnectingPoint num="29" id="691" />
+<TGConnectingPoint num="30" id="692" />
+<TGConnectingPoint num="31" id="693" />
+<TGConnectingPoint num="32" id="694" />
+<TGConnectingPoint num="33" id="695" />
+<TGConnectingPoint num="34" id="696" />
+<TGConnectingPoint num="35" id="697" />
+<TGConnectingPoint num="36" id="698" />
+<TGConnectingPoint num="37" id="699" />
+<TGConnectingPoint num="38" id="700" />
+<TGConnectingPoint num="39" id="701" />
+<TGConnectingPoint num="40" id="702" />
+<TGConnectingPoint num="41" id="703" />
+<TGConnectingPoint num="42" id="704" />
+<TGConnectingPoint num="43" id="705" />
+<TGConnectingPoint num="44" id="706" />
+<TGConnectingPoint num="45" id="707" />
+<TGConnectingPoint num="46" id="708" />
+<TGConnectingPoint num="47" id="709" />
+<TGConnectingPoint num="48" id="710" />
+<TGConnectingPoint num="49" id="711" />
+<TGConnectingPoint num="50" id="712" />
+<TGConnectingPoint num="51" id="713" />
+<TGConnectingPoint num="52" id="714" />
+<TGConnectingPoint num="53" id="715" />
+<TGConnectingPoint num="54" id="716" />
+<TGConnectingPoint num="55" id="717" />
+<TGConnectingPoint num="56" id="718" />
+<TGConnectingPoint num="57" id="719" />
+<TGConnectingPoint num="58" id="720" />
+<TGConnectingPoint num="59" id="721" />
+<TGConnectingPoint num="60" id="722" />
+<TGConnectingPoint num="61" id="723" />
+<TGConnectingPoint num="62" id="724" />
+<TGConnectingPoint num="63" id="725" />
+<TGConnectingPoint num="64" id="726" />
+<TGConnectingPoint num="65" id="727" />
+<TGConnectingPoint num="66" id="728" />
+<TGConnectingPoint num="67" id="729" />
+<TGConnectingPoint num="68" id="730" />
+<TGConnectingPoint num="69" id="731" />
+<TGConnectingPoint num="70" id="732" />
+<TGConnectingPoint num="71" id="733" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="807" >
+<cdparam x="343" y="116" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="735" />
+<TGConnectingPoint num="1" id="736" />
+<TGConnectingPoint num="2" id="737" />
+<TGConnectingPoint num="3" id="738" />
+<TGConnectingPoint num="4" id="739" />
+<TGConnectingPoint num="5" id="740" />
+<TGConnectingPoint num="6" id="741" />
+<TGConnectingPoint num="7" id="742" />
+<TGConnectingPoint num="8" id="743" />
+<TGConnectingPoint num="9" id="744" />
+<TGConnectingPoint num="10" id="745" />
+<TGConnectingPoint num="11" id="746" />
+<TGConnectingPoint num="12" id="747" />
+<TGConnectingPoint num="13" id="748" />
+<TGConnectingPoint num="14" id="749" />
+<TGConnectingPoint num="15" id="750" />
+<TGConnectingPoint num="16" id="751" />
+<TGConnectingPoint num="17" id="752" />
+<TGConnectingPoint num="18" id="753" />
+<TGConnectingPoint num="19" id="754" />
+<TGConnectingPoint num="20" id="755" />
+<TGConnectingPoint num="21" id="756" />
+<TGConnectingPoint num="22" id="757" />
+<TGConnectingPoint num="23" id="758" />
+<TGConnectingPoint num="24" id="759" />
+<TGConnectingPoint num="25" id="760" />
+<TGConnectingPoint num="26" id="761" />
+<TGConnectingPoint num="27" id="762" />
+<TGConnectingPoint num="28" id="763" />
+<TGConnectingPoint num="29" id="764" />
+<TGConnectingPoint num="30" id="765" />
+<TGConnectingPoint num="31" id="766" />
+<TGConnectingPoint num="32" id="767" />
+<TGConnectingPoint num="33" id="768" />
+<TGConnectingPoint num="34" id="769" />
+<TGConnectingPoint num="35" id="770" />
+<TGConnectingPoint num="36" id="771" />
+<TGConnectingPoint num="37" id="772" />
+<TGConnectingPoint num="38" id="773" />
+<TGConnectingPoint num="39" id="774" />
+<TGConnectingPoint num="40" id="775" />
+<TGConnectingPoint num="41" id="776" />
+<TGConnectingPoint num="42" id="777" />
+<TGConnectingPoint num="43" id="778" />
+<TGConnectingPoint num="44" id="779" />
+<TGConnectingPoint num="45" id="780" />
+<TGConnectingPoint num="46" id="781" />
+<TGConnectingPoint num="47" id="782" />
+<TGConnectingPoint num="48" id="783" />
+<TGConnectingPoint num="49" id="784" />
+<TGConnectingPoint num="50" id="785" />
+<TGConnectingPoint num="51" id="786" />
+<TGConnectingPoint num="52" id="787" />
+<TGConnectingPoint num="53" id="788" />
+<TGConnectingPoint num="54" id="789" />
+<TGConnectingPoint num="55" id="790" />
+<TGConnectingPoint num="56" id="791" />
+<TGConnectingPoint num="57" id="792" />
+<TGConnectingPoint num="58" id="793" />
+<TGConnectingPoint num="59" id="794" />
+<TGConnectingPoint num="60" id="795" />
+<TGConnectingPoint num="61" id="796" />
+<TGConnectingPoint num="62" id="797" />
+<TGConnectingPoint num="63" id="798" />
+<TGConnectingPoint num="64" id="799" />
+<TGConnectingPoint num="65" id="800" />
+<TGConnectingPoint num="66" id="801" />
+<TGConnectingPoint num="67" id="802" />
+<TGConnectingPoint num="68" id="803" />
+<TGConnectingPoint num="69" id="804" />
+<TGConnectingPoint num="70" id="805" />
+<TGConnectingPoint num="71" id="806" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="809" >
+<cdparam x="370" y="71" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="808" />
</COMPONENT>
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index d40680c8d6..181b77e2b1 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="3" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
<Modeling type="TML Component Design" nameTab="AppC" tabs="TML Component Task Diagram$Application$TCPIP$Timer$InterfaceDevice$SmartCard" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="2724" minY="0" maxY="916" channels="true" events="true" requests="true" zoom="1.0000000000000018" >
@@ -8,16 +8,16 @@
<cdparam x="535" y="347" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="556" y="321" id="113" />
-<P2 x="534" y="395" id="68" />
+<P1 x="556" y="347" id="169" />
+<P2 x="547" y="382" id="216" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="3" >
<cdparam x="820" y="398" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1025" y="471" id="210" />
-<P2 x="761" y="548" id="98" />
+<P1 x="1025" y="497" id="63" />
+<P2 x="761" y="574" id="184" />
<Point x="887" y="577" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2" >
@@ -33,192 +33,192 @@
<cdparam x="568" y="323" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="710" y="403" id="96" />
-<P2 x="693" y="321" id="135" />
+<P1 x="710" y="403" id="186" />
+<P2 x="693" y="347" id="147" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="5" >
<cdparam x="522" y="390" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="534" y="369" id="63" />
-<P2 x="453" y="322" id="33" />
+<P1 x="521" y="382" id="211" />
+<P2 x="466" y="335" id="41" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="6" >
<cdparam x="409" y="124" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="401" y="83" id="31" />
-<P2 x="593" y="84" id="111" />
+<P1 x="401" y="83" id="43" />
+<P2 x="593" y="84" id="171" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="7" >
<cdparam x="656" y="426" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="805" y="542" id="92" />
-<P2 x="969" y="474" id="196" />
+<P1 x="816" y="552" id="190" />
+<P2 x="969" y="495" id="77" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="8" >
<cdparam x="656" y="400" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="805" y="509" id="90" />
-<P2 x="931" y="466" id="198" />
+<P1 x="816" y="519" id="192" />
+<P2 x="921" y="476" id="75" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="9" >
<cdparam x="602" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="751" y="406" id="82" />
-<P2 x="842" y="362" id="162" />
+<P1 x="751" y="406" id="200" />
+<P2 x="829" y="375" id="105" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="10" >
<cdparam x="689" y="292" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="842" y="388" id="166" />
-<P2 x="931" y="352" id="188" />
+<P1 x="855" y="375" id="109" />
+<P2 x="921" y="362" id="85" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="11" >
<cdparam x="656" y="377" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="805" y="481" id="86" />
-<P2 x="931" y="443" id="190" />
+<P1 x="816" y="491" id="196" />
+<P2 x="921" y="453" id="83" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="12" >
<cdparam x="656" y="351" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="805" y="448" id="88" />
-<P2 x="931" y="416" id="192" />
+<P1 x="816" y="458" id="194" />
+<P2 x="921" y="426" id="81" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="13" >
<cdparam x="741" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="931" y="387" id="194" />
-<P2 x="805" y="419" id="84" />
+<P1 x="921" y="397" id="79" />
+<P2 x="816" y="429" id="198" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="14" >
<cdparam x="735" y="260" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="931" y="317" id="186" />
-<P2 x="734" y="269" id="123" />
+<P1 x="918" y="330" id="87" />
+<P2 x="747" y="282" id="159" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="15" >
<cdparam x="641" y="230" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="734" y="235" id="125" />
-<P2 x="931" y="278" id="184" />
+<P1 x="747" y="248" id="157" />
+<P2 x="918" y="291" id="89" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="16" >
<cdparam x="641" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="734" y="190" id="127" />
-<P2 x="931" y="235" id="182" />
+<P1 x="747" y="203" id="155" />
+<P2 x="918" y="248" id="91" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="17" >
<cdparam x="740" y="353" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="842" y="362" id="161" />
-<P2 x="734" y="301" id="129" />
+<P1 x="829" y="375" id="104" />
+<P2 x="747" y="314" id="153" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="18" >
<cdparam x="460" y="270" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="534" y="290" id="119" />
-<P2 x="453" y="290" id="39" />
+<P1 x="521" y="295" id="163" />
+<P2 x="466" y="299" id="35" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="19" >
<cdparam x="387" y="129" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="453" y="116" id="43" />
-<P2 x="534" y="116" id="131" />
+<P1 x="464" y="126" id="31" />
+<P2 x="524" y="126" id="151" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="20" >
<cdparam x="389" y="200" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="453" y="202" id="37" />
-<P2 x="534" y="202" id="117" />
+<P1 x="466" y="215" id="37" />
+<P2 x="521" y="215" id="165" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="21" >
<cdparam x="460" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="534" y="247" id="115" />
-<P2 x="453" y="247" id="35" />
+<P1 x="521" y="260" id="167" />
+<P2 x="466" y="260" id="39" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="22" >
<cdparam x="389" y="163" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="453" y="156" id="41" />
-<P2 x="534" y="156" id="121" />
+<P1 x="466" y="169" id="33" />
+<P2 x="521" y="169" id="161" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="23" >
<cdparam x="967" y="190" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="931" y="185" id="180" />
-<P2 x="734" y="111" id="109" />
+<P1 x="918" y="198" id="93" />
+<P2 x="747" y="124" id="173" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="24" >
<cdparam x="1028" y="535" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="630" y="324" id="133" />
-<P2 x="669" y="406" id="94" />
+<P1 x="630" y="345" id="149" />
+<P2 x="669" y="406" id="188" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="25" >
<cdparam x="1308" y="303" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1232" y="368" id="146" />
-<P2 x="1167" y="370" id="200" />
+<P1 x="1222" y="378" id="127" />
+<P2 x="1178" y="380" id="73" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="26" >
<cdparam x="1172" y="437" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1167" y="405" id="202" />
-<P2 x="1232" y="403" id="148" />
+<P1 x="1178" y="415" id="71" />
+<P2 x="1222" y="413" id="125" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="29" >
<cdparam x="1041" y="162" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1167" y="198" id="204" />
-<P2 x="1167" y="266" id="206" />
+<P1 x="1178" y="208" id="69" />
+<P2 x="1178" y="276" id="67" />
<Point x="1227" y="207" />
<Point x="1227" y="247" />
<AutomaticDrawing data="true" />
@@ -243,8 +243,8 @@
<cdparam x="877" y="343" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1167" y="444" id="208" />
-<P2 x="1232" y="431" id="150" />
+<P1 x="1178" y="454" id="65" />
+<P2 x="1222" y="441" id="123" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="53" >
@@ -272,14 +272,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="32" >
<father id="53" num="0" />
-<cdparam x="388" y="83" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="443" y="116" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
+<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
+<infoparam name="TGComponent" value="Request activation" />
<TGConnectingPoint num="0" id="31" />
<extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -289,16 +289,16 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="34" >
<father id="53" num="1" />
-<cdparam x="440" y="322" />
+<cdparam x="440" y="156" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<infoparam name="TGComponent" value="Event data_Ready" />
<TGConnectingPoint num="0" id="33" />
<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -306,14 +306,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="36" >
<father id="53" num="2" />
-<cdparam x="440" y="247" />
+<cdparam x="440" y="286" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
<TGConnectingPoint num="0" id="35" />
<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -340,14 +340,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="40" >
<father id="53" num="4" />
-<cdparam x="440" y="290" />
+<cdparam x="440" y="247" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
<TGConnectingPoint num="0" id="39" />
<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -357,16 +357,16 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="42" >
<father id="53" num="5" />
-<cdparam x="440" y="156" />
+<cdparam x="440" y="322" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
<TGConnectingPoint num="0" id="41" />
<extraparam>
-<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -374,14 +374,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="44" >
<father id="53" num="6" />
-<cdparam x="443" y="116" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="388" y="83" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
-<infoparam name="TGComponent" value="Request activation" />
+<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
+<infoparam name="TGComponent" value="Event reset, pTS, end" />
<TGConnectingPoint num="0" id="43" />
<extraparam>
-<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -428,61 +428,61 @@
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1201" id="81" >
+<SUBCOMPONENT type="1200" id="146" >
<father id="238" num="0" />
-<cdparam x="521" y="369" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="842" y="133" />
+<sizeparam width="570" height="485" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<TGConnectingPoint num="4" id="67" />
-<TGConnectingPoint num="5" id="68" />
-<TGConnectingPoint num="6" id="69" />
-<TGConnectingPoint num="7" id="70" />
-<TGConnectingPoint num="8" id="71" />
-<TGConnectingPoint num="9" id="72" />
-<TGConnectingPoint num="10" id="73" />
-<TGConnectingPoint num="11" id="74" />
-<TGConnectingPoint num="12" id="75" />
-<TGConnectingPoint num="13" id="76" />
-<TGConnectingPoint num="14" id="77" />
-<TGConnectingPoint num="15" id="78" />
-<TGConnectingPoint num="16" id="79" />
-<TGConnectingPoint num="17" id="80" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="108" >
-<father id="238" num="1" />
-<cdparam x="565" y="416" />
-<sizeparam width="240" height="145" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
+<infoparam name="TGComponent" value="TCPIP Entities" />
+<TGConnectingPoint num="0" id="138" />
+<TGConnectingPoint num="1" id="139" />
+<TGConnectingPoint num="2" id="140" />
+<TGConnectingPoint num="3" id="141" />
+<TGConnectingPoint num="4" id="142" />
+<TGConnectingPoint num="5" id="143" />
+<TGConnectingPoint num="6" id="144" />
+<TGConnectingPoint num="7" id="145" />
+<extraparam>
+<info hiddeni="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="103" >
+<father id="146" num="0" />
+<cdparam x="931" y="167" />
+<sizeparam width="236" height="317" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
-<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="100" />
-<TGConnectingPoint num="1" id="101" />
-<TGConnectingPoint num="2" id="102" />
-<TGConnectingPoint num="3" id="103" />
-<TGConnectingPoint num="4" id="104" />
-<TGConnectingPoint num="5" id="105" />
-<TGConnectingPoint num="6" id="106" />
-<TGConnectingPoint num="7" id="107" />
+<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
+<infoparam name="TGComponent" value="TCPIP" />
+<TGConnectingPoint num="0" id="95" />
+<TGConnectingPoint num="1" id="96" />
+<TGConnectingPoint num="2" id="97" />
+<TGConnectingPoint num="3" id="98" />
+<TGConnectingPoint num="4" id="99" />
+<TGConnectingPoint num="5" id="100" />
+<TGConnectingPoint num="6" id="101" />
+<TGConnectingPoint num="7" id="102" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
+<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" />
+<Attribute access="2" id="i" value="" type="0" typeOther="" />
+<Attribute access="2" id="j" value="" type="0" typeOther="" />
+<Attribute access="2" id="a" value="0" type="0" typeOther="" />
+<Attribute access="2" id="b" value="0" type="0" typeOther="" />
+<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="83" >
-<father id="108" num="0" />
-<cdparam x="741" y="406" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="64" >
+<father id="103" num="0" />
+<cdparam x="1012" y="471" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="82" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="Primitive port" value="Event opened" />
+<TGConnectingPoint num="0" id="63" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -490,16 +490,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="85" >
-<father id="108" num="1" />
-<cdparam x="795" y="419" />
+<SUBCOMPONENT type="1203" id="66" >
+<father id="103" num="1" />
+<cdparam x="1157" y="444" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="84" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="65" />
<extraparam>
-<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -507,16 +507,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="87" >
-<father id="108" num="2" />
-<cdparam x="795" y="481" />
+<SUBCOMPONENT type="1203" id="68" >
+<father id="103" num="2" />
+<cdparam x="1157" y="266" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="86" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="67" />
<extraparam>
-<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -524,16 +524,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="89" >
-<father id="108" num="3" />
-<cdparam x="795" y="448" />
+<SUBCOMPONENT type="1203" id="70" >
+<father id="103" num="3" />
+<cdparam x="1157" y="198" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="88" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="69" />
<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -541,16 +541,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="91" >
-<father id="108" num="4" />
-<cdparam x="795" y="509" />
+<SUBCOMPONENT type="1203" id="72" >
+<father id="103" num="4" />
+<cdparam x="1157" y="405" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="90" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="71" />
<extraparam>
-<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -558,16 +558,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="93" >
-<father id="108" num="5" />
-<cdparam x="795" y="542" />
+<SUBCOMPONENT type="1203" id="74" >
+<father id="103" num="5" />
+<cdparam x="1157" y="370" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="92" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="73" />
<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -575,16 +575,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="95" >
-<father id="108" num="6" />
-<cdparam x="659" y="406" />
+<SUBCOMPONENT type="1203" id="76" >
+<father id="103" num="6" />
+<cdparam x="921" y="466" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="94" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="75" />
<extraparam>
-<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -592,16 +592,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="97" >
-<father id="108" num="7" />
-<cdparam x="697" y="403" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="78" >
+<father id="103" num="7" />
+<cdparam x="959" y="474" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="96" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="77" />
<extraparam>
-<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -609,16 +609,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="99" >
-<father id="108" num="8" />
-<cdparam x="748" y="548" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="80" >
+<father id="103" num="8" />
+<cdparam x="921" y="387" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="98" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
+<TGConnectingPoint num="0" id="79" />
<extraparam>
-<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -626,43 +626,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="145" >
-<father id="238" num="2" />
-<cdparam x="534" y="97" />
-<sizeparam width="200" height="237" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="82" >
+<father id="103" num="9" />
+<cdparam x="921" y="416" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
-<infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="137" />
-<TGConnectingPoint num="1" id="138" />
-<TGConnectingPoint num="2" id="139" />
-<TGConnectingPoint num="3" id="140" />
-<TGConnectingPoint num="4" id="141" />
-<TGConnectingPoint num="5" id="142" />
-<TGConnectingPoint num="6" id="143" />
-<TGConnectingPoint num="7" id="144" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="81" />
<extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="" type="4" typeOther="" />
-<Attribute access="2" id="i" value="0" type="0" typeOther="" />
-<Attribute access="2" id="j" value="0" type="0" typeOther="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
-<Attribute access="2" id="t" value="" type="0" typeOther="" />
+<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<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="110" >
-<father id="145" num="0" />
-<cdparam x="721" y="111" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="84" >
+<father id="103" num="10" />
+<cdparam x="921" y="443" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="109" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="83" />
<extraparam>
-<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -670,16 +660,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="112" >
-<father id="145" num="1" />
-<cdparam x="580" y="84" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="86" >
+<father id="103" num="11" />
+<cdparam x="921" y="352" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
-<TGConnectingPoint num="0" id="111" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="85" />
<extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -687,16 +677,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="114" >
-<father id="145" num="2" />
-<cdparam x="543" y="321" />
+<SUBCOMPONENT type="1203" id="88" >
+<father id="103" num="12" />
+<cdparam x="918" y="317" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="113" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="87" />
<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -704,16 +694,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="116" >
-<father id="145" num="3" />
-<cdparam x="521" y="247" />
+<SUBCOMPONENT type="1203" id="90" >
+<father id="103" num="13" />
+<cdparam x="918" y="278" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="115" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="89" />
<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -721,16 +711,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="118" >
-<father id="145" num="4" />
-<cdparam x="521" y="202" />
+<SUBCOMPONENT type="1203" id="92" >
+<father id="103" num="14" />
+<cdparam x="918" y="235" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="117" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="91" />
<extraparam>
-<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -738,16 +728,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="120" >
-<father id="145" num="5" />
-<cdparam x="521" y="290" />
+<SUBCOMPONENT type="1203" id="94" >
+<father id="103" num="15" />
+<cdparam x="918" y="185" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="119" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="93" />
<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -755,33 +745,62 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="122" >
-<father id="145" num="6" />
-<cdparam x="521" y="156" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1201" id="122" >
+<father id="146" num="1" />
+<cdparam x="829" y="362" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready" />
-<TGConnectingPoint num="0" id="121" />
+<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="104" />
+<TGConnectingPoint num="1" id="105" />
+<TGConnectingPoint num="2" id="106" />
+<TGConnectingPoint num="3" id="107" />
+<TGConnectingPoint num="4" id="108" />
+<TGConnectingPoint num="5" id="109" />
+<TGConnectingPoint num="6" id="110" />
+<TGConnectingPoint num="7" id="111" />
+<TGConnectingPoint num="8" id="112" />
+<TGConnectingPoint num="9" id="113" />
+<TGConnectingPoint num="10" id="114" />
+<TGConnectingPoint num="11" id="115" />
+<TGConnectingPoint num="12" id="116" />
+<TGConnectingPoint num="13" id="117" />
+<TGConnectingPoint num="14" id="118" />
+<TGConnectingPoint num="15" id="119" />
+<TGConnectingPoint num="16" id="120" />
+<TGConnectingPoint num="17" id="121" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="137" >
+<father id="146" num="2" />
+<cdparam x="1232" y="328" />
+<sizeparam width="140" height="141" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
+<infoparam name="TGComponent" value="Timer" />
+<TGConnectingPoint num="0" id="129" />
+<TGConnectingPoint num="1" id="130" />
+<TGConnectingPoint num="2" id="131" />
+<TGConnectingPoint num="3" id="132" />
+<TGConnectingPoint num="4" id="133" />
+<TGConnectingPoint num="5" id="134" />
+<TGConnectingPoint num="6" id="135" />
+<TGConnectingPoint num="7" id="136" />
<extraparam>
-<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="x" value="0" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="124" >
-<father id="145" num="7" />
-<cdparam x="721" y="269" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="137" num="0" />
+<cdparam x="1222" y="431" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Event stop" />
<TGConnectingPoint num="0" id="123" />
<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -790,15 +809,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="126" >
-<father id="145" num="8" />
-<cdparam x="721" y="235" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="137" num="1" />
+<cdparam x="1222" y="403" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Request req_Timer" />
<TGConnectingPoint num="0" id="125" />
<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -807,15 +826,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="128" >
-<father id="145" num="9" />
-<cdparam x="721" y="190" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="137" num="2" />
+<cdparam x="1222" y="368" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event receive" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Event timeOut" />
<TGConnectingPoint num="0" id="127" />
<extraparam>
-<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -823,16 +842,43 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="130" >
-<father id="145" num="10" />
-<cdparam x="721" y="301" />
+<SUBCOMPONENT type="1202" id="183" >
+<father id="238" num="1" />
+<cdparam x="534" y="97" />
+<sizeparam width="200" height="237" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
+<infoparam name="TGComponent" value="SmartCard" />
+<TGConnectingPoint num="0" id="175" />
+<TGConnectingPoint num="1" id="176" />
+<TGConnectingPoint num="2" id="177" />
+<TGConnectingPoint num="3" id="178" />
+<TGConnectingPoint num="4" id="179" />
+<TGConnectingPoint num="5" id="180" />
+<TGConnectingPoint num="6" id="181" />
+<TGConnectingPoint num="7" id="182" />
+<extraparam>
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
+<Attribute access="2" id="a" value="0" type="0" typeOther="" />
+<Attribute access="2" id="b" value="" type="4" typeOther="" />
+<Attribute access="2" id="i" value="0" type="0" typeOther="" />
+<Attribute access="2" id="j" value="0" type="0" typeOther="" />
+<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
+<Attribute access="2" id="t" value="" type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="148" >
+<father id="183" num="0" />
+<cdparam x="680" y="321" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="129" />
+<infoparam name="Primitive port" value="Event connectionOpened" />
+<TGConnectingPoint num="0" id="147" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -840,16 +886,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="132" >
-<father id="145" num="11" />
-<cdparam x="524" y="116" />
+<SUBCOMPONENT type="1203" id="150" >
+<father id="183" num="1" />
+<cdparam x="620" y="324" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="131" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="149" />
<extraparam>
-<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -857,16 +903,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="134" >
-<father id="145" num="12" />
-<cdparam x="620" y="324" />
+<SUBCOMPONENT type="1203" id="152" >
+<father id="183" num="2" />
+<cdparam x="524" y="116" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="133" />
+<infoparam name="TGComponent" value="Request activation" />
+<TGConnectingPoint num="0" id="151" />
<extraparam>
-<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -874,16 +920,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="136" >
-<father id="145" num="13" />
-<cdparam x="680" y="321" />
+<SUBCOMPONENT type="1203" id="154" >
+<father id="183" num="3" />
+<cdparam x="721" y="301" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="135" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="153" />
<extraparam>
-<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -891,55 +937,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1200" id="229" >
-<father id="238" num="3" />
-<cdparam x="842" y="133" />
-<sizeparam width="570" height="485" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
-<infoparam name="TGComponent" value="TCPIP Entities" />
-<TGConnectingPoint num="0" id="221" />
-<TGConnectingPoint num="1" id="222" />
-<TGConnectingPoint num="2" id="223" />
-<TGConnectingPoint num="3" id="224" />
-<TGConnectingPoint num="4" id="225" />
-<TGConnectingPoint num="5" id="226" />
-<TGConnectingPoint num="6" id="227" />
-<TGConnectingPoint num="7" id="228" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="160" >
-<father id="229" num="0" />
-<cdparam x="1232" y="328" />
-<sizeparam width="140" height="141" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
-<infoparam name="TGComponent" value="Timer" />
-<TGConnectingPoint num="0" id="152" />
-<TGConnectingPoint num="1" id="153" />
-<TGConnectingPoint num="2" id="154" />
-<TGConnectingPoint num="3" id="155" />
-<TGConnectingPoint num="4" id="156" />
-<TGConnectingPoint num="5" id="157" />
-<TGConnectingPoint num="6" id="158" />
-<TGConnectingPoint num="7" id="159" />
-<extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="147" >
-<father id="160" num="0" />
-<cdparam x="1222" y="368" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="156" >
+<father id="183" num="4" />
+<cdparam x="721" y="190" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="146" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="155" />
<extraparam>
-<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -947,16 +954,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="149" >
-<father id="160" num="1" />
-<cdparam x="1222" y="403" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="158" >
+<father id="183" num="5" />
+<cdparam x="721" y="235" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="148" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="157" />
<extraparam>
-<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -964,16 +971,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="151" >
-<father id="160" num="2" />
-<cdparam x="1222" y="431" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="160" >
+<father id="183" num="6" />
+<cdparam x="721" y="269" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="150" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="159" />
<extraparam>
-<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -981,85 +988,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="179" >
-<father id="229" num="1" />
-<cdparam x="829" y="362" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="161" />
-<TGConnectingPoint num="1" id="162" />
-<TGConnectingPoint num="2" id="163" />
-<TGConnectingPoint num="3" id="164" />
-<TGConnectingPoint num="4" id="165" />
-<TGConnectingPoint num="5" id="166" />
-<TGConnectingPoint num="6" id="167" />
-<TGConnectingPoint num="7" id="168" />
-<TGConnectingPoint num="8" id="169" />
-<TGConnectingPoint num="9" id="170" />
-<TGConnectingPoint num="10" id="171" />
-<TGConnectingPoint num="11" id="172" />
-<TGConnectingPoint num="12" id="173" />
-<TGConnectingPoint num="13" id="174" />
-<TGConnectingPoint num="14" id="175" />
-<TGConnectingPoint num="15" id="176" />
-<TGConnectingPoint num="16" id="177" />
-<TGConnectingPoint num="17" id="178" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="220" >
-<father id="229" num="2" />
-<cdparam x="931" y="167" />
-<sizeparam width="236" height="317" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
-<infoparam name="TGComponent" value="TCPIP" />
-<TGConnectingPoint num="0" id="212" />
-<TGConnectingPoint num="1" id="213" />
-<TGConnectingPoint num="2" id="214" />
-<TGConnectingPoint num="3" id="215" />
-<TGConnectingPoint num="4" id="216" />
-<TGConnectingPoint num="5" id="217" />
-<TGConnectingPoint num="6" id="218" />
-<TGConnectingPoint num="7" id="219" />
-<extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
-<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" />
-<Attribute access="2" id="i" value="" type="0" typeOther="" />
-<Attribute access="2" id="j" value="" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="181" >
-<father id="220" num="0" />
-<cdparam x="918" y="185" />
+<SUBCOMPONENT type="1203" id="162" >
+<father id="183" num="7" />
+<cdparam x="521" y="156" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="180" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event data_Ready" />
+<TGConnectingPoint num="0" id="161" />
<extraparam>
-<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="183" >
-<father id="220" num="1" />
-<cdparam x="918" y="235" />
+<SUBCOMPONENT type="1203" id="164" >
+<father id="183" num="8" />
+<cdparam x="521" y="282" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="182" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<TGConnectingPoint num="0" id="163" />
<extraparam>
-<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1067,16 +1022,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="185" >
-<father id="220" num="2" />
-<cdparam x="918" y="278" />
+<SUBCOMPONENT type="1203" id="166" >
+<father id="183" num="9" />
+<cdparam x="521" y="202" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="184" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromDtoSC" />
+<TGConnectingPoint num="0" id="165" />
<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1084,16 +1039,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="187" >
-<father id="220" num="3" />
-<cdparam x="918" y="317" />
+<SUBCOMPONENT type="1203" id="168" >
+<father id="183" num="10" />
+<cdparam x="521" y="247" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="186" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<TGConnectingPoint num="0" id="167" />
<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1101,16 +1056,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="189" >
-<father id="220" num="4" />
-<cdparam x="921" y="352" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="170" >
+<father id="183" num="11" />
+<cdparam x="543" y="321" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="188" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<TGConnectingPoint num="0" id="169" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1118,16 +1073,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="191" >
-<father id="220" num="5" />
-<cdparam x="921" y="443" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="172" >
+<father id="183" num="12" />
+<cdparam x="580" y="84" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="190" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event reset, pTS, end" />
+<TGConnectingPoint num="0" id="171" />
<extraparam>
-<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1135,16 +1090,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="193" >
-<father id="220" num="6" />
-<cdparam x="921" y="416" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="174" >
+<father id="183" num="13" />
+<cdparam x="721" y="111" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="192" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="173" />
<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1152,16 +1107,35 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="195" >
-<father id="220" num="7" />
-<cdparam x="921" y="387" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="210" >
+<father id="238" num="2" />
+<cdparam x="565" y="416" />
+<sizeparam width="240" height="145" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="194" />
+<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
+<infoparam name="TGComponent" value="Application" />
+<TGConnectingPoint num="0" id="202" />
+<TGConnectingPoint num="1" id="203" />
+<TGConnectingPoint num="2" id="204" />
+<TGConnectingPoint num="3" id="205" />
+<TGConnectingPoint num="4" id="206" />
+<TGConnectingPoint num="5" id="207" />
+<TGConnectingPoint num="6" id="208" />
+<TGConnectingPoint num="7" id="209" />
<extraparam>
-<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="185" >
+<father id="210" num="0" />
+<cdparam x="748" y="548" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
+<infoparam name="Primitive port" value="Event opened" />
+<TGConnectingPoint num="0" id="184" />
+<extraparam>
+<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1169,16 +1143,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="197" >
-<father id="220" num="8" />
-<cdparam x="959" y="474" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="187" >
+<father id="210" num="1" />
+<cdparam x="697" y="403" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="196" />
+<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
+<infoparam name="Primitive port" value="Event connectionOpened" />
+<TGConnectingPoint num="0" id="186" />
<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1186,16 +1160,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="199" >
-<father id="220" num="9" />
-<cdparam x="921" y="466" />
+<SUBCOMPONENT type="1203" id="189" >
+<father id="210" num="2" />
+<cdparam x="659" y="406" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="198" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="188" />
<extraparam>
-<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1203,16 +1177,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="201" >
-<father id="220" num="10" />
-<cdparam x="1157" y="370" />
+<SUBCOMPONENT type="1203" id="191" >
+<father id="210" num="3" />
+<cdparam x="795" y="542" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="200" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="190" />
<extraparam>
-<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1220,16 +1194,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="203" >
-<father id="220" num="11" />
-<cdparam x="1157" y="405" />
+<SUBCOMPONENT type="1203" id="193" >
+<father id="210" num="4" />
+<cdparam x="795" y="509" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="202" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="192" />
<extraparam>
-<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1237,16 +1211,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="205" >
-<father id="220" num="12" />
-<cdparam x="1157" y="198" />
+<SUBCOMPONENT type="1203" id="195" >
+<father id="210" num="5" />
+<cdparam x="795" y="448" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="204" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="194" />
<extraparam>
-<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1254,16 +1228,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="207" >
-<father id="220" num="13" />
-<cdparam x="1157" y="266" />
+<SUBCOMPONENT type="1203" id="197" >
+<father id="210" num="6" />
+<cdparam x="795" y="481" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="206" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="196" />
<extraparam>
-<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1271,16 +1245,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="209" >
-<father id="220" num="14" />
-<cdparam x="1157" y="444" />
+<SUBCOMPONENT type="1203" id="199" >
+<father id="210" num="7" />
+<cdparam x="795" y="419" />
<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="208" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
+<TGConnectingPoint num="0" id="198" />
<extraparam>
-<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1288,16 +1262,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="211" >
-<father id="220" num="15" />
-<cdparam x="1012" y="471" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="201" >
+<father id="210" num="8" />
+<cdparam x="741" y="406" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="210" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="200" />
<extraparam>
-<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1305,6 +1279,32 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="229" >
+<father id="238" num="3" />
+<cdparam x="521" y="369" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="211" />
+<TGConnectingPoint num="1" id="212" />
+<TGConnectingPoint num="2" id="213" />
+<TGConnectingPoint num="3" id="214" />
+<TGConnectingPoint num="4" id="215" />
+<TGConnectingPoint num="5" id="216" />
+<TGConnectingPoint num="6" id="217" />
+<TGConnectingPoint num="7" id="218" />
+<TGConnectingPoint num="8" id="219" />
+<TGConnectingPoint num="9" id="220" />
+<TGConnectingPoint num="10" id="221" />
+<TGConnectingPoint num="11" id="222" />
+<TGConnectingPoint num="12" id="223" />
+<TGConnectingPoint num="13" id="224" />
+<TGConnectingPoint num="14" id="225" />
+<TGConnectingPoint num="15" id="226" />
+<TGConnectingPoint num="16" id="227" />
+<TGConnectingPoint num="17" id="228" />
+</SUBCOMPONENT>
</TMLComponentTaskDiagramPanel>
@@ -6038,8 +6038,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1314" >
-<cdparam x="416" y="364" />
-<sizeparam width="48" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="408" y="364" />
+<sizeparam width="64" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6052,8 +6052,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1317" >
-<cdparam x="231" y="201" />
-<sizeparam width="143" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="228" y="201" />
+<sizeparam width="149" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6076,8 +6076,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1322" >
-<cdparam x="138" y="129" />
-<sizeparam width="57" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="131" y="129" />
+<sizeparam width="71" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6091,8 +6091,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="1325" >
-<cdparam x="108" y="182" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="103" y="182" />
+<sizeparam width="126" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6105,8 +6105,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1328" >
-<cdparam x="143" y="237" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="135" y="237" />
+<sizeparam width="64" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6120,8 +6120,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="1331" >
-<cdparam x="121" y="308" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="114" y="308" />
+<sizeparam width="105" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6135,7 +6135,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="1348" >
<cdparam x="376" y="98" />
-<sizeparam width="249" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="233" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="The first two layers of the OSI model
@@ -6166,8 +6166,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1007" id="1351" >
-<cdparam x="250" y="97" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="244" y="97" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6180,8 +6180,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1007" id="1354" >
-<cdparam x="236" y="148" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="232" y="148" />
+<sizeparam width="134" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6203,8 +6203,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1008" id="1359" >
-<cdparam x="236" y="471" />
-<sizeparam width="115" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="231" y="471" />
+<sizeparam width="126" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6226,8 +6226,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1009" id="1364" >
-<cdparam x="249" y="429" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="242" y="429" />
+<sizeparam width="103" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6240,8 +6240,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1010" id="1367" >
-<cdparam x="266" y="385" />
-<sizeparam width="55" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="259" y="385" />
+<sizeparam width="70" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6254,8 +6254,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1006" id="1370" >
-<cdparam x="246" y="513" />
-<sizeparam width="94" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="240" y="513" />
+<sizeparam width="107" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6268,8 +6268,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1008" id="1373" >
-<cdparam x="559" y="472" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="552" y="472" />
+<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6282,8 +6282,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1009" id="1376" >
-<cdparam x="542" y="433" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="536" y="433" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6296,8 +6296,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1006" id="1379" >
-<cdparam x="549" y="509" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="542" y="509" />
+<sizeparam width="99" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6310,8 +6310,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1010" id="1382" >
-<cdparam x="532" y="390" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="526" y="390" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6327,7 +6327,7 @@ the smart card and the terminal
<COMPONENT type="1014" id="1386" >
<cdparam x="236" y="261" />
-<sizeparam width="124" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="125" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -6440,14 +6440,14 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to send request" value="null" />
<P1 x="298" y="122" id="1350" />
-<P2 x="298" y="143" id="1352" />
+<P2 x="299" y="143" id="1352" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1409" >
<cdparam x="286" y="421" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="293" y="410" id="1366" />
+<P1 x="294" y="410" id="1366" />
<P2 x="293" y="424" id="1362" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6456,14 +6456,14 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to send event" value="null" />
<P1 x="293" y="454" id="1363" />
-<P2 x="293" y="466" id="1357" />
+<P2 x="294" y="466" id="1357" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1411" >
<cdparam x="286" y="538" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="293" y="496" id="1358" />
+<P1 x="294" y="496" id="1358" />
<P2 x="293" y="508" id="1368" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6511,7 +6511,7 @@ the smart card and the terminal
<cdparam x="298" y="173" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to for loop" value="null" />
-<P1 x="298" y="173" id="1353" />
+<P1 x="299" y="173" id="1353" />
<P2 x="302" y="196" id="1315" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6528,7 +6528,7 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
<P1 x="399" y="300" id="1390" />
-<P2 x="293" y="380" id="1365" />
+<P2 x="294" y="380" id="1365" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1420" >
@@ -6543,7 +6543,7 @@ the smart card and the terminal
<cdparam x="391" y="341" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to select" value="null" />
-<P1 x="360" y="275" id="1384" />
+<P1 x="361" y="275" id="1384" />
<P2 x="439" y="280" id="1389" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6551,7 +6551,7 @@ the smart card and the terminal
<cdparam x="164" y="262" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="166" y="262" id="1327" />
+<P1 x="167" y="262" id="1327" />
<P2 x="166" y="303" id="1329" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6560,7 +6560,7 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
<P1 x="166" y="207" id="1324" />
-<P2 x="166" y="232" id="1326" />
+<P2 x="167" y="232" id="1326" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1424" >
@@ -6698,11 +6698,11 @@ the smart card and the terminal
</COMPONENT>
<SUBCOMPONENT type="1101" id="1484" >
<father id="1545" num="0" />
-<cdparam x="286" y="304" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="152" y="154" />
+<sizeparam width="163" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Timer" />
+<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
<TGConnectingPoint num="0" id="1476" />
<TGConnectingPoint num="1" id="1477" />
<TGConnectingPoint num="2" id="1478" />
@@ -6712,16 +6712,16 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1482" />
<TGConnectingPoint num="7" id="1483" />
<extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1493" >
<father id="1545" num="1" />
-<cdparam x="350" y="234" />
-<sizeparam width="139" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="351" y="153" />
+<sizeparam width="136" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Application" />
+<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
<TGConnectingPoint num="0" id="1485" />
<TGConnectingPoint num="1" id="1486" />
<TGConnectingPoint num="2" id="1487" />
@@ -6731,7 +6731,7 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1491" />
<TGConnectingPoint num="7" id="1492" />
<extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1502" >
@@ -6755,11 +6755,11 @@ the smart card and the terminal
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1511" >
<father id="1545" num="3" />
-<cdparam x="351" y="153" />
-<sizeparam width="136" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="350" y="234" />
+<sizeparam width="139" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
+<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Application" />
<TGConnectingPoint num="0" id="1503" />
<TGConnectingPoint num="1" id="1504" />
<TGConnectingPoint num="2" id="1505" />
@@ -6769,16 +6769,16 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1509" />
<TGConnectingPoint num="7" id="1510" />
<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1520" >
<father id="1545" num="4" />
-<cdparam x="152" y="154" />
-<sizeparam width="163" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="286" y="304" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
+<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Timer" />
<TGConnectingPoint num="0" id="1512" />
<TGConnectingPoint num="1" id="1513" />
<TGConnectingPoint num="2" id="1514" />
@@ -6788,7 +6788,7 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1518" />
<TGConnectingPoint num="7" id="1519" />
<extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -6990,11 +6990,11 @@ the smart card and the terminal
</COMPONENT>
<SUBCOMPONENT type="1101" id="1640" >
<father id="1683" num="0" />
-<cdparam x="387" y="123" />
-<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="272" y="94" />
+<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="136" minY="0" maxY="124" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
+<cdrectangleparam minX="0" maxX="164" minY="0" maxY="121" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
<TGConnectingPoint num="0" id="1632" />
<TGConnectingPoint num="1" id="1633" />
<TGConnectingPoint num="2" id="1634" />
@@ -7004,7 +7004,7 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1638" />
<TGConnectingPoint num="7" id="1639" />
<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1649" >
@@ -7028,11 +7028,11 @@ the smart card and the terminal
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1658" >
<father id="1683" num="2" />
-<cdparam x="272" y="94" />
-<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="387" y="123" />
+<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="164" minY="0" maxY="121" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
+<cdrectangleparam minX="0" maxX="136" minY="0" maxY="124" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
<TGConnectingPoint num="0" id="1650" />
<TGConnectingPoint num="1" id="1651" />
<TGConnectingPoint num="2" id="1652" />
@@ -7042,7 +7042,7 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1656" />
<TGConnectingPoint num="7" id="1657" />
<extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -7378,11 +7378,11 @@ the smart card and the terminal
</COMPONENT>
<SUBCOMPONENT type="1101" id="1848" >
<father id="1891" num="0" />
-<cdparam x="340" y="180" />
-<sizeparam width="108" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="270" y="75" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="205" minY="0" maxY="161" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
+<cdrectangleparam minX="0" maxX="174" minY="0" maxY="161" />
+<infoparam name="TGComponent" value="AppC::Application" />
<TGConnectingPoint num="0" id="1840" />
<TGConnectingPoint num="1" id="1841" />
<TGConnectingPoint num="2" id="1842" />
@@ -7392,7 +7392,7 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1846" />
<TGConnectingPoint num="7" id="1847" />
<extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1857" >
@@ -7416,11 +7416,11 @@ the smart card and the terminal
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1866" >
<father id="1891" num="2" />
-<cdparam x="270" y="75" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="340" y="180" />
+<sizeparam width="108" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="174" minY="0" maxY="161" />
-<infoparam name="TGComponent" value="AppC::Application" />
+<cdrectangleparam minX="0" maxX="205" minY="0" maxY="161" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
<TGConnectingPoint num="0" id="1858" />
<TGConnectingPoint num="1" id="1859" />
<TGConnectingPoint num="2" id="1860" />
@@ -7430,7 +7430,7 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="1864" />
<TGConnectingPoint num="7" id="1865" />
<extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
diff --git a/modeling/testModelCheckerAvatar/testClocks.xml b/modeling/testModelCheckerAvatar/testClocks.xml
index 331fd1a4cf..97bc00117e 100644
--- a/modeling/testModelCheckerAvatar/testClocks.xml
+++ b/modeling/testModelCheckerAvatar/testClocks.xml
@@ -1269,7 +1269,7 @@
<MainCode value="}"/>
<Optimized value="true" />
<considerTimingOperators value="true" />
-<Validated value="Block1;Block0;" />
+<Validated value="" />
<Ignored value="" />
<CONNECTOR type="5002" id="616" >
@@ -2037,7 +2037,7 @@
<MainCode value="}"/>
<Optimized value="true" />
<considerTimingOperators value="true" />
-<Validated value="Block1;Block0;" />
+<Validated value="" />
<Ignored value="" />
<CONNECTOR type="5002" id="992" >
diff --git a/src/main/java/avatartranslator/AvatarComposedGuard.java b/src/main/java/avatartranslator/AvatarComposedGuard.java
index e414be224d..af75da1a4e 100644
--- a/src/main/java/avatartranslator/AvatarComposedGuard.java
+++ b/src/main/java/avatartranslator/AvatarComposedGuard.java
@@ -47,7 +47,8 @@ package avatartranslator;
public abstract class AvatarComposedGuard extends AvatarGuard {
public AvatarComposedGuard getOpposite () {
- return new AvatarUnaryGuard ("not", "(", ")", this);
+ //return new AvatarUnaryGuard ("not", "(", ")", this);
+ return new AvatarUnaryGuard ("", "(", ") == false", this);
}
public abstract AvatarComposedGuard clone ();
diff --git a/src/main/java/avatartranslator/AvatarSpecification.java b/src/main/java/avatartranslator/AvatarSpecification.java
index b7ea5c898b..8a730df1d0 100644
--- a/src/main/java/avatartranslator/AvatarSpecification.java
+++ b/src/main/java/avatartranslator/AvatarSpecification.java
@@ -491,7 +491,7 @@ public class AvatarSpecification extends AvatarElement {
if (ar.isAsynchronous()) {
// Must be removed
int size = Math.min(_maxSizeOfInfiniteFifo, ar.getSizeOfFIFO());
- TraceManager.addDev("***************************** Size of FIFO:" + size);
+ //TraceManager.addDev("***************************** Size of FIFO:" + size);
size = Math.max(1, size);
FIFO_ID = removeFIFO(ar, size, oldOnes, newOnes, FIFO_ID);
}
@@ -622,7 +622,7 @@ public class AvatarSpecification extends AvatarElement {
if (ancientGuard == null)
continue;
- //TraceManager.addDev("[[[[[[[[[[[[[[[ Guard before: " + ancientGuard.toString());
+ //TraceManager.addDev("[[[[[[[[[[[[[[[ Guard before: " + ancientGuard.toString() + " type:" + ancientGuard.getClass().toString());
at.setGuard (ancientGuard.getRealGuard (asme));
//TraceManager.addDev("]]]]]]]]]]]]]]] Guard after: " + at.getGuard().toString());
}
diff --git a/src/main/java/avatartranslator/AvatarStateMachine.java b/src/main/java/avatartranslator/AvatarStateMachine.java
index 8e2503ca02..1fa59689de 100644
--- a/src/main/java/avatartranslator/AvatarStateMachine.java
+++ b/src/main/java/avatartranslator/AvatarStateMachine.java
@@ -505,7 +505,7 @@ public class AvatarStateMachine extends AvatarElement {
// Assumes no after clause on composite relation
public void removeCompositeStates(AvatarBlock _block) {
- TraceManager.addDev("\n-------------- Remove composite states ---------------\n");
+ //TraceManager.addDev("\n-------------- Remove composite states ---------------\n");
/*LinkedList<AvatarState> lists =*/
List<AvatarStartState> compositeStateToBeRemoved = removeAllInternalStartStates();
@@ -1653,7 +1653,7 @@ public class AvatarStateMachine extends AvatarElement {
if (at.getNext(0) instanceof AvatarStateElement) {
if (at.isEmpty() && at.hasNonDeterministicGuard()) {
if ((_canOptimize) && (!(elt.isCheckable()))) {
- TraceManager.addDev("State found:" + elt);
+ //TraceManager.addDev("State found:" + elt);
foundState1 = (AvatarStateElement) elt;
foundAt = at;
foundState2 = (AvatarStateElement) (at.getNext(0));
@@ -1670,14 +1670,14 @@ public class AvatarStateMachine extends AvatarElement {
if (foundState1 != null) {
if (foundState1 == foundState2) {
// We simply remove the transition
- TraceManager.addDev("Found same state -> removing the transitions");
+ //TraceManager.addDev("Found same state -> removing the transitions");
removeElement(foundAt);
// removing from the next of foundState1
foundState1.removeNext(foundAt);
} else {
// Must remove state1 and at, and link all previous of state 1 to state2
- TraceManager.addDev("Found 2 states state1=" + foundState1.getName() + " state2=" + foundState2.getName());
+ //TraceManager.addDev("Found 2 states state1=" + foundState1.getName() + " state2=" + foundState2.getName());
for (AvatarStateMachineElement elt : getPreviousElementsOf(foundState1)) {
elt.replaceAllNext(foundState1, foundState2);
}
diff --git a/src/main/java/avatartranslator/AvatarTuple.java b/src/main/java/avatartranslator/AvatarTuple.java
index cf4605a160..06eeaee902 100644
--- a/src/main/java/avatartranslator/AvatarTuple.java
+++ b/src/main/java/avatartranslator/AvatarTuple.java
@@ -87,7 +87,7 @@ public class AvatarTuple extends AvatarLeftHand {
if (!illFormed) {
// Every argument was correctly parsed
result = argsTuple;
- TraceManager.addDev("Successfully parsed tuple \"" + toParse.substring (indexLParen+1, indexRParen) + "\"");
+ //TraceManager.addDev("Successfully parsed tuple \"" + toParse.substring (indexLParen+1, indexRParen) + "\"");
} else {
TraceManager.addDev("Illformed expression ...");
}
diff --git a/src/main/java/avatartranslator/AvatarUnaryGuard.java b/src/main/java/avatartranslator/AvatarUnaryGuard.java
index ed463e1d25..0b977fc006 100644
--- a/src/main/java/avatartranslator/AvatarUnaryGuard.java
+++ b/src/main/java/avatartranslator/AvatarUnaryGuard.java
@@ -78,10 +78,10 @@ public class AvatarUnaryGuard extends AvatarComposedGuard {
}
public AvatarComposedGuard getOpposite () {
- if (this.unary.equals ("not")) {
+ /*if (this.unary.equals ("not")) {
return this.guard;
- }
- return new AvatarUnaryGuard ("not", "(", ")", this);
+ }*/
+ return new AvatarUnaryGuard ("", "(", ") == false ", this);
}
public String getAsString (AvatarSyntaxTranslator translator) {
diff --git a/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java b/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java
index cf64aa791c..801a83fcd8 100644
--- a/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java
+++ b/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java
@@ -1638,6 +1638,9 @@ public class AvatarModelChecker implements Runnable, myutil.Graph {
//String guard = _at.getGuard().toString();
//String s = Conversion.replaceAllString(guard, "[", "").trim();
//s = Conversion.replaceAllString(s, "]", "").trim();
+
+ //TraceManager.addDev("Guard=" + _at.getGuard());
+
return (_at.getGuardSolver().getResult(_sb) == 0) ? false : true;
//return evaluateBoolExpression(s, _block, _sb);
}
diff --git a/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java b/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java
index ddcae0991e..6f2c7e2adc 100644
--- a/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java
+++ b/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java
@@ -706,16 +706,21 @@ public class FullTML2Avatar {
for (TMLEvent event : tmlmodel.getEvents()) {
- TraceManager.addDev("Handling Event:" + event.getName() + " 1:" + taskBlockMap.get(event.getOriginTask()) + " 2:" + taskBlockMap.get
- (event.getDestinationTask()));
+ TraceManager.addDev("Handling Event:" + event.getName() + " 1:" + taskBlockMap.get(event.getOriginTask()).getName() + " 2:" + taskBlockMap
+ .get
+ (event.getDestinationTask()).getName());
// For each event, we create a FIFO, and so a double relation
AvatarRelation ar = new AvatarRelation(event.getName(), taskBlockMap.get(event.getOriginTask()), taskBlockMap.get(event.getDestinationTask()),
event.getReferenceObject());
+
AvatarSignal sigOut = signalOutMap.get(event.getName());
AvatarSignal sigIn = signalInMap.get(event.getName());
+
+ TraceManager.addDev("Relation for event " + event.getName() + " sigout:" + sigOut.getSignalName() + " sigin:" + sigIn.getSignalName());
+
AvatarSignal sigNotified = signalInMap.get(event.getName() + NOTIFIED);
ar.addSignals(sigOut, sigIn);
@@ -1765,7 +1770,7 @@ public class FullTML2Avatar {
TMLChoice c = (TMLChoice) ae;
for (int i = 0; i < c.getNbGuard(); i++) {
tran = new AvatarTransition(block, "__after_" + ae.getName() + "_" + i, ae.getReferenceObject());
- //tran.setGuard(c.getGuard(i));
+ tran.setGuard(c.getGuard(i));
as.addNext(tran);
List<AvatarStateMachineElement> nexts = translateState(ae.getNextElement(i), block);
if (nexts.size() > 0) {
@@ -1792,7 +1797,7 @@ public class FullTML2Avatar {
return elementList;
} else {
- TraceManager.addDev("undefined tml element " + ae);
+ TraceManager.addDev("Undefined tml element " + ae);
}
List<AvatarStateMachineElement> nexts = translateState(ae.getNextElement(0), block);
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index b4542e9e88..d474a51bf4 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -1893,7 +1893,7 @@ public class GTURTLEModeling {
TraceManager.addDev("Mapping finished");
}
- public void generateFullAvatarFromTML() {
+ public boolean generateFullAvatarFromTML() {
/*if (tmlm != null && tmap == null) {
tmap = tmlm.getDefaultMapping();
}*/
@@ -1902,6 +1902,10 @@ public class GTURTLEModeling {
FullTML2Avatar t2a = new FullTML2Avatar(tmlm);
TraceManager.addDev("Avatar spec generation");
avatarspec = t2a.generateAvatarSpec("1");
+ TraceManager.addDev("Avatar spec generated");
+
+ AvatarSyntaxChecker asc = new AvatarSyntaxChecker();
+
if (mgui.isExperimentalOn()) {
@@ -1911,6 +1915,8 @@ public class GTURTLEModeling {
//AvatarSpecification av2 = avatarspec.advancedClone();
//mgui.drawAvatarSpecification(av2);
}
+
+ return true;
}
public void generateAvatarFromTML(boolean mc, boolean security) {
@@ -9260,9 +9266,9 @@ public class GTURTLEModeling {
for (int i = 0; i < ar.nbOfSignals(); i++) {
//TraceManager.addDev("Adding signal relations to connector");
//
- TraceManager.addDev("Adding signal 1: " + ar.getSignal1(i).toString() + " of block " + ar.block1.getName());
+ //TraceManager.addDev("Adding signal 1: " + ar.getSignal1(i).toString() + " of block " + ar.block1.getName());
conn.addSignal(ar.getSignal1(i).toString(), ar.getSignal1(i).getInOut() == 0, ar.block1.getName().contains(bl1));
- TraceManager.addDev("Adding signal 2:" + ar.getSignal2(i).toString() + " of block " + ar.block2.getName());
+ //TraceManager.addDev("Adding signal 2:" + ar.getSignal2(i).toString() + " of block " + ar.block2.getName());
conn.addSignal(ar.getSignal2(i).toString(), ar.getSignal2(i).getInOut() == 0, !ar.block2.getName().contains(bl2));
//
}
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index a55044eb3d..e83d13cb7b 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -5057,7 +5057,12 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
TraceManager.addDev("Execute avatar model checker");
TURTLEPanel tdp = getCurrentTURTLEPanel();
if (tdp instanceof TMLComponentDesignPanel) {
- gtm.generateFullAvatarFromTML();
+ boolean ret = gtm.generateFullAvatarFromTML();
+
+ if (!ret) {
+ return;
+ }
+
}
if (gtm.getAvatarSpecification() == null) {
diff --git a/src/main/java/ui/avatarbd/AvatarBDPortConnector.java b/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
index 3fd8d5db79..2e55bb6766 100644
--- a/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
@@ -684,7 +684,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
}
public void addSignal(String signal, boolean in, boolean origin) {
- TraceManager.addDev("Adding signal " + signal + " isIn:" + in + " origin:" + origin);
+ //TraceManager.addDev("Adding signal " + signal + " isIn:" + in + " origin:" + origin);
if (in) {
if (origin) {
inSignalsAtOrigin.add(signal);
--
GitLab