From e81b2036170c0d70d27b31621a7216a2ba7ad02a Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Wed, 23 Jun 2021 18:36:42 +0200
Subject: [PATCH] First dependency matrix
---
modeling/AVATAR/CoffeeMachine_Avatar.xml | 5256 +++++++++--------
modeling/AVATAR/testMethod.xml | 44 +-
modeling/DIPLODOCUS/testBusSlice.xml | 8 +-
src/main/java/ui/ActionPerformer.java | 2 +
src/main/java/ui/MainGUI.java | 51 +
src/main/java/ui/TDiagramPanel.java | 18 +
src/main/java/ui/TGCDependencyMatrix.java | 289 +
src/main/java/ui/TGComponentManager.java | 6 +
src/main/java/ui/TGUIAction.java | 6 +-
.../java/ui/avatarrd/AvatarRDToolBar.java | 6 +
.../java/ui/window/DependencyTableModel.java | 98 +
.../ui/window/JDialogDependencyMatrix.java | 457 ++
12 files changed, 3601 insertions(+), 2640 deletions(-)
create mode 100644 src/main/java/ui/TGCDependencyMatrix.java
create mode 100644 src/main/java/ui/window/DependencyTableModel.java
create mode 100644 src/main/java/ui/window/JDialogDependencyMatrix.java
diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 147e185065..fa50f67982 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" 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="Avatar Requirement" nameTab="AVATAR Requirements" >
<AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="1400" zoom="1.0" >
-<COMPONENT type="5200" id="44" uid="21634324-f1ec-471d-b025-373bb090c963" >
-<cdparam x="693" y="512" />
-<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="309" id="17" index="0" uid="4264f684-9e08-4164-a2f5-6c22db88858f" >
+<cdparam x="1106" y="423" />
+<sizeparam width="150" height="150" minWidth="20" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
-<infoparam name="Requirement" value="Requirement_0" />
+<infoparam name="Matrix" value="Dependency Matrix" />
<TGConnectingPoint num="0" id="1" />
<TGConnectingPoint num="1" id="2" />
<TGConnectingPoint num="2" id="3" />
@@ -26,33 +26,63 @@
<TGConnectingPoint num="13" id="14" />
<TGConnectingPoint num="14" id="15" />
<TGConnectingPoint num="15" id="16" />
-<TGConnectingPoint num="16" id="17" />
-<TGConnectingPoint num="17" id="18" />
-<TGConnectingPoint num="18" id="19" />
-<TGConnectingPoint num="19" id="20" />
-<TGConnectingPoint num="20" id="21" />
-<TGConnectingPoint num="21" id="22" />
-<TGConnectingPoint num="22" id="23" />
-<TGConnectingPoint num="23" id="24" />
-<TGConnectingPoint num="24" id="25" />
-<TGConnectingPoint num="25" id="26" />
-<TGConnectingPoint num="26" id="27" />
-<TGConnectingPoint num="27" id="28" />
-<TGConnectingPoint num="28" id="29" />
-<TGConnectingPoint num="29" id="30" />
-<TGConnectingPoint num="30" id="31" />
-<TGConnectingPoint num="31" id="32" />
-<TGConnectingPoint num="32" id="33" />
-<TGConnectingPoint num="33" id="34" />
-<TGConnectingPoint num="34" id="35" />
-<TGConnectingPoint num="35" id="36" />
-<TGConnectingPoint num="36" id="37" />
-<TGConnectingPoint num="37" id="38" />
-<TGConnectingPoint num="38" id="39" />
-<TGConnectingPoint num="39" id="40" />
-<TGConnectingPoint num="40" id="41" />
-<TGConnectingPoint num="41" id="42" />
-<TGConnectingPoint num="42" id="43" />
+<extraparam>
+<columnDiag v="" />
+<rowDiag v="" />
+<rows v="" />
+<columns v="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="61" index="1" uid="21634324-f1ec-471d-b025-373bb090c963" >
+<cdparam x="693" y="512" />
+<sizeparam width="200" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
+<infoparam name="Requirement" value="Requirement_0" />
+<TGConnectingPoint num="0" id="18" />
+<TGConnectingPoint num="1" id="19" />
+<TGConnectingPoint num="2" id="20" />
+<TGConnectingPoint num="3" id="21" />
+<TGConnectingPoint num="4" id="22" />
+<TGConnectingPoint num="5" id="23" />
+<TGConnectingPoint num="6" id="24" />
+<TGConnectingPoint num="7" id="25" />
+<TGConnectingPoint num="8" id="26" />
+<TGConnectingPoint num="9" id="27" />
+<TGConnectingPoint num="10" id="28" />
+<TGConnectingPoint num="11" id="29" />
+<TGConnectingPoint num="12" id="30" />
+<TGConnectingPoint num="13" id="31" />
+<TGConnectingPoint num="14" id="32" />
+<TGConnectingPoint num="15" id="33" />
+<TGConnectingPoint num="16" id="34" />
+<TGConnectingPoint num="17" id="35" />
+<TGConnectingPoint num="18" id="36" />
+<TGConnectingPoint num="19" id="37" />
+<TGConnectingPoint num="20" id="38" />
+<TGConnectingPoint num="21" id="39" />
+<TGConnectingPoint num="22" id="40" />
+<TGConnectingPoint num="23" id="41" />
+<TGConnectingPoint num="24" id="42" />
+<TGConnectingPoint num="25" id="43" />
+<TGConnectingPoint num="26" id="44" />
+<TGConnectingPoint num="27" id="45" />
+<TGConnectingPoint num="28" id="46" />
+<TGConnectingPoint num="29" id="47" />
+<TGConnectingPoint num="30" id="48" />
+<TGConnectingPoint num="31" id="49" />
+<TGConnectingPoint num="32" id="50" />
+<TGConnectingPoint num="33" id="51" />
+<TGConnectingPoint num="34" id="52" />
+<TGConnectingPoint num="35" id="53" />
+<TGConnectingPoint num="36" id="54" />
+<TGConnectingPoint num="37" id="55" />
+<TGConnectingPoint num="38" id="56" />
+<TGConnectingPoint num="39" id="57" />
+<TGConnectingPoint num="40" id="58" />
+<TGConnectingPoint num="41" id="59" />
+<TGConnectingPoint num="42" id="60" />
<extraparam>
<textline data="Requirement description:" />
<textline data="Double-click to edit" />
@@ -68,101 +98,101 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5207" id="60" uid="34f78e28-10b6-4963-9df8-aa79601cc946" >
+<COMPONENT type="5207" id="77" index="2" uid="34f78e28-10b6-4963-9df8-aa79601cc946" >
<cdparam x="727" y="252" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="107" minDesiredHeight="0" />
+<sizeparam width="150" height="37" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="107" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarElementReference" value="CoffeeMachine" />
-<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="0" id="62" />
+<TGConnectingPoint num="1" id="63" />
+<TGConnectingPoint num="2" id="64" />
+<TGConnectingPoint num="3" id="65" />
+<TGConnectingPoint num="4" id="66" />
+<TGConnectingPoint num="5" id="67" />
+<TGConnectingPoint num="6" id="68" />
+<TGConnectingPoint num="7" id="69" />
+<TGConnectingPoint num="8" id="70" />
+<TGConnectingPoint num="9" id="71" />
+<TGConnectingPoint num="10" id="72" />
+<TGConnectingPoint num="11" id="73" />
+<TGConnectingPoint num="12" id="74" />
+<TGConnectingPoint num="13" id="75" />
+<TGConnectingPoint num="14" id="76" />
</COMPONENT>
-<COMPONENT type="5207" id="76" uid="4ca34bf8-01db-44a8-bb8c-0d28c1a6414c" >
+<COMPONENT type="5207" id="93" index="3" uid="4ca34bf8-01db-44a8-bb8c-0d28c1a6414c" >
<cdparam x="724" y="202" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="57" minDesiredHeight="0" />
+<sizeparam width="150" height="37" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="57" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarElementReference" value="Wallet" />
-<TGConnectingPoint num="0" id="61" />
-<TGConnectingPoint num="1" id="62" />
-<TGConnectingPoint num="2" id="63" />
-<TGConnectingPoint num="3" id="64" />
-<TGConnectingPoint num="4" id="65" />
-<TGConnectingPoint num="5" id="66" />
-<TGConnectingPoint num="6" id="67" />
-<TGConnectingPoint num="7" id="68" />
-<TGConnectingPoint num="8" id="69" />
-<TGConnectingPoint num="9" id="70" />
-<TGConnectingPoint num="10" id="71" />
-<TGConnectingPoint num="11" id="72" />
-<TGConnectingPoint num="12" id="73" />
-<TGConnectingPoint num="13" id="74" />
-<TGConnectingPoint num="14" id="75" />
+<TGConnectingPoint num="0" id="78" />
+<TGConnectingPoint num="1" id="79" />
+<TGConnectingPoint num="2" id="80" />
+<TGConnectingPoint num="3" id="81" />
+<TGConnectingPoint num="4" id="82" />
+<TGConnectingPoint num="5" id="83" />
+<TGConnectingPoint num="6" id="84" />
+<TGConnectingPoint num="7" id="85" />
+<TGConnectingPoint num="8" id="86" />
+<TGConnectingPoint num="9" id="87" />
+<TGConnectingPoint num="10" id="88" />
+<TGConnectingPoint num="11" id="89" />
+<TGConnectingPoint num="12" id="90" />
+<TGConnectingPoint num="13" id="91" />
+<TGConnectingPoint num="14" id="92" />
</COMPONENT>
-<COMPONENT type="5200" id="120" uid="6a44a70b-341e-4094-9eb3-95ef05784845" >
+<COMPONENT type="5200" id="137" index="4" uid="6a44a70b-341e-4094-9eb3-95ef05784845" >
<cdparam x="660" y="10" />
-<sizeparam width="278" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="59" minDesiredHeight="0" />
+<sizeparam width="278" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="59" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="req00" />
-<TGConnectingPoint num="0" id="77" />
-<TGConnectingPoint num="1" id="78" />
-<TGConnectingPoint num="2" id="79" />
-<TGConnectingPoint num="3" id="80" />
-<TGConnectingPoint num="4" id="81" />
-<TGConnectingPoint num="5" id="82" />
-<TGConnectingPoint num="6" id="83" />
-<TGConnectingPoint num="7" id="84" />
-<TGConnectingPoint num="8" id="85" />
-<TGConnectingPoint num="9" id="86" />
-<TGConnectingPoint num="10" id="87" />
-<TGConnectingPoint num="11" id="88" />
-<TGConnectingPoint num="12" id="89" />
-<TGConnectingPoint num="13" id="90" />
-<TGConnectingPoint num="14" id="91" />
-<TGConnectingPoint num="15" id="92" />
-<TGConnectingPoint num="16" id="93" />
-<TGConnectingPoint num="17" id="94" />
-<TGConnectingPoint num="18" id="95" />
-<TGConnectingPoint num="19" id="96" />
-<TGConnectingPoint num="20" id="97" />
-<TGConnectingPoint num="21" id="98" />
-<TGConnectingPoint num="22" id="99" />
-<TGConnectingPoint num="23" id="100" />
-<TGConnectingPoint num="24" id="101" />
-<TGConnectingPoint num="25" id="102" />
-<TGConnectingPoint num="26" id="103" />
-<TGConnectingPoint num="27" id="104" />
-<TGConnectingPoint num="28" id="105" />
-<TGConnectingPoint num="29" id="106" />
-<TGConnectingPoint num="30" id="107" />
-<TGConnectingPoint num="31" id="108" />
-<TGConnectingPoint num="32" id="109" />
-<TGConnectingPoint num="33" id="110" />
-<TGConnectingPoint num="34" id="111" />
-<TGConnectingPoint num="35" id="112" />
-<TGConnectingPoint num="36" id="113" />
-<TGConnectingPoint num="37" id="114" />
-<TGConnectingPoint num="38" id="115" />
-<TGConnectingPoint num="39" id="116" />
-<TGConnectingPoint num="40" id="117" />
-<TGConnectingPoint num="41" id="118" />
-<TGConnectingPoint num="42" id="119" />
+<TGConnectingPoint num="0" id="94" />
+<TGConnectingPoint num="1" id="95" />
+<TGConnectingPoint num="2" id="96" />
+<TGConnectingPoint num="3" id="97" />
+<TGConnectingPoint num="4" id="98" />
+<TGConnectingPoint num="5" id="99" />
+<TGConnectingPoint num="6" id="100" />
+<TGConnectingPoint num="7" id="101" />
+<TGConnectingPoint num="8" id="102" />
+<TGConnectingPoint num="9" id="103" />
+<TGConnectingPoint num="10" id="104" />
+<TGConnectingPoint num="11" id="105" />
+<TGConnectingPoint num="12" id="106" />
+<TGConnectingPoint num="13" id="107" />
+<TGConnectingPoint num="14" id="108" />
+<TGConnectingPoint num="15" id="109" />
+<TGConnectingPoint num="16" id="110" />
+<TGConnectingPoint num="17" id="111" />
+<TGConnectingPoint num="18" id="112" />
+<TGConnectingPoint num="19" id="113" />
+<TGConnectingPoint num="20" id="114" />
+<TGConnectingPoint num="21" id="115" />
+<TGConnectingPoint num="22" id="116" />
+<TGConnectingPoint num="23" id="117" />
+<TGConnectingPoint num="24" id="118" />
+<TGConnectingPoint num="25" id="119" />
+<TGConnectingPoint num="26" id="120" />
+<TGConnectingPoint num="27" id="121" />
+<TGConnectingPoint num="28" id="122" />
+<TGConnectingPoint num="29" id="123" />
+<TGConnectingPoint num="30" id="124" />
+<TGConnectingPoint num="31" id="125" />
+<TGConnectingPoint num="32" id="126" />
+<TGConnectingPoint num="33" id="127" />
+<TGConnectingPoint num="34" id="128" />
+<TGConnectingPoint num="35" id="129" />
+<TGConnectingPoint num="36" id="130" />
+<TGConnectingPoint num="37" id="131" />
+<TGConnectingPoint num="38" id="132" />
+<TGConnectingPoint num="39" id="133" />
+<TGConnectingPoint num="40" id="134" />
+<TGConnectingPoint num="41" id="135" />
+<TGConnectingPoint num="42" id="136" />
<extraparam>
<textline data="A coin not used within 50 seconds " />
<textline data="must be ejected" />
@@ -178,55 +208,55 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5200" id="164" uid="2db149ef-c53b-4707-8c0f-285eea3e4257" >
+<COMPONENT type="5200" id="181" index="5" uid="2db149ef-c53b-4707-8c0f-285eea3e4257" >
<cdparam x="46" y="491" />
-<sizeparam width="301" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
+<sizeparam width="301" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="Req_Availability" />
-<TGConnectingPoint num="0" id="121" />
-<TGConnectingPoint num="1" id="122" />
-<TGConnectingPoint num="2" id="123" />
-<TGConnectingPoint num="3" id="124" />
-<TGConnectingPoint num="4" id="125" />
-<TGConnectingPoint num="5" id="126" />
-<TGConnectingPoint num="6" id="127" />
-<TGConnectingPoint num="7" id="128" />
-<TGConnectingPoint num="8" id="129" />
-<TGConnectingPoint num="9" id="130" />
-<TGConnectingPoint num="10" id="131" />
-<TGConnectingPoint num="11" id="132" />
-<TGConnectingPoint num="12" id="133" />
-<TGConnectingPoint num="13" id="134" />
-<TGConnectingPoint num="14" id="135" />
-<TGConnectingPoint num="15" id="136" />
-<TGConnectingPoint num="16" id="137" />
-<TGConnectingPoint num="17" id="138" />
-<TGConnectingPoint num="18" id="139" />
-<TGConnectingPoint num="19" id="140" />
-<TGConnectingPoint num="20" id="141" />
-<TGConnectingPoint num="21" id="142" />
-<TGConnectingPoint num="22" id="143" />
-<TGConnectingPoint num="23" id="144" />
-<TGConnectingPoint num="24" id="145" />
-<TGConnectingPoint num="25" id="146" />
-<TGConnectingPoint num="26" id="147" />
-<TGConnectingPoint num="27" id="148" />
-<TGConnectingPoint num="28" id="149" />
-<TGConnectingPoint num="29" id="150" />
-<TGConnectingPoint num="30" id="151" />
-<TGConnectingPoint num="31" id="152" />
-<TGConnectingPoint num="32" id="153" />
-<TGConnectingPoint num="33" id="154" />
-<TGConnectingPoint num="34" id="155" />
-<TGConnectingPoint num="35" id="156" />
-<TGConnectingPoint num="36" id="157" />
-<TGConnectingPoint num="37" id="158" />
-<TGConnectingPoint num="38" id="159" />
-<TGConnectingPoint num="39" id="160" />
-<TGConnectingPoint num="40" id="161" />
-<TGConnectingPoint num="41" id="162" />
-<TGConnectingPoint num="42" id="163" />
+<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" />
+<TGConnectingPoint num="8" id="146" />
+<TGConnectingPoint num="9" id="147" />
+<TGConnectingPoint num="10" id="148" />
+<TGConnectingPoint num="11" id="149" />
+<TGConnectingPoint num="12" id="150" />
+<TGConnectingPoint num="13" id="151" />
+<TGConnectingPoint num="14" id="152" />
+<TGConnectingPoint num="15" id="153" />
+<TGConnectingPoint num="16" id="154" />
+<TGConnectingPoint num="17" id="155" />
+<TGConnectingPoint num="18" id="156" />
+<TGConnectingPoint num="19" id="157" />
+<TGConnectingPoint num="20" id="158" />
+<TGConnectingPoint num="21" id="159" />
+<TGConnectingPoint num="22" id="160" />
+<TGConnectingPoint num="23" id="161" />
+<TGConnectingPoint num="24" id="162" />
+<TGConnectingPoint num="25" id="163" />
+<TGConnectingPoint num="26" id="164" />
+<TGConnectingPoint num="27" id="165" />
+<TGConnectingPoint num="28" id="166" />
+<TGConnectingPoint num="29" id="167" />
+<TGConnectingPoint num="30" id="168" />
+<TGConnectingPoint num="31" id="169" />
+<TGConnectingPoint num="32" id="170" />
+<TGConnectingPoint num="33" id="171" />
+<TGConnectingPoint num="34" id="172" />
+<TGConnectingPoint num="35" id="173" />
+<TGConnectingPoint num="36" id="174" />
+<TGConnectingPoint num="37" id="175" />
+<TGConnectingPoint num="38" id="176" />
+<TGConnectingPoint num="39" id="177" />
+<TGConnectingPoint num="40" id="178" />
+<TGConnectingPoint num="41" id="179" />
+<TGConnectingPoint num="42" id="180" />
<extraparam>
<textline data="The availability of the machine shall be" />
<textline data="no less than 99.99%" />
@@ -242,55 +272,55 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5200" id="208" uid="e73051aa-2858-45ad-9538-4bb540752766" >
+<COMPONENT type="5200" id="225" index="6" uid="e73051aa-2858-45ad-9538-4bb540752766" >
<cdparam x="10" y="182" />
-<sizeparam width="150" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
+<sizeparam width="150" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="Req_CoffeeMachine" />
-<TGConnectingPoint num="0" id="165" />
-<TGConnectingPoint num="1" id="166" />
-<TGConnectingPoint num="2" id="167" />
-<TGConnectingPoint num="3" id="168" />
-<TGConnectingPoint num="4" id="169" />
-<TGConnectingPoint num="5" id="170" />
-<TGConnectingPoint num="6" id="171" />
-<TGConnectingPoint num="7" id="172" />
-<TGConnectingPoint num="8" id="173" />
-<TGConnectingPoint num="9" id="174" />
-<TGConnectingPoint num="10" id="175" />
-<TGConnectingPoint num="11" id="176" />
-<TGConnectingPoint num="12" id="177" />
-<TGConnectingPoint num="13" id="178" />
-<TGConnectingPoint num="14" id="179" />
-<TGConnectingPoint num="15" id="180" />
-<TGConnectingPoint num="16" id="181" />
-<TGConnectingPoint num="17" id="182" />
-<TGConnectingPoint num="18" id="183" />
-<TGConnectingPoint num="19" id="184" />
-<TGConnectingPoint num="20" id="185" />
-<TGConnectingPoint num="21" id="186" />
-<TGConnectingPoint num="22" id="187" />
-<TGConnectingPoint num="23" id="188" />
-<TGConnectingPoint num="24" id="189" />
-<TGConnectingPoint num="25" id="190" />
-<TGConnectingPoint num="26" id="191" />
-<TGConnectingPoint num="27" id="192" />
-<TGConnectingPoint num="28" id="193" />
-<TGConnectingPoint num="29" id="194" />
-<TGConnectingPoint num="30" id="195" />
-<TGConnectingPoint num="31" id="196" />
-<TGConnectingPoint num="32" id="197" />
-<TGConnectingPoint num="33" id="198" />
-<TGConnectingPoint num="34" id="199" />
-<TGConnectingPoint num="35" id="200" />
-<TGConnectingPoint num="36" id="201" />
-<TGConnectingPoint num="37" id="202" />
-<TGConnectingPoint num="38" id="203" />
-<TGConnectingPoint num="39" id="204" />
-<TGConnectingPoint num="40" id="205" />
-<TGConnectingPoint num="41" id="206" />
-<TGConnectingPoint num="42" id="207" />
+<TGConnectingPoint num="0" id="182" />
+<TGConnectingPoint num="1" id="183" />
+<TGConnectingPoint num="2" id="184" />
+<TGConnectingPoint num="3" id="185" />
+<TGConnectingPoint num="4" id="186" />
+<TGConnectingPoint num="5" id="187" />
+<TGConnectingPoint num="6" id="188" />
+<TGConnectingPoint num="7" id="189" />
+<TGConnectingPoint num="8" id="190" />
+<TGConnectingPoint num="9" id="191" />
+<TGConnectingPoint num="10" id="192" />
+<TGConnectingPoint num="11" id="193" />
+<TGConnectingPoint num="12" id="194" />
+<TGConnectingPoint num="13" id="195" />
+<TGConnectingPoint num="14" id="196" />
+<TGConnectingPoint num="15" id="197" />
+<TGConnectingPoint num="16" id="198" />
+<TGConnectingPoint num="17" id="199" />
+<TGConnectingPoint num="18" id="200" />
+<TGConnectingPoint num="19" id="201" />
+<TGConnectingPoint num="20" id="202" />
+<TGConnectingPoint num="21" id="203" />
+<TGConnectingPoint num="22" id="204" />
+<TGConnectingPoint num="23" id="205" />
+<TGConnectingPoint num="24" id="206" />
+<TGConnectingPoint num="25" id="207" />
+<TGConnectingPoint num="26" id="208" />
+<TGConnectingPoint num="27" id="209" />
+<TGConnectingPoint num="28" id="210" />
+<TGConnectingPoint num="29" id="211" />
+<TGConnectingPoint num="30" id="212" />
+<TGConnectingPoint num="31" id="213" />
+<TGConnectingPoint num="32" id="214" />
+<TGConnectingPoint num="33" id="215" />
+<TGConnectingPoint num="34" id="216" />
+<TGConnectingPoint num="35" id="217" />
+<TGConnectingPoint num="36" id="218" />
+<TGConnectingPoint num="37" id="219" />
+<TGConnectingPoint num="38" id="220" />
+<TGConnectingPoint num="39" id="221" />
+<TGConnectingPoint num="40" id="222" />
+<TGConnectingPoint num="41" id="223" />
+<TGConnectingPoint num="42" id="224" />
<extraparam>
<textline data="Requirements of the coffee machine" />
<kind data="Functional" />
@@ -305,101 +335,101 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5201" id="224" uid="13281d49-f5cd-41bd-b16d-e239622a41f2" >
+<COMPONENT type="5201" id="241" index="7" uid="13281d49-f5cd-41bd-b16d-e239622a41f2" >
<cdparam x="682" y="367" />
-<sizeparam width="171" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
+<sizeparam width="171" height="37" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarProperty" value="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="209" />
-<TGConnectingPoint num="1" id="210" />
-<TGConnectingPoint num="2" id="211" />
-<TGConnectingPoint num="3" id="212" />
-<TGConnectingPoint num="4" id="213" />
-<TGConnectingPoint num="5" id="214" />
-<TGConnectingPoint num="6" id="215" />
-<TGConnectingPoint num="7" id="216" />
-<TGConnectingPoint num="8" id="217" />
-<TGConnectingPoint num="9" id="218" />
-<TGConnectingPoint num="10" id="219" />
-<TGConnectingPoint num="11" id="220" />
-<TGConnectingPoint num="12" id="221" />
-<TGConnectingPoint num="13" id="222" />
-<TGConnectingPoint num="14" id="223" />
+<TGConnectingPoint num="0" id="226" />
+<TGConnectingPoint num="1" id="227" />
+<TGConnectingPoint num="2" id="228" />
+<TGConnectingPoint num="3" id="229" />
+<TGConnectingPoint num="4" id="230" />
+<TGConnectingPoint num="5" id="231" />
+<TGConnectingPoint num="6" id="232" />
+<TGConnectingPoint num="7" id="233" />
+<TGConnectingPoint num="8" id="234" />
+<TGConnectingPoint num="9" id="235" />
+<TGConnectingPoint num="10" id="236" />
+<TGConnectingPoint num="11" id="237" />
+<TGConnectingPoint num="12" id="238" />
+<TGConnectingPoint num="13" id="239" />
+<TGConnectingPoint num="14" id="240" />
</COMPONENT>
-<COMPONENT type="5201" id="240" uid="b8c39bfa-aea4-445a-a7c8-53f5f38cf5d7" >
+<COMPONENT type="5201" id="257" index="8" uid="b8c39bfa-aea4-445a-a7c8-53f5f38cf5d7" >
<cdparam x="728" y="304" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="128" minDesiredHeight="0" />
+<sizeparam width="150" height="37" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="128" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarProperty" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="225" />
-<TGConnectingPoint num="1" id="226" />
-<TGConnectingPoint num="2" id="227" />
-<TGConnectingPoint num="3" id="228" />
-<TGConnectingPoint num="4" id="229" />
-<TGConnectingPoint num="5" id="230" />
-<TGConnectingPoint num="6" id="231" />
-<TGConnectingPoint num="7" id="232" />
-<TGConnectingPoint num="8" id="233" />
-<TGConnectingPoint num="9" id="234" />
-<TGConnectingPoint num="10" id="235" />
-<TGConnectingPoint num="11" id="236" />
-<TGConnectingPoint num="12" id="237" />
-<TGConnectingPoint num="13" id="238" />
-<TGConnectingPoint num="14" id="239" />
+<TGConnectingPoint num="0" id="242" />
+<TGConnectingPoint num="1" id="243" />
+<TGConnectingPoint num="2" id="244" />
+<TGConnectingPoint num="3" id="245" />
+<TGConnectingPoint num="4" id="246" />
+<TGConnectingPoint num="5" id="247" />
+<TGConnectingPoint num="6" id="248" />
+<TGConnectingPoint num="7" id="249" />
+<TGConnectingPoint num="8" id="250" />
+<TGConnectingPoint num="9" id="251" />
+<TGConnectingPoint num="10" id="252" />
+<TGConnectingPoint num="11" id="253" />
+<TGConnectingPoint num="12" id="254" />
+<TGConnectingPoint num="13" id="255" />
+<TGConnectingPoint num="14" id="256" />
</COMPONENT>
-<COMPONENT type="5200" id="284" uid="d6ff748e-4216-4bb2-b0ce-81e64e2dbd68" >
+<COMPONENT type="5200" id="301" index="9" uid="d6ff748e-4216-4bb2-b0ce-81e64e2dbd68" >
<cdparam x="233" y="147" />
-<sizeparam width="271" height="104" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<sizeparam width="271" height="104" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="req1" />
-<TGConnectingPoint num="0" id="241" />
-<TGConnectingPoint num="1" id="242" />
-<TGConnectingPoint num="2" id="243" />
-<TGConnectingPoint num="3" id="244" />
-<TGConnectingPoint num="4" id="245" />
-<TGConnectingPoint num="5" id="246" />
-<TGConnectingPoint num="6" id="247" />
-<TGConnectingPoint num="7" id="248" />
-<TGConnectingPoint num="8" id="249" />
-<TGConnectingPoint num="9" id="250" />
-<TGConnectingPoint num="10" id="251" />
-<TGConnectingPoint num="11" id="252" />
-<TGConnectingPoint num="12" id="253" />
-<TGConnectingPoint num="13" id="254" />
-<TGConnectingPoint num="14" id="255" />
-<TGConnectingPoint num="15" id="256" />
-<TGConnectingPoint num="16" id="257" />
-<TGConnectingPoint num="17" id="258" />
-<TGConnectingPoint num="18" id="259" />
-<TGConnectingPoint num="19" id="260" />
-<TGConnectingPoint num="20" id="261" />
-<TGConnectingPoint num="21" id="262" />
-<TGConnectingPoint num="22" id="263" />
-<TGConnectingPoint num="23" id="264" />
-<TGConnectingPoint num="24" id="265" />
-<TGConnectingPoint num="25" id="266" />
-<TGConnectingPoint num="26" id="267" />
-<TGConnectingPoint num="27" id="268" />
-<TGConnectingPoint num="28" id="269" />
-<TGConnectingPoint num="29" id="270" />
-<TGConnectingPoint num="30" id="271" />
-<TGConnectingPoint num="31" id="272" />
-<TGConnectingPoint num="32" id="273" />
-<TGConnectingPoint num="33" id="274" />
-<TGConnectingPoint num="34" id="275" />
-<TGConnectingPoint num="35" id="276" />
-<TGConnectingPoint num="36" id="277" />
-<TGConnectingPoint num="37" id="278" />
-<TGConnectingPoint num="38" id="279" />
-<TGConnectingPoint num="39" id="280" />
-<TGConnectingPoint num="40" id="281" />
-<TGConnectingPoint num="41" id="282" />
-<TGConnectingPoint num="42" id="283" />
+<TGConnectingPoint num="0" id="258" />
+<TGConnectingPoint num="1" id="259" />
+<TGConnectingPoint num="2" id="260" />
+<TGConnectingPoint num="3" id="261" />
+<TGConnectingPoint num="4" id="262" />
+<TGConnectingPoint num="5" id="263" />
+<TGConnectingPoint num="6" id="264" />
+<TGConnectingPoint num="7" id="265" />
+<TGConnectingPoint num="8" id="266" />
+<TGConnectingPoint num="9" id="267" />
+<TGConnectingPoint num="10" id="268" />
+<TGConnectingPoint num="11" id="269" />
+<TGConnectingPoint num="12" id="270" />
+<TGConnectingPoint num="13" id="271" />
+<TGConnectingPoint num="14" id="272" />
+<TGConnectingPoint num="15" id="273" />
+<TGConnectingPoint num="16" id="274" />
+<TGConnectingPoint num="17" id="275" />
+<TGConnectingPoint num="18" id="276" />
+<TGConnectingPoint num="19" id="277" />
+<TGConnectingPoint num="20" id="278" />
+<TGConnectingPoint num="21" id="279" />
+<TGConnectingPoint num="22" id="280" />
+<TGConnectingPoint num="23" id="281" />
+<TGConnectingPoint num="24" id="282" />
+<TGConnectingPoint num="25" id="283" />
+<TGConnectingPoint num="26" id="284" />
+<TGConnectingPoint num="27" id="285" />
+<TGConnectingPoint num="28" id="286" />
+<TGConnectingPoint num="29" id="287" />
+<TGConnectingPoint num="30" id="288" />
+<TGConnectingPoint num="31" id="289" />
+<TGConnectingPoint num="32" id="290" />
+<TGConnectingPoint num="33" id="291" />
+<TGConnectingPoint num="34" id="292" />
+<TGConnectingPoint num="35" id="293" />
+<TGConnectingPoint num="36" id="294" />
+<TGConnectingPoint num="37" id="295" />
+<TGConnectingPoint num="38" id="296" />
+<TGConnectingPoint num="39" id="297" />
+<TGConnectingPoint num="40" id="298" />
+<TGConnectingPoint num="41" id="299" />
+<TGConnectingPoint num="42" id="300" />
<extraparam>
<textline data="A wallet must never contain a " />
<textline data="negative number of coins" />
@@ -415,78 +445,78 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5201" id="300" uid="579a8979-6f5a-4f6d-9fed-784c03cd2678" >
+<COMPONENT type="5201" id="317" index="10" uid="579a8979-6f5a-4f6d-9fed-784c03cd2678" >
<cdparam x="632" y="151" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
+<sizeparam width="150" height="37" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarProperty" value="OneCoinProperty" />
-<TGConnectingPoint num="0" id="285" />
-<TGConnectingPoint num="1" id="286" />
-<TGConnectingPoint num="2" id="287" />
-<TGConnectingPoint num="3" id="288" />
-<TGConnectingPoint num="4" id="289" />
-<TGConnectingPoint num="5" id="290" />
-<TGConnectingPoint num="6" id="291" />
-<TGConnectingPoint num="7" id="292" />
-<TGConnectingPoint num="8" id="293" />
-<TGConnectingPoint num="9" id="294" />
-<TGConnectingPoint num="10" id="295" />
-<TGConnectingPoint num="11" id="296" />
-<TGConnectingPoint num="12" id="297" />
-<TGConnectingPoint num="13" id="298" />
-<TGConnectingPoint num="14" id="299" />
+<TGConnectingPoint num="0" id="302" />
+<TGConnectingPoint num="1" id="303" />
+<TGConnectingPoint num="2" id="304" />
+<TGConnectingPoint num="3" id="305" />
+<TGConnectingPoint num="4" id="306" />
+<TGConnectingPoint num="5" id="307" />
+<TGConnectingPoint num="6" id="308" />
+<TGConnectingPoint num="7" id="309" />
+<TGConnectingPoint num="8" id="310" />
+<TGConnectingPoint num="9" id="311" />
+<TGConnectingPoint num="10" id="312" />
+<TGConnectingPoint num="11" id="313" />
+<TGConnectingPoint num="12" id="314" />
+<TGConnectingPoint num="13" id="315" />
+<TGConnectingPoint num="14" id="316" />
</COMPONENT>
-<COMPONENT type="5200" id="344" uid="3f856106-1533-4f29-bb50-d5da20b70742" >
+<COMPONENT type="5200" id="361" index="11" uid="3f856106-1533-4f29-bb50-d5da20b70742" >
<cdparam x="192" y="15" />
-<sizeparam width="307" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="51" minDesiredHeight="0" />
+<sizeparam width="307" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="51" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="req0" />
-<TGConnectingPoint num="0" id="301" />
-<TGConnectingPoint num="1" id="302" />
-<TGConnectingPoint num="2" id="303" />
-<TGConnectingPoint num="3" id="304" />
-<TGConnectingPoint num="4" id="305" />
-<TGConnectingPoint num="5" id="306" />
-<TGConnectingPoint num="6" id="307" />
-<TGConnectingPoint num="7" id="308" />
-<TGConnectingPoint num="8" id="309" />
-<TGConnectingPoint num="9" id="310" />
-<TGConnectingPoint num="10" id="311" />
-<TGConnectingPoint num="11" id="312" />
-<TGConnectingPoint num="12" id="313" />
-<TGConnectingPoint num="13" id="314" />
-<TGConnectingPoint num="14" id="315" />
-<TGConnectingPoint num="15" id="316" />
-<TGConnectingPoint num="16" id="317" />
-<TGConnectingPoint num="17" id="318" />
-<TGConnectingPoint num="18" id="319" />
-<TGConnectingPoint num="19" id="320" />
-<TGConnectingPoint num="20" id="321" />
-<TGConnectingPoint num="21" id="322" />
-<TGConnectingPoint num="22" id="323" />
-<TGConnectingPoint num="23" id="324" />
-<TGConnectingPoint num="24" id="325" />
-<TGConnectingPoint num="25" id="326" />
-<TGConnectingPoint num="26" id="327" />
-<TGConnectingPoint num="27" id="328" />
-<TGConnectingPoint num="28" id="329" />
-<TGConnectingPoint num="29" id="330" />
-<TGConnectingPoint num="30" id="331" />
-<TGConnectingPoint num="31" id="332" />
-<TGConnectingPoint num="32" id="333" />
-<TGConnectingPoint num="33" id="334" />
-<TGConnectingPoint num="34" id="335" />
-<TGConnectingPoint num="35" id="336" />
-<TGConnectingPoint num="36" id="337" />
-<TGConnectingPoint num="37" id="338" />
-<TGConnectingPoint num="38" id="339" />
-<TGConnectingPoint num="39" id="340" />
-<TGConnectingPoint num="40" id="341" />
-<TGConnectingPoint num="41" id="342" />
-<TGConnectingPoint num="42" id="343" />
+<TGConnectingPoint num="0" id="318" />
+<TGConnectingPoint num="1" id="319" />
+<TGConnectingPoint num="2" id="320" />
+<TGConnectingPoint num="3" id="321" />
+<TGConnectingPoint num="4" id="322" />
+<TGConnectingPoint num="5" id="323" />
+<TGConnectingPoint num="6" id="324" />
+<TGConnectingPoint num="7" id="325" />
+<TGConnectingPoint num="8" id="326" />
+<TGConnectingPoint num="9" id="327" />
+<TGConnectingPoint num="10" id="328" />
+<TGConnectingPoint num="11" id="329" />
+<TGConnectingPoint num="12" id="330" />
+<TGConnectingPoint num="13" id="331" />
+<TGConnectingPoint num="14" id="332" />
+<TGConnectingPoint num="15" id="333" />
+<TGConnectingPoint num="16" id="334" />
+<TGConnectingPoint num="17" id="335" />
+<TGConnectingPoint num="18" id="336" />
+<TGConnectingPoint num="19" id="337" />
+<TGConnectingPoint num="20" id="338" />
+<TGConnectingPoint num="21" id="339" />
+<TGConnectingPoint num="22" id="340" />
+<TGConnectingPoint num="23" id="341" />
+<TGConnectingPoint num="24" id="342" />
+<TGConnectingPoint num="25" id="343" />
+<TGConnectingPoint num="26" id="344" />
+<TGConnectingPoint num="27" id="345" />
+<TGConnectingPoint num="28" id="346" />
+<TGConnectingPoint num="29" id="347" />
+<TGConnectingPoint num="30" id="348" />
+<TGConnectingPoint num="31" id="349" />
+<TGConnectingPoint num="32" id="350" />
+<TGConnectingPoint num="33" id="351" />
+<TGConnectingPoint num="34" id="352" />
+<TGConnectingPoint num="35" id="353" />
+<TGConnectingPoint num="36" id="354" />
+<TGConnectingPoint num="37" id="355" />
+<TGConnectingPoint num="38" id="356" />
+<TGConnectingPoint num="39" id="357" />
+<TGConnectingPoint num="40" id="358" />
+<TGConnectingPoint num="41" id="359" />
+<TGConnectingPoint num="42" id="360" />
<extraparam>
<textline data="The coffee machine never has one coin " />
<textline data=" inserted more than 50 units of time" />
@@ -502,55 +532,55 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5200" id="388" uid="e1c3057e-2674-463d-8b8c-6d741b397711" >
+<COMPONENT type="5200" id="405" index="12" uid="e1c3057e-2674-463d-8b8c-6d741b397711" >
<cdparam x="208" y="294" />
-<sizeparam width="357" height="174" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<sizeparam width="357" height="174" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="req2" />
-<TGConnectingPoint num="0" id="345" />
-<TGConnectingPoint num="1" id="346" />
-<TGConnectingPoint num="2" id="347" />
-<TGConnectingPoint num="3" id="348" />
-<TGConnectingPoint num="4" id="349" />
-<TGConnectingPoint num="5" id="350" />
-<TGConnectingPoint num="6" id="351" />
-<TGConnectingPoint num="7" id="352" />
-<TGConnectingPoint num="8" id="353" />
-<TGConnectingPoint num="9" id="354" />
-<TGConnectingPoint num="10" id="355" />
-<TGConnectingPoint num="11" id="356" />
-<TGConnectingPoint num="12" id="357" />
-<TGConnectingPoint num="13" id="358" />
-<TGConnectingPoint num="14" id="359" />
-<TGConnectingPoint num="15" id="360" />
-<TGConnectingPoint num="16" id="361" />
-<TGConnectingPoint num="17" id="362" />
-<TGConnectingPoint num="18" id="363" />
-<TGConnectingPoint num="19" id="364" />
-<TGConnectingPoint num="20" id="365" />
-<TGConnectingPoint num="21" id="366" />
-<TGConnectingPoint num="22" id="367" />
-<TGConnectingPoint num="23" id="368" />
-<TGConnectingPoint num="24" id="369" />
-<TGConnectingPoint num="25" id="370" />
-<TGConnectingPoint num="26" id="371" />
-<TGConnectingPoint num="27" id="372" />
-<TGConnectingPoint num="28" id="373" />
-<TGConnectingPoint num="29" id="374" />
-<TGConnectingPoint num="30" id="375" />
-<TGConnectingPoint num="31" id="376" />
-<TGConnectingPoint num="32" id="377" />
-<TGConnectingPoint num="33" id="378" />
-<TGConnectingPoint num="34" id="379" />
-<TGConnectingPoint num="35" id="380" />
-<TGConnectingPoint num="36" id="381" />
-<TGConnectingPoint num="37" id="382" />
-<TGConnectingPoint num="38" id="383" />
-<TGConnectingPoint num="39" id="384" />
-<TGConnectingPoint num="40" id="385" />
-<TGConnectingPoint num="41" id="386" />
-<TGConnectingPoint num="42" id="387" />
+<TGConnectingPoint num="0" id="362" />
+<TGConnectingPoint num="1" id="363" />
+<TGConnectingPoint num="2" id="364" />
+<TGConnectingPoint num="3" id="365" />
+<TGConnectingPoint num="4" id="366" />
+<TGConnectingPoint num="5" id="367" />
+<TGConnectingPoint num="6" id="368" />
+<TGConnectingPoint num="7" id="369" />
+<TGConnectingPoint num="8" id="370" />
+<TGConnectingPoint num="9" id="371" />
+<TGConnectingPoint num="10" id="372" />
+<TGConnectingPoint num="11" id="373" />
+<TGConnectingPoint num="12" id="374" />
+<TGConnectingPoint num="13" id="375" />
+<TGConnectingPoint num="14" id="376" />
+<TGConnectingPoint num="15" id="377" />
+<TGConnectingPoint num="16" id="378" />
+<TGConnectingPoint num="17" id="379" />
+<TGConnectingPoint num="18" id="380" />
+<TGConnectingPoint num="19" id="381" />
+<TGConnectingPoint num="20" id="382" />
+<TGConnectingPoint num="21" id="383" />
+<TGConnectingPoint num="22" id="384" />
+<TGConnectingPoint num="23" id="385" />
+<TGConnectingPoint num="24" id="386" />
+<TGConnectingPoint num="25" id="387" />
+<TGConnectingPoint num="26" id="388" />
+<TGConnectingPoint num="27" id="389" />
+<TGConnectingPoint num="28" id="390" />
+<TGConnectingPoint num="29" id="391" />
+<TGConnectingPoint num="30" id="392" />
+<TGConnectingPoint num="31" id="393" />
+<TGConnectingPoint num="32" id="394" />
+<TGConnectingPoint num="33" id="395" />
+<TGConnectingPoint num="34" id="396" />
+<TGConnectingPoint num="35" id="397" />
+<TGConnectingPoint num="36" id="398" />
+<TGConnectingPoint num="37" id="399" />
+<TGConnectingPoint num="38" id="400" />
+<TGConnectingPoint num="39" id="401" />
+<TGConnectingPoint num="40" id="402" />
+<TGConnectingPoint num="41" id="403" />
+<TGConnectingPoint num="42" id="404" />
<extraparam>
<textline data="When the application starts, if the wallet contains " />
<textline data="at least 2 coins, then a beverage may be delivered. " />
@@ -570,131 +600,131 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="5205" id="390" uid="34ca7799-3a0e-4d01-83f8-ae20f0b73c75" >
+<CONNECTOR type="5205" id="407" index="13" uid="34ca7799-3a0e-4d01-83f8-ae20f0b73c75" >
<cdparam x="661" y="76" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<TGConnectingPoint num="0" id="389" />
-<P1 x="660" y="70" id="78" />
-<P2 x="499" y="75" id="305" />
+<TGConnectingPoint num="0" id="406" />
+<P1 x="660" y="70" id="95" />
+<P2 x="499" y="75" id="322" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5208" id="392" uid="3dcf1aca-7b26-498d-965e-0ce76e35d74c" >
+<CONNECTOR type="5208" id="409" index="14" uid="3dcf1aca-7b26-498d-965e-0ce76e35d74c" >
<cdparam x="749" y="267" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<satisfy>>" />
-<TGConnectingPoint num="0" id="391" />
-<P1 x="727" y="267" id="46" />
-<P2 x="504" y="199" id="273" />
+<TGConnectingPoint num="0" id="408" />
+<P1 x="727" y="270" id="63" />
+<P2 x="504" y="199" id="290" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5208" id="394" uid="92b60407-bed3-42f3-85f9-79c4fa7b7464" >
+<CONNECTOR type="5208" id="411" index="15" uid="92b60407-bed3-42f3-85f9-79c4fa7b7464" >
<cdparam x="783" y="223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<satisfy>>" />
-<TGConnectingPoint num="0" id="393" />
-<P1 x="724" y="224" id="63" />
-<P2 x="504" y="173" id="272" />
+<TGConnectingPoint num="0" id="410" />
+<P1 x="724" y="229" id="80" />
+<P2 x="504" y="173" id="289" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="396" uid="dba5607e-348b-4eb0-aa5e-9364bef195de" >
+<CONNECTOR type="5205" id="413" index="16" uid="dba5607e-348b-4eb0-aa5e-9364bef195de" >
<cdparam x="124" y="457" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="395" />
-<P1 x="121" y="491" id="127" />
-<P2 x="122" y="302" id="176" />
+<TGConnectingPoint num="0" id="412" />
+<P1 x="121" y="491" id="144" />
+<P2 x="122" y="302" id="193" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="398" uid="0c74ef40-da5b-401a-9963-6aa77f1a1c90" >
+<CONNECTOR type="5205" id="415" index="17" uid="0c74ef40-da5b-401a-9963-6aa77f1a1c90" >
<cdparam x="244" y="315" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="397" />
-<P1 x="208" y="337" id="345" />
-<P2 x="160" y="272" id="170" />
+<TGConnectingPoint num="0" id="414" />
+<P1 x="208" y="337" id="362" />
+<P2 x="160" y="272" id="187" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="400" uid="738dc73a-f5b8-4f44-bc7b-22a007baaa25" >
+<CONNECTOR type="5205" id="417" index="18" uid="738dc73a-f5b8-4f44-bc7b-22a007baaa25" >
<cdparam x="249" y="199" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="399" />
-<P1 x="233" y="199" id="242" />
-<P2 x="160" y="212" id="168" />
+<TGConnectingPoint num="0" id="416" />
+<P1 x="233" y="199" id="259" />
+<P2 x="160" y="212" id="185" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="402" uid="a9a6682a-e612-4a26-bf3a-19ad83c15c8b" >
+<CONNECTOR type="5205" id="419" index="19" uid="a9a6682a-e612-4a26-bf3a-19ad83c15c8b" >
<cdparam x="237" y="98" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="401" />
-<P1 x="192" y="105" id="303" />
-<P2 x="122" y="182" id="173" />
+<TGConnectingPoint num="0" id="418" />
+<P1 x="192" y="105" id="320" />
+<P2 x="122" y="182" id="190" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5203" id="404" uid="27c5ca6a-578f-4236-934f-702c2dc5707b" >
+<CONNECTOR type="5203" id="421" index="20" uid="27c5ca6a-578f-4236-934f-702c2dc5707b" >
<cdparam x="538" y="537" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
-<TGConnectingPoint num="0" id="403" />
-<P1 x="682" y="382" id="210" />
-<P2 x="565" y="381" id="361" />
+<TGConnectingPoint num="0" id="420" />
+<P1 x="682" y="385" id="227" />
+<P2 x="565" y="381" id="378" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5203" id="406" uid="816b42a1-ea46-4c60-8fe1-8e0bafd5b89e" >
+<CONNECTOR type="5203" id="423" index="21" uid="816b42a1-ea46-4c60-8fe1-8e0bafd5b89e" >
<cdparam x="545" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
-<TGConnectingPoint num="0" id="405" />
-<P1 x="728" y="319" id="226" />
-<P2 x="504" y="199" id="257" />
+<TGConnectingPoint num="0" id="422" />
+<P1 x="728" y="322" id="243" />
+<P2 x="504" y="199" id="274" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5203" id="408" uid="9f92255c-a65c-44f2-b7f2-26437150ffac" >
+<CONNECTOR type="5203" id="425" index="22" uid="9f92255c-a65c-44f2-b7f2-26437150ffac" >
<cdparam x="563" y="148" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
-<TGConnectingPoint num="0" id="407" />
-<P1 x="632" y="166" id="286" />
-<P2 x="499" y="105" id="318" />
+<TGConnectingPoint num="0" id="424" />
+<P1 x="632" y="169" id="303" />
+<P2 x="499" y="105" id="335" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</AvatarRDPanel>
<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
-<CONNECTOR type="5312" id="410" uid="5786535d-3c79-48a8-a54b-96d466ced62a" >
+<CONNECTOR type="5312" id="427" index="0" uid="5786535d-3c79-48a8-a54b-96d466ced62a" >
<cdparam x="582" y="248" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="409" />
-<P1 x="502" y="258" id="535" />
-<P2 x="502" y="334" id="423" />
+<TGConnectingPoint num="0" id="426" />
+<P1 x="502" y="258" id="552" />
+<P2 x="502" y="334" id="440" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5310" id="416" uid="455354c9-2755-40b4-87cc-768024569fb7" >
+<CONNECTOR type="5310" id="433" index="1" uid="455354c9-2755-40b4-87cc-768024569fb7" >
<cdparam x="247" y="616" />
<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="413" />
-<TGConnectingPoint num="1" id="414" />
-<TGConnectingPoint num="2" id="415" />
-<P1 x="492" y="126" id="498" />
-<P2 x="492" y="209" id="539" />
+<TGConnectingPoint num="0" id="430" />
+<TGConnectingPoint num="1" id="431" />
+<TGConnectingPoint num="2" id="432" />
+<P1 x="492" y="126" id="515" />
+<P2 x="492" y="209" id="556" />
<Point x="467" y="147" />
<Point x="467" y="192" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="411" uid="76f4a561-8f55-4177-bf7c-dc0cf0813ec2" >
-<father id="416" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="428" index="11" uid="76f4a561-8f55-4177-bf7c-dc0cf0813ec2" >
+<father id="433" num="0" />
<cdparam x="467" y="147" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="412" uid="b40ad13e-3cf8-43fc-9186-740d4d6bbb0a" >
-<father id="416" num="1" />
+<SUBCOMPONENT type="-1" id="429" index="12" uid="b40ad13e-3cf8-43fc-9186-740d4d6bbb0a" >
+<father id="433" num="1" />
<cdparam x="467" y="192" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -702,229 +732,229 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5311" id="418" uid="11524948-a147-43ef-96d1-5735e92d5595" >
+<CONNECTOR type="5311" id="435" index="2" uid="11524948-a147-43ef-96d1-5735e92d5595" >
<cdparam x="280" y="200" />
<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="417" />
-<P1 x="302" y="261" id="461" />
-<P2 x="361" y="261" id="436" />
+<TGConnectingPoint num="0" id="434" />
+<P1 x="302" y="261" id="478" />
+<P2 x="361" y="261" id="453" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="420" uid="5158f55a-df11-4b2d-84af-dbf9292cf117" >
+<CONNECTOR type="5312" id="437" index="3" uid="5158f55a-df11-4b2d-84af-dbf9292cf117" >
<cdparam x="473" 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="reg" />
-<TGConnectingPoint num="0" id="419" />
-<P1 x="390" y="286" id="434" />
-<P2 x="390" y="331" id="428" />
+<TGConnectingPoint num="0" id="436" />
+<P1 x="390" y="286" id="451" />
+<P2 x="390" y="331" id="445" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5311" id="422" uid="93d13263-174e-4cf6-84df-d6189931b7be" >
+<CONNECTOR type="5311" id="439" index="4" uid="93d13263-174e-4cf6-84df-d6189931b7be" >
<cdparam x="276" 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="" />
-<TGConnectingPoint num="0" id="421" />
-<P1 x="305" y="211" id="448" />
-<P2 x="361" y="211" id="435" />
+<TGConnectingPoint num="0" id="438" />
+<P1 x="305" y="211" id="465" />
+<P2 x="361" y="211" id="452" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="5308" id="427" uid="fae3f1e2-3a0b-4232-91cd-bd992671f997" >
+<COMPONENT type="5308" id="444" index="5" uid="fae3f1e2-3a0b-4232-91cd-bd992671f997" >
<cdparam x="446" y="334" />
<sizeparam width="112" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="423" />
-<TGConnectingPoint num="1" id="424" />
-<TGConnectingPoint num="2" id="425" />
-<TGConnectingPoint num="3" id="426" />
+<TGConnectingPoint num="0" id="440" />
+<TGConnectingPoint num="1" id="441" />
+<TGConnectingPoint num="2" id="442" />
+<TGConnectingPoint num="3" id="443" />
<extraparam>
<liveness data="0" />
<not data="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5308" id="432" uid="d2ab93ee-4487-4970-8b2e-9a3c2a0201fa" >
+<COMPONENT type="5308" id="449" index="6" uid="d2ab93ee-4487-4970-8b2e-9a3c2a0201fa" >
<cdparam x="340" y="331" />
<sizeparam width="100" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value="oneCoinProperty" />
-<TGConnectingPoint num="0" id="428" />
-<TGConnectingPoint num="1" id="429" />
-<TGConnectingPoint num="2" id="430" />
-<TGConnectingPoint num="3" id="431" />
+<TGConnectingPoint num="0" id="445" />
+<TGConnectingPoint num="1" id="446" />
+<TGConnectingPoint num="2" id="447" />
+<TGConnectingPoint num="3" id="448" />
<extraparam>
<liveness data="1" />
<not data="true" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5302" id="445" uid="4323221d-cfa2-44e4-915f-11af59e9af62" >
+<COMPONENT type="5302" id="462" index="7" uid="4323221d-cfa2-44e4-915f-11af59e9af62" >
<cdparam x="361" y="187" />
<sizeparam width="59" height="99" minWidth="50" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value=">50" />
-<TGConnectingPoint num="0" id="433" />
-<TGConnectingPoint num="1" id="434" />
-<TGConnectingPoint num="2" id="435" />
-<TGConnectingPoint num="3" id="436" />
-<TGConnectingPoint num="4" id="437" />
-<TGConnectingPoint num="5" id="438" />
-<TGConnectingPoint num="6" id="439" />
-<TGConnectingPoint num="7" id="440" />
-<TGConnectingPoint num="8" id="441" />
-<TGConnectingPoint num="9" id="442" />
-<TGConnectingPoint num="10" id="443" />
-<TGConnectingPoint num="11" id="444" />
+<TGConnectingPoint num="0" id="450" />
+<TGConnectingPoint num="1" id="451" />
+<TGConnectingPoint num="2" id="452" />
+<TGConnectingPoint num="3" id="453" />
+<TGConnectingPoint num="4" id="454" />
+<TGConnectingPoint num="5" id="455" />
+<TGConnectingPoint num="6" id="456" />
+<TGConnectingPoint num="7" id="457" />
+<TGConnectingPoint num="8" id="458" />
+<TGConnectingPoint num="9" id="459" />
+<TGConnectingPoint num="10" id="460" />
+<TGConnectingPoint num="11" id="461" />
</COMPONENT>
-<COMPONENT type="5300" id="496" uid="19458285-e5f8-4cc6-8495-6c57a6e3a604" >
+<COMPONENT type="5300" id="513" index="8" uid="19458285-e5f8-4cc6-8495-6c57a6e3a604" >
<cdparam x="150" y="142" />
<sizeparam width="168" height="154" minWidth="5" minHeight="2" 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" />
-<TGConnectingPoint num="0" id="472" />
-<TGConnectingPoint num="1" id="473" />
-<TGConnectingPoint num="2" id="474" />
-<TGConnectingPoint num="3" id="475" />
-<TGConnectingPoint num="4" id="476" />
-<TGConnectingPoint num="5" id="477" />
-<TGConnectingPoint num="6" id="478" />
-<TGConnectingPoint num="7" id="479" />
-<TGConnectingPoint num="8" id="480" />
-<TGConnectingPoint num="9" id="481" />
-<TGConnectingPoint num="10" id="482" />
-<TGConnectingPoint num="11" id="483" />
-<TGConnectingPoint num="12" id="484" />
-<TGConnectingPoint num="13" id="485" />
-<TGConnectingPoint num="14" id="486" />
-<TGConnectingPoint num="15" id="487" />
-<TGConnectingPoint num="16" id="488" />
-<TGConnectingPoint num="17" id="489" />
-<TGConnectingPoint num="18" id="490" />
-<TGConnectingPoint num="19" id="491" />
-<TGConnectingPoint num="20" id="492" />
-<TGConnectingPoint num="21" id="493" />
-<TGConnectingPoint num="22" id="494" />
-<TGConnectingPoint num="23" id="495" />
+<TGConnectingPoint num="0" id="489" />
+<TGConnectingPoint num="1" id="490" />
+<TGConnectingPoint num="2" id="491" />
+<TGConnectingPoint num="3" id="492" />
+<TGConnectingPoint num="4" id="493" />
+<TGConnectingPoint num="5" id="494" />
+<TGConnectingPoint num="6" id="495" />
+<TGConnectingPoint num="7" id="496" />
+<TGConnectingPoint num="8" id="497" />
+<TGConnectingPoint num="9" id="498" />
+<TGConnectingPoint num="10" id="499" />
+<TGConnectingPoint num="11" id="500" />
+<TGConnectingPoint num="12" id="501" />
+<TGConnectingPoint num="13" id="502" />
+<TGConnectingPoint num="14" id="503" />
+<TGConnectingPoint num="15" id="504" />
+<TGConnectingPoint num="16" id="505" />
+<TGConnectingPoint num="17" id="506" />
+<TGConnectingPoint num="18" id="507" />
+<TGConnectingPoint num="19" id="508" />
+<TGConnectingPoint num="20" id="509" />
+<TGConnectingPoint num="21" id="510" />
+<TGConnectingPoint num="22" id="511" />
+<TGConnectingPoint num="23" id="512" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="458" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
-<father id="496" num="0" />
+<SUBCOMPONENT type="5304" id="475" index="13" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
+<father id="513" num="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="29" minY="0" maxY="114" />
<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
-<TGConnectingPoint num="0" id="446" />
-<TGConnectingPoint num="1" id="447" />
-<TGConnectingPoint num="2" id="448" />
-<TGConnectingPoint num="3" id="449" />
-<TGConnectingPoint num="4" id="450" />
-<TGConnectingPoint num="5" id="451" />
-<TGConnectingPoint num="6" id="452" />
-<TGConnectingPoint num="7" id="453" />
-<TGConnectingPoint num="8" id="454" />
-<TGConnectingPoint num="9" id="455" />
-<TGConnectingPoint num="10" id="456" />
-<TGConnectingPoint num="11" id="457" />
+<TGConnectingPoint num="0" id="463" />
+<TGConnectingPoint num="1" id="464" />
+<TGConnectingPoint num="2" id="465" />
+<TGConnectingPoint num="3" id="466" />
+<TGConnectingPoint num="4" id="467" />
+<TGConnectingPoint num="5" id="468" />
+<TGConnectingPoint num="6" id="469" />
+<TGConnectingPoint num="7" id="470" />
+<TGConnectingPoint num="8" id="471" />
+<TGConnectingPoint num="9" id="472" />
+<TGConnectingPoint num="10" id="473" />
+<TGConnectingPoint num="11" id="474" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="471" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
-<father id="496" num="1" />
+<SUBCOMPONENT type="5304" id="488" index="14" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
+<father id="513" num="1" />
<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="20" minY="0" maxY="114" />
<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
-<TGConnectingPoint num="0" id="459" />
-<TGConnectingPoint num="1" id="460" />
-<TGConnectingPoint num="2" id="461" />
-<TGConnectingPoint num="3" id="462" />
-<TGConnectingPoint num="4" id="463" />
-<TGConnectingPoint num="5" id="464" />
-<TGConnectingPoint num="6" id="465" />
-<TGConnectingPoint num="7" id="466" />
-<TGConnectingPoint num="8" id="467" />
-<TGConnectingPoint num="9" id="468" />
-<TGConnectingPoint num="10" id="469" />
-<TGConnectingPoint num="11" id="470" />
+<TGConnectingPoint num="0" id="476" />
+<TGConnectingPoint num="1" id="477" />
+<TGConnectingPoint num="2" id="478" />
+<TGConnectingPoint num="3" id="479" />
+<TGConnectingPoint num="4" id="480" />
+<TGConnectingPoint num="5" id="481" />
+<TGConnectingPoint num="6" id="482" />
+<TGConnectingPoint num="7" id="483" />
+<TGConnectingPoint num="8" id="484" />
+<TGConnectingPoint num="9" id="485" />
+<TGConnectingPoint num="10" id="486" />
+<TGConnectingPoint num="11" id="487" />
</SUBCOMPONENT>
-<COMPONENT type="5300" id="534" uid="5fc02a85-add5-4156-9375-73e189b6bfbb" >
+<COMPONENT type="5300" id="551" index="9" uid="5fc02a85-add5-4156-9375-73e189b6bfbb" >
<cdparam x="459" y="61" />
<sizeparam width="150" height="116" minWidth="5" minHeight="2" 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" />
-<TGConnectingPoint num="0" id="510" />
-<TGConnectingPoint num="1" id="511" />
-<TGConnectingPoint num="2" id="512" />
-<TGConnectingPoint num="3" id="513" />
-<TGConnectingPoint num="4" id="514" />
-<TGConnectingPoint num="5" id="515" />
-<TGConnectingPoint num="6" id="516" />
-<TGConnectingPoint num="7" id="517" />
-<TGConnectingPoint num="8" id="518" />
-<TGConnectingPoint num="9" id="519" />
-<TGConnectingPoint num="10" id="520" />
-<TGConnectingPoint num="11" id="521" />
-<TGConnectingPoint num="12" id="522" />
-<TGConnectingPoint num="13" id="523" />
-<TGConnectingPoint num="14" id="524" />
-<TGConnectingPoint num="15" id="525" />
-<TGConnectingPoint num="16" id="526" />
-<TGConnectingPoint num="17" id="527" />
-<TGConnectingPoint num="18" id="528" />
-<TGConnectingPoint num="19" id="529" />
-<TGConnectingPoint num="20" id="530" />
-<TGConnectingPoint num="21" id="531" />
-<TGConnectingPoint num="22" id="532" />
-<TGConnectingPoint num="23" id="533" />
+<TGConnectingPoint num="0" id="527" />
+<TGConnectingPoint num="1" id="528" />
+<TGConnectingPoint num="2" id="529" />
+<TGConnectingPoint num="3" id="530" />
+<TGConnectingPoint num="4" id="531" />
+<TGConnectingPoint num="5" id="532" />
+<TGConnectingPoint num="6" id="533" />
+<TGConnectingPoint num="7" id="534" />
+<TGConnectingPoint num="8" id="535" />
+<TGConnectingPoint num="9" id="536" />
+<TGConnectingPoint num="10" id="537" />
+<TGConnectingPoint num="11" id="538" />
+<TGConnectingPoint num="12" id="539" />
+<TGConnectingPoint num="13" id="540" />
+<TGConnectingPoint num="14" id="541" />
+<TGConnectingPoint num="15" id="542" />
+<TGConnectingPoint num="16" id="543" />
+<TGConnectingPoint num="17" id="544" />
+<TGConnectingPoint num="18" id="545" />
+<TGConnectingPoint num="19" id="546" />
+<TGConnectingPoint num="20" id="547" />
+<TGConnectingPoint num="21" id="548" />
+<TGConnectingPoint num="22" id="549" />
+<TGConnectingPoint num="23" id="550" />
</COMPONENT>
-<SUBCOMPONENT type="5303" id="509" uid="f28bac3d-3521-4547-82e8-954be90918d4" >
-<father id="534" num="0" />
+<SUBCOMPONENT type="5303" id="526" index="15" uid="f28bac3d-3521-4547-82e8-954be90918d4" >
+<father id="551" num="0" />
<cdparam x="492" y="102" />
<sizeparam width="100" height="49" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="50" minY="0" maxY="67" />
<infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="497" />
-<TGConnectingPoint num="1" id="498" />
-<TGConnectingPoint num="2" id="499" />
-<TGConnectingPoint num="3" id="500" />
-<TGConnectingPoint num="4" id="501" />
-<TGConnectingPoint num="5" id="502" />
-<TGConnectingPoint num="6" id="503" />
-<TGConnectingPoint num="7" id="504" />
-<TGConnectingPoint num="8" id="505" />
-<TGConnectingPoint num="9" id="506" />
-<TGConnectingPoint num="10" id="507" />
-<TGConnectingPoint num="11" id="508" />
+<TGConnectingPoint num="0" id="514" />
+<TGConnectingPoint num="1" id="515" />
+<TGConnectingPoint num="2" id="516" />
+<TGConnectingPoint num="3" id="517" />
+<TGConnectingPoint num="4" id="518" />
+<TGConnectingPoint num="5" id="519" />
+<TGConnectingPoint num="6" id="520" />
+<TGConnectingPoint num="7" id="521" />
+<TGConnectingPoint num="8" id="522" />
+<TGConnectingPoint num="9" id="523" />
+<TGConnectingPoint num="10" id="524" />
+<TGConnectingPoint num="11" id="525" />
<extraparam>
<Toggle value="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5306" id="546" uid="ee18a19d-7d39-450d-8ec1-36a3f5d62bb6" >
+<COMPONENT type="5306" id="563" index="10" uid="ee18a19d-7d39-450d-8ec1-36a3f5d62bb6" >
<cdparam x="467" y="209" />
<sizeparam width="100" height="49" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value="nbOfCoins >= 0" />
-<TGConnectingPoint num="0" id="535" />
-<TGConnectingPoint num="1" id="536" />
-<TGConnectingPoint num="2" id="537" />
-<TGConnectingPoint num="3" id="538" />
-<TGConnectingPoint num="4" id="539" />
-<TGConnectingPoint num="5" id="540" />
-<TGConnectingPoint num="6" id="541" />
-<TGConnectingPoint num="7" id="542" />
-<TGConnectingPoint num="8" id="543" />
-<TGConnectingPoint num="9" id="544" />
-<TGConnectingPoint num="10" id="545" />
+<TGConnectingPoint num="0" id="552" />
+<TGConnectingPoint num="1" id="553" />
+<TGConnectingPoint num="2" id="554" />
+<TGConnectingPoint num="3" id="555" />
+<TGConnectingPoint num="4" id="556" />
+<TGConnectingPoint num="5" id="557" />
+<TGConnectingPoint num="6" id="558" />
+<TGConnectingPoint num="7" id="559" />
+<TGConnectingPoint num="8" id="560" />
+<TGConnectingPoint num="9" id="561" />
+<TGConnectingPoint num="10" id="562" />
<extraparam>
<Toggle value="" />
</extraparam>
@@ -934,55 +964,55 @@
</AvatarPDPanel>
<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
-<CONNECTOR type="5312" id="548" uid="804e9975-57cd-4256-841e-4b27c4d6a4b7" >
+<CONNECTOR type="5312" id="565" index="0" uid="804e9975-57cd-4256-841e-4b27c4d6a4b7" >
<cdparam x="580" y="547" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="547" />
-<P1 x="637" y="538" id="729" />
-<P2 x="632" y="563" id="580" />
+<TGConnectingPoint num="0" id="564" />
+<P1 x="637" y="538" id="746" />
+<P2 x="632" y="563" id="597" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="550" uid="745ab8ed-0f7b-4547-89d8-c41760ff8e68" >
+<CONNECTOR type="5312" id="567" index="1" uid="745ab8ed-0f7b-4547-89d8-c41760ff8e68" >
<cdparam x="506" y="493" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="549" />
-<P1 x="577" y="471" id="734" />
-<P2 x="617" y="498" id="722" />
+<TGConnectingPoint num="0" id="566" />
+<P1 x="577" y="471" id="751" />
+<P2 x="617" y="498" id="739" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="552" uid="378e2969-7a9a-4fd3-babc-615537326b6b" >
+<CONNECTOR type="5312" id="569" index="2" uid="378e2969-7a9a-4fd3-babc-615537326b6b" >
<cdparam x="694" y="460" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="551" />
-<P1 x="694" y="472" id="576" />
-<P2 x="657" y="498" id="724" />
+<TGConnectingPoint num="0" id="568" />
+<P1 x="694" y="472" id="593" />
+<P2 x="657" y="498" id="741" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5311" id="558" uid="e80d282a-ac5f-4bd7-ad2c-3eddf0adf9f1" >
+<CONNECTOR type="5311" id="575" index="3" uid="e80d282a-ac5f-4bd7-ad2c-3eddf0adf9f1" >
<cdparam x="581" y="133" />
<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="555" />
-<TGConnectingPoint num="1" id="556" />
-<TGConnectingPoint num="2" id="557" />
-<P1 x="581" y="154" id="631" />
-<P2 x="546" y="305" id="701" />
+<TGConnectingPoint num="0" id="572" />
+<TGConnectingPoint num="1" id="573" />
+<TGConnectingPoint num="2" id="574" />
+<P1 x="581" y="154" id="648" />
+<P2 x="546" y="305" id="718" />
<Point x="518" y="154" />
<Point x="518" y="305" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="553" uid="1522829c-bbb2-4982-80f4-210a359a84ae" >
-<father id="558" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="570" index="19" uid="1522829c-bbb2-4982-80f4-210a359a84ae" >
+<father id="575" num="0" />
<cdparam x="518" y="154" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="554" uid="8fe9fbbe-3a0b-4b35-9b2b-57dd0f1b9751" >
-<father id="558" num="1" />
+<SUBCOMPONENT type="-1" id="571" index="20" uid="8fe9fbbe-3a0b-4b35-9b2b-57dd0f1b9751" >
+<father id="575" num="1" />
<cdparam x="518" y="305" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -990,18 +1020,18 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5311" id="562" uid="92277775-80ba-462e-9e92-a291bfef15f4" >
+<CONNECTOR type="5311" id="579" index="4" uid="92277775-80ba-462e-9e92-a291bfef15f4" >
<cdparam x="631" y="143" />
<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="560" />
-<TGConnectingPoint num="1" id="561" />
-<P1 x="631" y="164" id="626" />
-<P2 x="667" y="310" id="688" />
+<TGConnectingPoint num="0" id="577" />
+<TGConnectingPoint num="1" id="578" />
+<P1 x="631" y="164" id="643" />
+<P2 x="667" y="310" id="705" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="559" uid="4ac0821c-3216-4a8e-8f05-24d25e2dd06b" >
-<father id="562" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="576" index="21" uid="4ac0821c-3216-4a8e-8f05-24d25e2dd06b" >
+<father id="579" num="0" />
<cdparam x="631" y="310" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1009,27 +1039,27 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5312" id="564" uid="d5b6f7ef-d921-42be-a1cd-c55cac2ed3ba" >
+<CONNECTOR type="5312" id="581" index="5" uid="d5b6f7ef-d921-42be-a1cd-c55cac2ed3ba" >
<cdparam x="695" y="396" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="563" />
-<P1 x="696" y="385" id="687" />
-<P2 x="694" y="417" id="575" />
+<TGConnectingPoint num="0" id="580" />
+<P1 x="696" y="385" id="704" />
+<P2 x="694" y="417" id="592" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5310" id="568" uid="2ebd68a2-a655-43d9-bfca-aae8caefd17d" >
+<CONNECTOR type="5310" id="585" index="6" uid="2ebd68a2-a655-43d9-bfca-aae8caefd17d" >
<cdparam x="877" y="168" />
<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="566" />
-<TGConnectingPoint num="1" id="567" />
-<P1 x="721" y="158" id="637" />
-<P2 x="700" y="204" id="678" />
+<TGConnectingPoint num="0" id="583" />
+<TGConnectingPoint num="1" id="584" />
+<P1 x="721" y="158" id="654" />
+<P2 x="700" y="204" id="695" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="565" uid="6b580922-daec-4433-aa3d-c7b3510046ed" >
-<father id="568" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="582" index="22" uid="6b580922-daec-4433-aa3d-c7b3510046ed" >
+<father id="585" num="0" />
<cdparam x="700" y="158" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1037,292 +1067,292 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5312" id="570" uid="5879f6a1-a770-4eb3-896c-23db885e74c0" >
+<CONNECTOR type="5312" id="587" index="7" uid="5879f6a1-a770-4eb3-896c-23db885e74c0" >
<cdparam x="915" y="307" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="569" />
-<P1 x="710" y="254" id="674" />
-<P2 x="711" y="285" id="686" />
+<TGConnectingPoint num="0" id="586" />
+<P1 x="710" y="254" id="691" />
+<P2 x="711" y="285" id="703" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="572" uid="04af3f3a-6136-41ac-9584-89e70a450fc1" >
+<CONNECTOR type="5312" id="589" index="8" uid="04af3f3a-6136-41ac-9584-89e70a450fc1" >
<cdparam x="993" y="581" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="571" />
-<P1 x="576" y="385" id="700" />
-<P2 x="577" y="416" id="733" />
+<TGConnectingPoint num="0" id="588" />
+<P1 x="576" y="385" id="717" />
+<P2 x="577" y="416" id="750" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5311" id="574" uid="f54001b1-3193-4e4e-85b0-1c835681ec49" >
+<CONNECTOR type="5311" id="591" index="9" uid="f54001b1-3193-4e4e-85b0-1c835681ec49" >
<cdparam x="426" y="264" />
<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="573" />
-<P1 x="491" y="345" id="587" />
-<P2 x="546" y="345" id="705" />
+<TGConnectingPoint num="0" id="590" />
+<P1 x="491" y="345" id="604" />
+<P2 x="546" y="345" id="722" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="5308" id="579" uid="e3b7f45a-dbee-491c-b5c3-a72d033d4258" >
+<COMPONENT type="5308" id="596" index="10" uid="e3b7f45a-dbee-491c-b5c3-a72d033d4258" >
<cdparam x="644" y="417" />
<sizeparam width="100" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="prop01" />
-<TGConnectingPoint num="0" id="575" />
-<TGConnectingPoint num="1" id="576" />
-<TGConnectingPoint num="2" id="577" />
-<TGConnectingPoint num="3" id="578" />
+<TGConnectingPoint num="0" id="592" />
+<TGConnectingPoint num="1" id="593" />
+<TGConnectingPoint num="2" id="594" />
+<TGConnectingPoint num="3" id="595" />
<extraparam>
<liveness data="1" />
<not data="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5308" id="584" uid="63239556-e68a-4da5-9a61-1975ad5a0701" >
+<COMPONENT type="5308" id="601" index="11" uid="63239556-e68a-4da5-9a61-1975ad5a0701" >
<cdparam x="559" y="563" />
<sizeparam width="146" height="54" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="580" />
-<TGConnectingPoint num="1" id="581" />
-<TGConnectingPoint num="2" id="582" />
-<TGConnectingPoint num="3" id="583" />
+<TGConnectingPoint num="0" id="597" />
+<TGConnectingPoint num="1" id="598" />
+<TGConnectingPoint num="2" id="599" />
+<TGConnectingPoint num="3" id="600" />
<extraparam>
<liveness data="0" />
<not data="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5300" id="622" uid="d39912db-1919-408c-8703-c96dfe900859" >
+<COMPONENT type="5300" id="639" index="12" uid="d39912db-1919-408c-8703-c96dfe900859" >
<cdparam x="372" y="227" />
<sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="598" />
-<TGConnectingPoint num="1" id="599" />
-<TGConnectingPoint num="2" id="600" />
-<TGConnectingPoint num="3" id="601" />
-<TGConnectingPoint num="4" id="602" />
-<TGConnectingPoint num="5" id="603" />
-<TGConnectingPoint num="6" id="604" />
-<TGConnectingPoint num="7" id="605" />
-<TGConnectingPoint num="8" id="606" />
-<TGConnectingPoint num="9" id="607" />
-<TGConnectingPoint num="10" id="608" />
-<TGConnectingPoint num="11" id="609" />
-<TGConnectingPoint num="12" id="610" />
-<TGConnectingPoint num="13" id="611" />
-<TGConnectingPoint num="14" id="612" />
-<TGConnectingPoint num="15" id="613" />
-<TGConnectingPoint num="16" id="614" />
-<TGConnectingPoint num="17" id="615" />
-<TGConnectingPoint num="18" id="616" />
-<TGConnectingPoint num="19" id="617" />
-<TGConnectingPoint num="20" id="618" />
-<TGConnectingPoint num="21" id="619" />
-<TGConnectingPoint num="22" id="620" />
-<TGConnectingPoint num="23" id="621" />
+<TGConnectingPoint num="0" id="615" />
+<TGConnectingPoint num="1" id="616" />
+<TGConnectingPoint num="2" id="617" />
+<TGConnectingPoint num="3" id="618" />
+<TGConnectingPoint num="4" id="619" />
+<TGConnectingPoint num="5" id="620" />
+<TGConnectingPoint num="6" id="621" />
+<TGConnectingPoint num="7" id="622" />
+<TGConnectingPoint num="8" id="623" />
+<TGConnectingPoint num="9" id="624" />
+<TGConnectingPoint num="10" id="625" />
+<TGConnectingPoint num="11" id="626" />
+<TGConnectingPoint num="12" id="627" />
+<TGConnectingPoint num="13" id="628" />
+<TGConnectingPoint num="14" id="629" />
+<TGConnectingPoint num="15" id="630" />
+<TGConnectingPoint num="16" id="631" />
+<TGConnectingPoint num="17" id="632" />
+<TGConnectingPoint num="18" id="633" />
+<TGConnectingPoint num="19" id="634" />
+<TGConnectingPoint num="20" id="635" />
+<TGConnectingPoint num="21" id="636" />
+<TGConnectingPoint num="22" id="637" />
+<TGConnectingPoint num="23" id="638" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="597" uid="5d1a626c-a563-4ec6-aa1c-9bc5df2f6e2f" >
-<father id="622" num="0" />
+<SUBCOMPONENT type="5304" id="614" index="23" uid="5d1a626c-a563-4ec6-aa1c-9bc5df2f6e2f" >
+<father id="639" num="0" />
<cdparam x="391" y="326" />
<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="32" minY="0" maxY="114" />
<infoparam name="TGComponent" value="beverageReady" />
-<TGConnectingPoint num="0" id="585" />
-<TGConnectingPoint num="1" id="586" />
-<TGConnectingPoint num="2" id="587" />
-<TGConnectingPoint num="3" id="588" />
-<TGConnectingPoint num="4" id="589" />
-<TGConnectingPoint num="5" id="590" />
-<TGConnectingPoint num="6" id="591" />
-<TGConnectingPoint num="7" id="592" />
-<TGConnectingPoint num="8" id="593" />
-<TGConnectingPoint num="9" id="594" />
-<TGConnectingPoint num="10" id="595" />
-<TGConnectingPoint num="11" id="596" />
+<TGConnectingPoint num="0" id="602" />
+<TGConnectingPoint num="1" id="603" />
+<TGConnectingPoint num="2" id="604" />
+<TGConnectingPoint num="3" id="605" />
+<TGConnectingPoint num="4" id="606" />
+<TGConnectingPoint num="5" id="607" />
+<TGConnectingPoint num="6" id="608" />
+<TGConnectingPoint num="7" id="609" />
+<TGConnectingPoint num="8" id="610" />
+<TGConnectingPoint num="9" id="611" />
+<TGConnectingPoint num="10" id="612" />
+<TGConnectingPoint num="11" id="613" />
</SUBCOMPONENT>
-<COMPONENT type="5300" id="673" uid="2cb86cb8-7c0b-4009-8700-94f5734b69b6" >
+<COMPONENT type="5300" id="690" index="13" uid="2cb86cb8-7c0b-4009-8700-94f5734b69b6" >
<cdparam x="563" y="78" />
<sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="649" />
-<TGConnectingPoint num="1" id="650" />
-<TGConnectingPoint num="2" id="651" />
-<TGConnectingPoint num="3" id="652" />
-<TGConnectingPoint num="4" id="653" />
-<TGConnectingPoint num="5" id="654" />
-<TGConnectingPoint num="6" id="655" />
-<TGConnectingPoint num="7" id="656" />
-<TGConnectingPoint num="8" id="657" />
-<TGConnectingPoint num="9" id="658" />
-<TGConnectingPoint num="10" id="659" />
-<TGConnectingPoint num="11" id="660" />
-<TGConnectingPoint num="12" id="661" />
-<TGConnectingPoint num="13" id="662" />
-<TGConnectingPoint num="14" id="663" />
-<TGConnectingPoint num="15" id="664" />
-<TGConnectingPoint num="16" id="665" />
-<TGConnectingPoint num="17" id="666" />
-<TGConnectingPoint num="18" id="667" />
-<TGConnectingPoint num="19" id="668" />
-<TGConnectingPoint num="20" id="669" />
-<TGConnectingPoint num="21" id="670" />
-<TGConnectingPoint num="22" id="671" />
-<TGConnectingPoint num="23" id="672" />
+<TGConnectingPoint num="0" id="666" />
+<TGConnectingPoint num="1" id="667" />
+<TGConnectingPoint num="2" id="668" />
+<TGConnectingPoint num="3" id="669" />
+<TGConnectingPoint num="4" id="670" />
+<TGConnectingPoint num="5" id="671" />
+<TGConnectingPoint num="6" id="672" />
+<TGConnectingPoint num="7" id="673" />
+<TGConnectingPoint num="8" id="674" />
+<TGConnectingPoint num="9" id="675" />
+<TGConnectingPoint num="10" id="676" />
+<TGConnectingPoint num="11" id="677" />
+<TGConnectingPoint num="12" id="678" />
+<TGConnectingPoint num="13" id="679" />
+<TGConnectingPoint num="14" id="680" />
+<TGConnectingPoint num="15" id="681" />
+<TGConnectingPoint num="16" id="682" />
+<TGConnectingPoint num="17" id="683" />
+<TGConnectingPoint num="18" id="684" />
+<TGConnectingPoint num="19" id="685" />
+<TGConnectingPoint num="20" id="686" />
+<TGConnectingPoint num="21" id="687" />
+<TGConnectingPoint num="22" id="688" />
+<TGConnectingPoint num="23" id="689" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="635" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
-<father id="673" num="0" />
+<SUBCOMPONENT type="5304" id="652" index="24" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
+<father id="690" num="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="76" />
<infoparam name="TGComponent" value="Start" />
-<TGConnectingPoint num="0" id="623" />
-<TGConnectingPoint num="1" id="624" />
-<TGConnectingPoint num="2" id="625" />
-<TGConnectingPoint num="3" id="626" />
-<TGConnectingPoint num="4" id="627" />
-<TGConnectingPoint num="5" id="628" />
-<TGConnectingPoint num="6" id="629" />
-<TGConnectingPoint num="7" id="630" />
-<TGConnectingPoint num="8" id="631" />
-<TGConnectingPoint num="9" id="632" />
-<TGConnectingPoint num="10" id="633" />
-<TGConnectingPoint num="11" id="634" />
+<TGConnectingPoint num="0" id="640" />
+<TGConnectingPoint num="1" id="641" />
+<TGConnectingPoint num="2" id="642" />
+<TGConnectingPoint num="3" id="643" />
+<TGConnectingPoint num="4" id="644" />
+<TGConnectingPoint num="5" id="645" />
+<TGConnectingPoint num="6" id="646" />
+<TGConnectingPoint num="7" id="647" />
+<TGConnectingPoint num="8" id="648" />
+<TGConnectingPoint num="9" id="649" />
+<TGConnectingPoint num="10" id="650" />
+<TGConnectingPoint num="11" id="651" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="648" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
-<father id="673" num="1" />
+<SUBCOMPONENT type="5303" id="665" index="25" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
+<father id="690" num="1" />
<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="65" />
<infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="636" />
-<TGConnectingPoint num="1" id="637" />
-<TGConnectingPoint num="2" id="638" />
-<TGConnectingPoint num="3" id="639" />
-<TGConnectingPoint num="4" id="640" />
-<TGConnectingPoint num="5" id="641" />
-<TGConnectingPoint num="6" id="642" />
-<TGConnectingPoint num="7" id="643" />
-<TGConnectingPoint num="8" id="644" />
-<TGConnectingPoint num="9" id="645" />
-<TGConnectingPoint num="10" id="646" />
-<TGConnectingPoint num="11" id="647" />
+<TGConnectingPoint num="0" id="653" />
+<TGConnectingPoint num="1" id="654" />
+<TGConnectingPoint num="2" id="655" />
+<TGConnectingPoint num="3" id="656" />
+<TGConnectingPoint num="4" id="657" />
+<TGConnectingPoint num="5" id="658" />
+<TGConnectingPoint num="6" id="659" />
+<TGConnectingPoint num="7" id="660" />
+<TGConnectingPoint num="8" id="661" />
+<TGConnectingPoint num="9" id="662" />
+<TGConnectingPoint num="10" id="663" />
+<TGConnectingPoint num="11" id="664" />
<extraparam>
<Toggle value="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5306" id="685" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" >
+<COMPONENT type="5306" id="702" index="14" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" >
<cdparam x="675" y="204" />
<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="nbOfCoins > 1" />
-<TGConnectingPoint num="0" id="674" />
-<TGConnectingPoint num="1" id="675" />
-<TGConnectingPoint num="2" id="676" />
-<TGConnectingPoint num="3" id="677" />
-<TGConnectingPoint num="4" id="678" />
-<TGConnectingPoint num="5" id="679" />
-<TGConnectingPoint num="6" id="680" />
-<TGConnectingPoint num="7" id="681" />
-<TGConnectingPoint num="8" id="682" />
-<TGConnectingPoint num="9" id="683" />
-<TGConnectingPoint num="10" id="684" />
+<TGConnectingPoint num="0" id="691" />
+<TGConnectingPoint num="1" id="692" />
+<TGConnectingPoint num="2" id="693" />
+<TGConnectingPoint num="3" id="694" />
+<TGConnectingPoint num="4" id="695" />
+<TGConnectingPoint num="5" id="696" />
+<TGConnectingPoint num="6" id="697" />
+<TGConnectingPoint num="7" id="698" />
+<TGConnectingPoint num="8" id="699" />
+<TGConnectingPoint num="9" id="700" />
+<TGConnectingPoint num="10" id="701" />
<extraparam>
<Toggle value="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5302" id="698" uid="30896ebb-7bcf-4961-bcf7-c9e5bdc72b01" >
+<COMPONENT type="5302" id="715" index="15" uid="30896ebb-7bcf-4961-bcf7-c9e5bdc72b01" >
<cdparam x="667" y="285" />
<sizeparam width="59" height="100" minWidth="50" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="=0" />
-<TGConnectingPoint num="0" id="686" />
-<TGConnectingPoint num="1" id="687" />
-<TGConnectingPoint num="2" id="688" />
-<TGConnectingPoint num="3" id="689" />
-<TGConnectingPoint num="4" id="690" />
-<TGConnectingPoint num="5" id="691" />
-<TGConnectingPoint num="6" id="692" />
-<TGConnectingPoint num="7" id="693" />
-<TGConnectingPoint num="8" id="694" />
-<TGConnectingPoint num="9" id="695" />
-<TGConnectingPoint num="10" id="696" />
-<TGConnectingPoint num="11" id="697" />
+<TGConnectingPoint num="0" id="703" />
+<TGConnectingPoint num="1" id="704" />
+<TGConnectingPoint num="2" id="705" />
+<TGConnectingPoint num="3" id="706" />
+<TGConnectingPoint num="4" id="707" />
+<TGConnectingPoint num="5" id="708" />
+<TGConnectingPoint num="6" id="709" />
+<TGConnectingPoint num="7" id="710" />
+<TGConnectingPoint num="8" id="711" />
+<TGConnectingPoint num="9" id="712" />
+<TGConnectingPoint num="10" id="713" />
+<TGConnectingPoint num="11" id="714" />
</COMPONENT>
-<COMPONENT type="5301" id="719" uid="20367f57-662b-4c60-b7ad-d993ad0f3506" >
+<COMPONENT type="5301" id="736" index="16" uid="20367f57-662b-4c60-b7ad-d993ad0f3506" >
<cdparam x="546" y="285" />
<sizeparam width="60" height="100" minWidth="50" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="<<LS>>" />
-<TGConnectingPoint num="0" id="699" />
-<TGConnectingPoint num="1" id="700" />
-<TGConnectingPoint num="2" id="701" />
-<TGConnectingPoint num="3" id="702" />
-<TGConnectingPoint num="4" id="703" />
-<TGConnectingPoint num="5" id="704" />
-<TGConnectingPoint num="6" id="705" />
-<TGConnectingPoint num="7" id="706" />
-<TGConnectingPoint num="8" id="707" />
-<TGConnectingPoint num="9" id="708" />
-<TGConnectingPoint num="10" id="709" />
-<TGConnectingPoint num="11" id="710" />
-<TGConnectingPoint num="12" id="711" />
-<TGConnectingPoint num="13" id="712" />
-<TGConnectingPoint num="14" id="713" />
-<TGConnectingPoint num="15" id="714" />
-<TGConnectingPoint num="16" id="715" />
-<TGConnectingPoint num="17" id="716" />
-<TGConnectingPoint num="18" id="717" />
-<TGConnectingPoint num="19" id="718" />
+<TGConnectingPoint num="0" id="716" />
+<TGConnectingPoint num="1" id="717" />
+<TGConnectingPoint num="2" id="718" />
+<TGConnectingPoint num="3" id="719" />
+<TGConnectingPoint num="4" id="720" />
+<TGConnectingPoint num="5" id="721" />
+<TGConnectingPoint num="6" id="722" />
+<TGConnectingPoint num="7" id="723" />
+<TGConnectingPoint num="8" id="724" />
+<TGConnectingPoint num="9" id="725" />
+<TGConnectingPoint num="10" id="726" />
+<TGConnectingPoint num="11" id="727" />
+<TGConnectingPoint num="12" id="728" />
+<TGConnectingPoint num="13" id="729" />
+<TGConnectingPoint num="14" id="730" />
+<TGConnectingPoint num="15" id="731" />
+<TGConnectingPoint num="16" id="732" />
+<TGConnectingPoint num="17" id="733" />
+<TGConnectingPoint num="18" id="734" />
+<TGConnectingPoint num="19" id="735" />
</COMPONENT>
-<COMPONENT type="5309" id="732" uid="a08e3068-5afc-4fca-aea0-878f850371cb" >
+<COMPONENT type="5309" id="749" index="17" uid="a08e3068-5afc-4fca-aea0-878f850371cb" >
<cdparam x="597" y="498" />
<sizeparam width="80" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="<=>" />
-<TGConnectingPoint num="0" id="720" />
-<TGConnectingPoint num="1" id="721" />
-<TGConnectingPoint num="2" id="722" />
-<TGConnectingPoint num="3" id="723" />
-<TGConnectingPoint num="4" id="724" />
-<TGConnectingPoint num="5" id="725" />
-<TGConnectingPoint num="6" id="726" />
-<TGConnectingPoint num="7" id="727" />
-<TGConnectingPoint num="8" id="728" />
-<TGConnectingPoint num="9" id="729" />
-<TGConnectingPoint num="10" id="730" />
-<TGConnectingPoint num="11" id="731" />
+<TGConnectingPoint num="0" id="737" />
+<TGConnectingPoint num="1" id="738" />
+<TGConnectingPoint num="2" id="739" />
+<TGConnectingPoint num="3" id="740" />
+<TGConnectingPoint num="4" id="741" />
+<TGConnectingPoint num="5" id="742" />
+<TGConnectingPoint num="6" id="743" />
+<TGConnectingPoint num="7" id="744" />
+<TGConnectingPoint num="8" id="745" />
+<TGConnectingPoint num="9" id="746" />
+<TGConnectingPoint num="10" id="747" />
+<TGConnectingPoint num="11" id="748" />
</COMPONENT>
-<COMPONENT type="5308" id="737" uid="8d6a7e09-e3ac-432f-8a63-334e2bc2acd4" >
+<COMPONENT type="5308" id="754" index="18" uid="8d6a7e09-e3ac-432f-8a63-334e2bc2acd4" >
<cdparam x="527" y="416" />
<sizeparam width="100" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="prop02" />
-<TGConnectingPoint num="0" id="733" />
-<TGConnectingPoint num="1" id="734" />
-<TGConnectingPoint num="2" id="735" />
-<TGConnectingPoint num="3" id="736" />
+<TGConnectingPoint num="0" id="750" />
+<TGConnectingPoint num="1" id="751" />
+<TGConnectingPoint num="2" id="752" />
+<TGConnectingPoint num="3" id="753" />
<extraparam>
<liveness data="1" />
<not data="false" />
@@ -1346,13 +1376,13 @@
<Validated value="" />
<Ignored value="" />
-<CONNECTOR type="5002" id="739" uid="f480e606-bbb6-4ab7-8f89-8abb37ff40bb" >
+<CONNECTOR type="5002" id="756" index="0" uid="f480e606-bbb6-4ab7-8f89-8abb37ff40bb" >
<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="738" />
-<P1 x="446" y="279" id="817" />
-<P2 x="447" y="301" id="850" />
+<TGConnectingPoint num="0" id="755" />
+<P1 x="446" y="279" id="834" />
+<P2 x="447" y="301" id="867" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushCoffeeButton()" />
@@ -1360,13 +1390,13 @@
<FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5002" id="741" uid="403b1fb9-e973-4050-b3c2-b7e92680c5b4" >
+<CONNECTOR type="5002" id="758" index="1" uid="403b1fb9-e973-4050-b3c2-b7e92680c5b4" >
<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="740" />
-<P1 x="243" y="86" id="772" />
-<P2 x="355" y="86" id="846" />
+<TGConnectingPoint num="0" id="757" />
+<P1 x="243" y="86" id="789" />
+<P2 x="355" y="86" id="863" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in getCoin(int nbOfCoins)" />
@@ -1376,13 +1406,13 @@
<FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5002" id="743" uid="2f759ef7-69b3-40e9-9fea-acea53f78b16" >
+<CONNECTOR type="5002" id="760" index="2" uid="2f759ef7-69b3-40e9-9fea-acea53f78b16" >
<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="742" />
-<P1 x="631" y="278" id="792" />
-<P2 x="631" y="301" id="851" />
+<TGConnectingPoint num="0" id="759" />
+<P1 x="631" y="278" id="809" />
+<P2 x="631" y="301" id="868" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushTeaButton()" />
@@ -1390,7 +1420,7 @@
<FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
</extraparam>
</CONNECTOR>
-<COMPONENT type="303" id="760" uid="5f1b10fb-a1c2-4046-aad5-8b2f240adbd6" >
+<COMPONENT type="303" id="777" index="3" uid="5f1b10fb-a1c2-4046-aad5-8b2f240adbd6" >
<cdparam x="12" y="340" />
<sizeparam width="562" height="181" minWidth="27" minHeight="3" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1413,22 +1443,22 @@ CoffeeMachine.WaitingForFirstCoin --> CoffeeMachine.EjectState || CoffeeMachi
CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
" />
-<TGConnectingPoint num="0" id="744" />
-<TGConnectingPoint num="1" id="745" />
-<TGConnectingPoint num="2" id="746" />
-<TGConnectingPoint num="3" id="747" />
-<TGConnectingPoint num="4" id="748" />
-<TGConnectingPoint num="5" id="749" />
-<TGConnectingPoint num="6" id="750" />
-<TGConnectingPoint num="7" id="751" />
-<TGConnectingPoint num="8" id="752" />
-<TGConnectingPoint num="9" id="753" />
-<TGConnectingPoint num="10" id="754" />
-<TGConnectingPoint num="11" id="755" />
-<TGConnectingPoint num="12" id="756" />
-<TGConnectingPoint num="13" id="757" />
-<TGConnectingPoint num="14" id="758" />
-<TGConnectingPoint num="15" id="759" />
+<TGConnectingPoint num="0" id="761" />
+<TGConnectingPoint num="1" id="762" />
+<TGConnectingPoint num="2" id="763" />
+<TGConnectingPoint num="3" id="764" />
+<TGConnectingPoint num="4" id="765" />
+<TGConnectingPoint num="5" id="766" />
+<TGConnectingPoint num="6" id="767" />
+<TGConnectingPoint num="7" id="768" />
+<TGConnectingPoint num="8" id="769" />
+<TGConnectingPoint num="9" id="770" />
+<TGConnectingPoint num="10" id="771" />
+<TGConnectingPoint num="11" id="772" />
+<TGConnectingPoint num="12" id="773" />
+<TGConnectingPoint num="13" id="774" />
+<TGConnectingPoint num="14" id="775" />
+<TGConnectingPoint num="15" id="776" />
<extraparam>
<Line value="A[] CoffeeMachine.nbOfCoins<=2" />
<Line value="T E<> CoffeeMachine.nbOfCoins>0" />
@@ -1450,36 +1480,36 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="785" uid="bfe1f65b-e947-4455-a4f9-e84d772ca5b5" >
+<COMPONENT type="5000" id="802" index="4" uid="bfe1f65b-e947-4455-a4f9-e84d772ca5b5" >
<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="1524" />
<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="761" />
-<TGConnectingPoint num="1" id="762" />
-<TGConnectingPoint num="2" id="763" />
-<TGConnectingPoint num="3" id="764" />
-<TGConnectingPoint num="4" id="765" />
-<TGConnectingPoint num="5" id="766" />
-<TGConnectingPoint num="6" id="767" />
-<TGConnectingPoint num="7" id="768" />
-<TGConnectingPoint num="8" id="769" />
-<TGConnectingPoint num="9" id="770" />
-<TGConnectingPoint num="10" id="771" />
-<TGConnectingPoint num="11" id="772" />
-<TGConnectingPoint num="12" id="773" />
-<TGConnectingPoint num="13" id="774" />
-<TGConnectingPoint num="14" id="775" />
-<TGConnectingPoint num="15" id="776" />
-<TGConnectingPoint num="16" id="777" />
-<TGConnectingPoint num="17" id="778" />
-<TGConnectingPoint num="18" id="779" />
-<TGConnectingPoint num="19" id="780" />
-<TGConnectingPoint num="20" id="781" />
-<TGConnectingPoint num="21" id="782" />
-<TGConnectingPoint num="22" id="783" />
-<TGConnectingPoint num="23" id="784" />
+<TGConnectingPoint num="0" id="778" />
+<TGConnectingPoint num="1" id="779" />
+<TGConnectingPoint num="2" id="780" />
+<TGConnectingPoint num="3" id="781" />
+<TGConnectingPoint num="4" id="782" />
+<TGConnectingPoint num="5" id="783" />
+<TGConnectingPoint num="6" id="784" />
+<TGConnectingPoint num="7" id="785" />
+<TGConnectingPoint num="8" id="786" />
+<TGConnectingPoint num="9" id="787" />
+<TGConnectingPoint num="10" id="788" />
+<TGConnectingPoint num="11" id="789" />
+<TGConnectingPoint num="12" id="790" />
+<TGConnectingPoint num="13" id="791" />
+<TGConnectingPoint num="14" id="792" />
+<TGConnectingPoint num="15" id="793" />
+<TGConnectingPoint num="16" id="794" />
+<TGConnectingPoint num="17" id="795" />
+<TGConnectingPoint num="18" id="796" />
+<TGConnectingPoint num="19" id="797" />
+<TGConnectingPoint num="20" id="798" />
+<TGConnectingPoint num="21" id="799" />
+<TGConnectingPoint num="22" id="800" />
+<TGConnectingPoint num="23" id="801" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1493,36 +1523,36 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="860" uid="c413ffec-f29b-466c-b400-87bd699b9ee9" >
+<COMPONENT type="5000" id="877" index="5" uid="c413ffec-f29b-466c-b400-87bd699b9ee9" >
<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="1524" />
<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="836" />
-<TGConnectingPoint num="1" id="837" />
-<TGConnectingPoint num="2" id="838" />
-<TGConnectingPoint num="3" id="839" />
-<TGConnectingPoint num="4" id="840" />
-<TGConnectingPoint num="5" id="841" />
-<TGConnectingPoint num="6" id="842" />
-<TGConnectingPoint num="7" id="843" />
-<TGConnectingPoint num="8" id="844" />
-<TGConnectingPoint num="9" id="845" />
-<TGConnectingPoint num="10" id="846" />
-<TGConnectingPoint num="11" id="847" />
-<TGConnectingPoint num="12" id="848" />
-<TGConnectingPoint num="13" id="849" />
-<TGConnectingPoint num="14" id="850" />
-<TGConnectingPoint num="15" id="851" />
-<TGConnectingPoint num="16" id="852" />
-<TGConnectingPoint num="17" id="853" />
-<TGConnectingPoint num="18" id="854" />
-<TGConnectingPoint num="19" id="855" />
-<TGConnectingPoint num="20" id="856" />
-<TGConnectingPoint num="21" id="857" />
-<TGConnectingPoint num="22" id="858" />
-<TGConnectingPoint num="23" id="859" />
+<TGConnectingPoint num="0" id="853" />
+<TGConnectingPoint num="1" id="854" />
+<TGConnectingPoint num="2" id="855" />
+<TGConnectingPoint num="3" id="856" />
+<TGConnectingPoint num="4" id="857" />
+<TGConnectingPoint num="5" id="858" />
+<TGConnectingPoint num="6" id="859" />
+<TGConnectingPoint num="7" id="860" />
+<TGConnectingPoint num="8" id="861" />
+<TGConnectingPoint num="9" id="862" />
+<TGConnectingPoint num="10" id="863" />
+<TGConnectingPoint num="11" id="864" />
+<TGConnectingPoint num="12" id="865" />
+<TGConnectingPoint num="13" id="866" />
+<TGConnectingPoint num="14" id="867" />
+<TGConnectingPoint num="15" id="868" />
+<TGConnectingPoint num="16" id="869" />
+<TGConnectingPoint num="17" id="870" />
+<TGConnectingPoint num="18" id="871" />
+<TGConnectingPoint num="19" id="872" />
+<TGConnectingPoint num="20" id="873" />
+<TGConnectingPoint num="21" id="874" />
+<TGConnectingPoint num="22" id="875" />
+<TGConnectingPoint num="23" id="876" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1540,37 +1570,37 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="810" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
-<father id="860" num="0" />
+<SUBCOMPONENT type="5000" id="827" index="6" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
+<father id="877" num="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="218" minY="0" maxY="205" />
<infoparam name="Block1" value="TeaButton" />
-<TGConnectingPoint num="0" id="786" />
-<TGConnectingPoint num="1" id="787" />
-<TGConnectingPoint num="2" id="788" />
-<TGConnectingPoint num="3" id="789" />
-<TGConnectingPoint num="4" id="790" />
-<TGConnectingPoint num="5" id="791" />
-<TGConnectingPoint num="6" id="792" />
-<TGConnectingPoint num="7" id="793" />
-<TGConnectingPoint num="8" id="794" />
-<TGConnectingPoint num="9" id="795" />
-<TGConnectingPoint num="10" id="796" />
-<TGConnectingPoint num="11" id="797" />
-<TGConnectingPoint num="12" id="798" />
-<TGConnectingPoint num="13" id="799" />
-<TGConnectingPoint num="14" id="800" />
-<TGConnectingPoint num="15" id="801" />
-<TGConnectingPoint num="16" id="802" />
-<TGConnectingPoint num="17" id="803" />
-<TGConnectingPoint num="18" id="804" />
-<TGConnectingPoint num="19" id="805" />
-<TGConnectingPoint num="20" id="806" />
-<TGConnectingPoint num="21" id="807" />
-<TGConnectingPoint num="22" id="808" />
-<TGConnectingPoint num="23" id="809" />
+<TGConnectingPoint num="0" id="803" />
+<TGConnectingPoint num="1" id="804" />
+<TGConnectingPoint num="2" id="805" />
+<TGConnectingPoint num="3" id="806" />
+<TGConnectingPoint num="4" id="807" />
+<TGConnectingPoint num="5" id="808" />
+<TGConnectingPoint num="6" id="809" />
+<TGConnectingPoint num="7" id="810" />
+<TGConnectingPoint num="8" id="811" />
+<TGConnectingPoint num="9" id="812" />
+<TGConnectingPoint num="10" id="813" />
+<TGConnectingPoint num="11" id="814" />
+<TGConnectingPoint num="12" id="815" />
+<TGConnectingPoint num="13" id="816" />
+<TGConnectingPoint num="14" id="817" />
+<TGConnectingPoint num="15" id="818" />
+<TGConnectingPoint num="16" id="819" />
+<TGConnectingPoint num="17" id="820" />
+<TGConnectingPoint num="18" id="821" />
+<TGConnectingPoint num="19" id="822" />
+<TGConnectingPoint num="20" id="823" />
+<TGConnectingPoint num="21" id="824" />
+<TGConnectingPoint num="22" id="825" />
+<TGConnectingPoint num="23" id="826" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1578,37 +1608,37 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out push()" attached="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="835" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
-<father id="860" num="1" />
+<SUBCOMPONENT type="5000" id="852" index="7" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
+<father id="877" num="1" />
<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="217" minY="0" maxY="205" />
<infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="811" />
-<TGConnectingPoint num="1" id="812" />
-<TGConnectingPoint num="2" id="813" />
-<TGConnectingPoint num="3" id="814" />
-<TGConnectingPoint num="4" id="815" />
-<TGConnectingPoint num="5" id="816" />
-<TGConnectingPoint num="6" id="817" />
-<TGConnectingPoint num="7" id="818" />
-<TGConnectingPoint num="8" id="819" />
-<TGConnectingPoint num="9" id="820" />
-<TGConnectingPoint num="10" id="821" />
-<TGConnectingPoint num="11" id="822" />
-<TGConnectingPoint num="12" id="823" />
-<TGConnectingPoint num="13" id="824" />
-<TGConnectingPoint num="14" id="825" />
-<TGConnectingPoint num="15" id="826" />
-<TGConnectingPoint num="16" id="827" />
-<TGConnectingPoint num="17" id="828" />
-<TGConnectingPoint num="18" id="829" />
-<TGConnectingPoint num="19" id="830" />
-<TGConnectingPoint num="20" id="831" />
-<TGConnectingPoint num="21" id="832" />
-<TGConnectingPoint num="22" id="833" />
-<TGConnectingPoint num="23" id="834" />
+<TGConnectingPoint num="0" id="828" />
+<TGConnectingPoint num="1" id="829" />
+<TGConnectingPoint num="2" id="830" />
+<TGConnectingPoint num="3" id="831" />
+<TGConnectingPoint num="4" id="832" />
+<TGConnectingPoint num="5" id="833" />
+<TGConnectingPoint num="6" id="834" />
+<TGConnectingPoint num="7" id="835" />
+<TGConnectingPoint num="8" id="836" />
+<TGConnectingPoint num="9" id="837" />
+<TGConnectingPoint num="10" id="838" />
+<TGConnectingPoint num="11" id="839" />
+<TGConnectingPoint num="12" id="840" />
+<TGConnectingPoint num="13" id="841" />
+<TGConnectingPoint num="14" id="842" />
+<TGConnectingPoint num="15" id="843" />
+<TGConnectingPoint num="16" id="844" />
+<TGConnectingPoint num="17" id="845" />
+<TGConnectingPoint num="18" id="846" />
+<TGConnectingPoint num="19" id="847" />
+<TGConnectingPoint num="20" id="848" />
+<TGConnectingPoint num="21" id="849" />
+<TGConnectingPoint num="22" id="850" />
+<TGConnectingPoint num="23" id="851" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1621,26 +1651,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="867" uid="ab3fc175-6883-4ceb-932b-6a503e349bea" >
+<CONNECTOR type="5102" id="884" index="0" uid="ab3fc175-6883-4ceb-932b-6a503e349bea" >
<cdparam x="177" y="199" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="866" />
-<P1 x="340" y="233" id="1037" />
-<P2 x="353" y="252" id="1039" />
+<TGConnectingPoint num="0" id="883" />
+<P1 x="340" y="233" id="1054" />
+<P2 x="353" y="252" id="1056" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="865" uid="4b47f2ec-3073-4a06-b6e0-da7704454345" >
-<father id="867" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="882" index="8" uid="4b47f2ec-3073-4a06-b6e0-da7704454345" >
+<father id="884" num="0" />
<cdparam x="177" y="239" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="861" />
-<TGConnectingPoint num="1" id="862" />
-<TGConnectingPoint num="2" id="863" />
-<TGConnectingPoint num="3" id="864" />
+<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="1" id="879" />
+<TGConnectingPoint num="2" id="880" />
+<TGConnectingPoint num="3" id="881" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -1654,26 +1684,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="874" uid="55f1de79-3429-47a8-9f5c-84ccf8abc547" >
+<CONNECTOR type="5102" id="891" index="1" uid="55f1de79-3429-47a8-9f5c-84ccf8abc547" >
<cdparam x="322" y="69" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="873" />
-<P1 x="322" y="69" id="1035" />
-<P2 x="322" y="88" id="963" />
+<TGConnectingPoint num="0" id="890" />
+<P1 x="322" y="69" id="1052" />
+<P2 x="322" y="88" id="980" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="872" uid="59eff059-85a8-4d8f-aeb0-42e8e19675ae" >
-<father id="874" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="889" index="9" uid="59eff059-85a8-4d8f-aeb0-42e8e19675ae" >
+<father id="891" num="0" />
<cdparam x="322" y="109" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="868" />
-<TGConnectingPoint num="1" id="869" />
-<TGConnectingPoint num="2" id="870" />
-<TGConnectingPoint num="3" id="871" />
+<TGConnectingPoint num="0" id="885" />
+<TGConnectingPoint num="1" id="886" />
+<TGConnectingPoint num="2" id="887" />
+<TGConnectingPoint num="3" id="888" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -1687,26 +1717,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="881" uid="27ff6095-9b50-46df-afe1-3b6ad63ec543" >
+<CONNECTOR type="5102" id="898" index="2" uid="27ff6095-9b50-46df-afe1-3b6ad63ec543" >
<cdparam x="377" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="880" />
-<P1 x="322" y="118" id="968" />
-<P2 x="356" y="174" id="1051" />
+<TGConnectingPoint num="0" id="897" />
+<P1 x="322" y="118" id="985" />
+<P2 x="356" y="174" id="1068" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="879" uid="304fd2b1-277e-48d2-a345-7e4b73c1e0d7" >
-<father id="881" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="896" index="10" uid="304fd2b1-277e-48d2-a345-7e4b73c1e0d7" >
+<father id="898" num="0" />
<cdparam x="377" y="184" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="875" />
-<TGConnectingPoint num="1" id="876" />
-<TGConnectingPoint num="2" id="877" />
-<TGConnectingPoint num="3" id="878" />
+<TGConnectingPoint num="0" id="892" />
+<TGConnectingPoint num="1" id="893" />
+<TGConnectingPoint num="2" id="894" />
+<TGConnectingPoint num="3" id="895" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -1720,26 +1750,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="888" uid="8265b237-e32a-4014-9db6-0e4817084b6d" >
+<CONNECTOR type="5102" id="905" index="3" uid="8265b237-e32a-4014-9db6-0e4817084b6d" >
<cdparam x="377" y="187" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="887" />
-<P1 x="353" y="282" id="1040" />
-<P2 x="399" y="352" id="890" />
+<TGConnectingPoint num="0" id="904" />
+<P1 x="353" y="282" id="1057" />
+<P2 x="399" y="352" id="907" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="886" uid="ef1e1204-6711-4c2c-b81f-515c0e412fcb" >
-<father id="888" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="903" index="11" uid="ef1e1204-6711-4c2c-b81f-515c0e412fcb" >
+<father id="905" num="0" />
<cdparam x="417" y="335" />
<sizeparam width="145" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="882" />
-<TGConnectingPoint num="1" id="883" />
-<TGConnectingPoint num="2" id="884" />
-<TGConnectingPoint num="3" id="885" />
+<TGConnectingPoint num="0" id="899" />
+<TGConnectingPoint num="1" id="900" />
+<TGConnectingPoint num="2" id="901" />
+<TGConnectingPoint num="3" id="902" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="mechanicalDelay" enabled="true"/>
@@ -1753,316 +1783,316 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="961" uid="a8480980-aa52-45ec-b0bf-a5a376e0c5c6" >
+<COMPONENT type="5106" id="978" index="4" uid="a8480980-aa52-45ec-b0bf-a5a376e0c5c6" >
<cdparam x="374" y="352" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="889" />
-<TGConnectingPoint num="1" id="890" />
-<TGConnectingPoint num="2" id="891" />
-<TGConnectingPoint num="3" id="892" />
-<TGConnectingPoint num="4" id="893" />
-<TGConnectingPoint num="5" id="894" />
-<TGConnectingPoint num="6" id="895" />
-<TGConnectingPoint num="7" id="896" />
-<TGConnectingPoint num="8" id="897" />
-<TGConnectingPoint num="9" id="898" />
-<TGConnectingPoint num="10" id="899" />
-<TGConnectingPoint num="11" id="900" />
-<TGConnectingPoint num="12" id="901" />
-<TGConnectingPoint num="13" id="902" />
-<TGConnectingPoint num="14" id="903" />
-<TGConnectingPoint num="15" id="904" />
-<TGConnectingPoint num="16" id="905" />
-<TGConnectingPoint num="17" id="906" />
-<TGConnectingPoint num="18" id="907" />
-<TGConnectingPoint num="19" id="908" />
-<TGConnectingPoint num="20" id="909" />
-<TGConnectingPoint num="21" id="910" />
-<TGConnectingPoint num="22" id="911" />
-<TGConnectingPoint num="23" id="912" />
-<TGConnectingPoint num="24" id="913" />
-<TGConnectingPoint num="25" id="914" />
-<TGConnectingPoint num="26" id="915" />
-<TGConnectingPoint num="27" id="916" />
-<TGConnectingPoint num="28" id="917" />
-<TGConnectingPoint num="29" id="918" />
-<TGConnectingPoint num="30" id="919" />
-<TGConnectingPoint num="31" id="920" />
-<TGConnectingPoint num="32" id="921" />
-<TGConnectingPoint num="33" id="922" />
-<TGConnectingPoint num="34" id="923" />
-<TGConnectingPoint num="35" id="924" />
-<TGConnectingPoint num="36" id="925" />
-<TGConnectingPoint num="37" id="926" />
-<TGConnectingPoint num="38" id="927" />
-<TGConnectingPoint num="39" id="928" />
-<TGConnectingPoint num="40" id="929" />
-<TGConnectingPoint num="41" id="930" />
-<TGConnectingPoint num="42" id="931" />
-<TGConnectingPoint num="43" id="932" />
-<TGConnectingPoint num="44" id="933" />
-<TGConnectingPoint num="45" id="934" />
-<TGConnectingPoint num="46" id="935" />
-<TGConnectingPoint num="47" id="936" />
-<TGConnectingPoint num="48" id="937" />
-<TGConnectingPoint num="49" id="938" />
-<TGConnectingPoint num="50" id="939" />
-<TGConnectingPoint num="51" id="940" />
-<TGConnectingPoint num="52" id="941" />
-<TGConnectingPoint num="53" id="942" />
-<TGConnectingPoint num="54" id="943" />
-<TGConnectingPoint num="55" id="944" />
-<TGConnectingPoint num="56" id="945" />
-<TGConnectingPoint num="57" id="946" />
-<TGConnectingPoint num="58" id="947" />
-<TGConnectingPoint num="59" id="948" />
-<TGConnectingPoint num="60" id="949" />
-<TGConnectingPoint num="61" id="950" />
-<TGConnectingPoint num="62" id="951" />
-<TGConnectingPoint num="63" id="952" />
-<TGConnectingPoint num="64" id="953" />
-<TGConnectingPoint num="65" id="954" />
-<TGConnectingPoint num="66" id="955" />
-<TGConnectingPoint num="67" id="956" />
-<TGConnectingPoint num="68" id="957" />
-<TGConnectingPoint num="69" id="958" />
-<TGConnectingPoint num="70" id="959" />
-<TGConnectingPoint num="71" id="960" />
+<TGConnectingPoint num="0" id="906" />
+<TGConnectingPoint num="1" id="907" />
+<TGConnectingPoint num="2" id="908" />
+<TGConnectingPoint num="3" id="909" />
+<TGConnectingPoint num="4" id="910" />
+<TGConnectingPoint num="5" id="911" />
+<TGConnectingPoint num="6" id="912" />
+<TGConnectingPoint num="7" id="913" />
+<TGConnectingPoint num="8" id="914" />
+<TGConnectingPoint num="9" id="915" />
+<TGConnectingPoint num="10" id="916" />
+<TGConnectingPoint num="11" id="917" />
+<TGConnectingPoint num="12" id="918" />
+<TGConnectingPoint num="13" id="919" />
+<TGConnectingPoint num="14" id="920" />
+<TGConnectingPoint num="15" id="921" />
+<TGConnectingPoint num="16" id="922" />
+<TGConnectingPoint num="17" id="923" />
+<TGConnectingPoint num="18" id="924" />
+<TGConnectingPoint num="19" id="925" />
+<TGConnectingPoint num="20" id="926" />
+<TGConnectingPoint num="21" id="927" />
+<TGConnectingPoint num="22" id="928" />
+<TGConnectingPoint num="23" id="929" />
+<TGConnectingPoint num="24" id="930" />
+<TGConnectingPoint num="25" id="931" />
+<TGConnectingPoint num="26" id="932" />
+<TGConnectingPoint num="27" id="933" />
+<TGConnectingPoint num="28" id="934" />
+<TGConnectingPoint num="29" id="935" />
+<TGConnectingPoint num="30" id="936" />
+<TGConnectingPoint num="31" id="937" />
+<TGConnectingPoint num="32" id="938" />
+<TGConnectingPoint num="33" id="939" />
+<TGConnectingPoint num="34" id="940" />
+<TGConnectingPoint num="35" id="941" />
+<TGConnectingPoint num="36" id="942" />
+<TGConnectingPoint num="37" id="943" />
+<TGConnectingPoint num="38" id="944" />
+<TGConnectingPoint num="39" id="945" />
+<TGConnectingPoint num="40" id="946" />
+<TGConnectingPoint num="41" id="947" />
+<TGConnectingPoint num="42" id="948" />
+<TGConnectingPoint num="43" id="949" />
+<TGConnectingPoint num="44" id="950" />
+<TGConnectingPoint num="45" id="951" />
+<TGConnectingPoint num="46" id="952" />
+<TGConnectingPoint num="47" id="953" />
+<TGConnectingPoint num="48" id="954" />
+<TGConnectingPoint num="49" id="955" />
+<TGConnectingPoint num="50" id="956" />
+<TGConnectingPoint num="51" id="957" />
+<TGConnectingPoint num="52" id="958" />
+<TGConnectingPoint num="53" id="959" />
+<TGConnectingPoint num="54" id="960" />
+<TGConnectingPoint num="55" id="961" />
+<TGConnectingPoint num="56" id="962" />
+<TGConnectingPoint num="57" id="963" />
+<TGConnectingPoint num="58" id="964" />
+<TGConnectingPoint num="59" id="965" />
+<TGConnectingPoint num="60" id="966" />
+<TGConnectingPoint num="61" id="967" />
+<TGConnectingPoint num="62" id="968" />
+<TGConnectingPoint num="63" id="969" />
+<TGConnectingPoint num="64" id="970" />
+<TGConnectingPoint num="65" id="971" />
+<TGConnectingPoint num="66" id="972" />
+<TGConnectingPoint num="67" id="973" />
+<TGConnectingPoint num="68" id="974" />
+<TGConnectingPoint num="69" id="975" />
+<TGConnectingPoint num="70" id="976" />
+<TGConnectingPoint num="71" id="977" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1034" uid="bdf4e5e9-759e-4940-891e-d3b20cbd9b7b" >
+<COMPONENT type="5106" id="1051" index="5" uid="bdf4e5e9-759e-4940-891e-d3b20cbd9b7b" >
<cdparam x="297" y="88" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="962" />
-<TGConnectingPoint num="1" id="963" />
-<TGConnectingPoint num="2" id="964" />
-<TGConnectingPoint num="3" id="965" />
-<TGConnectingPoint num="4" id="966" />
-<TGConnectingPoint num="5" id="967" />
-<TGConnectingPoint num="6" id="968" />
-<TGConnectingPoint num="7" id="969" />
-<TGConnectingPoint num="8" id="970" />
-<TGConnectingPoint num="9" id="971" />
-<TGConnectingPoint num="10" id="972" />
-<TGConnectingPoint num="11" id="973" />
-<TGConnectingPoint num="12" id="974" />
-<TGConnectingPoint num="13" id="975" />
-<TGConnectingPoint num="14" id="976" />
-<TGConnectingPoint num="15" id="977" />
-<TGConnectingPoint num="16" id="978" />
-<TGConnectingPoint num="17" id="979" />
-<TGConnectingPoint num="18" id="980" />
-<TGConnectingPoint num="19" id="981" />
-<TGConnectingPoint num="20" id="982" />
-<TGConnectingPoint num="21" id="983" />
-<TGConnectingPoint num="22" id="984" />
-<TGConnectingPoint num="23" id="985" />
-<TGConnectingPoint num="24" id="986" />
-<TGConnectingPoint num="25" id="987" />
-<TGConnectingPoint num="26" id="988" />
-<TGConnectingPoint num="27" id="989" />
-<TGConnectingPoint num="28" id="990" />
-<TGConnectingPoint num="29" id="991" />
-<TGConnectingPoint num="30" id="992" />
-<TGConnectingPoint num="31" id="993" />
-<TGConnectingPoint num="32" id="994" />
-<TGConnectingPoint num="33" id="995" />
-<TGConnectingPoint num="34" id="996" />
-<TGConnectingPoint num="35" id="997" />
-<TGConnectingPoint num="36" id="998" />
-<TGConnectingPoint num="37" id="999" />
-<TGConnectingPoint num="38" id="1000" />
-<TGConnectingPoint num="39" id="1001" />
-<TGConnectingPoint num="40" id="1002" />
-<TGConnectingPoint num="41" id="1003" />
-<TGConnectingPoint num="42" id="1004" />
-<TGConnectingPoint num="43" id="1005" />
-<TGConnectingPoint num="44" id="1006" />
-<TGConnectingPoint num="45" id="1007" />
-<TGConnectingPoint num="46" id="1008" />
-<TGConnectingPoint num="47" id="1009" />
-<TGConnectingPoint num="48" id="1010" />
-<TGConnectingPoint num="49" id="1011" />
-<TGConnectingPoint num="50" id="1012" />
-<TGConnectingPoint num="51" id="1013" />
-<TGConnectingPoint num="52" id="1014" />
-<TGConnectingPoint num="53" id="1015" />
-<TGConnectingPoint num="54" id="1016" />
-<TGConnectingPoint num="55" id="1017" />
-<TGConnectingPoint num="56" id="1018" />
-<TGConnectingPoint num="57" id="1019" />
-<TGConnectingPoint num="58" id="1020" />
-<TGConnectingPoint num="59" id="1021" />
-<TGConnectingPoint num="60" id="1022" />
-<TGConnectingPoint num="61" id="1023" />
-<TGConnectingPoint num="62" id="1024" />
-<TGConnectingPoint num="63" id="1025" />
-<TGConnectingPoint num="64" id="1026" />
-<TGConnectingPoint num="65" id="1027" />
-<TGConnectingPoint num="66" id="1028" />
-<TGConnectingPoint num="67" id="1029" />
-<TGConnectingPoint num="68" id="1030" />
-<TGConnectingPoint num="69" id="1031" />
-<TGConnectingPoint num="70" id="1032" />
-<TGConnectingPoint num="71" id="1033" />
+<TGConnectingPoint num="0" id="979" />
+<TGConnectingPoint num="1" id="980" />
+<TGConnectingPoint num="2" id="981" />
+<TGConnectingPoint num="3" id="982" />
+<TGConnectingPoint num="4" id="983" />
+<TGConnectingPoint num="5" id="984" />
+<TGConnectingPoint num="6" id="985" />
+<TGConnectingPoint num="7" id="986" />
+<TGConnectingPoint num="8" id="987" />
+<TGConnectingPoint num="9" id="988" />
+<TGConnectingPoint num="10" id="989" />
+<TGConnectingPoint num="11" id="990" />
+<TGConnectingPoint num="12" id="991" />
+<TGConnectingPoint num="13" id="992" />
+<TGConnectingPoint num="14" id="993" />
+<TGConnectingPoint num="15" id="994" />
+<TGConnectingPoint num="16" id="995" />
+<TGConnectingPoint num="17" id="996" />
+<TGConnectingPoint num="18" id="997" />
+<TGConnectingPoint num="19" id="998" />
+<TGConnectingPoint num="20" id="999" />
+<TGConnectingPoint num="21" id="1000" />
+<TGConnectingPoint num="22" id="1001" />
+<TGConnectingPoint num="23" id="1002" />
+<TGConnectingPoint num="24" id="1003" />
+<TGConnectingPoint num="25" id="1004" />
+<TGConnectingPoint num="26" id="1005" />
+<TGConnectingPoint num="27" id="1006" />
+<TGConnectingPoint num="28" id="1007" />
+<TGConnectingPoint num="29" id="1008" />
+<TGConnectingPoint num="30" id="1009" />
+<TGConnectingPoint num="31" id="1010" />
+<TGConnectingPoint num="32" id="1011" />
+<TGConnectingPoint num="33" id="1012" />
+<TGConnectingPoint num="34" id="1013" />
+<TGConnectingPoint num="35" id="1014" />
+<TGConnectingPoint num="36" id="1015" />
+<TGConnectingPoint num="37" id="1016" />
+<TGConnectingPoint num="38" id="1017" />
+<TGConnectingPoint num="39" id="1018" />
+<TGConnectingPoint num="40" id="1019" />
+<TGConnectingPoint num="41" id="1020" />
+<TGConnectingPoint num="42" id="1021" />
+<TGConnectingPoint num="43" id="1022" />
+<TGConnectingPoint num="44" id="1023" />
+<TGConnectingPoint num="45" id="1024" />
+<TGConnectingPoint num="46" id="1025" />
+<TGConnectingPoint num="47" id="1026" />
+<TGConnectingPoint num="48" id="1027" />
+<TGConnectingPoint num="49" id="1028" />
+<TGConnectingPoint num="50" id="1029" />
+<TGConnectingPoint num="51" id="1030" />
+<TGConnectingPoint num="52" id="1031" />
+<TGConnectingPoint num="53" id="1032" />
+<TGConnectingPoint num="54" id="1033" />
+<TGConnectingPoint num="55" id="1034" />
+<TGConnectingPoint num="56" id="1035" />
+<TGConnectingPoint num="57" id="1036" />
+<TGConnectingPoint num="58" id="1037" />
+<TGConnectingPoint num="59" id="1038" />
+<TGConnectingPoint num="60" id="1039" />
+<TGConnectingPoint num="61" id="1040" />
+<TGConnectingPoint num="62" id="1041" />
+<TGConnectingPoint num="63" id="1042" />
+<TGConnectingPoint num="64" id="1043" />
+<TGConnectingPoint num="65" id="1044" />
+<TGConnectingPoint num="66" id="1045" />
+<TGConnectingPoint num="67" id="1046" />
+<TGConnectingPoint num="68" id="1047" />
+<TGConnectingPoint num="69" id="1048" />
+<TGConnectingPoint num="70" id="1049" />
+<TGConnectingPoint num="71" id="1050" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1036" uid="8a5f524c-e9d9-43ed-8bb2-62d6981ea781" >
+<COMPONENT type="5100" id="1053" index="6" uid="8a5f524c-e9d9-43ed-8bb2-62d6981ea781" >
<cdparam x="315" y="49" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1035" />
+<TGConnectingPoint num="0" id="1052" />
</COMPONENT>
-<COMPONENT type="5106" id="1122" uid="0351de1d-1a78-41a0-9a44-227ba3d1a1f8" >
+<COMPONENT type="5106" id="1139" index="7" uid="0351de1d-1a78-41a0-9a44-227ba3d1a1f8" >
<cdparam x="264" y="174" />
<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="1050" />
-<TGConnectingPoint num="1" id="1051" />
-<TGConnectingPoint num="2" id="1052" />
-<TGConnectingPoint num="3" id="1053" />
-<TGConnectingPoint num="4" id="1054" />
-<TGConnectingPoint num="5" id="1055" />
-<TGConnectingPoint num="6" id="1056" />
-<TGConnectingPoint num="7" id="1057" />
-<TGConnectingPoint num="8" id="1058" />
-<TGConnectingPoint num="9" id="1059" />
-<TGConnectingPoint num="10" id="1060" />
-<TGConnectingPoint num="11" id="1061" />
-<TGConnectingPoint num="12" id="1062" />
-<TGConnectingPoint num="13" id="1063" />
-<TGConnectingPoint num="14" id="1064" />
-<TGConnectingPoint num="15" id="1065" />
-<TGConnectingPoint num="16" id="1066" />
-<TGConnectingPoint num="17" id="1067" />
-<TGConnectingPoint num="18" id="1068" />
-<TGConnectingPoint num="19" id="1069" />
-<TGConnectingPoint num="20" id="1070" />
-<TGConnectingPoint num="21" id="1071" />
-<TGConnectingPoint num="22" id="1072" />
-<TGConnectingPoint num="23" id="1073" />
-<TGConnectingPoint num="24" id="1074" />
-<TGConnectingPoint num="25" id="1075" />
-<TGConnectingPoint num="26" id="1076" />
-<TGConnectingPoint num="27" id="1077" />
-<TGConnectingPoint num="28" id="1078" />
-<TGConnectingPoint num="29" id="1079" />
-<TGConnectingPoint num="30" id="1080" />
-<TGConnectingPoint num="31" id="1081" />
-<TGConnectingPoint num="32" id="1082" />
-<TGConnectingPoint num="33" id="1083" />
-<TGConnectingPoint num="34" id="1084" />
-<TGConnectingPoint num="35" id="1085" />
-<TGConnectingPoint num="36" id="1086" />
-<TGConnectingPoint num="37" id="1087" />
-<TGConnectingPoint num="38" id="1088" />
-<TGConnectingPoint num="39" id="1089" />
-<TGConnectingPoint num="40" id="1090" />
-<TGConnectingPoint num="41" id="1091" />
-<TGConnectingPoint num="42" id="1092" />
-<TGConnectingPoint num="43" id="1093" />
-<TGConnectingPoint num="44" id="1094" />
-<TGConnectingPoint num="45" id="1095" />
-<TGConnectingPoint num="46" id="1096" />
-<TGConnectingPoint num="47" id="1097" />
-<TGConnectingPoint num="48" id="1098" />
-<TGConnectingPoint num="49" id="1099" />
-<TGConnectingPoint num="50" id="1100" />
-<TGConnectingPoint num="51" id="1101" />
-<TGConnectingPoint num="52" id="1102" />
-<TGConnectingPoint num="53" id="1103" />
-<TGConnectingPoint num="54" id="1104" />
-<TGConnectingPoint num="55" id="1105" />
-<TGConnectingPoint num="56" id="1106" />
-<TGConnectingPoint num="57" id="1107" />
-<TGConnectingPoint num="58" id="1108" />
-<TGConnectingPoint num="59" id="1109" />
-<TGConnectingPoint num="60" id="1110" />
-<TGConnectingPoint num="61" id="1111" />
-<TGConnectingPoint num="62" id="1112" />
-<TGConnectingPoint num="63" id="1113" />
-<TGConnectingPoint num="64" id="1114" />
-<TGConnectingPoint num="65" id="1115" />
-<TGConnectingPoint num="66" id="1116" />
-<TGConnectingPoint num="67" id="1117" />
-<TGConnectingPoint num="68" id="1118" />
-<TGConnectingPoint num="69" id="1119" />
-<TGConnectingPoint num="70" id="1120" />
-<TGConnectingPoint num="71" id="1121" />
+<TGConnectingPoint num="0" id="1067" />
+<TGConnectingPoint num="1" id="1068" />
+<TGConnectingPoint num="2" id="1069" />
+<TGConnectingPoint num="3" id="1070" />
+<TGConnectingPoint num="4" id="1071" />
+<TGConnectingPoint num="5" id="1072" />
+<TGConnectingPoint num="6" id="1073" />
+<TGConnectingPoint num="7" id="1074" />
+<TGConnectingPoint num="8" id="1075" />
+<TGConnectingPoint num="9" id="1076" />
+<TGConnectingPoint num="10" id="1077" />
+<TGConnectingPoint num="11" id="1078" />
+<TGConnectingPoint num="12" id="1079" />
+<TGConnectingPoint num="13" id="1080" />
+<TGConnectingPoint num="14" id="1081" />
+<TGConnectingPoint num="15" id="1082" />
+<TGConnectingPoint num="16" id="1083" />
+<TGConnectingPoint num="17" id="1084" />
+<TGConnectingPoint num="18" id="1085" />
+<TGConnectingPoint num="19" id="1086" />
+<TGConnectingPoint num="20" id="1087" />
+<TGConnectingPoint num="21" id="1088" />
+<TGConnectingPoint num="22" id="1089" />
+<TGConnectingPoint num="23" id="1090" />
+<TGConnectingPoint num="24" id="1091" />
+<TGConnectingPoint num="25" id="1092" />
+<TGConnectingPoint num="26" id="1093" />
+<TGConnectingPoint num="27" id="1094" />
+<TGConnectingPoint num="28" id="1095" />
+<TGConnectingPoint num="29" id="1096" />
+<TGConnectingPoint num="30" id="1097" />
+<TGConnectingPoint num="31" id="1098" />
+<TGConnectingPoint num="32" id="1099" />
+<TGConnectingPoint num="33" id="1100" />
+<TGConnectingPoint num="34" id="1101" />
+<TGConnectingPoint num="35" id="1102" />
+<TGConnectingPoint num="36" id="1103" />
+<TGConnectingPoint num="37" id="1104" />
+<TGConnectingPoint num="38" id="1105" />
+<TGConnectingPoint num="39" id="1106" />
+<TGConnectingPoint num="40" id="1107" />
+<TGConnectingPoint num="41" id="1108" />
+<TGConnectingPoint num="42" id="1109" />
+<TGConnectingPoint num="43" id="1110" />
+<TGConnectingPoint num="44" id="1111" />
+<TGConnectingPoint num="45" id="1112" />
+<TGConnectingPoint num="46" id="1113" />
+<TGConnectingPoint num="47" id="1114" />
+<TGConnectingPoint num="48" id="1115" />
+<TGConnectingPoint num="49" id="1116" />
+<TGConnectingPoint num="50" id="1117" />
+<TGConnectingPoint num="51" id="1118" />
+<TGConnectingPoint num="52" id="1119" />
+<TGConnectingPoint num="53" id="1120" />
+<TGConnectingPoint num="54" id="1121" />
+<TGConnectingPoint num="55" id="1122" />
+<TGConnectingPoint num="56" id="1123" />
+<TGConnectingPoint num="57" id="1124" />
+<TGConnectingPoint num="58" id="1125" />
+<TGConnectingPoint num="59" id="1126" />
+<TGConnectingPoint num="60" id="1127" />
+<TGConnectingPoint num="61" id="1128" />
+<TGConnectingPoint num="62" id="1129" />
+<TGConnectingPoint num="63" id="1130" />
+<TGConnectingPoint num="64" id="1131" />
+<TGConnectingPoint num="65" id="1132" />
+<TGConnectingPoint num="66" id="1133" />
+<TGConnectingPoint num="67" id="1134" />
+<TGConnectingPoint num="68" id="1135" />
+<TGConnectingPoint num="69" id="1136" />
+<TGConnectingPoint num="70" id="1137" />
+<TGConnectingPoint num="71" id="1138" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5100" id="1038" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
-<father id="1122" num="0" />
+<SUBCOMPONENT type="5100" id="1055" index="12" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
+<father id="1139" 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="1037" />
+<TGConnectingPoint num="0" id="1054" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1049" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
-<father id="1122" num="1" />
+<SUBCOMPONENT type="5103" id="1066" index="13" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
+<father id="1139" 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="1039" />
-<TGConnectingPoint num="1" id="1040" />
-<TGConnectingPoint num="2" id="1041" />
-<TGConnectingPoint num="3" id="1042" />
-<TGConnectingPoint num="4" id="1043" />
-<TGConnectingPoint num="5" id="1044" />
-<TGConnectingPoint num="6" id="1045" />
-<TGConnectingPoint num="7" id="1046" />
-<TGConnectingPoint num="8" id="1047" />
-<TGConnectingPoint num="9" id="1048" />
+<TGConnectingPoint num="0" id="1056" />
+<TGConnectingPoint num="1" id="1057" />
+<TGConnectingPoint num="2" id="1058" />
+<TGConnectingPoint num="3" id="1059" />
+<TGConnectingPoint num="4" id="1060" />
+<TGConnectingPoint num="5" id="1061" />
+<TGConnectingPoint num="6" id="1062" />
+<TGConnectingPoint num="7" id="1063" />
+<TGConnectingPoint num="8" id="1064" />
+<TGConnectingPoint num="9" id="1065" />
</SUBCOMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1129" uid="b6b72041-1a86-4a7e-b183-a1063714fc5a" >
+<CONNECTOR type="5102" id="1146" index="0" uid="b6b72041-1a86-4a7e-b183-a1063714fc5a" >
<cdparam x="363" y="193" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1128" />
-<P1 x="363" y="204" id="1145" />
-<P2 x="362" y="257" id="1156" />
+<TGConnectingPoint num="0" id="1145" />
+<P1 x="363" y="204" id="1162" />
+<P2 x="362" y="257" id="1173" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1127" uid="4eff576d-2797-4cd7-8b4a-9f8d3eedbfa3" >
-<father id="1129" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1144" index="7" uid="4eff576d-2797-4cd7-8b4a-9f8d3eedbfa3" >
+<father id="1146" num="0" />
<cdparam x="380" y="228" />
<sizeparam width="145" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1123" />
-<TGConnectingPoint num="1" id="1124" />
-<TGConnectingPoint num="2" id="1125" />
-<TGConnectingPoint num="3" id="1126" />
+<TGConnectingPoint num="0" id="1140" />
+<TGConnectingPoint num="1" id="1141" />
+<TGConnectingPoint num="2" id="1142" />
+<TGConnectingPoint num="3" id="1143" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="mechanicalDelay" enabled="true"/>
@@ -2076,26 +2106,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1136" uid="55be5b63-5ab7-4c70-82a5-ccb157f1e48e" >
+<CONNECTOR type="5102" id="1153" index="1" uid="55be5b63-5ab7-4c70-82a5-ccb157f1e48e" >
<cdparam x="363" y="150" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1135" />
-<P1 x="363" y="150" id="1234" />
-<P2 x="363" y="174" id="1144" />
+<TGConnectingPoint num="0" id="1152" />
+<P1 x="363" y="150" id="1251" />
+<P2 x="363" y="174" id="1161" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1134" uid="dc0ebe3b-67a8-4563-ae0c-619e1c188dbf" >
-<father id="1136" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1151" index="8" uid="dc0ebe3b-67a8-4563-ae0c-619e1c188dbf" >
+<father id="1153" num="0" />
<cdparam x="363" y="190" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1130" />
-<TGConnectingPoint num="1" id="1131" />
-<TGConnectingPoint num="2" id="1132" />
-<TGConnectingPoint num="3" id="1133" />
+<TGConnectingPoint num="0" id="1147" />
+<TGConnectingPoint num="1" id="1148" />
+<TGConnectingPoint num="2" id="1149" />
+<TGConnectingPoint num="3" id="1150" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2109,26 +2139,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1143" uid="fbfd2179-4cd4-412d-999c-b51632f9369a" >
+<CONNECTOR type="5102" id="1160" index="2" uid="fbfd2179-4cd4-412d-999c-b51632f9369a" >
<cdparam x="362" y="101" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1142" />
-<P1 x="362" y="101" id="1301" />
-<P2 x="363" y="120" id="1229" />
+<TGConnectingPoint num="0" id="1159" />
+<P1 x="362" y="101" id="1318" />
+<P2 x="363" y="120" id="1246" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1141" uid="b71cbbe8-7a22-4871-8547-0b76c0af9a17" >
-<father id="1143" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1158" index="9" uid="b71cbbe8-7a22-4871-8547-0b76c0af9a17" >
+<father id="1160" num="0" />
<cdparam x="362" y="141" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1137" />
-<TGConnectingPoint num="1" id="1138" />
-<TGConnectingPoint num="2" id="1139" />
-<TGConnectingPoint num="3" id="1140" />
+<TGConnectingPoint num="0" id="1154" />
+<TGConnectingPoint num="1" id="1155" />
+<TGConnectingPoint num="2" id="1156" />
+<TGConnectingPoint num="3" id="1157" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2142,225 +2172,225 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="1154" uid="d4a9c558-0141-43d3-a937-04cd022daa47" >
+<COMPONENT type="5103" id="1171" index="3" uid="d4a9c558-0141-43d3-a937-04cd022daa47" >
<cdparam x="340" y="179" />
<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="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1144" />
-<TGConnectingPoint num="1" id="1145" />
-<TGConnectingPoint num="2" id="1146" />
-<TGConnectingPoint num="3" id="1147" />
-<TGConnectingPoint num="4" id="1148" />
-<TGConnectingPoint num="5" id="1149" />
-<TGConnectingPoint num="6" id="1150" />
-<TGConnectingPoint num="7" id="1151" />
-<TGConnectingPoint num="8" id="1152" />
-<TGConnectingPoint num="9" id="1153" />
+<TGConnectingPoint num="0" id="1161" />
+<TGConnectingPoint num="1" id="1162" />
+<TGConnectingPoint num="2" id="1163" />
+<TGConnectingPoint num="3" id="1164" />
+<TGConnectingPoint num="4" id="1165" />
+<TGConnectingPoint num="5" id="1166" />
+<TGConnectingPoint num="6" id="1167" />
+<TGConnectingPoint num="7" id="1168" />
+<TGConnectingPoint num="8" id="1169" />
+<TGConnectingPoint num="9" id="1170" />
</COMPONENT>
-<COMPONENT type="5106" id="1227" uid="6ce54c55-bad8-48d1-8f26-da8a04e9aa63" >
+<COMPONENT type="5106" id="1244" index="4" uid="6ce54c55-bad8-48d1-8f26-da8a04e9aa63" >
<cdparam x="337" y="257" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1155" />
-<TGConnectingPoint num="1" id="1156" />
-<TGConnectingPoint num="2" id="1157" />
-<TGConnectingPoint num="3" id="1158" />
-<TGConnectingPoint num="4" id="1159" />
-<TGConnectingPoint num="5" id="1160" />
-<TGConnectingPoint num="6" id="1161" />
-<TGConnectingPoint num="7" id="1162" />
-<TGConnectingPoint num="8" id="1163" />
-<TGConnectingPoint num="9" id="1164" />
-<TGConnectingPoint num="10" id="1165" />
-<TGConnectingPoint num="11" id="1166" />
-<TGConnectingPoint num="12" id="1167" />
-<TGConnectingPoint num="13" id="1168" />
-<TGConnectingPoint num="14" id="1169" />
-<TGConnectingPoint num="15" id="1170" />
-<TGConnectingPoint num="16" id="1171" />
-<TGConnectingPoint num="17" id="1172" />
-<TGConnectingPoint num="18" id="1173" />
-<TGConnectingPoint num="19" id="1174" />
-<TGConnectingPoint num="20" id="1175" />
-<TGConnectingPoint num="21" id="1176" />
-<TGConnectingPoint num="22" id="1177" />
-<TGConnectingPoint num="23" id="1178" />
-<TGConnectingPoint num="24" id="1179" />
-<TGConnectingPoint num="25" id="1180" />
-<TGConnectingPoint num="26" id="1181" />
-<TGConnectingPoint num="27" id="1182" />
-<TGConnectingPoint num="28" id="1183" />
-<TGConnectingPoint num="29" id="1184" />
-<TGConnectingPoint num="30" id="1185" />
-<TGConnectingPoint num="31" id="1186" />
-<TGConnectingPoint num="32" id="1187" />
-<TGConnectingPoint num="33" id="1188" />
-<TGConnectingPoint num="34" id="1189" />
-<TGConnectingPoint num="35" id="1190" />
-<TGConnectingPoint num="36" id="1191" />
-<TGConnectingPoint num="37" id="1192" />
-<TGConnectingPoint num="38" id="1193" />
-<TGConnectingPoint num="39" id="1194" />
-<TGConnectingPoint num="40" id="1195" />
-<TGConnectingPoint num="41" id="1196" />
-<TGConnectingPoint num="42" id="1197" />
-<TGConnectingPoint num="43" id="1198" />
-<TGConnectingPoint num="44" id="1199" />
-<TGConnectingPoint num="45" id="1200" />
-<TGConnectingPoint num="46" id="1201" />
-<TGConnectingPoint num="47" id="1202" />
-<TGConnectingPoint num="48" id="1203" />
-<TGConnectingPoint num="49" id="1204" />
-<TGConnectingPoint num="50" id="1205" />
-<TGConnectingPoint num="51" id="1206" />
-<TGConnectingPoint num="52" id="1207" />
-<TGConnectingPoint num="53" id="1208" />
-<TGConnectingPoint num="54" id="1209" />
-<TGConnectingPoint num="55" id="1210" />
-<TGConnectingPoint num="56" id="1211" />
-<TGConnectingPoint num="57" id="1212" />
-<TGConnectingPoint num="58" id="1213" />
-<TGConnectingPoint num="59" id="1214" />
-<TGConnectingPoint num="60" id="1215" />
-<TGConnectingPoint num="61" id="1216" />
-<TGConnectingPoint num="62" id="1217" />
-<TGConnectingPoint num="63" id="1218" />
-<TGConnectingPoint num="64" id="1219" />
-<TGConnectingPoint num="65" id="1220" />
-<TGConnectingPoint num="66" id="1221" />
-<TGConnectingPoint num="67" id="1222" />
-<TGConnectingPoint num="68" id="1223" />
-<TGConnectingPoint num="69" id="1224" />
-<TGConnectingPoint num="70" id="1225" />
-<TGConnectingPoint num="71" id="1226" />
+<TGConnectingPoint num="0" id="1172" />
+<TGConnectingPoint num="1" id="1173" />
+<TGConnectingPoint num="2" id="1174" />
+<TGConnectingPoint num="3" id="1175" />
+<TGConnectingPoint num="4" id="1176" />
+<TGConnectingPoint num="5" id="1177" />
+<TGConnectingPoint num="6" id="1178" />
+<TGConnectingPoint num="7" id="1179" />
+<TGConnectingPoint num="8" id="1180" />
+<TGConnectingPoint num="9" id="1181" />
+<TGConnectingPoint num="10" id="1182" />
+<TGConnectingPoint num="11" id="1183" />
+<TGConnectingPoint num="12" id="1184" />
+<TGConnectingPoint num="13" id="1185" />
+<TGConnectingPoint num="14" id="1186" />
+<TGConnectingPoint num="15" id="1187" />
+<TGConnectingPoint num="16" id="1188" />
+<TGConnectingPoint num="17" id="1189" />
+<TGConnectingPoint num="18" id="1190" />
+<TGConnectingPoint num="19" id="1191" />
+<TGConnectingPoint num="20" id="1192" />
+<TGConnectingPoint num="21" id="1193" />
+<TGConnectingPoint num="22" id="1194" />
+<TGConnectingPoint num="23" id="1195" />
+<TGConnectingPoint num="24" id="1196" />
+<TGConnectingPoint num="25" id="1197" />
+<TGConnectingPoint num="26" id="1198" />
+<TGConnectingPoint num="27" id="1199" />
+<TGConnectingPoint num="28" id="1200" />
+<TGConnectingPoint num="29" id="1201" />
+<TGConnectingPoint num="30" id="1202" />
+<TGConnectingPoint num="31" id="1203" />
+<TGConnectingPoint num="32" id="1204" />
+<TGConnectingPoint num="33" id="1205" />
+<TGConnectingPoint num="34" id="1206" />
+<TGConnectingPoint num="35" id="1207" />
+<TGConnectingPoint num="36" id="1208" />
+<TGConnectingPoint num="37" id="1209" />
+<TGConnectingPoint num="38" id="1210" />
+<TGConnectingPoint num="39" id="1211" />
+<TGConnectingPoint num="40" id="1212" />
+<TGConnectingPoint num="41" id="1213" />
+<TGConnectingPoint num="42" id="1214" />
+<TGConnectingPoint num="43" id="1215" />
+<TGConnectingPoint num="44" id="1216" />
+<TGConnectingPoint num="45" id="1217" />
+<TGConnectingPoint num="46" id="1218" />
+<TGConnectingPoint num="47" id="1219" />
+<TGConnectingPoint num="48" id="1220" />
+<TGConnectingPoint num="49" id="1221" />
+<TGConnectingPoint num="50" id="1222" />
+<TGConnectingPoint num="51" id="1223" />
+<TGConnectingPoint num="52" id="1224" />
+<TGConnectingPoint num="53" id="1225" />
+<TGConnectingPoint num="54" id="1226" />
+<TGConnectingPoint num="55" id="1227" />
+<TGConnectingPoint num="56" id="1228" />
+<TGConnectingPoint num="57" id="1229" />
+<TGConnectingPoint num="58" id="1230" />
+<TGConnectingPoint num="59" id="1231" />
+<TGConnectingPoint num="60" id="1232" />
+<TGConnectingPoint num="61" id="1233" />
+<TGConnectingPoint num="62" id="1234" />
+<TGConnectingPoint num="63" id="1235" />
+<TGConnectingPoint num="64" id="1236" />
+<TGConnectingPoint num="65" id="1237" />
+<TGConnectingPoint num="66" id="1238" />
+<TGConnectingPoint num="67" id="1239" />
+<TGConnectingPoint num="68" id="1240" />
+<TGConnectingPoint num="69" id="1241" />
+<TGConnectingPoint num="70" id="1242" />
+<TGConnectingPoint num="71" id="1243" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1300" uid="922672f4-2b7f-4eec-8310-397ed6e8ae02" >
+<COMPONENT type="5106" id="1317" index="5" uid="922672f4-2b7f-4eec-8310-397ed6e8ae02" >
<cdparam x="338" y="120" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1228" />
-<TGConnectingPoint num="1" id="1229" />
-<TGConnectingPoint num="2" id="1230" />
-<TGConnectingPoint num="3" id="1231" />
-<TGConnectingPoint num="4" id="1232" />
-<TGConnectingPoint num="5" id="1233" />
-<TGConnectingPoint num="6" id="1234" />
-<TGConnectingPoint num="7" id="1235" />
-<TGConnectingPoint num="8" id="1236" />
-<TGConnectingPoint num="9" id="1237" />
-<TGConnectingPoint num="10" id="1238" />
-<TGConnectingPoint num="11" id="1239" />
-<TGConnectingPoint num="12" id="1240" />
-<TGConnectingPoint num="13" id="1241" />
-<TGConnectingPoint num="14" id="1242" />
-<TGConnectingPoint num="15" id="1243" />
-<TGConnectingPoint num="16" id="1244" />
-<TGConnectingPoint num="17" id="1245" />
-<TGConnectingPoint num="18" id="1246" />
-<TGConnectingPoint num="19" id="1247" />
-<TGConnectingPoint num="20" id="1248" />
-<TGConnectingPoint num="21" id="1249" />
-<TGConnectingPoint num="22" id="1250" />
-<TGConnectingPoint num="23" id="1251" />
-<TGConnectingPoint num="24" id="1252" />
-<TGConnectingPoint num="25" id="1253" />
-<TGConnectingPoint num="26" id="1254" />
-<TGConnectingPoint num="27" id="1255" />
-<TGConnectingPoint num="28" id="1256" />
-<TGConnectingPoint num="29" id="1257" />
-<TGConnectingPoint num="30" id="1258" />
-<TGConnectingPoint num="31" id="1259" />
-<TGConnectingPoint num="32" id="1260" />
-<TGConnectingPoint num="33" id="1261" />
-<TGConnectingPoint num="34" id="1262" />
-<TGConnectingPoint num="35" id="1263" />
-<TGConnectingPoint num="36" id="1264" />
-<TGConnectingPoint num="37" id="1265" />
-<TGConnectingPoint num="38" id="1266" />
-<TGConnectingPoint num="39" id="1267" />
-<TGConnectingPoint num="40" id="1268" />
-<TGConnectingPoint num="41" id="1269" />
-<TGConnectingPoint num="42" id="1270" />
-<TGConnectingPoint num="43" id="1271" />
-<TGConnectingPoint num="44" id="1272" />
-<TGConnectingPoint num="45" id="1273" />
-<TGConnectingPoint num="46" id="1274" />
-<TGConnectingPoint num="47" id="1275" />
-<TGConnectingPoint num="48" id="1276" />
-<TGConnectingPoint num="49" id="1277" />
-<TGConnectingPoint num="50" id="1278" />
-<TGConnectingPoint num="51" id="1279" />
-<TGConnectingPoint num="52" id="1280" />
-<TGConnectingPoint num="53" id="1281" />
-<TGConnectingPoint num="54" id="1282" />
-<TGConnectingPoint num="55" id="1283" />
-<TGConnectingPoint num="56" id="1284" />
-<TGConnectingPoint num="57" id="1285" />
-<TGConnectingPoint num="58" id="1286" />
-<TGConnectingPoint num="59" id="1287" />
-<TGConnectingPoint num="60" id="1288" />
-<TGConnectingPoint num="61" id="1289" />
-<TGConnectingPoint num="62" id="1290" />
-<TGConnectingPoint num="63" id="1291" />
-<TGConnectingPoint num="64" id="1292" />
-<TGConnectingPoint num="65" id="1293" />
-<TGConnectingPoint num="66" id="1294" />
-<TGConnectingPoint num="67" id="1295" />
-<TGConnectingPoint num="68" id="1296" />
-<TGConnectingPoint num="69" id="1297" />
-<TGConnectingPoint num="70" id="1298" />
-<TGConnectingPoint num="71" id="1299" />
+<TGConnectingPoint num="0" id="1245" />
+<TGConnectingPoint num="1" id="1246" />
+<TGConnectingPoint num="2" id="1247" />
+<TGConnectingPoint num="3" id="1248" />
+<TGConnectingPoint num="4" id="1249" />
+<TGConnectingPoint num="5" id="1250" />
+<TGConnectingPoint num="6" id="1251" />
+<TGConnectingPoint num="7" id="1252" />
+<TGConnectingPoint num="8" id="1253" />
+<TGConnectingPoint num="9" id="1254" />
+<TGConnectingPoint num="10" id="1255" />
+<TGConnectingPoint num="11" id="1256" />
+<TGConnectingPoint num="12" id="1257" />
+<TGConnectingPoint num="13" id="1258" />
+<TGConnectingPoint num="14" id="1259" />
+<TGConnectingPoint num="15" id="1260" />
+<TGConnectingPoint num="16" id="1261" />
+<TGConnectingPoint num="17" id="1262" />
+<TGConnectingPoint num="18" id="1263" />
+<TGConnectingPoint num="19" id="1264" />
+<TGConnectingPoint num="20" id="1265" />
+<TGConnectingPoint num="21" id="1266" />
+<TGConnectingPoint num="22" id="1267" />
+<TGConnectingPoint num="23" id="1268" />
+<TGConnectingPoint num="24" id="1269" />
+<TGConnectingPoint num="25" id="1270" />
+<TGConnectingPoint num="26" id="1271" />
+<TGConnectingPoint num="27" id="1272" />
+<TGConnectingPoint num="28" id="1273" />
+<TGConnectingPoint num="29" id="1274" />
+<TGConnectingPoint num="30" id="1275" />
+<TGConnectingPoint num="31" id="1276" />
+<TGConnectingPoint num="32" id="1277" />
+<TGConnectingPoint num="33" id="1278" />
+<TGConnectingPoint num="34" id="1279" />
+<TGConnectingPoint num="35" id="1280" />
+<TGConnectingPoint num="36" id="1281" />
+<TGConnectingPoint num="37" id="1282" />
+<TGConnectingPoint num="38" id="1283" />
+<TGConnectingPoint num="39" id="1284" />
+<TGConnectingPoint num="40" id="1285" />
+<TGConnectingPoint num="41" id="1286" />
+<TGConnectingPoint num="42" id="1287" />
+<TGConnectingPoint num="43" id="1288" />
+<TGConnectingPoint num="44" id="1289" />
+<TGConnectingPoint num="45" id="1290" />
+<TGConnectingPoint num="46" id="1291" />
+<TGConnectingPoint num="47" id="1292" />
+<TGConnectingPoint num="48" id="1293" />
+<TGConnectingPoint num="49" id="1294" />
+<TGConnectingPoint num="50" id="1295" />
+<TGConnectingPoint num="51" id="1296" />
+<TGConnectingPoint num="52" id="1297" />
+<TGConnectingPoint num="53" id="1298" />
+<TGConnectingPoint num="54" id="1299" />
+<TGConnectingPoint num="55" id="1300" />
+<TGConnectingPoint num="56" id="1301" />
+<TGConnectingPoint num="57" id="1302" />
+<TGConnectingPoint num="58" id="1303" />
+<TGConnectingPoint num="59" id="1304" />
+<TGConnectingPoint num="60" id="1305" />
+<TGConnectingPoint num="61" id="1306" />
+<TGConnectingPoint num="62" id="1307" />
+<TGConnectingPoint num="63" id="1308" />
+<TGConnectingPoint num="64" id="1309" />
+<TGConnectingPoint num="65" id="1310" />
+<TGConnectingPoint num="66" id="1311" />
+<TGConnectingPoint num="67" id="1312" />
+<TGConnectingPoint num="68" id="1313" />
+<TGConnectingPoint num="69" id="1314" />
+<TGConnectingPoint num="70" id="1315" />
+<TGConnectingPoint num="71" id="1316" />
<color value="-3342490" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1302" uid="4dd96fd3-bb7e-4733-8f80-c8025d0affae" >
+<COMPONENT type="5100" id="1319" index="6" uid="4dd96fd3-bb7e-4733-8f80-c8025d0affae" >
<cdparam x="355" y="81" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1301" />
+<TGConnectingPoint num="0" id="1318" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="1309" uid="337b5408-bff6-4276-ab18-13e08d8e6eed" >
+<CONNECTOR type="5102" id="1326" index="0" uid="337b5408-bff6-4276-ab18-13e08d8e6eed" >
<cdparam x="296" y="699" />
<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="1308" />
-<P1 x="296" y="699" id="1848" />
-<P2 x="289" y="748" id="1697" />
+<TGConnectingPoint num="0" id="1325" />
+<P1 x="296" y="699" id="1865" />
+<P2 x="289" y="748" id="1714" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1307" uid="4429f9b6-d417-4a3a-a891-fe7728ba5e2d" >
-<father id="1309" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1324" index="30" uid="4429f9b6-d417-4a3a-a891-fe7728ba5e2d" >
+<father id="1326" num="0" />
<cdparam x="292" y="723" />
<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="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1303" />
-<TGConnectingPoint num="1" id="1304" />
-<TGConnectingPoint num="2" id="1305" />
-<TGConnectingPoint num="3" id="1306" />
+<TGConnectingPoint num="0" id="1320" />
+<TGConnectingPoint num="1" id="1321" />
+<TGConnectingPoint num="2" id="1322" />
+<TGConnectingPoint num="3" id="1323" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2374,26 +2404,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1316" uid="c7e8cb96-e451-49ce-9cc9-6ec084226c22" >
+<CONNECTOR type="5102" id="1333" index="1" uid="c7e8cb96-e451-49ce-9cc9-6ec084226c22" >
<cdparam x="303" y="40" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1315" />
-<P1 x="303" y="40" id="1621" />
-<P2 x="302" y="62" id="1624" />
+<TGConnectingPoint num="0" id="1332" />
+<P1 x="303" y="40" id="1638" />
+<P2 x="302" y="62" id="1641" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1314" uid="1125c964-453f-4528-bc32-c8ee4c2ea64e" >
-<father id="1316" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1331" index="31" uid="1125c964-453f-4528-bc32-c8ee4c2ea64e" >
+<father id="1333" num="0" />
<cdparam x="303" y="80" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1310" />
-<TGConnectingPoint num="1" id="1311" />
-<TGConnectingPoint num="2" id="1312" />
-<TGConnectingPoint num="3" id="1313" />
+<TGConnectingPoint num="0" id="1327" />
+<TGConnectingPoint num="1" id="1328" />
+<TGConnectingPoint num="2" id="1329" />
+<TGConnectingPoint num="3" id="1330" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2407,26 +2437,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1323" uid="fc30809c-b1b6-4b45-84f0-7974cfc18ef4" >
+<CONNECTOR type="5102" id="1340" index="2" uid="fc30809c-b1b6-4b45-84f0-7974cfc18ef4" >
<cdparam x="303" y="103" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1322" />
-<P1 x="302" y="102" id="1629" />
-<P2 x="306" y="136" id="1442" />
+<TGConnectingPoint num="0" id="1339" />
+<P1 x="302" y="102" id="1646" />
+<P2 x="306" y="136" id="1459" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1321" uid="0603efd4-6d7d-47a2-9caa-b415cabc5de3" >
-<father id="1323" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1338" index="32" uid="0603efd4-6d7d-47a2-9caa-b415cabc5de3" >
+<father id="1340" num="0" />
<cdparam x="303" y="143" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1317" />
-<TGConnectingPoint num="1" id="1318" />
-<TGConnectingPoint num="2" id="1319" />
-<TGConnectingPoint num="3" id="1320" />
+<TGConnectingPoint num="0" id="1334" />
+<TGConnectingPoint num="1" id="1335" />
+<TGConnectingPoint num="2" id="1336" />
+<TGConnectingPoint num="3" id="1337" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2440,26 +2470,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1330" uid="9550af17-6cff-4985-a9bf-c5a20e1fbdde" >
+<CONNECTOR type="5102" id="1347" index="3" uid="9550af17-6cff-4985-a9bf-c5a20e1fbdde" >
<cdparam x="309" y="160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1329" />
-<P1 x="306" y="166" id="1443" />
-<P2 x="309" y="188" id="1549" />
+<TGConnectingPoint num="0" id="1346" />
+<P1 x="306" y="166" id="1460" />
+<P2 x="309" y="188" id="1566" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1328" uid="b559eedf-0c1b-4649-af86-002b18b6cec0" >
-<father id="1330" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1345" index="33" uid="b559eedf-0c1b-4649-af86-002b18b6cec0" >
+<father id="1347" num="0" />
<cdparam x="112" y="175" />
<sizeparam width="168" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1324" />
-<TGConnectingPoint num="1" id="1325" />
-<TGConnectingPoint num="2" id="1326" />
-<TGConnectingPoint num="3" id="1327" />
+<TGConnectingPoint num="0" id="1341" />
+<TGConnectingPoint num="1" id="1342" />
+<TGConnectingPoint num="2" id="1343" />
+<TGConnectingPoint num="3" id="1344" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2474,26 +2504,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1337" uid="5aca63f4-637a-4446-bf35-5ceca5b2b5b7" >
+<CONNECTOR type="5102" id="1354" index="4" uid="5aca63f4-637a-4446-bf35-5ceca5b2b5b7" >
<cdparam x="270" y="224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1336" />
-<P1 x="270" y="228" id="1562" />
-<P2 x="277" y="275" id="1464" />
+<TGConnectingPoint num="0" id="1353" />
+<P1 x="270" y="228" id="1579" />
+<P2 x="277" y="275" id="1481" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1335" uid="95f680e7-c6de-4b21-9cc3-240c458f5232" >
-<father id="1337" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1352" index="34" uid="95f680e7-c6de-4b21-9cc3-240c458f5232" >
+<father id="1354" num="0" />
<cdparam x="270" y="264" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1331" />
-<TGConnectingPoint num="1" id="1332" />
-<TGConnectingPoint num="2" id="1333" />
-<TGConnectingPoint num="3" id="1334" />
+<TGConnectingPoint num="0" id="1348" />
+<TGConnectingPoint num="1" id="1349" />
+<TGConnectingPoint num="2" id="1350" />
+<TGConnectingPoint num="3" id="1351" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2507,26 +2537,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1344" uid="eabfbfd7-d326-4844-98e5-c9d776fb3af7" >
+<CONNECTOR type="5102" id="1361" index="5" uid="eabfbfd7-d326-4844-98e5-c9d776fb3af7" >
<cdparam x="243" y="319" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1343" />
-<P1 x="277" y="305" id="1465" />
-<P2 x="311" y="372" id="2097" />
+<TGConnectingPoint num="0" id="1360" />
+<P1 x="277" y="305" id="1482" />
+<P2 x="311" y="372" id="2114" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1342" uid="26605bc0-b58e-4341-8d3a-ed61576c60e7" >
-<father id="1344" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1359" index="35" uid="26605bc0-b58e-4341-8d3a-ed61576c60e7" >
+<father id="1361" num="0" />
<cdparam x="291" y="348" />
<sizeparam width="85" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1338" />
-<TGConnectingPoint num="1" id="1339" />
-<TGConnectingPoint num="2" id="1340" />
-<TGConnectingPoint num="3" id="1341" />
+<TGConnectingPoint num="0" id="1355" />
+<TGConnectingPoint num="1" id="1356" />
+<TGConnectingPoint num="2" id="1357" />
+<TGConnectingPoint num="3" id="1358" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2541,26 +2571,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1351" uid="f81da3ef-51ca-491d-b645-4672ae80a670" >
+<CONNECTOR type="5102" id="1368" index="6" uid="f81da3ef-51ca-491d-b645-4672ae80a670" >
<cdparam x="348" y="228" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1350" />
-<P1 x="388" y="208" id="1552" />
-<P2 x="649" y="264" id="1478" />
+<TGConnectingPoint num="0" id="1367" />
+<P1 x="388" y="208" id="1569" />
+<P2 x="649" y="264" id="1495" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1349" uid="6da8ef68-bfcd-4555-a437-382dba9ed0fa" >
-<father id="1351" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1366" index="36" uid="6da8ef68-bfcd-4555-a437-382dba9ed0fa" >
+<father id="1368" num="0" />
<cdparam x="411" y="206" />
<sizeparam width="100" height="30" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1345" />
-<TGConnectingPoint num="1" id="1346" />
-<TGConnectingPoint num="2" id="1347" />
-<TGConnectingPoint num="3" id="1348" />
+<TGConnectingPoint num="0" id="1362" />
+<TGConnectingPoint num="1" id="1363" />
+<TGConnectingPoint num="2" id="1364" />
+<TGConnectingPoint num="3" id="1365" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="coinDelay" enabled="true"/>
@@ -2574,26 +2604,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1358" uid="125fbb03-8eb0-4874-930b-4795cc51a421" >
+<CONNECTOR type="5102" id="1375" index="7" uid="125fbb03-8eb0-4874-930b-4795cc51a421" >
<cdparam x="667" y="346" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1357" />
-<P1 x="699" y="346" id="1454" />
-<P2 x="699" y="381" id="1770" />
+<TGConnectingPoint num="0" id="1374" />
+<P1 x="699" y="346" id="1471" />
+<P2 x="699" y="381" id="1787" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1356" uid="c78ca8fa-a504-4c17-b0fd-1b441e700bc9" >
-<father id="1358" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1373" index="37" uid="c78ca8fa-a504-4c17-b0fd-1b441e700bc9" >
+<father id="1375" num="0" />
<cdparam x="707" y="368" />
<sizeparam width="89" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1352" />
-<TGConnectingPoint num="1" id="1353" />
-<TGConnectingPoint num="2" id="1354" />
-<TGConnectingPoint num="3" id="1355" />
+<TGConnectingPoint num="0" id="1369" />
+<TGConnectingPoint num="1" id="1370" />
+<TGConnectingPoint num="2" id="1371" />
+<TGConnectingPoint num="3" id="1372" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2608,26 +2638,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1365" uid="f110ec7e-786f-4874-aa4c-a5a8452e3bec" >
+<CONNECTOR type="5102" id="1382" index="8" uid="f110ec7e-786f-4874-aa4c-a5a8452e3bec" >
<cdparam x="280" y="420" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1364" />
-<P1 x="261" y="421" id="2010" />
-<P2 x="260" y="437" id="2013" />
+<TGConnectingPoint num="0" id="1381" />
+<P1 x="261" y="421" id="2027" />
+<P2 x="260" y="437" id="2030" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1363" uid="a28ea541-81ef-4713-8ea6-c7f5ba166daa" >
-<father id="1365" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1380" index="38" uid="a28ea541-81ef-4713-8ea6-c7f5ba166daa" >
+<father id="1382" num="0" />
<cdparam x="280" y="460" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1359" />
-<TGConnectingPoint num="1" id="1360" />
-<TGConnectingPoint num="2" id="1361" />
-<TGConnectingPoint num="3" id="1362" />
+<TGConnectingPoint num="0" id="1376" />
+<TGConnectingPoint num="1" id="1377" />
+<TGConnectingPoint num="2" id="1378" />
+<TGConnectingPoint num="3" id="1379" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2641,26 +2671,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1372" uid="ec9882f1-0571-4a17-8450-f90cc3541165" >
+<CONNECTOR type="5102" id="1389" index="9" uid="ec9882f1-0571-4a17-8450-f90cc3541165" >
<cdparam x="229" y="465" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1371" />
-<P1 x="227" y="477" id="2026" />
-<P2 x="126" y="524" id="1999" />
+<TGConnectingPoint num="0" id="1388" />
+<P1 x="227" y="477" id="2043" />
+<P2 x="126" y="524" id="2016" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1370" uid="2484893a-3443-40dc-8f74-e1443edc2bde" >
-<father id="1372" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1387" index="39" uid="2484893a-3443-40dc-8f74-e1443edc2bde" >
+<father id="1389" num="0" />
<cdparam x="229" y="505" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1366" />
-<TGConnectingPoint num="1" id="1367" />
-<TGConnectingPoint num="2" id="1368" />
-<TGConnectingPoint num="3" id="1369" />
+<TGConnectingPoint num="0" id="1383" />
+<TGConnectingPoint num="1" id="1384" />
+<TGConnectingPoint num="2" id="1385" />
+<TGConnectingPoint num="3" id="1386" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2674,26 +2704,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1379" uid="fd458a6e-b8c4-40f4-9bcf-7c278afd59f0" >
+<CONNECTOR type="5102" id="1396" index="10" uid="fd458a6e-b8c4-40f4-9bcf-7c278afd59f0" >
<cdparam x="148" y="549" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1378" />
-<P1 x="126" y="554" id="2000" />
-<P2 x="126" y="653" id="1916" />
+<TGConnectingPoint num="0" id="1395" />
+<P1 x="126" y="554" id="2017" />
+<P2 x="126" y="653" id="1933" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1377" uid="6f6c6e3e-0702-4e99-b1e6-da999207526e" >
-<father id="1379" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1394" index="40" uid="6f6c6e3e-0702-4e99-b1e6-da999207526e" >
+<father id="1396" num="0" />
<cdparam x="32" y="587" />
<sizeparam width="288" height="45" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1373" />
-<TGConnectingPoint num="1" id="1374" />
-<TGConnectingPoint num="2" id="1375" />
-<TGConnectingPoint num="3" id="1376" />
+<TGConnectingPoint num="0" id="1390" />
+<TGConnectingPoint num="1" id="1391" />
+<TGConnectingPoint num="2" id="1392" />
+<TGConnectingPoint num="3" id="1393" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2709,26 +2739,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1386" uid="3c5402fb-df1c-436c-b72e-b1dd1b9edfce" >
+<CONNECTOR type="5102" id="1403" index="11" uid="3c5402fb-df1c-436c-b72e-b1dd1b9edfce" >
<cdparam x="295" y="465" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1385" />
-<P1 x="293" y="477" id="2027" />
-<P2 x="298" y="524" id="2085" />
+<TGConnectingPoint num="0" id="1402" />
+<P1 x="293" y="477" id="2044" />
+<P2 x="298" y="524" id="2102" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1384" uid="18f77c23-d770-43b2-a9ca-161802d8a987" >
-<father id="1386" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1401" index="41" uid="18f77c23-d770-43b2-a9ca-161802d8a987" >
+<father id="1403" num="0" />
<cdparam x="295" y="505" />
<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="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1380" />
-<TGConnectingPoint num="1" id="1381" />
-<TGConnectingPoint num="2" id="1382" />
-<TGConnectingPoint num="3" id="1383" />
+<TGConnectingPoint num="0" id="1397" />
+<TGConnectingPoint num="1" id="1398" />
+<TGConnectingPoint num="2" id="1399" />
+<TGConnectingPoint num="3" id="1400" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2742,26 +2772,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1393" uid="1ab7405e-ff9d-48d1-a671-8176c9b67d36" >
+<CONNECTOR type="5102" id="1410" index="12" uid="1ab7405e-ff9d-48d1-a671-8176c9b67d36" >
<cdparam x="355" y="545" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1392" />
-<P1 x="298" y="554" id="2086" />
-<P2 x="296" y="650" id="1843" />
+<TGConnectingPoint num="0" id="1409" />
+<P1 x="298" y="554" id="2103" />
+<P2 x="296" y="650" id="1860" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1391" uid="a2a44349-5c04-4880-b1fb-76fa61d0f788" >
-<father id="1393" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1408" index="42" uid="a2a44349-5c04-4880-b1fb-76fa61d0f788" >
+<father id="1410" num="0" />
<cdparam x="213" y="607" />
<sizeparam width="252" height="45" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1387" />
-<TGConnectingPoint num="1" id="1388" />
-<TGConnectingPoint num="2" id="1389" />
-<TGConnectingPoint num="3" id="1390" />
+<TGConnectingPoint num="0" id="1404" />
+<TGConnectingPoint num="1" id="1405" />
+<TGConnectingPoint num="2" id="1406" />
+<TGConnectingPoint num="3" id="1407" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2777,26 +2807,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1400" uid="cee896e5-8c0f-4b50-8b35-1f184209456c" >
+<CONNECTOR type="5102" id="1417" index="13" uid="cee896e5-8c0f-4b50-8b35-1f184209456c" >
<cdparam x="555" y="559" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1399" />
-<P1 x="326" y="457" id="2016" />
-<P2 x="442" y="497" id="1988" />
+<TGConnectingPoint num="0" id="1416" />
+<P1 x="326" y="457" id="2033" />
+<P2 x="442" y="497" id="2005" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1398" uid="1286b08f-20a2-44ff-9ae2-d3d09cf02647" >
-<father id="1400" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1415" index="43" uid="1286b08f-20a2-44ff-9ae2-d3d09cf02647" >
+<father id="1417" num="0" />
<cdparam x="395" y="448" />
<sizeparam width="100" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1394" />
-<TGConnectingPoint num="1" id="1395" />
-<TGConnectingPoint num="2" id="1396" />
-<TGConnectingPoint num="3" id="1397" />
+<TGConnectingPoint num="0" id="1411" />
+<TGConnectingPoint num="1" id="1412" />
+<TGConnectingPoint num="2" id="1413" />
+<TGConnectingPoint num="3" id="1414" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="coinDelay" enabled="true"/>
@@ -2810,36 +2840,36 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1409" uid="d927b2cb-520a-4566-9900-87c60e941505" >
+<CONNECTOR type="5102" id="1426" index="14" uid="d927b2cb-520a-4566-9900-87c60e941505" >
<cdparam x="481" y="501" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1407" />
-<TGConnectingPoint num="1" id="1408" />
-<P1 x="442" y="527" id="1989" />
-<P2 x="323" y="748" id="1705" />
+<TGConnectingPoint num="0" id="1424" />
+<TGConnectingPoint num="1" id="1425" />
+<P1 x="442" y="527" id="2006" />
+<P2 x="323" y="748" id="1722" />
<Point x="442" y="737" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1401" uid="97f05691-fdba-4c23-8f17-efc594de748a" >
-<father id="1409" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1418" index="44" uid="97f05691-fdba-4c23-8f17-efc594de748a" >
+<father id="1426" num="0" />
<cdparam x="442" y="737" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1406" uid="89079180-d69e-4fbf-9f0d-538fe96f80b6" >
-<father id="1409" num="1" />
+<SUBCOMPONENT type="-1" id="1423" index="45" uid="89079180-d69e-4fbf-9f0d-538fe96f80b6" >
+<father id="1426" num="1" />
<cdparam x="420" y="552" />
<sizeparam width="89" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1402" />
-<TGConnectingPoint num="1" id="1403" />
-<TGConnectingPoint num="2" id="1404" />
-<TGConnectingPoint num="3" id="1405" />
+<TGConnectingPoint num="0" id="1419" />
+<TGConnectingPoint num="1" id="1420" />
+<TGConnectingPoint num="2" id="1421" />
+<TGConnectingPoint num="3" id="1422" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2854,26 +2884,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1416" uid="dbe5265f-c3eb-4de1-8a5c-ee149db3ca08" >
+<CONNECTOR type="5102" id="1433" index="15" uid="dbe5265f-c3eb-4de1-8a5c-ee149db3ca08" >
<cdparam x="691" y="288" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1415" />
-<P1 x="704" y="289" id="1481" />
-<P2 x="699" y="316" id="1453" />
+<TGConnectingPoint num="0" id="1432" />
+<P1 x="704" y="289" id="1498" />
+<P2 x="699" y="316" id="1470" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1414" uid="bfad4a28-4646-4532-b3dc-40f159448f2a" >
-<father id="1416" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1431" index="46" uid="bfad4a28-4646-4532-b3dc-40f159448f2a" >
+<father id="1433" num="0" />
<cdparam x="691" y="328" />
<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="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1410" />
-<TGConnectingPoint num="1" id="1411" />
-<TGConnectingPoint num="2" id="1412" />
-<TGConnectingPoint num="3" id="1413" />
+<TGConnectingPoint num="0" id="1427" />
+<TGConnectingPoint num="1" id="1428" />
+<TGConnectingPoint num="2" id="1429" />
+<TGConnectingPoint num="3" id="1430" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2887,34 +2917,34 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="118" id="1417" uid="16a00ddb-ec76-43d7-b039-f31426282506" >
+<CONNECTOR type="118" id="1434" index="16" uid="16a00ddb-ec76-43d7-b039-f31426282506" >
<cdparam x="372" y="83" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="412" y="82" id="1659" />
-<P2 x="472" y="82" id="1428" />
+<P1 x="412" y="82" id="1676" />
+<P2 x="472" y="82" id="1445" />
<AutomaticDrawing data="false" />
</CONNECTOR>
-<CONNECTOR type="5102" id="1424" uid="ffb36ef5-a87f-4098-9e53-6b9aa5d9f2bf" >
+<CONNECTOR type="5102" id="1441" index="17" uid="ffb36ef5-a87f-4098-9e53-6b9aa5d9f2bf" >
<cdparam x="126" y="702" />
<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="1423" />
-<P1 x="126" y="702" id="1921" />
-<P2 x="221" y="758" id="1706" />
+<TGConnectingPoint num="0" id="1440" />
+<P1 x="126" y="702" id="1938" />
+<P2 x="221" y="758" id="1723" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1422" uid="96753e12-f1ba-45d7-9fc5-e71fe53eb22b" >
-<father id="1424" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1439" index="47" uid="96753e12-f1ba-45d7-9fc5-e71fe53eb22b" >
+<father id="1441" num="0" />
<cdparam x="173" y="730" />
<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="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1418" />
-<TGConnectingPoint num="1" id="1419" />
-<TGConnectingPoint num="2" id="1420" />
-<TGConnectingPoint num="3" id="1421" />
+<TGConnectingPoint num="0" id="1435" />
+<TGConnectingPoint num="1" id="1436" />
+<TGConnectingPoint num="2" id="1437" />
+<TGConnectingPoint num="3" id="1438" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2928,916 +2958,916 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="301" id="1441" uid="0fc38199-404b-4919-af36-91d94e67bd82" >
+<COMPONENT type="301" id="1458" index="18" uid="0fc38199-404b-4919-af36-91d94e67bd82" >
<cdparam x="472" y="75" />
<sizeparam width="100" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="UML Note" value="Activity1.docx
" />
-<TGConnectingPoint num="0" id="1425" />
-<TGConnectingPoint num="1" id="1426" />
-<TGConnectingPoint num="2" id="1427" />
-<TGConnectingPoint num="3" id="1428" />
-<TGConnectingPoint num="4" id="1429" />
-<TGConnectingPoint num="5" id="1430" />
-<TGConnectingPoint num="6" id="1431" />
-<TGConnectingPoint num="7" id="1432" />
-<TGConnectingPoint num="8" id="1433" />
-<TGConnectingPoint num="9" id="1434" />
-<TGConnectingPoint num="10" id="1435" />
-<TGConnectingPoint num="11" id="1436" />
-<TGConnectingPoint num="12" id="1437" />
-<TGConnectingPoint num="13" id="1438" />
-<TGConnectingPoint num="14" id="1439" />
-<TGConnectingPoint num="15" id="1440" />
+<TGConnectingPoint num="0" id="1442" />
+<TGConnectingPoint num="1" id="1443" />
+<TGConnectingPoint num="2" id="1444" />
+<TGConnectingPoint num="3" id="1445" />
+<TGConnectingPoint num="4" id="1446" />
+<TGConnectingPoint num="5" id="1447" />
+<TGConnectingPoint num="6" id="1448" />
+<TGConnectingPoint num="7" id="1449" />
+<TGConnectingPoint num="8" id="1450" />
+<TGConnectingPoint num="9" id="1451" />
+<TGConnectingPoint num="10" id="1452" />
+<TGConnectingPoint num="11" id="1453" />
+<TGConnectingPoint num="12" id="1454" />
+<TGConnectingPoint num="13" id="1455" />
+<TGConnectingPoint num="14" id="1456" />
+<TGConnectingPoint num="15" id="1457" />
<extraparam>
<Line value="Activity1.docx" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5104" id="1452" uid="d83a71f6-2c21-4d03-a0df-a3cd72c20ffa" >
+<COMPONENT type="5104" id="1469" index="19" uid="d83a71f6-2c21-4d03-a0df-a3cd72c20ffa" >
<cdparam x="268" y="141" />
<sizeparam width="76" 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="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1442" />
-<TGConnectingPoint num="1" id="1443" />
-<TGConnectingPoint num="2" id="1444" />
-<TGConnectingPoint num="3" id="1445" />
-<TGConnectingPoint num="4" id="1446" />
-<TGConnectingPoint num="5" id="1447" />
-<TGConnectingPoint num="6" id="1448" />
-<TGConnectingPoint num="7" id="1449" />
-<TGConnectingPoint num="8" id="1450" />
-<TGConnectingPoint num="9" id="1451" />
+<TGConnectingPoint num="0" id="1459" />
+<TGConnectingPoint num="1" id="1460" />
+<TGConnectingPoint num="2" id="1461" />
+<TGConnectingPoint num="3" id="1462" />
+<TGConnectingPoint num="4" id="1463" />
+<TGConnectingPoint num="5" id="1464" />
+<TGConnectingPoint num="6" id="1465" />
+<TGConnectingPoint num="7" id="1466" />
+<TGConnectingPoint num="8" id="1467" />
+<TGConnectingPoint num="9" id="1468" />
</COMPONENT>
-<COMPONENT type="5103" id="1463" uid="d69a1f8e-85ca-49cd-9f8c-a853348e5be5" >
+<COMPONENT type="5103" id="1480" index="20" uid="d69a1f8e-85ca-49cd-9f8c-a853348e5be5" >
<cdparam x="634" y="321" />
<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="1400" />
<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1453" />
-<TGConnectingPoint num="1" id="1454" />
-<TGConnectingPoint num="2" id="1455" />
-<TGConnectingPoint num="3" id="1456" />
-<TGConnectingPoint num="4" id="1457" />
-<TGConnectingPoint num="5" id="1458" />
-<TGConnectingPoint num="6" id="1459" />
-<TGConnectingPoint num="7" id="1460" />
-<TGConnectingPoint num="8" id="1461" />
-<TGConnectingPoint num="9" id="1462" />
+<TGConnectingPoint num="0" id="1470" />
+<TGConnectingPoint num="1" id="1471" />
+<TGConnectingPoint num="2" id="1472" />
+<TGConnectingPoint num="3" id="1473" />
+<TGConnectingPoint num="4" id="1474" />
+<TGConnectingPoint num="5" id="1475" />
+<TGConnectingPoint num="6" id="1476" />
+<TGConnectingPoint num="7" id="1477" />
+<TGConnectingPoint num="8" id="1478" />
+<TGConnectingPoint num="9" id="1479" />
</COMPONENT>
-<COMPONENT type="5104" id="1474" uid="90146507-882f-4b3d-b9ac-1db93cca92c4" >
+<COMPONENT type="5104" id="1491" index="21" uid="90146507-882f-4b3d-b9ac-1db93cca92c4" >
<cdparam x="239" y="280" />
<sizeparam width="76" 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="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1464" />
-<TGConnectingPoint num="1" id="1465" />
-<TGConnectingPoint num="2" id="1466" />
-<TGConnectingPoint num="3" id="1467" />
-<TGConnectingPoint num="4" id="1468" />
-<TGConnectingPoint num="5" id="1469" />
-<TGConnectingPoint num="6" id="1470" />
-<TGConnectingPoint num="7" id="1471" />
-<TGConnectingPoint num="8" id="1472" />
-<TGConnectingPoint num="9" id="1473" />
+<TGConnectingPoint num="0" id="1481" />
+<TGConnectingPoint num="1" id="1482" />
+<TGConnectingPoint num="2" id="1483" />
+<TGConnectingPoint num="3" id="1484" />
+<TGConnectingPoint num="4" id="1485" />
+<TGConnectingPoint num="5" id="1486" />
+<TGConnectingPoint num="6" id="1487" />
+<TGConnectingPoint num="7" id="1488" />
+<TGConnectingPoint num="8" id="1489" />
+<TGConnectingPoint num="9" id="1490" />
<accessibility />
</COMPONENT>
-<COMPONENT type="5106" id="1547" uid="f7f6cc4e-efaa-4ffe-aeef-5e22694d971c" >
+<COMPONENT type="5106" id="1564" index="22" uid="f7f6cc4e-efaa-4ffe-aeef-5e22694d971c" >
<cdparam x="649" y="239" />
<sizeparam width="110" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="EjectState" />
-<TGConnectingPoint num="0" id="1475" />
-<TGConnectingPoint num="1" id="1476" />
-<TGConnectingPoint num="2" id="1477" />
-<TGConnectingPoint num="3" id="1478" />
-<TGConnectingPoint num="4" id="1479" />
-<TGConnectingPoint num="5" id="1480" />
-<TGConnectingPoint num="6" id="1481" />
-<TGConnectingPoint num="7" id="1482" />
-<TGConnectingPoint num="8" id="1483" />
-<TGConnectingPoint num="9" id="1484" />
-<TGConnectingPoint num="10" id="1485" />
-<TGConnectingPoint num="11" id="1486" />
-<TGConnectingPoint num="12" id="1487" />
-<TGConnectingPoint num="13" id="1488" />
-<TGConnectingPoint num="14" id="1489" />
-<TGConnectingPoint num="15" id="1490" />
-<TGConnectingPoint num="16" id="1491" />
-<TGConnectingPoint num="17" id="1492" />
-<TGConnectingPoint num="18" id="1493" />
-<TGConnectingPoint num="19" id="1494" />
-<TGConnectingPoint num="20" id="1495" />
-<TGConnectingPoint num="21" id="1496" />
-<TGConnectingPoint num="22" id="1497" />
-<TGConnectingPoint num="23" id="1498" />
-<TGConnectingPoint num="24" id="1499" />
-<TGConnectingPoint num="25" id="1500" />
-<TGConnectingPoint num="26" id="1501" />
-<TGConnectingPoint num="27" id="1502" />
-<TGConnectingPoint num="28" id="1503" />
-<TGConnectingPoint num="29" id="1504" />
-<TGConnectingPoint num="30" id="1505" />
-<TGConnectingPoint num="31" id="1506" />
-<TGConnectingPoint num="32" id="1507" />
-<TGConnectingPoint num="33" id="1508" />
-<TGConnectingPoint num="34" id="1509" />
-<TGConnectingPoint num="35" id="1510" />
-<TGConnectingPoint num="36" id="1511" />
-<TGConnectingPoint num="37" id="1512" />
-<TGConnectingPoint num="38" id="1513" />
-<TGConnectingPoint num="39" id="1514" />
-<TGConnectingPoint num="40" id="1515" />
-<TGConnectingPoint num="41" id="1516" />
-<TGConnectingPoint num="42" id="1517" />
-<TGConnectingPoint num="43" id="1518" />
-<TGConnectingPoint num="44" id="1519" />
-<TGConnectingPoint num="45" id="1520" />
-<TGConnectingPoint num="46" id="1521" />
-<TGConnectingPoint num="47" id="1522" />
-<TGConnectingPoint num="48" id="1523" />
-<TGConnectingPoint num="49" id="1524" />
-<TGConnectingPoint num="50" id="1525" />
-<TGConnectingPoint num="51" id="1526" />
-<TGConnectingPoint num="52" id="1527" />
-<TGConnectingPoint num="53" id="1528" />
-<TGConnectingPoint num="54" id="1529" />
-<TGConnectingPoint num="55" id="1530" />
-<TGConnectingPoint num="56" id="1531" />
-<TGConnectingPoint num="57" id="1532" />
-<TGConnectingPoint num="58" id="1533" />
-<TGConnectingPoint num="59" id="1534" />
-<TGConnectingPoint num="60" id="1535" />
-<TGConnectingPoint num="61" id="1536" />
-<TGConnectingPoint num="62" id="1537" />
-<TGConnectingPoint num="63" id="1538" />
-<TGConnectingPoint num="64" id="1539" />
-<TGConnectingPoint num="65" id="1540" />
-<TGConnectingPoint num="66" id="1541" />
-<TGConnectingPoint num="67" id="1542" />
-<TGConnectingPoint num="68" id="1543" />
-<TGConnectingPoint num="69" id="1544" />
-<TGConnectingPoint num="70" id="1545" />
-<TGConnectingPoint num="71" id="1546" />
+<TGConnectingPoint num="0" id="1492" />
+<TGConnectingPoint num="1" id="1493" />
+<TGConnectingPoint num="2" id="1494" />
+<TGConnectingPoint num="3" id="1495" />
+<TGConnectingPoint num="4" id="1496" />
+<TGConnectingPoint num="5" id="1497" />
+<TGConnectingPoint num="6" id="1498" />
+<TGConnectingPoint num="7" id="1499" />
+<TGConnectingPoint num="8" id="1500" />
+<TGConnectingPoint num="9" id="1501" />
+<TGConnectingPoint num="10" id="1502" />
+<TGConnectingPoint num="11" id="1503" />
+<TGConnectingPoint num="12" id="1504" />
+<TGConnectingPoint num="13" id="1505" />
+<TGConnectingPoint num="14" id="1506" />
+<TGConnectingPoint num="15" id="1507" />
+<TGConnectingPoint num="16" id="1508" />
+<TGConnectingPoint num="17" id="1509" />
+<TGConnectingPoint num="18" id="1510" />
+<TGConnectingPoint num="19" id="1511" />
+<TGConnectingPoint num="20" id="1512" />
+<TGConnectingPoint num="21" id="1513" />
+<TGConnectingPoint num="22" id="1514" />
+<TGConnectingPoint num="23" id="1515" />
+<TGConnectingPoint num="24" id="1516" />
+<TGConnectingPoint num="25" id="1517" />
+<TGConnectingPoint num="26" id="1518" />
+<TGConnectingPoint num="27" id="1519" />
+<TGConnectingPoint num="28" id="1520" />
+<TGConnectingPoint num="29" id="1521" />
+<TGConnectingPoint num="30" id="1522" />
+<TGConnectingPoint num="31" id="1523" />
+<TGConnectingPoint num="32" id="1524" />
+<TGConnectingPoint num="33" id="1525" />
+<TGConnectingPoint num="34" id="1526" />
+<TGConnectingPoint num="35" id="1527" />
+<TGConnectingPoint num="36" id="1528" />
+<TGConnectingPoint num="37" id="1529" />
+<TGConnectingPoint num="38" id="1530" />
+<TGConnectingPoint num="39" id="1531" />
+<TGConnectingPoint num="40" id="1532" />
+<TGConnectingPoint num="41" id="1533" />
+<TGConnectingPoint num="42" id="1534" />
+<TGConnectingPoint num="43" id="1535" />
+<TGConnectingPoint num="44" id="1536" />
+<TGConnectingPoint num="45" id="1537" />
+<TGConnectingPoint num="46" id="1538" />
+<TGConnectingPoint num="47" id="1539" />
+<TGConnectingPoint num="48" id="1540" />
+<TGConnectingPoint num="49" id="1541" />
+<TGConnectingPoint num="50" id="1542" />
+<TGConnectingPoint num="51" id="1543" />
+<TGConnectingPoint num="52" id="1544" />
+<TGConnectingPoint num="53" id="1545" />
+<TGConnectingPoint num="54" id="1546" />
+<TGConnectingPoint num="55" id="1547" />
+<TGConnectingPoint num="56" id="1548" />
+<TGConnectingPoint num="57" id="1549" />
+<TGConnectingPoint num="58" id="1550" />
+<TGConnectingPoint num="59" id="1551" />
+<TGConnectingPoint num="60" id="1552" />
+<TGConnectingPoint num="61" id="1553" />
+<TGConnectingPoint num="62" id="1554" />
+<TGConnectingPoint num="63" id="1555" />
+<TGConnectingPoint num="64" id="1556" />
+<TGConnectingPoint num="65" id="1557" />
+<TGConnectingPoint num="66" id="1558" />
+<TGConnectingPoint num="67" id="1559" />
+<TGConnectingPoint num="68" id="1560" />
+<TGConnectingPoint num="69" id="1561" />
+<TGConnectingPoint num="70" id="1562" />
+<TGConnectingPoint num="71" id="1563" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1620" uid="0e66f92f-ee5c-400a-9368-9ec8b591b9ac" >
+<COMPONENT type="5106" id="1637" index="23" uid="0e66f92f-ee5c-400a-9368-9ec8b591b9ac" >
<cdparam x="231" y="188" />
<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1548" />
-<TGConnectingPoint num="1" id="1549" />
-<TGConnectingPoint num="2" id="1550" />
-<TGConnectingPoint num="3" id="1551" />
-<TGConnectingPoint num="4" id="1552" />
-<TGConnectingPoint num="5" id="1553" />
-<TGConnectingPoint num="6" id="1554" />
-<TGConnectingPoint num="7" id="1555" />
-<TGConnectingPoint num="8" id="1556" />
-<TGConnectingPoint num="9" id="1557" />
-<TGConnectingPoint num="10" id="1558" />
-<TGConnectingPoint num="11" id="1559" />
-<TGConnectingPoint num="12" id="1560" />
-<TGConnectingPoint num="13" id="1561" />
-<TGConnectingPoint num="14" id="1562" />
-<TGConnectingPoint num="15" id="1563" />
-<TGConnectingPoint num="16" id="1564" />
-<TGConnectingPoint num="17" id="1565" />
-<TGConnectingPoint num="18" id="1566" />
-<TGConnectingPoint num="19" id="1567" />
-<TGConnectingPoint num="20" id="1568" />
-<TGConnectingPoint num="21" id="1569" />
-<TGConnectingPoint num="22" id="1570" />
-<TGConnectingPoint num="23" id="1571" />
-<TGConnectingPoint num="24" id="1572" />
-<TGConnectingPoint num="25" id="1573" />
-<TGConnectingPoint num="26" id="1574" />
-<TGConnectingPoint num="27" id="1575" />
-<TGConnectingPoint num="28" id="1576" />
-<TGConnectingPoint num="29" id="1577" />
-<TGConnectingPoint num="30" id="1578" />
-<TGConnectingPoint num="31" id="1579" />
-<TGConnectingPoint num="32" id="1580" />
-<TGConnectingPoint num="33" id="1581" />
-<TGConnectingPoint num="34" id="1582" />
-<TGConnectingPoint num="35" id="1583" />
-<TGConnectingPoint num="36" id="1584" />
-<TGConnectingPoint num="37" id="1585" />
-<TGConnectingPoint num="38" id="1586" />
-<TGConnectingPoint num="39" id="1587" />
-<TGConnectingPoint num="40" id="1588" />
-<TGConnectingPoint num="41" id="1589" />
-<TGConnectingPoint num="42" id="1590" />
-<TGConnectingPoint num="43" id="1591" />
-<TGConnectingPoint num="44" id="1592" />
-<TGConnectingPoint num="45" id="1593" />
-<TGConnectingPoint num="46" id="1594" />
-<TGConnectingPoint num="47" id="1595" />
-<TGConnectingPoint num="48" id="1596" />
-<TGConnectingPoint num="49" id="1597" />
-<TGConnectingPoint num="50" id="1598" />
-<TGConnectingPoint num="51" id="1599" />
-<TGConnectingPoint num="52" id="1600" />
-<TGConnectingPoint num="53" id="1601" />
-<TGConnectingPoint num="54" id="1602" />
-<TGConnectingPoint num="55" id="1603" />
-<TGConnectingPoint num="56" id="1604" />
-<TGConnectingPoint num="57" id="1605" />
-<TGConnectingPoint num="58" id="1606" />
-<TGConnectingPoint num="59" id="1607" />
-<TGConnectingPoint num="60" id="1608" />
-<TGConnectingPoint num="61" id="1609" />
-<TGConnectingPoint num="62" id="1610" />
-<TGConnectingPoint num="63" id="1611" />
-<TGConnectingPoint num="64" id="1612" />
-<TGConnectingPoint num="65" id="1613" />
-<TGConnectingPoint num="66" id="1614" />
-<TGConnectingPoint num="67" id="1615" />
-<TGConnectingPoint num="68" id="1616" />
-<TGConnectingPoint num="69" id="1617" />
-<TGConnectingPoint num="70" id="1618" />
-<TGConnectingPoint num="71" id="1619" />
+<TGConnectingPoint num="0" id="1565" />
+<TGConnectingPoint num="1" id="1566" />
+<TGConnectingPoint num="2" id="1567" />
+<TGConnectingPoint num="3" id="1568" />
+<TGConnectingPoint num="4" id="1569" />
+<TGConnectingPoint num="5" id="1570" />
+<TGConnectingPoint num="6" id="1571" />
+<TGConnectingPoint num="7" id="1572" />
+<TGConnectingPoint num="8" id="1573" />
+<TGConnectingPoint num="9" id="1574" />
+<TGConnectingPoint num="10" id="1575" />
+<TGConnectingPoint num="11" id="1576" />
+<TGConnectingPoint num="12" id="1577" />
+<TGConnectingPoint num="13" id="1578" />
+<TGConnectingPoint num="14" id="1579" />
+<TGConnectingPoint num="15" id="1580" />
+<TGConnectingPoint num="16" id="1581" />
+<TGConnectingPoint num="17" id="1582" />
+<TGConnectingPoint num="18" id="1583" />
+<TGConnectingPoint num="19" id="1584" />
+<TGConnectingPoint num="20" id="1585" />
+<TGConnectingPoint num="21" id="1586" />
+<TGConnectingPoint num="22" id="1587" />
+<TGConnectingPoint num="23" id="1588" />
+<TGConnectingPoint num="24" id="1589" />
+<TGConnectingPoint num="25" id="1590" />
+<TGConnectingPoint num="26" id="1591" />
+<TGConnectingPoint num="27" id="1592" />
+<TGConnectingPoint num="28" id="1593" />
+<TGConnectingPoint num="29" id="1594" />
+<TGConnectingPoint num="30" id="1595" />
+<TGConnectingPoint num="31" id="1596" />
+<TGConnectingPoint num="32" id="1597" />
+<TGConnectingPoint num="33" id="1598" />
+<TGConnectingPoint num="34" id="1599" />
+<TGConnectingPoint num="35" id="1600" />
+<TGConnectingPoint num="36" id="1601" />
+<TGConnectingPoint num="37" id="1602" />
+<TGConnectingPoint num="38" id="1603" />
+<TGConnectingPoint num="39" id="1604" />
+<TGConnectingPoint num="40" id="1605" />
+<TGConnectingPoint num="41" id="1606" />
+<TGConnectingPoint num="42" id="1607" />
+<TGConnectingPoint num="43" id="1608" />
+<TGConnectingPoint num="44" id="1609" />
+<TGConnectingPoint num="45" id="1610" />
+<TGConnectingPoint num="46" id="1611" />
+<TGConnectingPoint num="47" id="1612" />
+<TGConnectingPoint num="48" id="1613" />
+<TGConnectingPoint num="49" id="1614" />
+<TGConnectingPoint num="50" id="1615" />
+<TGConnectingPoint num="51" id="1616" />
+<TGConnectingPoint num="52" id="1617" />
+<TGConnectingPoint num="53" id="1618" />
+<TGConnectingPoint num="54" id="1619" />
+<TGConnectingPoint num="55" id="1620" />
+<TGConnectingPoint num="56" id="1621" />
+<TGConnectingPoint num="57" id="1622" />
+<TGConnectingPoint num="58" id="1623" />
+<TGConnectingPoint num="59" id="1624" />
+<TGConnectingPoint num="60" id="1625" />
+<TGConnectingPoint num="61" id="1626" />
+<TGConnectingPoint num="62" id="1627" />
+<TGConnectingPoint num="63" id="1628" />
+<TGConnectingPoint num="64" id="1629" />
+<TGConnectingPoint num="65" id="1630" />
+<TGConnectingPoint num="66" id="1631" />
+<TGConnectingPoint num="67" id="1632" />
+<TGConnectingPoint num="68" id="1633" />
+<TGConnectingPoint num="69" id="1634" />
+<TGConnectingPoint num="70" id="1635" />
+<TGConnectingPoint num="71" id="1636" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1622" uid="cd96e981-7ab7-4452-93eb-43b6ba735715" >
+<COMPONENT type="5100" id="1639" index="24" uid="cd96e981-7ab7-4452-93eb-43b6ba735715" >
<cdparam x="296" y="20" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1621" />
+<TGConnectingPoint num="0" id="1638" />
</COMPONENT>
-<COMPONENT type="5106" id="1695" uid="eeabd234-3d25-4fee-b660-71f9833d42c0" >
+<COMPONENT type="5106" id="1712" index="25" uid="eeabd234-3d25-4fee-b660-71f9833d42c0" >
<cdparam x="192" y="62" />
<sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1623" />
-<TGConnectingPoint num="1" id="1624" />
-<TGConnectingPoint num="2" id="1625" />
-<TGConnectingPoint num="3" id="1626" />
-<TGConnectingPoint num="4" id="1627" />
-<TGConnectingPoint num="5" id="1628" />
-<TGConnectingPoint num="6" id="1629" />
-<TGConnectingPoint num="7" id="1630" />
-<TGConnectingPoint num="8" id="1631" />
-<TGConnectingPoint num="9" id="1632" />
-<TGConnectingPoint num="10" id="1633" />
-<TGConnectingPoint num="11" id="1634" />
-<TGConnectingPoint num="12" id="1635" />
-<TGConnectingPoint num="13" id="1636" />
-<TGConnectingPoint num="14" id="1637" />
-<TGConnectingPoint num="15" id="1638" />
-<TGConnectingPoint num="16" id="1639" />
-<TGConnectingPoint num="17" id="1640" />
-<TGConnectingPoint num="18" id="1641" />
-<TGConnectingPoint num="19" id="1642" />
-<TGConnectingPoint num="20" id="1643" />
-<TGConnectingPoint num="21" id="1644" />
-<TGConnectingPoint num="22" id="1645" />
-<TGConnectingPoint num="23" id="1646" />
-<TGConnectingPoint num="24" id="1647" />
-<TGConnectingPoint num="25" id="1648" />
-<TGConnectingPoint num="26" id="1649" />
-<TGConnectingPoint num="27" id="1650" />
-<TGConnectingPoint num="28" id="1651" />
-<TGConnectingPoint num="29" id="1652" />
-<TGConnectingPoint num="30" id="1653" />
-<TGConnectingPoint num="31" id="1654" />
-<TGConnectingPoint num="32" id="1655" />
-<TGConnectingPoint num="33" id="1656" />
-<TGConnectingPoint num="34" id="1657" />
-<TGConnectingPoint num="35" id="1658" />
-<TGConnectingPoint num="36" id="1659" />
-<TGConnectingPoint num="37" id="1660" />
-<TGConnectingPoint num="38" id="1661" />
-<TGConnectingPoint num="39" id="1662" />
-<TGConnectingPoint num="40" id="1663" />
-<TGConnectingPoint num="41" id="1664" />
-<TGConnectingPoint num="42" id="1665" />
-<TGConnectingPoint num="43" id="1666" />
-<TGConnectingPoint num="44" id="1667" />
-<TGConnectingPoint num="45" id="1668" />
-<TGConnectingPoint num="46" id="1669" />
-<TGConnectingPoint num="47" id="1670" />
-<TGConnectingPoint num="48" id="1671" />
-<TGConnectingPoint num="49" id="1672" />
-<TGConnectingPoint num="50" id="1673" />
-<TGConnectingPoint num="51" id="1674" />
-<TGConnectingPoint num="52" id="1675" />
-<TGConnectingPoint num="53" id="1676" />
-<TGConnectingPoint num="54" id="1677" />
-<TGConnectingPoint num="55" id="1678" />
-<TGConnectingPoint num="56" id="1679" />
-<TGConnectingPoint num="57" id="1680" />
-<TGConnectingPoint num="58" id="1681" />
-<TGConnectingPoint num="59" id="1682" />
-<TGConnectingPoint num="60" id="1683" />
-<TGConnectingPoint num="61" id="1684" />
-<TGConnectingPoint num="62" id="1685" />
-<TGConnectingPoint num="63" id="1686" />
-<TGConnectingPoint num="64" id="1687" />
-<TGConnectingPoint num="65" id="1688" />
-<TGConnectingPoint num="66" id="1689" />
-<TGConnectingPoint num="67" id="1690" />
-<TGConnectingPoint num="68" id="1691" />
-<TGConnectingPoint num="69" id="1692" />
-<TGConnectingPoint num="70" id="1693" />
-<TGConnectingPoint num="71" id="1694" />
+<TGConnectingPoint num="0" id="1640" />
+<TGConnectingPoint num="1" id="1641" />
+<TGConnectingPoint num="2" id="1642" />
+<TGConnectingPoint num="3" id="1643" />
+<TGConnectingPoint num="4" id="1644" />
+<TGConnectingPoint num="5" id="1645" />
+<TGConnectingPoint num="6" id="1646" />
+<TGConnectingPoint num="7" id="1647" />
+<TGConnectingPoint num="8" id="1648" />
+<TGConnectingPoint num="9" id="1649" />
+<TGConnectingPoint num="10" id="1650" />
+<TGConnectingPoint num="11" id="1651" />
+<TGConnectingPoint num="12" id="1652" />
+<TGConnectingPoint num="13" id="1653" />
+<TGConnectingPoint num="14" id="1654" />
+<TGConnectingPoint num="15" id="1655" />
+<TGConnectingPoint num="16" id="1656" />
+<TGConnectingPoint num="17" id="1657" />
+<TGConnectingPoint num="18" id="1658" />
+<TGConnectingPoint num="19" id="1659" />
+<TGConnectingPoint num="20" id="1660" />
+<TGConnectingPoint num="21" id="1661" />
+<TGConnectingPoint num="22" id="1662" />
+<TGConnectingPoint num="23" id="1663" />
+<TGConnectingPoint num="24" id="1664" />
+<TGConnectingPoint num="25" id="1665" />
+<TGConnectingPoint num="26" id="1666" />
+<TGConnectingPoint num="27" id="1667" />
+<TGConnectingPoint num="28" id="1668" />
+<TGConnectingPoint num="29" id="1669" />
+<TGConnectingPoint num="30" id="1670" />
+<TGConnectingPoint num="31" id="1671" />
+<TGConnectingPoint num="32" id="1672" />
+<TGConnectingPoint num="33" id="1673" />
+<TGConnectingPoint num="34" id="1674" />
+<TGConnectingPoint num="35" id="1675" />
+<TGConnectingPoint num="36" id="1676" />
+<TGConnectingPoint num="37" id="1677" />
+<TGConnectingPoint num="38" id="1678" />
+<TGConnectingPoint num="39" id="1679" />
+<TGConnectingPoint num="40" id="1680" />
+<TGConnectingPoint num="41" id="1681" />
+<TGConnectingPoint num="42" id="1682" />
+<TGConnectingPoint num="43" id="1683" />
+<TGConnectingPoint num="44" id="1684" />
+<TGConnectingPoint num="45" id="1685" />
+<TGConnectingPoint num="46" id="1686" />
+<TGConnectingPoint num="47" id="1687" />
+<TGConnectingPoint num="48" id="1688" />
+<TGConnectingPoint num="49" id="1689" />
+<TGConnectingPoint num="50" id="1690" />
+<TGConnectingPoint num="51" id="1691" />
+<TGConnectingPoint num="52" id="1692" />
+<TGConnectingPoint num="53" id="1693" />
+<TGConnectingPoint num="54" id="1694" />
+<TGConnectingPoint num="55" id="1695" />
+<TGConnectingPoint num="56" id="1696" />
+<TGConnectingPoint num="57" id="1697" />
+<TGConnectingPoint num="58" id="1698" />
+<TGConnectingPoint num="59" id="1699" />
+<TGConnectingPoint num="60" id="1700" />
+<TGConnectingPoint num="61" id="1701" />
+<TGConnectingPoint num="62" id="1702" />
+<TGConnectingPoint num="63" id="1703" />
+<TGConnectingPoint num="64" id="1704" />
+<TGConnectingPoint num="65" id="1705" />
+<TGConnectingPoint num="66" id="1706" />
+<TGConnectingPoint num="67" id="1707" />
+<TGConnectingPoint num="68" id="1708" />
+<TGConnectingPoint num="69" id="1709" />
+<TGConnectingPoint num="70" id="1710" />
+<TGConnectingPoint num="71" id="1711" />
<latencyCheck />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1768" uid="75872e55-4480-49da-9868-b01b1830387d" >
+<COMPONENT type="5106" id="1785" index="26" uid="75872e55-4480-49da-9868-b01b1830387d" >
<cdparam x="221" y="748" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1696" />
-<TGConnectingPoint num="1" id="1697" />
-<TGConnectingPoint num="2" id="1698" />
-<TGConnectingPoint num="3" id="1699" />
-<TGConnectingPoint num="4" id="1700" />
-<TGConnectingPoint num="5" id="1701" />
-<TGConnectingPoint num="6" id="1702" />
-<TGConnectingPoint num="7" id="1703" />
-<TGConnectingPoint num="8" id="1704" />
-<TGConnectingPoint num="9" id="1705" />
-<TGConnectingPoint num="10" id="1706" />
-<TGConnectingPoint num="11" id="1707" />
-<TGConnectingPoint num="12" id="1708" />
-<TGConnectingPoint num="13" id="1709" />
-<TGConnectingPoint num="14" id="1710" />
-<TGConnectingPoint num="15" id="1711" />
-<TGConnectingPoint num="16" id="1712" />
-<TGConnectingPoint num="17" id="1713" />
-<TGConnectingPoint num="18" id="1714" />
-<TGConnectingPoint num="19" id="1715" />
-<TGConnectingPoint num="20" id="1716" />
-<TGConnectingPoint num="21" id="1717" />
-<TGConnectingPoint num="22" id="1718" />
-<TGConnectingPoint num="23" id="1719" />
-<TGConnectingPoint num="24" id="1720" />
-<TGConnectingPoint num="25" id="1721" />
-<TGConnectingPoint num="26" id="1722" />
-<TGConnectingPoint num="27" id="1723" />
-<TGConnectingPoint num="28" id="1724" />
-<TGConnectingPoint num="29" id="1725" />
-<TGConnectingPoint num="30" id="1726" />
-<TGConnectingPoint num="31" id="1727" />
-<TGConnectingPoint num="32" id="1728" />
-<TGConnectingPoint num="33" id="1729" />
-<TGConnectingPoint num="34" id="1730" />
-<TGConnectingPoint num="35" id="1731" />
-<TGConnectingPoint num="36" id="1732" />
-<TGConnectingPoint num="37" id="1733" />
-<TGConnectingPoint num="38" id="1734" />
-<TGConnectingPoint num="39" id="1735" />
-<TGConnectingPoint num="40" id="1736" />
-<TGConnectingPoint num="41" id="1737" />
-<TGConnectingPoint num="42" id="1738" />
-<TGConnectingPoint num="43" id="1739" />
-<TGConnectingPoint num="44" id="1740" />
-<TGConnectingPoint num="45" id="1741" />
-<TGConnectingPoint num="46" id="1742" />
-<TGConnectingPoint num="47" id="1743" />
-<TGConnectingPoint num="48" id="1744" />
-<TGConnectingPoint num="49" id="1745" />
-<TGConnectingPoint num="50" id="1746" />
-<TGConnectingPoint num="51" id="1747" />
-<TGConnectingPoint num="52" id="1748" />
-<TGConnectingPoint num="53" id="1749" />
-<TGConnectingPoint num="54" id="1750" />
-<TGConnectingPoint num="55" id="1751" />
-<TGConnectingPoint num="56" id="1752" />
-<TGConnectingPoint num="57" id="1753" />
-<TGConnectingPoint num="58" id="1754" />
-<TGConnectingPoint num="59" id="1755" />
-<TGConnectingPoint num="60" id="1756" />
-<TGConnectingPoint num="61" id="1757" />
-<TGConnectingPoint num="62" id="1758" />
-<TGConnectingPoint num="63" id="1759" />
-<TGConnectingPoint num="64" id="1760" />
-<TGConnectingPoint num="65" id="1761" />
-<TGConnectingPoint num="66" id="1762" />
-<TGConnectingPoint num="67" id="1763" />
-<TGConnectingPoint num="68" id="1764" />
-<TGConnectingPoint num="69" id="1765" />
-<TGConnectingPoint num="70" id="1766" />
-<TGConnectingPoint num="71" id="1767" />
+<TGConnectingPoint num="0" id="1713" />
+<TGConnectingPoint num="1" id="1714" />
+<TGConnectingPoint num="2" id="1715" />
+<TGConnectingPoint num="3" id="1716" />
+<TGConnectingPoint num="4" id="1717" />
+<TGConnectingPoint num="5" id="1718" />
+<TGConnectingPoint num="6" id="1719" />
+<TGConnectingPoint num="7" id="1720" />
+<TGConnectingPoint num="8" id="1721" />
+<TGConnectingPoint num="9" id="1722" />
+<TGConnectingPoint num="10" id="1723" />
+<TGConnectingPoint num="11" id="1724" />
+<TGConnectingPoint num="12" id="1725" />
+<TGConnectingPoint num="13" id="1726" />
+<TGConnectingPoint num="14" id="1727" />
+<TGConnectingPoint num="15" id="1728" />
+<TGConnectingPoint num="16" id="1729" />
+<TGConnectingPoint num="17" id="1730" />
+<TGConnectingPoint num="18" id="1731" />
+<TGConnectingPoint num="19" id="1732" />
+<TGConnectingPoint num="20" id="1733" />
+<TGConnectingPoint num="21" id="1734" />
+<TGConnectingPoint num="22" id="1735" />
+<TGConnectingPoint num="23" id="1736" />
+<TGConnectingPoint num="24" id="1737" />
+<TGConnectingPoint num="25" id="1738" />
+<TGConnectingPoint num="26" id="1739" />
+<TGConnectingPoint num="27" id="1740" />
+<TGConnectingPoint num="28" id="1741" />
+<TGConnectingPoint num="29" id="1742" />
+<TGConnectingPoint num="30" id="1743" />
+<TGConnectingPoint num="31" id="1744" />
+<TGConnectingPoint num="32" id="1745" />
+<TGConnectingPoint num="33" id="1746" />
+<TGConnectingPoint num="34" id="1747" />
+<TGConnectingPoint num="35" id="1748" />
+<TGConnectingPoint num="36" id="1749" />
+<TGConnectingPoint num="37" id="1750" />
+<TGConnectingPoint num="38" id="1751" />
+<TGConnectingPoint num="39" id="1752" />
+<TGConnectingPoint num="40" id="1753" />
+<TGConnectingPoint num="41" id="1754" />
+<TGConnectingPoint num="42" id="1755" />
+<TGConnectingPoint num="43" id="1756" />
+<TGConnectingPoint num="44" id="1757" />
+<TGConnectingPoint num="45" id="1758" />
+<TGConnectingPoint num="46" id="1759" />
+<TGConnectingPoint num="47" id="1760" />
+<TGConnectingPoint num="48" id="1761" />
+<TGConnectingPoint num="49" id="1762" />
+<TGConnectingPoint num="50" id="1763" />
+<TGConnectingPoint num="51" id="1764" />
+<TGConnectingPoint num="52" id="1765" />
+<TGConnectingPoint num="53" id="1766" />
+<TGConnectingPoint num="54" id="1767" />
+<TGConnectingPoint num="55" id="1768" />
+<TGConnectingPoint num="56" id="1769" />
+<TGConnectingPoint num="57" id="1770" />
+<TGConnectingPoint num="58" id="1771" />
+<TGConnectingPoint num="59" id="1772" />
+<TGConnectingPoint num="60" id="1773" />
+<TGConnectingPoint num="61" id="1774" />
+<TGConnectingPoint num="62" id="1775" />
+<TGConnectingPoint num="63" id="1776" />
+<TGConnectingPoint num="64" id="1777" />
+<TGConnectingPoint num="65" id="1778" />
+<TGConnectingPoint num="66" id="1779" />
+<TGConnectingPoint num="67" id="1780" />
+<TGConnectingPoint num="68" id="1781" />
+<TGConnectingPoint num="69" id="1782" />
+<TGConnectingPoint num="70" id="1783" />
+<TGConnectingPoint num="71" id="1784" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1841" uid="8f37bad1-cd33-4f8f-9321-d72e5e6d32eb" >
+<COMPONENT type="5106" id="1858" index="27" uid="8f37bad1-cd33-4f8f-9321-d72e5e6d32eb" >
<cdparam x="631" y="381" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1769" />
-<TGConnectingPoint num="1" id="1770" />
-<TGConnectingPoint num="2" id="1771" />
-<TGConnectingPoint num="3" id="1772" />
-<TGConnectingPoint num="4" id="1773" />
-<TGConnectingPoint num="5" id="1774" />
-<TGConnectingPoint num="6" id="1775" />
-<TGConnectingPoint num="7" id="1776" />
-<TGConnectingPoint num="8" id="1777" />
-<TGConnectingPoint num="9" id="1778" />
-<TGConnectingPoint num="10" id="1779" />
-<TGConnectingPoint num="11" id="1780" />
-<TGConnectingPoint num="12" id="1781" />
-<TGConnectingPoint num="13" id="1782" />
-<TGConnectingPoint num="14" id="1783" />
-<TGConnectingPoint num="15" id="1784" />
-<TGConnectingPoint num="16" id="1785" />
-<TGConnectingPoint num="17" id="1786" />
-<TGConnectingPoint num="18" id="1787" />
-<TGConnectingPoint num="19" id="1788" />
-<TGConnectingPoint num="20" id="1789" />
-<TGConnectingPoint num="21" id="1790" />
-<TGConnectingPoint num="22" id="1791" />
-<TGConnectingPoint num="23" id="1792" />
-<TGConnectingPoint num="24" id="1793" />
-<TGConnectingPoint num="25" id="1794" />
-<TGConnectingPoint num="26" id="1795" />
-<TGConnectingPoint num="27" id="1796" />
-<TGConnectingPoint num="28" id="1797" />
-<TGConnectingPoint num="29" id="1798" />
-<TGConnectingPoint num="30" id="1799" />
-<TGConnectingPoint num="31" id="1800" />
-<TGConnectingPoint num="32" id="1801" />
-<TGConnectingPoint num="33" id="1802" />
-<TGConnectingPoint num="34" id="1803" />
-<TGConnectingPoint num="35" id="1804" />
-<TGConnectingPoint num="36" id="1805" />
-<TGConnectingPoint num="37" id="1806" />
-<TGConnectingPoint num="38" id="1807" />
-<TGConnectingPoint num="39" id="1808" />
-<TGConnectingPoint num="40" id="1809" />
-<TGConnectingPoint num="41" id="1810" />
-<TGConnectingPoint num="42" id="1811" />
-<TGConnectingPoint num="43" id="1812" />
-<TGConnectingPoint num="44" id="1813" />
-<TGConnectingPoint num="45" id="1814" />
-<TGConnectingPoint num="46" id="1815" />
-<TGConnectingPoint num="47" id="1816" />
-<TGConnectingPoint num="48" id="1817" />
-<TGConnectingPoint num="49" id="1818" />
-<TGConnectingPoint num="50" id="1819" />
-<TGConnectingPoint num="51" id="1820" />
-<TGConnectingPoint num="52" id="1821" />
-<TGConnectingPoint num="53" id="1822" />
-<TGConnectingPoint num="54" id="1823" />
-<TGConnectingPoint num="55" id="1824" />
-<TGConnectingPoint num="56" id="1825" />
-<TGConnectingPoint num="57" id="1826" />
-<TGConnectingPoint num="58" id="1827" />
-<TGConnectingPoint num="59" id="1828" />
-<TGConnectingPoint num="60" id="1829" />
-<TGConnectingPoint num="61" id="1830" />
-<TGConnectingPoint num="62" id="1831" />
-<TGConnectingPoint num="63" id="1832" />
-<TGConnectingPoint num="64" id="1833" />
-<TGConnectingPoint num="65" id="1834" />
-<TGConnectingPoint num="66" id="1835" />
-<TGConnectingPoint num="67" id="1836" />
-<TGConnectingPoint num="68" id="1837" />
-<TGConnectingPoint num="69" id="1838" />
-<TGConnectingPoint num="70" id="1839" />
-<TGConnectingPoint num="71" id="1840" />
+<TGConnectingPoint num="0" id="1786" />
+<TGConnectingPoint num="1" id="1787" />
+<TGConnectingPoint num="2" id="1788" />
+<TGConnectingPoint num="3" id="1789" />
+<TGConnectingPoint num="4" id="1790" />
+<TGConnectingPoint num="5" id="1791" />
+<TGConnectingPoint num="6" id="1792" />
+<TGConnectingPoint num="7" id="1793" />
+<TGConnectingPoint num="8" id="1794" />
+<TGConnectingPoint num="9" id="1795" />
+<TGConnectingPoint num="10" id="1796" />
+<TGConnectingPoint num="11" id="1797" />
+<TGConnectingPoint num="12" id="1798" />
+<TGConnectingPoint num="13" id="1799" />
+<TGConnectingPoint num="14" id="1800" />
+<TGConnectingPoint num="15" id="1801" />
+<TGConnectingPoint num="16" id="1802" />
+<TGConnectingPoint num="17" id="1803" />
+<TGConnectingPoint num="18" id="1804" />
+<TGConnectingPoint num="19" id="1805" />
+<TGConnectingPoint num="20" id="1806" />
+<TGConnectingPoint num="21" id="1807" />
+<TGConnectingPoint num="22" id="1808" />
+<TGConnectingPoint num="23" id="1809" />
+<TGConnectingPoint num="24" id="1810" />
+<TGConnectingPoint num="25" id="1811" />
+<TGConnectingPoint num="26" id="1812" />
+<TGConnectingPoint num="27" id="1813" />
+<TGConnectingPoint num="28" id="1814" />
+<TGConnectingPoint num="29" id="1815" />
+<TGConnectingPoint num="30" id="1816" />
+<TGConnectingPoint num="31" id="1817" />
+<TGConnectingPoint num="32" id="1818" />
+<TGConnectingPoint num="33" id="1819" />
+<TGConnectingPoint num="34" id="1820" />
+<TGConnectingPoint num="35" id="1821" />
+<TGConnectingPoint num="36" id="1822" />
+<TGConnectingPoint num="37" id="1823" />
+<TGConnectingPoint num="38" id="1824" />
+<TGConnectingPoint num="39" id="1825" />
+<TGConnectingPoint num="40" id="1826" />
+<TGConnectingPoint num="41" id="1827" />
+<TGConnectingPoint num="42" id="1828" />
+<TGConnectingPoint num="43" id="1829" />
+<TGConnectingPoint num="44" id="1830" />
+<TGConnectingPoint num="45" id="1831" />
+<TGConnectingPoint num="46" id="1832" />
+<TGConnectingPoint num="47" id="1833" />
+<TGConnectingPoint num="48" id="1834" />
+<TGConnectingPoint num="49" id="1835" />
+<TGConnectingPoint num="50" id="1836" />
+<TGConnectingPoint num="51" id="1837" />
+<TGConnectingPoint num="52" id="1838" />
+<TGConnectingPoint num="53" id="1839" />
+<TGConnectingPoint num="54" id="1840" />
+<TGConnectingPoint num="55" id="1841" />
+<TGConnectingPoint num="56" id="1842" />
+<TGConnectingPoint num="57" id="1843" />
+<TGConnectingPoint num="58" id="1844" />
+<TGConnectingPoint num="59" id="1845" />
+<TGConnectingPoint num="60" id="1846" />
+<TGConnectingPoint num="61" id="1847" />
+<TGConnectingPoint num="62" id="1848" />
+<TGConnectingPoint num="63" id="1849" />
+<TGConnectingPoint num="64" id="1850" />
+<TGConnectingPoint num="65" id="1851" />
+<TGConnectingPoint num="66" id="1852" />
+<TGConnectingPoint num="67" id="1853" />
+<TGConnectingPoint num="68" id="1854" />
+<TGConnectingPoint num="69" id="1855" />
+<TGConnectingPoint num="70" id="1856" />
+<TGConnectingPoint num="71" id="1857" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1914" uid="4e9ff4f4-63c9-4878-88c3-6ca78d7d9fb3" >
+<COMPONENT type="5106" id="1931" index="28" uid="4e9ff4f4-63c9-4878-88c3-6ca78d7d9fb3" >
<cdparam x="223" y="650" />
<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="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="TeaDelivered" />
-<TGConnectingPoint num="0" id="1842" />
-<TGConnectingPoint num="1" id="1843" />
-<TGConnectingPoint num="2" id="1844" />
-<TGConnectingPoint num="3" id="1845" />
-<TGConnectingPoint num="4" id="1846" />
-<TGConnectingPoint num="5" id="1847" />
-<TGConnectingPoint num="6" id="1848" />
-<TGConnectingPoint num="7" id="1849" />
-<TGConnectingPoint num="8" id="1850" />
-<TGConnectingPoint num="9" id="1851" />
-<TGConnectingPoint num="10" id="1852" />
-<TGConnectingPoint num="11" id="1853" />
-<TGConnectingPoint num="12" id="1854" />
-<TGConnectingPoint num="13" id="1855" />
-<TGConnectingPoint num="14" id="1856" />
-<TGConnectingPoint num="15" id="1857" />
-<TGConnectingPoint num="16" id="1858" />
-<TGConnectingPoint num="17" id="1859" />
-<TGConnectingPoint num="18" id="1860" />
-<TGConnectingPoint num="19" id="1861" />
-<TGConnectingPoint num="20" id="1862" />
-<TGConnectingPoint num="21" id="1863" />
-<TGConnectingPoint num="22" id="1864" />
-<TGConnectingPoint num="23" id="1865" />
-<TGConnectingPoint num="24" id="1866" />
-<TGConnectingPoint num="25" id="1867" />
-<TGConnectingPoint num="26" id="1868" />
-<TGConnectingPoint num="27" id="1869" />
-<TGConnectingPoint num="28" id="1870" />
-<TGConnectingPoint num="29" id="1871" />
-<TGConnectingPoint num="30" id="1872" />
-<TGConnectingPoint num="31" id="1873" />
-<TGConnectingPoint num="32" id="1874" />
-<TGConnectingPoint num="33" id="1875" />
-<TGConnectingPoint num="34" id="1876" />
-<TGConnectingPoint num="35" id="1877" />
-<TGConnectingPoint num="36" id="1878" />
-<TGConnectingPoint num="37" id="1879" />
-<TGConnectingPoint num="38" id="1880" />
-<TGConnectingPoint num="39" id="1881" />
-<TGConnectingPoint num="40" id="1882" />
-<TGConnectingPoint num="41" id="1883" />
-<TGConnectingPoint num="42" id="1884" />
-<TGConnectingPoint num="43" id="1885" />
-<TGConnectingPoint num="44" id="1886" />
-<TGConnectingPoint num="45" id="1887" />
-<TGConnectingPoint num="46" id="1888" />
-<TGConnectingPoint num="47" id="1889" />
-<TGConnectingPoint num="48" id="1890" />
-<TGConnectingPoint num="49" id="1891" />
-<TGConnectingPoint num="50" id="1892" />
-<TGConnectingPoint num="51" id="1893" />
-<TGConnectingPoint num="52" id="1894" />
-<TGConnectingPoint num="53" id="1895" />
-<TGConnectingPoint num="54" id="1896" />
-<TGConnectingPoint num="55" id="1897" />
-<TGConnectingPoint num="56" id="1898" />
-<TGConnectingPoint num="57" id="1899" />
-<TGConnectingPoint num="58" id="1900" />
-<TGConnectingPoint num="59" id="1901" />
-<TGConnectingPoint num="60" id="1902" />
-<TGConnectingPoint num="61" id="1903" />
-<TGConnectingPoint num="62" id="1904" />
-<TGConnectingPoint num="63" id="1905" />
-<TGConnectingPoint num="64" id="1906" />
-<TGConnectingPoint num="65" id="1907" />
-<TGConnectingPoint num="66" id="1908" />
-<TGConnectingPoint num="67" id="1909" />
-<TGConnectingPoint num="68" id="1910" />
-<TGConnectingPoint num="69" id="1911" />
-<TGConnectingPoint num="70" id="1912" />
-<TGConnectingPoint num="71" id="1913" />
+<TGConnectingPoint num="0" id="1859" />
+<TGConnectingPoint num="1" id="1860" />
+<TGConnectingPoint num="2" id="1861" />
+<TGConnectingPoint num="3" id="1862" />
+<TGConnectingPoint num="4" id="1863" />
+<TGConnectingPoint num="5" id="1864" />
+<TGConnectingPoint num="6" id="1865" />
+<TGConnectingPoint num="7" id="1866" />
+<TGConnectingPoint num="8" id="1867" />
+<TGConnectingPoint num="9" id="1868" />
+<TGConnectingPoint num="10" id="1869" />
+<TGConnectingPoint num="11" id="1870" />
+<TGConnectingPoint num="12" id="1871" />
+<TGConnectingPoint num="13" id="1872" />
+<TGConnectingPoint num="14" id="1873" />
+<TGConnectingPoint num="15" id="1874" />
+<TGConnectingPoint num="16" id="1875" />
+<TGConnectingPoint num="17" id="1876" />
+<TGConnectingPoint num="18" id="1877" />
+<TGConnectingPoint num="19" id="1878" />
+<TGConnectingPoint num="20" id="1879" />
+<TGConnectingPoint num="21" id="1880" />
+<TGConnectingPoint num="22" id="1881" />
+<TGConnectingPoint num="23" id="1882" />
+<TGConnectingPoint num="24" id="1883" />
+<TGConnectingPoint num="25" id="1884" />
+<TGConnectingPoint num="26" id="1885" />
+<TGConnectingPoint num="27" id="1886" />
+<TGConnectingPoint num="28" id="1887" />
+<TGConnectingPoint num="29" id="1888" />
+<TGConnectingPoint num="30" id="1889" />
+<TGConnectingPoint num="31" id="1890" />
+<TGConnectingPoint num="32" id="1891" />
+<TGConnectingPoint num="33" id="1892" />
+<TGConnectingPoint num="34" id="1893" />
+<TGConnectingPoint num="35" id="1894" />
+<TGConnectingPoint num="36" id="1895" />
+<TGConnectingPoint num="37" id="1896" />
+<TGConnectingPoint num="38" id="1897" />
+<TGConnectingPoint num="39" id="1898" />
+<TGConnectingPoint num="40" id="1899" />
+<TGConnectingPoint num="41" id="1900" />
+<TGConnectingPoint num="42" id="1901" />
+<TGConnectingPoint num="43" id="1902" />
+<TGConnectingPoint num="44" id="1903" />
+<TGConnectingPoint num="45" id="1904" />
+<TGConnectingPoint num="46" id="1905" />
+<TGConnectingPoint num="47" id="1906" />
+<TGConnectingPoint num="48" id="1907" />
+<TGConnectingPoint num="49" id="1908" />
+<TGConnectingPoint num="50" id="1909" />
+<TGConnectingPoint num="51" id="1910" />
+<TGConnectingPoint num="52" id="1911" />
+<TGConnectingPoint num="53" id="1912" />
+<TGConnectingPoint num="54" id="1913" />
+<TGConnectingPoint num="55" id="1914" />
+<TGConnectingPoint num="56" id="1915" />
+<TGConnectingPoint num="57" id="1916" />
+<TGConnectingPoint num="58" id="1917" />
+<TGConnectingPoint num="59" id="1918" />
+<TGConnectingPoint num="60" id="1919" />
+<TGConnectingPoint num="61" id="1920" />
+<TGConnectingPoint num="62" id="1921" />
+<TGConnectingPoint num="63" id="1922" />
+<TGConnectingPoint num="64" id="1923" />
+<TGConnectingPoint num="65" id="1924" />
+<TGConnectingPoint num="66" id="1925" />
+<TGConnectingPoint num="67" id="1926" />
+<TGConnectingPoint num="68" id="1927" />
+<TGConnectingPoint num="69" id="1928" />
+<TGConnectingPoint num="70" id="1929" />
+<TGConnectingPoint num="71" id="1930" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2168" uid="4cd4f614-9c4a-4b57-b765-feef76122aeb" >
+<COMPONENT type="5106" id="2185" index="29" uid="4cd4f614-9c4a-4b57-b765-feef76122aeb" >
<cdparam x="23" y="372" />
<sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="Beverage" />
-<TGConnectingPoint num="0" id="2096" />
-<TGConnectingPoint num="1" id="2097" />
-<TGConnectingPoint num="2" id="2098" />
-<TGConnectingPoint num="3" id="2099" />
-<TGConnectingPoint num="4" id="2100" />
-<TGConnectingPoint num="5" id="2101" />
-<TGConnectingPoint num="6" id="2102" />
-<TGConnectingPoint num="7" id="2103" />
-<TGConnectingPoint num="8" id="2104" />
-<TGConnectingPoint num="9" id="2105" />
-<TGConnectingPoint num="10" id="2106" />
-<TGConnectingPoint num="11" id="2107" />
-<TGConnectingPoint num="12" id="2108" />
-<TGConnectingPoint num="13" id="2109" />
-<TGConnectingPoint num="14" id="2110" />
-<TGConnectingPoint num="15" id="2111" />
-<TGConnectingPoint num="16" id="2112" />
-<TGConnectingPoint num="17" id="2113" />
-<TGConnectingPoint num="18" id="2114" />
-<TGConnectingPoint num="19" id="2115" />
-<TGConnectingPoint num="20" id="2116" />
-<TGConnectingPoint num="21" id="2117" />
-<TGConnectingPoint num="22" id="2118" />
-<TGConnectingPoint num="23" id="2119" />
-<TGConnectingPoint num="24" id="2120" />
-<TGConnectingPoint num="25" id="2121" />
-<TGConnectingPoint num="26" id="2122" />
-<TGConnectingPoint num="27" id="2123" />
-<TGConnectingPoint num="28" id="2124" />
-<TGConnectingPoint num="29" id="2125" />
-<TGConnectingPoint num="30" id="2126" />
-<TGConnectingPoint num="31" id="2127" />
-<TGConnectingPoint num="32" id="2128" />
-<TGConnectingPoint num="33" id="2129" />
-<TGConnectingPoint num="34" id="2130" />
-<TGConnectingPoint num="35" id="2131" />
-<TGConnectingPoint num="36" id="2132" />
-<TGConnectingPoint num="37" id="2133" />
-<TGConnectingPoint num="38" id="2134" />
-<TGConnectingPoint num="39" id="2135" />
-<TGConnectingPoint num="40" id="2136" />
-<TGConnectingPoint num="41" id="2137" />
-<TGConnectingPoint num="42" id="2138" />
-<TGConnectingPoint num="43" id="2139" />
-<TGConnectingPoint num="44" id="2140" />
-<TGConnectingPoint num="45" id="2141" />
-<TGConnectingPoint num="46" id="2142" />
-<TGConnectingPoint num="47" id="2143" />
-<TGConnectingPoint num="48" id="2144" />
-<TGConnectingPoint num="49" id="2145" />
-<TGConnectingPoint num="50" id="2146" />
-<TGConnectingPoint num="51" id="2147" />
-<TGConnectingPoint num="52" id="2148" />
-<TGConnectingPoint num="53" id="2149" />
-<TGConnectingPoint num="54" id="2150" />
-<TGConnectingPoint num="55" id="2151" />
-<TGConnectingPoint num="56" id="2152" />
-<TGConnectingPoint num="57" id="2153" />
-<TGConnectingPoint num="58" id="2154" />
-<TGConnectingPoint num="59" id="2155" />
-<TGConnectingPoint num="60" id="2156" />
-<TGConnectingPoint num="61" id="2157" />
-<TGConnectingPoint num="62" id="2158" />
-<TGConnectingPoint num="63" id="2159" />
-<TGConnectingPoint num="64" id="2160" />
-<TGConnectingPoint num="65" id="2161" />
-<TGConnectingPoint num="66" id="2162" />
-<TGConnectingPoint num="67" id="2163" />
-<TGConnectingPoint num="68" id="2164" />
-<TGConnectingPoint num="69" id="2165" />
-<TGConnectingPoint num="70" id="2166" />
-<TGConnectingPoint num="71" id="2167" />
+<TGConnectingPoint num="0" id="2113" />
+<TGConnectingPoint num="1" id="2114" />
+<TGConnectingPoint num="2" id="2115" />
+<TGConnectingPoint num="3" id="2116" />
+<TGConnectingPoint num="4" id="2117" />
+<TGConnectingPoint num="5" id="2118" />
+<TGConnectingPoint num="6" id="2119" />
+<TGConnectingPoint num="7" id="2120" />
+<TGConnectingPoint num="8" id="2121" />
+<TGConnectingPoint num="9" id="2122" />
+<TGConnectingPoint num="10" id="2123" />
+<TGConnectingPoint num="11" id="2124" />
+<TGConnectingPoint num="12" id="2125" />
+<TGConnectingPoint num="13" id="2126" />
+<TGConnectingPoint num="14" id="2127" />
+<TGConnectingPoint num="15" id="2128" />
+<TGConnectingPoint num="16" id="2129" />
+<TGConnectingPoint num="17" id="2130" />
+<TGConnectingPoint num="18" id="2131" />
+<TGConnectingPoint num="19" id="2132" />
+<TGConnectingPoint num="20" id="2133" />
+<TGConnectingPoint num="21" id="2134" />
+<TGConnectingPoint num="22" id="2135" />
+<TGConnectingPoint num="23" id="2136" />
+<TGConnectingPoint num="24" id="2137" />
+<TGConnectingPoint num="25" id="2138" />
+<TGConnectingPoint num="26" id="2139" />
+<TGConnectingPoint num="27" id="2140" />
+<TGConnectingPoint num="28" id="2141" />
+<TGConnectingPoint num="29" id="2142" />
+<TGConnectingPoint num="30" id="2143" />
+<TGConnectingPoint num="31" id="2144" />
+<TGConnectingPoint num="32" id="2145" />
+<TGConnectingPoint num="33" id="2146" />
+<TGConnectingPoint num="34" id="2147" />
+<TGConnectingPoint num="35" id="2148" />
+<TGConnectingPoint num="36" id="2149" />
+<TGConnectingPoint num="37" id="2150" />
+<TGConnectingPoint num="38" id="2151" />
+<TGConnectingPoint num="39" id="2152" />
+<TGConnectingPoint num="40" id="2153" />
+<TGConnectingPoint num="41" id="2154" />
+<TGConnectingPoint num="42" id="2155" />
+<TGConnectingPoint num="43" id="2156" />
+<TGConnectingPoint num="44" id="2157" />
+<TGConnectingPoint num="45" id="2158" />
+<TGConnectingPoint num="46" id="2159" />
+<TGConnectingPoint num="47" id="2160" />
+<TGConnectingPoint num="48" id="2161" />
+<TGConnectingPoint num="49" id="2162" />
+<TGConnectingPoint num="50" id="2163" />
+<TGConnectingPoint num="51" id="2164" />
+<TGConnectingPoint num="52" id="2165" />
+<TGConnectingPoint num="53" id="2166" />
+<TGConnectingPoint num="54" id="2167" />
+<TGConnectingPoint num="55" id="2168" />
+<TGConnectingPoint num="56" id="2169" />
+<TGConnectingPoint num="57" id="2170" />
+<TGConnectingPoint num="58" id="2171" />
+<TGConnectingPoint num="59" id="2172" />
+<TGConnectingPoint num="60" id="2173" />
+<TGConnectingPoint num="61" id="2174" />
+<TGConnectingPoint num="62" id="2175" />
+<TGConnectingPoint num="63" id="2176" />
+<TGConnectingPoint num="64" id="2177" />
+<TGConnectingPoint num="65" id="2178" />
+<TGConnectingPoint num="66" id="2179" />
+<TGConnectingPoint num="67" id="2180" />
+<TGConnectingPoint num="68" id="2181" />
+<TGConnectingPoint num="69" id="2182" />
+<TGConnectingPoint num="70" id="2183" />
+<TGConnectingPoint num="71" id="2184" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5106" id="1987" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
-<father id="2168" num="0" />
+<SUBCOMPONENT type="5106" id="2004" index="48" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
+<father id="2185" num="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="431" minY="0" maxY="305" />
<infoparam name="state0" value="CoffeeDelivered" />
-<TGConnectingPoint num="0" id="1915" />
-<TGConnectingPoint num="1" id="1916" />
-<TGConnectingPoint num="2" id="1917" />
-<TGConnectingPoint num="3" id="1918" />
-<TGConnectingPoint num="4" id="1919" />
-<TGConnectingPoint num="5" id="1920" />
-<TGConnectingPoint num="6" id="1921" />
-<TGConnectingPoint num="7" id="1922" />
-<TGConnectingPoint num="8" id="1923" />
-<TGConnectingPoint num="9" id="1924" />
-<TGConnectingPoint num="10" id="1925" />
-<TGConnectingPoint num="11" id="1926" />
-<TGConnectingPoint num="12" id="1927" />
-<TGConnectingPoint num="13" id="1928" />
-<TGConnectingPoint num="14" id="1929" />
-<TGConnectingPoint num="15" id="1930" />
-<TGConnectingPoint num="16" id="1931" />
-<TGConnectingPoint num="17" id="1932" />
-<TGConnectingPoint num="18" id="1933" />
-<TGConnectingPoint num="19" id="1934" />
-<TGConnectingPoint num="20" id="1935" />
-<TGConnectingPoint num="21" id="1936" />
-<TGConnectingPoint num="22" id="1937" />
-<TGConnectingPoint num="23" id="1938" />
-<TGConnectingPoint num="24" id="1939" />
-<TGConnectingPoint num="25" id="1940" />
-<TGConnectingPoint num="26" id="1941" />
-<TGConnectingPoint num="27" id="1942" />
-<TGConnectingPoint num="28" id="1943" />
-<TGConnectingPoint num="29" id="1944" />
-<TGConnectingPoint num="30" id="1945" />
-<TGConnectingPoint num="31" id="1946" />
-<TGConnectingPoint num="32" id="1947" />
-<TGConnectingPoint num="33" id="1948" />
-<TGConnectingPoint num="34" id="1949" />
-<TGConnectingPoint num="35" id="1950" />
-<TGConnectingPoint num="36" id="1951" />
-<TGConnectingPoint num="37" id="1952" />
-<TGConnectingPoint num="38" id="1953" />
-<TGConnectingPoint num="39" id="1954" />
-<TGConnectingPoint num="40" id="1955" />
-<TGConnectingPoint num="41" id="1956" />
-<TGConnectingPoint num="42" id="1957" />
-<TGConnectingPoint num="43" id="1958" />
-<TGConnectingPoint num="44" id="1959" />
-<TGConnectingPoint num="45" id="1960" />
-<TGConnectingPoint num="46" id="1961" />
-<TGConnectingPoint num="47" id="1962" />
-<TGConnectingPoint num="48" id="1963" />
-<TGConnectingPoint num="49" id="1964" />
-<TGConnectingPoint num="50" id="1965" />
-<TGConnectingPoint num="51" id="1966" />
-<TGConnectingPoint num="52" id="1967" />
-<TGConnectingPoint num="53" id="1968" />
-<TGConnectingPoint num="54" id="1969" />
-<TGConnectingPoint num="55" id="1970" />
-<TGConnectingPoint num="56" id="1971" />
-<TGConnectingPoint num="57" id="1972" />
-<TGConnectingPoint num="58" id="1973" />
-<TGConnectingPoint num="59" id="1974" />
-<TGConnectingPoint num="60" id="1975" />
-<TGConnectingPoint num="61" id="1976" />
-<TGConnectingPoint num="62" id="1977" />
-<TGConnectingPoint num="63" id="1978" />
-<TGConnectingPoint num="64" id="1979" />
-<TGConnectingPoint num="65" id="1980" />
-<TGConnectingPoint num="66" id="1981" />
-<TGConnectingPoint num="67" id="1982" />
-<TGConnectingPoint num="68" id="1983" />
-<TGConnectingPoint num="69" id="1984" />
-<TGConnectingPoint num="70" id="1985" />
-<TGConnectingPoint num="71" id="1986" />
+<TGConnectingPoint num="0" id="1932" />
+<TGConnectingPoint num="1" id="1933" />
+<TGConnectingPoint num="2" id="1934" />
+<TGConnectingPoint num="3" id="1935" />
+<TGConnectingPoint num="4" id="1936" />
+<TGConnectingPoint num="5" id="1937" />
+<TGConnectingPoint num="6" id="1938" />
+<TGConnectingPoint num="7" id="1939" />
+<TGConnectingPoint num="8" id="1940" />
+<TGConnectingPoint num="9" id="1941" />
+<TGConnectingPoint num="10" id="1942" />
+<TGConnectingPoint num="11" id="1943" />
+<TGConnectingPoint num="12" id="1944" />
+<TGConnectingPoint num="13" id="1945" />
+<TGConnectingPoint num="14" id="1946" />
+<TGConnectingPoint num="15" id="1947" />
+<TGConnectingPoint num="16" id="1948" />
+<TGConnectingPoint num="17" id="1949" />
+<TGConnectingPoint num="18" id="1950" />
+<TGConnectingPoint num="19" id="1951" />
+<TGConnectingPoint num="20" id="1952" />
+<TGConnectingPoint num="21" id="1953" />
+<TGConnectingPoint num="22" id="1954" />
+<TGConnectingPoint num="23" id="1955" />
+<TGConnectingPoint num="24" id="1956" />
+<TGConnectingPoint num="25" id="1957" />
+<TGConnectingPoint num="26" id="1958" />
+<TGConnectingPoint num="27" id="1959" />
+<TGConnectingPoint num="28" id="1960" />
+<TGConnectingPoint num="29" id="1961" />
+<TGConnectingPoint num="30" id="1962" />
+<TGConnectingPoint num="31" id="1963" />
+<TGConnectingPoint num="32" id="1964" />
+<TGConnectingPoint num="33" id="1965" />
+<TGConnectingPoint num="34" id="1966" />
+<TGConnectingPoint num="35" id="1967" />
+<TGConnectingPoint num="36" id="1968" />
+<TGConnectingPoint num="37" id="1969" />
+<TGConnectingPoint num="38" id="1970" />
+<TGConnectingPoint num="39" id="1971" />
+<TGConnectingPoint num="40" id="1972" />
+<TGConnectingPoint num="41" id="1973" />
+<TGConnectingPoint num="42" id="1974" />
+<TGConnectingPoint num="43" id="1975" />
+<TGConnectingPoint num="44" id="1976" />
+<TGConnectingPoint num="45" id="1977" />
+<TGConnectingPoint num="46" id="1978" />
+<TGConnectingPoint num="47" id="1979" />
+<TGConnectingPoint num="48" id="1980" />
+<TGConnectingPoint num="49" id="1981" />
+<TGConnectingPoint num="50" id="1982" />
+<TGConnectingPoint num="51" id="1983" />
+<TGConnectingPoint num="52" id="1984" />
+<TGConnectingPoint num="53" id="1985" />
+<TGConnectingPoint num="54" id="1986" />
+<TGConnectingPoint num="55" id="1987" />
+<TGConnectingPoint num="56" id="1988" />
+<TGConnectingPoint num="57" id="1989" />
+<TGConnectingPoint num="58" id="1990" />
+<TGConnectingPoint num="59" id="1991" />
+<TGConnectingPoint num="60" id="1992" />
+<TGConnectingPoint num="61" id="1993" />
+<TGConnectingPoint num="62" id="1994" />
+<TGConnectingPoint num="63" id="1995" />
+<TGConnectingPoint num="64" id="1996" />
+<TGConnectingPoint num="65" id="1997" />
+<TGConnectingPoint num="66" id="1998" />
+<TGConnectingPoint num="67" id="1999" />
+<TGConnectingPoint num="68" id="2000" />
+<TGConnectingPoint num="69" id="2001" />
+<TGConnectingPoint num="70" id="2002" />
+<TGConnectingPoint num="71" id="2003" />
<extraparam>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1998" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
-<father id="2168" num="1" />
+<SUBCOMPONENT type="5103" id="2015" index="49" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
+<father id="2185" num="1" />
<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="447" minY="0" maxY="334" />
<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1988" />
-<TGConnectingPoint num="1" id="1989" />
-<TGConnectingPoint num="2" id="1990" />
-<TGConnectingPoint num="3" id="1991" />
-<TGConnectingPoint num="4" id="1992" />
-<TGConnectingPoint num="5" id="1993" />
-<TGConnectingPoint num="6" id="1994" />
-<TGConnectingPoint num="7" id="1995" />
-<TGConnectingPoint num="8" id="1996" />
-<TGConnectingPoint num="9" id="1997" />
+<TGConnectingPoint num="0" id="2005" />
+<TGConnectingPoint num="1" id="2006" />
+<TGConnectingPoint num="2" id="2007" />
+<TGConnectingPoint num="3" id="2008" />
+<TGConnectingPoint num="4" id="2009" />
+<TGConnectingPoint num="5" id="2010" />
+<TGConnectingPoint num="6" id="2011" />
+<TGConnectingPoint num="7" id="2012" />
+<TGConnectingPoint num="8" id="2013" />
+<TGConnectingPoint num="9" id="2014" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2009" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
-<father id="2168" num="2" />
+<SUBCOMPONENT type="5104" id="2026" index="50" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
+<father id="2185" num="2" />
<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="1999" />
-<TGConnectingPoint num="1" id="2000" />
-<TGConnectingPoint num="2" id="2001" />
-<TGConnectingPoint num="3" id="2002" />
-<TGConnectingPoint num="4" id="2003" />
-<TGConnectingPoint num="5" id="2004" />
-<TGConnectingPoint num="6" id="2005" />
-<TGConnectingPoint num="7" id="2006" />
-<TGConnectingPoint num="8" id="2007" />
-<TGConnectingPoint num="9" id="2008" />
+<TGConnectingPoint num="0" id="2016" />
+<TGConnectingPoint num="1" id="2017" />
+<TGConnectingPoint num="2" id="2018" />
+<TGConnectingPoint num="3" id="2019" />
+<TGConnectingPoint num="4" id="2020" />
+<TGConnectingPoint num="5" id="2021" />
+<TGConnectingPoint num="6" id="2022" />
+<TGConnectingPoint num="7" id="2023" />
+<TGConnectingPoint num="8" id="2024" />
+<TGConnectingPoint num="9" id="2025" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="2011" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
-<father id="2168" num="3" />
+<SUBCOMPONENT type="5100" id="2028" index="51" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
+<father id="2185" 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="2010" />
+<TGConnectingPoint num="0" id="2027" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2084" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
-<father id="2168" num="4" />
+<SUBCOMPONENT type="5106" id="2101" index="52" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
+<father id="2185" num="4" />
<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="445" minY="0" maxY="314" />
<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="2012" />
-<TGConnectingPoint num="1" id="2013" />
-<TGConnectingPoint num="2" id="2014" />
-<TGConnectingPoint num="3" id="2015" />
-<TGConnectingPoint num="4" id="2016" />
-<TGConnectingPoint num="5" id="2017" />
-<TGConnectingPoint num="6" id="2018" />
-<TGConnectingPoint num="7" id="2019" />
-<TGConnectingPoint num="8" id="2020" />
-<TGConnectingPoint num="9" id="2021" />
-<TGConnectingPoint num="10" id="2022" />
-<TGConnectingPoint num="11" id="2023" />
-<TGConnectingPoint num="12" id="2024" />
-<TGConnectingPoint num="13" id="2025" />
-<TGConnectingPoint num="14" id="2026" />
-<TGConnectingPoint num="15" id="2027" />
-<TGConnectingPoint num="16" id="2028" />
-<TGConnectingPoint num="17" id="2029" />
-<TGConnectingPoint num="18" id="2030" />
-<TGConnectingPoint num="19" id="2031" />
-<TGConnectingPoint num="20" id="2032" />
-<TGConnectingPoint num="21" id="2033" />
-<TGConnectingPoint num="22" id="2034" />
-<TGConnectingPoint num="23" id="2035" />
-<TGConnectingPoint num="24" id="2036" />
-<TGConnectingPoint num="25" id="2037" />
-<TGConnectingPoint num="26" id="2038" />
-<TGConnectingPoint num="27" id="2039" />
-<TGConnectingPoint num="28" id="2040" />
-<TGConnectingPoint num="29" id="2041" />
-<TGConnectingPoint num="30" id="2042" />
-<TGConnectingPoint num="31" id="2043" />
-<TGConnectingPoint num="32" id="2044" />
-<TGConnectingPoint num="33" id="2045" />
-<TGConnectingPoint num="34" id="2046" />
-<TGConnectingPoint num="35" id="2047" />
-<TGConnectingPoint num="36" id="2048" />
-<TGConnectingPoint num="37" id="2049" />
-<TGConnectingPoint num="38" id="2050" />
-<TGConnectingPoint num="39" id="2051" />
-<TGConnectingPoint num="40" id="2052" />
-<TGConnectingPoint num="41" id="2053" />
-<TGConnectingPoint num="42" id="2054" />
-<TGConnectingPoint num="43" id="2055" />
-<TGConnectingPoint num="44" id="2056" />
-<TGConnectingPoint num="45" id="2057" />
-<TGConnectingPoint num="46" id="2058" />
-<TGConnectingPoint num="47" id="2059" />
-<TGConnectingPoint num="48" id="2060" />
-<TGConnectingPoint num="49" id="2061" />
-<TGConnectingPoint num="50" id="2062" />
-<TGConnectingPoint num="51" id="2063" />
-<TGConnectingPoint num="52" id="2064" />
-<TGConnectingPoint num="53" id="2065" />
-<TGConnectingPoint num="54" id="2066" />
-<TGConnectingPoint num="55" id="2067" />
-<TGConnectingPoint num="56" id="2068" />
-<TGConnectingPoint num="57" id="2069" />
-<TGConnectingPoint num="58" id="2070" />
-<TGConnectingPoint num="59" id="2071" />
-<TGConnectingPoint num="60" id="2072" />
-<TGConnectingPoint num="61" id="2073" />
-<TGConnectingPoint num="62" id="2074" />
-<TGConnectingPoint num="63" id="2075" />
-<TGConnectingPoint num="64" id="2076" />
-<TGConnectingPoint num="65" id="2077" />
-<TGConnectingPoint num="66" id="2078" />
-<TGConnectingPoint num="67" id="2079" />
-<TGConnectingPoint num="68" id="2080" />
-<TGConnectingPoint num="69" id="2081" />
-<TGConnectingPoint num="70" id="2082" />
-<TGConnectingPoint num="71" id="2083" />
+<TGConnectingPoint num="0" id="2029" />
+<TGConnectingPoint num="1" id="2030" />
+<TGConnectingPoint num="2" id="2031" />
+<TGConnectingPoint num="3" id="2032" />
+<TGConnectingPoint num="4" id="2033" />
+<TGConnectingPoint num="5" id="2034" />
+<TGConnectingPoint num="6" id="2035" />
+<TGConnectingPoint num="7" id="2036" />
+<TGConnectingPoint num="8" id="2037" />
+<TGConnectingPoint num="9" id="2038" />
+<TGConnectingPoint num="10" id="2039" />
+<TGConnectingPoint num="11" id="2040" />
+<TGConnectingPoint num="12" id="2041" />
+<TGConnectingPoint num="13" id="2042" />
+<TGConnectingPoint num="14" id="2043" />
+<TGConnectingPoint num="15" id="2044" />
+<TGConnectingPoint num="16" id="2045" />
+<TGConnectingPoint num="17" id="2046" />
+<TGConnectingPoint num="18" id="2047" />
+<TGConnectingPoint num="19" id="2048" />
+<TGConnectingPoint num="20" id="2049" />
+<TGConnectingPoint num="21" id="2050" />
+<TGConnectingPoint num="22" id="2051" />
+<TGConnectingPoint num="23" id="2052" />
+<TGConnectingPoint num="24" id="2053" />
+<TGConnectingPoint num="25" id="2054" />
+<TGConnectingPoint num="26" id="2055" />
+<TGConnectingPoint num="27" id="2056" />
+<TGConnectingPoint num="28" id="2057" />
+<TGConnectingPoint num="29" id="2058" />
+<TGConnectingPoint num="30" id="2059" />
+<TGConnectingPoint num="31" id="2060" />
+<TGConnectingPoint num="32" id="2061" />
+<TGConnectingPoint num="33" id="2062" />
+<TGConnectingPoint num="34" id="2063" />
+<TGConnectingPoint num="35" id="2064" />
+<TGConnectingPoint num="36" id="2065" />
+<TGConnectingPoint num="37" id="2066" />
+<TGConnectingPoint num="38" id="2067" />
+<TGConnectingPoint num="39" id="2068" />
+<TGConnectingPoint num="40" id="2069" />
+<TGConnectingPoint num="41" id="2070" />
+<TGConnectingPoint num="42" id="2071" />
+<TGConnectingPoint num="43" id="2072" />
+<TGConnectingPoint num="44" id="2073" />
+<TGConnectingPoint num="45" id="2074" />
+<TGConnectingPoint num="46" id="2075" />
+<TGConnectingPoint num="47" id="2076" />
+<TGConnectingPoint num="48" id="2077" />
+<TGConnectingPoint num="49" id="2078" />
+<TGConnectingPoint num="50" id="2079" />
+<TGConnectingPoint num="51" id="2080" />
+<TGConnectingPoint num="52" id="2081" />
+<TGConnectingPoint num="53" id="2082" />
+<TGConnectingPoint num="54" id="2083" />
+<TGConnectingPoint num="55" id="2084" />
+<TGConnectingPoint num="56" id="2085" />
+<TGConnectingPoint num="57" id="2086" />
+<TGConnectingPoint num="58" id="2087" />
+<TGConnectingPoint num="59" id="2088" />
+<TGConnectingPoint num="60" id="2089" />
+<TGConnectingPoint num="61" id="2090" />
+<TGConnectingPoint num="62" id="2091" />
+<TGConnectingPoint num="63" id="2092" />
+<TGConnectingPoint num="64" id="2093" />
+<TGConnectingPoint num="65" id="2094" />
+<TGConnectingPoint num="66" id="2095" />
+<TGConnectingPoint num="67" id="2096" />
+<TGConnectingPoint num="68" id="2097" />
+<TGConnectingPoint num="69" id="2098" />
+<TGConnectingPoint num="70" id="2099" />
+<TGConnectingPoint num="71" id="2100" />
<latencyCheck />
<extraparam>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2095" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
-<father id="2168" num="5" />
+<SUBCOMPONENT type="5104" id="2112" index="53" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
+<father id="2185" num="5" />
<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="465" minY="0" maxY="334" />
<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="2085" />
-<TGConnectingPoint num="1" id="2086" />
-<TGConnectingPoint num="2" id="2087" />
-<TGConnectingPoint num="3" id="2088" />
-<TGConnectingPoint num="4" id="2089" />
-<TGConnectingPoint num="5" id="2090" />
-<TGConnectingPoint num="6" id="2091" />
-<TGConnectingPoint num="7" id="2092" />
-<TGConnectingPoint num="8" id="2093" />
-<TGConnectingPoint num="9" id="2094" />
+<TGConnectingPoint num="0" id="2102" />
+<TGConnectingPoint num="1" id="2103" />
+<TGConnectingPoint num="2" id="2104" />
+<TGConnectingPoint num="3" id="2105" />
+<TGConnectingPoint num="4" id="2106" />
+<TGConnectingPoint num="5" id="2107" />
+<TGConnectingPoint num="6" id="2108" />
+<TGConnectingPoint num="7" id="2109" />
+<TGConnectingPoint num="8" id="2110" />
+<TGConnectingPoint num="9" id="2111" />
<accessibility />
</SUBCOMPONENT>
@@ -3845,26 +3875,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2175" uid="e1fdc635-a14a-4753-a90a-d34a5c378103" >
+<CONNECTOR type="5102" id="2192" index="0" uid="e1fdc635-a14a-4753-a90a-d34a5c378103" >
<cdparam x="516" y="264" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2174" />
-<P1 x="485" y="219" id="2216" />
-<P2 x="485" y="275" id="2227" />
+<TGConnectingPoint num="0" id="2191" />
+<P1 x="485" y="219" id="2233" />
+<P2 x="485" y="275" id="2244" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2173" uid="ef977ae6-5b41-474a-8ad1-ffa74018c3f6" >
-<father id="2175" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2190" index="11" uid="ef977ae6-5b41-474a-8ad1-ffa74018c3f6" >
+<father id="2192" num="0" />
<cdparam x="493" y="251" />
<sizeparam width="173" height="30" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2169" />
-<TGConnectingPoint num="1" id="2170" />
-<TGConnectingPoint num="2" id="2171" />
-<TGConnectingPoint num="3" id="2172" />
+<TGConnectingPoint num="0" id="2186" />
+<TGConnectingPoint num="1" id="2187" />
+<TGConnectingPoint num="2" id="2188" />
+<TGConnectingPoint num="3" id="2189" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3880,26 +3910,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2182" uid="a1601233-0112-4577-872e-f3d1239ddaa2" >
+<CONNECTOR type="5102" id="2199" index="1" uid="a1601233-0112-4577-872e-f3d1239ddaa2" >
<cdparam x="382" y="165" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2181" />
-<P1 x="382" y="165" id="2387" />
-<P2 x="485" y="189" id="2215" />
+<TGConnectingPoint num="0" id="2198" />
+<P1 x="382" y="165" id="2404" />
+<P2 x="485" y="189" id="2232" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2180" uid="c4a6003f-c191-4f16-812f-88460fc99537" >
-<father id="2182" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2197" index="12" uid="c4a6003f-c191-4f16-812f-88460fc99537" >
+<father id="2199" num="0" />
<cdparam x="419" y="170" />
<sizeparam width="20" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2176" />
-<TGConnectingPoint num="1" id="2177" />
-<TGConnectingPoint num="2" id="2178" />
-<TGConnectingPoint num="3" id="2179" />
+<TGConnectingPoint num="0" id="2193" />
+<TGConnectingPoint num="1" id="2194" />
+<TGConnectingPoint num="2" id="2195" />
+<TGConnectingPoint num="3" id="2196" />
<extraparam>
<guard value="[]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3913,26 +3943,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2189" uid="cb8b379f-fbb5-465e-b390-d20051de84c9" >
+<CONNECTOR type="5102" id="2206" index="2" uid="cb8b379f-fbb5-465e-b390-d20051de84c9" >
<cdparam x="223" y="260" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2188" />
-<P1 x="251" y="231" id="2205" />
-<P2 x="251" y="300" id="2300" />
+<TGConnectingPoint num="0" id="2205" />
+<P1 x="251" y="231" id="2222" />
+<P2 x="251" y="300" id="2317" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2187" uid="a9ba3ee4-2310-452a-ac15-378273520860" >
-<father id="2189" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2204" index="13" uid="a9ba3ee4-2310-452a-ac15-378273520860" >
+<father id="2206" num="0" />
<cdparam x="175" y="246" />
<sizeparam width="225" height="60" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2183" />
-<TGConnectingPoint num="1" id="2184" />
-<TGConnectingPoint num="2" id="2185" />
-<TGConnectingPoint num="3" id="2186" />
+<TGConnectingPoint num="0" id="2200" />
+<TGConnectingPoint num="1" id="2201" />
+<TGConnectingPoint num="2" id="2202" />
+<TGConnectingPoint num="3" id="2203" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="minUserDelay" enabled="true"/>
@@ -3948,26 +3978,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2196" uid="1051ae7b-48a2-4ad4-bcfd-7e2d67fb5557" >
+<CONNECTOR type="5102" id="2213" index="3" uid="1051ae7b-48a2-4ad4-bcfd-7e2d67fb5557" >
<cdparam x="357" y="165" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2195" />
-<P1 x="357" y="165" id="2386" />
-<P2 x="251" y="201" id="2204" />
+<TGConnectingPoint num="0" id="2212" />
+<P1 x="357" y="165" id="2403" />
+<P2 x="251" y="201" id="2221" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2194" uid="51361a43-5f1e-4e05-834c-38e957e74dbc" >
-<father id="2196" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2211" index="14" uid="51361a43-5f1e-4e05-834c-38e957e74dbc" >
+<father id="2213" num="0" />
<cdparam x="220" y="174" />
<sizeparam width="99" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2190" />
-<TGConnectingPoint num="1" id="2191" />
-<TGConnectingPoint num="2" id="2192" />
-<TGConnectingPoint num="3" id="2193" />
+<TGConnectingPoint num="0" id="2207" />
+<TGConnectingPoint num="1" id="2208" />
+<TGConnectingPoint num="2" id="2209" />
+<TGConnectingPoint num="3" id="2210" />
<extraparam>
<guard value="[nbOfCoins > 0]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3981,26 +4011,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2203" uid="e20c8526-7e17-4a95-a112-8b1e6afc65ff" >
+<CONNECTOR type="5102" id="2220" index="4" uid="e20c8526-7e17-4a95-a112-8b1e6afc65ff" >
<cdparam x="369" y="115" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2202" />
-<P1 x="370" y="64" id="2445" />
-<P2 x="370" y="135" id="2373" />
+<TGConnectingPoint num="0" id="2219" />
+<P1 x="370" y="64" id="2462" />
+<P2 x="370" y="135" id="2390" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2201" uid="67af2caf-f2db-4b34-b537-438d7b0e3fcc" >
-<father id="2203" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2218" index="15" uid="67af2caf-f2db-4b34-b537-438d7b0e3fcc" >
+<father id="2220" num="0" />
<cdparam x="406" y="124" />
<sizeparam width="173" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2197" />
-<TGConnectingPoint num="1" id="2198" />
-<TGConnectingPoint num="2" id="2199" />
-<TGConnectingPoint num="3" id="2200" />
+<TGConnectingPoint num="0" id="2214" />
+<TGConnectingPoint num="1" id="2215" />
+<TGConnectingPoint num="2" id="2216" />
+<TGConnectingPoint num="3" id="2217" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -4015,300 +4045,300 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="2214" uid="1bbf332d-b36f-4992-82c7-f06006cdb1c1" >
+<COMPONENT type="5103" id="2231" index="5" uid="1bbf332d-b36f-4992-82c7-f06006cdb1c1" >
<cdparam x="217" y="206" />
<sizeparam width="69" 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" />
<infoparam name="Send signal" value="putCoin(x)" />
-<TGConnectingPoint num="0" id="2204" />
-<TGConnectingPoint num="1" id="2205" />
-<TGConnectingPoint num="2" id="2206" />
-<TGConnectingPoint num="3" id="2207" />
-<TGConnectingPoint num="4" id="2208" />
-<TGConnectingPoint num="5" id="2209" />
-<TGConnectingPoint num="6" id="2210" />
-<TGConnectingPoint num="7" id="2211" />
-<TGConnectingPoint num="8" id="2212" />
-<TGConnectingPoint num="9" id="2213" />
+<TGConnectingPoint num="0" id="2221" />
+<TGConnectingPoint num="1" id="2222" />
+<TGConnectingPoint num="2" id="2223" />
+<TGConnectingPoint num="3" id="2224" />
+<TGConnectingPoint num="4" id="2225" />
+<TGConnectingPoint num="5" id="2226" />
+<TGConnectingPoint num="6" id="2227" />
+<TGConnectingPoint num="7" id="2228" />
+<TGConnectingPoint num="8" id="2229" />
+<TGConnectingPoint num="9" id="2230" />
</COMPONENT>
-<COMPONENT type="5104" id="2225" uid="27a771a1-8452-4bd5-965d-690218370079" >
+<COMPONENT type="5104" id="2242" index="6" uid="27a771a1-8452-4bd5-965d-690218370079" >
<cdparam x="447" y="194" />
<sizeparam width="76" 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" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="2215" />
-<TGConnectingPoint num="1" id="2216" />
-<TGConnectingPoint num="2" id="2217" />
-<TGConnectingPoint num="3" id="2218" />
-<TGConnectingPoint num="4" id="2219" />
-<TGConnectingPoint num="5" id="2220" />
-<TGConnectingPoint num="6" id="2221" />
-<TGConnectingPoint num="7" id="2222" />
-<TGConnectingPoint num="8" id="2223" />
-<TGConnectingPoint num="9" id="2224" />
+<TGConnectingPoint num="0" id="2232" />
+<TGConnectingPoint num="1" id="2233" />
+<TGConnectingPoint num="2" id="2234" />
+<TGConnectingPoint num="3" id="2235" />
+<TGConnectingPoint num="4" id="2236" />
+<TGConnectingPoint num="5" id="2237" />
+<TGConnectingPoint num="6" id="2238" />
+<TGConnectingPoint num="7" id="2239" />
+<TGConnectingPoint num="8" id="2240" />
+<TGConnectingPoint num="9" id="2241" />
</COMPONENT>
-<COMPONENT type="5106" id="2298" uid="dff82f3a-8689-42a4-9a5a-e1083a596f96" >
+<COMPONENT type="5106" id="2315" index="7" uid="dff82f3a-8689-42a4-9a5a-e1083a596f96" >
<cdparam x="460" y="275" />
<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2226" />
-<TGConnectingPoint num="1" id="2227" />
-<TGConnectingPoint num="2" id="2228" />
-<TGConnectingPoint num="3" id="2229" />
-<TGConnectingPoint num="4" id="2230" />
-<TGConnectingPoint num="5" id="2231" />
-<TGConnectingPoint num="6" id="2232" />
-<TGConnectingPoint num="7" id="2233" />
-<TGConnectingPoint num="8" id="2234" />
-<TGConnectingPoint num="9" id="2235" />
-<TGConnectingPoint num="10" id="2236" />
-<TGConnectingPoint num="11" id="2237" />
-<TGConnectingPoint num="12" id="2238" />
-<TGConnectingPoint num="13" id="2239" />
-<TGConnectingPoint num="14" id="2240" />
-<TGConnectingPoint num="15" id="2241" />
-<TGConnectingPoint num="16" id="2242" />
-<TGConnectingPoint num="17" id="2243" />
-<TGConnectingPoint num="18" id="2244" />
-<TGConnectingPoint num="19" id="2245" />
-<TGConnectingPoint num="20" id="2246" />
-<TGConnectingPoint num="21" id="2247" />
-<TGConnectingPoint num="22" id="2248" />
-<TGConnectingPoint num="23" id="2249" />
-<TGConnectingPoint num="24" id="2250" />
-<TGConnectingPoint num="25" id="2251" />
-<TGConnectingPoint num="26" id="2252" />
-<TGConnectingPoint num="27" id="2253" />
-<TGConnectingPoint num="28" id="2254" />
-<TGConnectingPoint num="29" id="2255" />
-<TGConnectingPoint num="30" id="2256" />
-<TGConnectingPoint num="31" id="2257" />
-<TGConnectingPoint num="32" id="2258" />
-<TGConnectingPoint num="33" id="2259" />
-<TGConnectingPoint num="34" id="2260" />
-<TGConnectingPoint num="35" id="2261" />
-<TGConnectingPoint num="36" id="2262" />
-<TGConnectingPoint num="37" id="2263" />
-<TGConnectingPoint num="38" id="2264" />
-<TGConnectingPoint num="39" id="2265" />
-<TGConnectingPoint num="40" id="2266" />
-<TGConnectingPoint num="41" id="2267" />
-<TGConnectingPoint num="42" id="2268" />
-<TGConnectingPoint num="43" id="2269" />
-<TGConnectingPoint num="44" id="2270" />
-<TGConnectingPoint num="45" id="2271" />
-<TGConnectingPoint num="46" id="2272" />
-<TGConnectingPoint num="47" id="2273" />
-<TGConnectingPoint num="48" id="2274" />
-<TGConnectingPoint num="49" id="2275" />
-<TGConnectingPoint num="50" id="2276" />
-<TGConnectingPoint num="51" id="2277" />
-<TGConnectingPoint num="52" id="2278" />
-<TGConnectingPoint num="53" id="2279" />
-<TGConnectingPoint num="54" id="2280" />
-<TGConnectingPoint num="55" id="2281" />
-<TGConnectingPoint num="56" id="2282" />
-<TGConnectingPoint num="57" id="2283" />
-<TGConnectingPoint num="58" id="2284" />
-<TGConnectingPoint num="59" id="2285" />
-<TGConnectingPoint num="60" id="2286" />
-<TGConnectingPoint num="61" id="2287" />
-<TGConnectingPoint num="62" id="2288" />
-<TGConnectingPoint num="63" id="2289" />
-<TGConnectingPoint num="64" id="2290" />
-<TGConnectingPoint num="65" id="2291" />
-<TGConnectingPoint num="66" id="2292" />
-<TGConnectingPoint num="67" id="2293" />
-<TGConnectingPoint num="68" id="2294" />
-<TGConnectingPoint num="69" id="2295" />
-<TGConnectingPoint num="70" id="2296" />
-<TGConnectingPoint num="71" id="2297" />
+<TGConnectingPoint num="0" id="2243" />
+<TGConnectingPoint num="1" id="2244" />
+<TGConnectingPoint num="2" id="2245" />
+<TGConnectingPoint num="3" id="2246" />
+<TGConnectingPoint num="4" id="2247" />
+<TGConnectingPoint num="5" id="2248" />
+<TGConnectingPoint num="6" id="2249" />
+<TGConnectingPoint num="7" id="2250" />
+<TGConnectingPoint num="8" id="2251" />
+<TGConnectingPoint num="9" id="2252" />
+<TGConnectingPoint num="10" id="2253" />
+<TGConnectingPoint num="11" id="2254" />
+<TGConnectingPoint num="12" id="2255" />
+<TGConnectingPoint num="13" id="2256" />
+<TGConnectingPoint num="14" id="2257" />
+<TGConnectingPoint num="15" id="2258" />
+<TGConnectingPoint num="16" id="2259" />
+<TGConnectingPoint num="17" id="2260" />
+<TGConnectingPoint num="18" id="2261" />
+<TGConnectingPoint num="19" id="2262" />
+<TGConnectingPoint num="20" id="2263" />
+<TGConnectingPoint num="21" id="2264" />
+<TGConnectingPoint num="22" id="2265" />
+<TGConnectingPoint num="23" id="2266" />
+<TGConnectingPoint num="24" id="2267" />
+<TGConnectingPoint num="25" id="2268" />
+<TGConnectingPoint num="26" id="2269" />
+<TGConnectingPoint num="27" id="2270" />
+<TGConnectingPoint num="28" id="2271" />
+<TGConnectingPoint num="29" id="2272" />
+<TGConnectingPoint num="30" id="2273" />
+<TGConnectingPoint num="31" id="2274" />
+<TGConnectingPoint num="32" id="2275" />
+<TGConnectingPoint num="33" id="2276" />
+<TGConnectingPoint num="34" id="2277" />
+<TGConnectingPoint num="35" id="2278" />
+<TGConnectingPoint num="36" id="2279" />
+<TGConnectingPoint num="37" id="2280" />
+<TGConnectingPoint num="38" id="2281" />
+<TGConnectingPoint num="39" id="2282" />
+<TGConnectingPoint num="40" id="2283" />
+<TGConnectingPoint num="41" id="2284" />
+<TGConnectingPoint num="42" id="2285" />
+<TGConnectingPoint num="43" id="2286" />
+<TGConnectingPoint num="44" id="2287" />
+<TGConnectingPoint num="45" id="2288" />
+<TGConnectingPoint num="46" id="2289" />
+<TGConnectingPoint num="47" id="2290" />
+<TGConnectingPoint num="48" id="2291" />
+<TGConnectingPoint num="49" id="2292" />
+<TGConnectingPoint num="50" id="2293" />
+<TGConnectingPoint num="51" id="2294" />
+<TGConnectingPoint num="52" id="2295" />
+<TGConnectingPoint num="53" id="2296" />
+<TGConnectingPoint num="54" id="2297" />
+<TGConnectingPoint num="55" id="2298" />
+<TGConnectingPoint num="56" id="2299" />
+<TGConnectingPoint num="57" id="2300" />
+<TGConnectingPoint num="58" id="2301" />
+<TGConnectingPoint num="59" id="2302" />
+<TGConnectingPoint num="60" id="2303" />
+<TGConnectingPoint num="61" id="2304" />
+<TGConnectingPoint num="62" id="2305" />
+<TGConnectingPoint num="63" id="2306" />
+<TGConnectingPoint num="64" id="2307" />
+<TGConnectingPoint num="65" id="2308" />
+<TGConnectingPoint num="66" id="2309" />
+<TGConnectingPoint num="67" id="2310" />
+<TGConnectingPoint num="68" id="2311" />
+<TGConnectingPoint num="69" id="2312" />
+<TGConnectingPoint num="70" id="2313" />
+<TGConnectingPoint num="71" id="2314" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2371" uid="d8e0235a-a7a6-4c1f-ae66-2d51d55f91c4" >
+<COMPONENT type="5106" id="2388" index="8" uid="d8e0235a-a7a6-4c1f-ae66-2d51d55f91c4" >
<cdparam x="226" y="300" />
<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2299" />
-<TGConnectingPoint num="1" id="2300" />
-<TGConnectingPoint num="2" id="2301" />
-<TGConnectingPoint num="3" id="2302" />
-<TGConnectingPoint num="4" id="2303" />
-<TGConnectingPoint num="5" id="2304" />
-<TGConnectingPoint num="6" id="2305" />
-<TGConnectingPoint num="7" id="2306" />
-<TGConnectingPoint num="8" id="2307" />
-<TGConnectingPoint num="9" id="2308" />
-<TGConnectingPoint num="10" id="2309" />
-<TGConnectingPoint num="11" id="2310" />
-<TGConnectingPoint num="12" id="2311" />
-<TGConnectingPoint num="13" id="2312" />
-<TGConnectingPoint num="14" id="2313" />
-<TGConnectingPoint num="15" id="2314" />
-<TGConnectingPoint num="16" id="2315" />
-<TGConnectingPoint num="17" id="2316" />
-<TGConnectingPoint num="18" id="2317" />
-<TGConnectingPoint num="19" id="2318" />
-<TGConnectingPoint num="20" id="2319" />
-<TGConnectingPoint num="21" id="2320" />
-<TGConnectingPoint num="22" id="2321" />
-<TGConnectingPoint num="23" id="2322" />
-<TGConnectingPoint num="24" id="2323" />
-<TGConnectingPoint num="25" id="2324" />
-<TGConnectingPoint num="26" id="2325" />
-<TGConnectingPoint num="27" id="2326" />
-<TGConnectingPoint num="28" id="2327" />
-<TGConnectingPoint num="29" id="2328" />
-<TGConnectingPoint num="30" id="2329" />
-<TGConnectingPoint num="31" id="2330" />
-<TGConnectingPoint num="32" id="2331" />
-<TGConnectingPoint num="33" id="2332" />
-<TGConnectingPoint num="34" id="2333" />
-<TGConnectingPoint num="35" id="2334" />
-<TGConnectingPoint num="36" id="2335" />
-<TGConnectingPoint num="37" id="2336" />
-<TGConnectingPoint num="38" id="2337" />
-<TGConnectingPoint num="39" id="2338" />
-<TGConnectingPoint num="40" id="2339" />
-<TGConnectingPoint num="41" id="2340" />
-<TGConnectingPoint num="42" id="2341" />
-<TGConnectingPoint num="43" id="2342" />
-<TGConnectingPoint num="44" id="2343" />
-<TGConnectingPoint num="45" id="2344" />
-<TGConnectingPoint num="46" id="2345" />
-<TGConnectingPoint num="47" id="2346" />
-<TGConnectingPoint num="48" id="2347" />
-<TGConnectingPoint num="49" id="2348" />
-<TGConnectingPoint num="50" id="2349" />
-<TGConnectingPoint num="51" id="2350" />
-<TGConnectingPoint num="52" id="2351" />
-<TGConnectingPoint num="53" id="2352" />
-<TGConnectingPoint num="54" id="2353" />
-<TGConnectingPoint num="55" id="2354" />
-<TGConnectingPoint num="56" id="2355" />
-<TGConnectingPoint num="57" id="2356" />
-<TGConnectingPoint num="58" id="2357" />
-<TGConnectingPoint num="59" id="2358" />
-<TGConnectingPoint num="60" id="2359" />
-<TGConnectingPoint num="61" id="2360" />
-<TGConnectingPoint num="62" id="2361" />
-<TGConnectingPoint num="63" id="2362" />
-<TGConnectingPoint num="64" id="2363" />
-<TGConnectingPoint num="65" id="2364" />
-<TGConnectingPoint num="66" id="2365" />
-<TGConnectingPoint num="67" id="2366" />
-<TGConnectingPoint num="68" id="2367" />
-<TGConnectingPoint num="69" id="2368" />
-<TGConnectingPoint num="70" id="2369" />
-<TGConnectingPoint num="71" id="2370" />
+<TGConnectingPoint num="0" id="2316" />
+<TGConnectingPoint num="1" id="2317" />
+<TGConnectingPoint num="2" id="2318" />
+<TGConnectingPoint num="3" id="2319" />
+<TGConnectingPoint num="4" id="2320" />
+<TGConnectingPoint num="5" id="2321" />
+<TGConnectingPoint num="6" id="2322" />
+<TGConnectingPoint num="7" id="2323" />
+<TGConnectingPoint num="8" id="2324" />
+<TGConnectingPoint num="9" id="2325" />
+<TGConnectingPoint num="10" id="2326" />
+<TGConnectingPoint num="11" id="2327" />
+<TGConnectingPoint num="12" id="2328" />
+<TGConnectingPoint num="13" id="2329" />
+<TGConnectingPoint num="14" id="2330" />
+<TGConnectingPoint num="15" id="2331" />
+<TGConnectingPoint num="16" id="2332" />
+<TGConnectingPoint num="17" id="2333" />
+<TGConnectingPoint num="18" id="2334" />
+<TGConnectingPoint num="19" id="2335" />
+<TGConnectingPoint num="20" id="2336" />
+<TGConnectingPoint num="21" id="2337" />
+<TGConnectingPoint num="22" id="2338" />
+<TGConnectingPoint num="23" id="2339" />
+<TGConnectingPoint num="24" id="2340" />
+<TGConnectingPoint num="25" id="2341" />
+<TGConnectingPoint num="26" id="2342" />
+<TGConnectingPoint num="27" id="2343" />
+<TGConnectingPoint num="28" id="2344" />
+<TGConnectingPoint num="29" id="2345" />
+<TGConnectingPoint num="30" id="2346" />
+<TGConnectingPoint num="31" id="2347" />
+<TGConnectingPoint num="32" id="2348" />
+<TGConnectingPoint num="33" id="2349" />
+<TGConnectingPoint num="34" id="2350" />
+<TGConnectingPoint num="35" id="2351" />
+<TGConnectingPoint num="36" id="2352" />
+<TGConnectingPoint num="37" id="2353" />
+<TGConnectingPoint num="38" id="2354" />
+<TGConnectingPoint num="39" id="2355" />
+<TGConnectingPoint num="40" id="2356" />
+<TGConnectingPoint num="41" id="2357" />
+<TGConnectingPoint num="42" id="2358" />
+<TGConnectingPoint num="43" id="2359" />
+<TGConnectingPoint num="44" id="2360" />
+<TGConnectingPoint num="45" id="2361" />
+<TGConnectingPoint num="46" id="2362" />
+<TGConnectingPoint num="47" id="2363" />
+<TGConnectingPoint num="48" id="2364" />
+<TGConnectingPoint num="49" id="2365" />
+<TGConnectingPoint num="50" id="2366" />
+<TGConnectingPoint num="51" id="2367" />
+<TGConnectingPoint num="52" id="2368" />
+<TGConnectingPoint num="53" id="2369" />
+<TGConnectingPoint num="54" id="2370" />
+<TGConnectingPoint num="55" id="2371" />
+<TGConnectingPoint num="56" id="2372" />
+<TGConnectingPoint num="57" id="2373" />
+<TGConnectingPoint num="58" id="2374" />
+<TGConnectingPoint num="59" id="2375" />
+<TGConnectingPoint num="60" id="2376" />
+<TGConnectingPoint num="61" id="2377" />
+<TGConnectingPoint num="62" id="2378" />
+<TGConnectingPoint num="63" id="2379" />
+<TGConnectingPoint num="64" id="2380" />
+<TGConnectingPoint num="65" id="2381" />
+<TGConnectingPoint num="66" id="2382" />
+<TGConnectingPoint num="67" id="2383" />
+<TGConnectingPoint num="68" id="2384" />
+<TGConnectingPoint num="69" id="2385" />
+<TGConnectingPoint num="70" id="2386" />
+<TGConnectingPoint num="71" id="2387" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2444" uid="7800bef7-c428-4182-a94c-9832c7e71ad9" >
+<COMPONENT type="5106" id="2461" index="9" uid="7800bef7-c428-4182-a94c-9832c7e71ad9" >
<cdparam x="345" y="135" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2372" />
-<TGConnectingPoint num="1" id="2373" />
-<TGConnectingPoint num="2" id="2374" />
-<TGConnectingPoint num="3" id="2375" />
-<TGConnectingPoint num="4" id="2376" />
-<TGConnectingPoint num="5" id="2377" />
-<TGConnectingPoint num="6" id="2378" />
-<TGConnectingPoint num="7" id="2379" />
-<TGConnectingPoint num="8" id="2380" />
-<TGConnectingPoint num="9" id="2381" />
-<TGConnectingPoint num="10" id="2382" />
-<TGConnectingPoint num="11" id="2383" />
-<TGConnectingPoint num="12" id="2384" />
-<TGConnectingPoint num="13" id="2385" />
-<TGConnectingPoint num="14" id="2386" />
-<TGConnectingPoint num="15" id="2387" />
-<TGConnectingPoint num="16" id="2388" />
-<TGConnectingPoint num="17" id="2389" />
-<TGConnectingPoint num="18" id="2390" />
-<TGConnectingPoint num="19" id="2391" />
-<TGConnectingPoint num="20" id="2392" />
-<TGConnectingPoint num="21" id="2393" />
-<TGConnectingPoint num="22" id="2394" />
-<TGConnectingPoint num="23" id="2395" />
-<TGConnectingPoint num="24" id="2396" />
-<TGConnectingPoint num="25" id="2397" />
-<TGConnectingPoint num="26" id="2398" />
-<TGConnectingPoint num="27" id="2399" />
-<TGConnectingPoint num="28" id="2400" />
-<TGConnectingPoint num="29" id="2401" />
-<TGConnectingPoint num="30" id="2402" />
-<TGConnectingPoint num="31" id="2403" />
-<TGConnectingPoint num="32" id="2404" />
-<TGConnectingPoint num="33" id="2405" />
-<TGConnectingPoint num="34" id="2406" />
-<TGConnectingPoint num="35" id="2407" />
-<TGConnectingPoint num="36" id="2408" />
-<TGConnectingPoint num="37" id="2409" />
-<TGConnectingPoint num="38" id="2410" />
-<TGConnectingPoint num="39" id="2411" />
-<TGConnectingPoint num="40" id="2412" />
-<TGConnectingPoint num="41" id="2413" />
-<TGConnectingPoint num="42" id="2414" />
-<TGConnectingPoint num="43" id="2415" />
-<TGConnectingPoint num="44" id="2416" />
-<TGConnectingPoint num="45" id="2417" />
-<TGConnectingPoint num="46" id="2418" />
-<TGConnectingPoint num="47" id="2419" />
-<TGConnectingPoint num="48" id="2420" />
-<TGConnectingPoint num="49" id="2421" />
-<TGConnectingPoint num="50" id="2422" />
-<TGConnectingPoint num="51" id="2423" />
-<TGConnectingPoint num="52" id="2424" />
-<TGConnectingPoint num="53" id="2425" />
-<TGConnectingPoint num="54" id="2426" />
-<TGConnectingPoint num="55" id="2427" />
-<TGConnectingPoint num="56" id="2428" />
-<TGConnectingPoint num="57" id="2429" />
-<TGConnectingPoint num="58" id="2430" />
-<TGConnectingPoint num="59" id="2431" />
-<TGConnectingPoint num="60" id="2432" />
-<TGConnectingPoint num="61" id="2433" />
-<TGConnectingPoint num="62" id="2434" />
-<TGConnectingPoint num="63" id="2435" />
-<TGConnectingPoint num="64" id="2436" />
-<TGConnectingPoint num="65" id="2437" />
-<TGConnectingPoint num="66" id="2438" />
-<TGConnectingPoint num="67" id="2439" />
-<TGConnectingPoint num="68" id="2440" />
-<TGConnectingPoint num="69" id="2441" />
-<TGConnectingPoint num="70" id="2442" />
-<TGConnectingPoint num="71" id="2443" />
+<TGConnectingPoint num="0" id="2389" />
+<TGConnectingPoint num="1" id="2390" />
+<TGConnectingPoint num="2" id="2391" />
+<TGConnectingPoint num="3" id="2392" />
+<TGConnectingPoint num="4" id="2393" />
+<TGConnectingPoint num="5" id="2394" />
+<TGConnectingPoint num="6" id="2395" />
+<TGConnectingPoint num="7" id="2396" />
+<TGConnectingPoint num="8" id="2397" />
+<TGConnectingPoint num="9" id="2398" />
+<TGConnectingPoint num="10" id="2399" />
+<TGConnectingPoint num="11" id="2400" />
+<TGConnectingPoint num="12" id="2401" />
+<TGConnectingPoint num="13" id="2402" />
+<TGConnectingPoint num="14" id="2403" />
+<TGConnectingPoint num="15" id="2404" />
+<TGConnectingPoint num="16" id="2405" />
+<TGConnectingPoint num="17" id="2406" />
+<TGConnectingPoint num="18" id="2407" />
+<TGConnectingPoint num="19" id="2408" />
+<TGConnectingPoint num="20" id="2409" />
+<TGConnectingPoint num="21" id="2410" />
+<TGConnectingPoint num="22" id="2411" />
+<TGConnectingPoint num="23" id="2412" />
+<TGConnectingPoint num="24" id="2413" />
+<TGConnectingPoint num="25" id="2414" />
+<TGConnectingPoint num="26" id="2415" />
+<TGConnectingPoint num="27" id="2416" />
+<TGConnectingPoint num="28" id="2417" />
+<TGConnectingPoint num="29" id="2418" />
+<TGConnectingPoint num="30" id="2419" />
+<TGConnectingPoint num="31" id="2420" />
+<TGConnectingPoint num="32" id="2421" />
+<TGConnectingPoint num="33" id="2422" />
+<TGConnectingPoint num="34" id="2423" />
+<TGConnectingPoint num="35" id="2424" />
+<TGConnectingPoint num="36" id="2425" />
+<TGConnectingPoint num="37" id="2426" />
+<TGConnectingPoint num="38" id="2427" />
+<TGConnectingPoint num="39" id="2428" />
+<TGConnectingPoint num="40" id="2429" />
+<TGConnectingPoint num="41" id="2430" />
+<TGConnectingPoint num="42" id="2431" />
+<TGConnectingPoint num="43" id="2432" />
+<TGConnectingPoint num="44" id="2433" />
+<TGConnectingPoint num="45" id="2434" />
+<TGConnectingPoint num="46" id="2435" />
+<TGConnectingPoint num="47" id="2436" />
+<TGConnectingPoint num="48" id="2437" />
+<TGConnectingPoint num="49" id="2438" />
+<TGConnectingPoint num="50" id="2439" />
+<TGConnectingPoint num="51" id="2440" />
+<TGConnectingPoint num="52" id="2441" />
+<TGConnectingPoint num="53" id="2442" />
+<TGConnectingPoint num="54" id="2443" />
+<TGConnectingPoint num="55" id="2444" />
+<TGConnectingPoint num="56" id="2445" />
+<TGConnectingPoint num="57" id="2446" />
+<TGConnectingPoint num="58" id="2447" />
+<TGConnectingPoint num="59" id="2448" />
+<TGConnectingPoint num="60" id="2449" />
+<TGConnectingPoint num="61" id="2450" />
+<TGConnectingPoint num="62" id="2451" />
+<TGConnectingPoint num="63" id="2452" />
+<TGConnectingPoint num="64" id="2453" />
+<TGConnectingPoint num="65" id="2454" />
+<TGConnectingPoint num="66" id="2455" />
+<TGConnectingPoint num="67" id="2456" />
+<TGConnectingPoint num="68" id="2457" />
+<TGConnectingPoint num="69" id="2458" />
+<TGConnectingPoint num="70" id="2459" />
+<TGConnectingPoint num="71" id="2460" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="2446" uid="e7196c4b-f0b1-4487-b81c-4db89e85366e" >
+<COMPONENT type="5100" id="2463" index="10" uid="e7196c4b-f0b1-4487-b81c-4db89e85366e" >
<cdparam x="363" y="44" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2445" />
+<TGConnectingPoint num="0" id="2462" />
</COMPONENT>
diff --git a/modeling/AVATAR/testMethod.xml b/modeling/AVATAR/testMethod.xml
index 977dd8c976..6ef6aa2d76 100644
--- a/modeling/AVATAR/testMethod.xml
+++ b/modeling/AVATAR/testMethod.xml
@@ -632,7 +632,7 @@
<TGConnectingPoint num="1" id="379" />
<TGConnectingPoint num="2" id="380" />
<P1 x="334" y="322" id="308" />
-<P2 x="652" y="463" id="457" />
+<P2 x="652" y="463" id="435" />
<Point x="595" y="385" />
<Point x="595" y="450" />
<AutomaticDrawing data="true" />
@@ -659,8 +659,8 @@
<infoparam name="connector" value="<<deriveReqt>>" />
<TGConnectingPoint num="0" id="383" />
<TGConnectingPoint num="1" id="384" />
-<P1 x="1019" y="520" id="436" />
-<P2 x="1119" y="602" id="413" />
+<P1 x="1019" y="520" id="458" />
+<P2 x="1119" y="602" id="479" />
<Point x="1060" y="625" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="382" index="25" uid="05aeea61-d04f-4ff6-be02-396da907c3f2" >
@@ -678,8 +678,8 @@
<infoparam name="connector" value="<<deriveReqt>>" />
<TGConnectingPoint num="0" id="387" />
<TGConnectingPoint num="1" id="388" />
-<P1 x="873" y="447" id="480" />
-<P2 x="1019" y="502" id="435" />
+<P1 x="873" y="447" id="414" />
+<P2 x="1019" y="502" id="457" />
<Point x="960" y="525" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="386" index="26" uid="b0f480a8-0658-4db6-9e16-8eea59b72850" >
@@ -773,13 +773,13 @@
<TextColor value="-1" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5706" id="434" index="27" uid="e0ff3e6e-1e15-4426-8332-e13a7e1c550c" >
+<SUBCOMPONENT type="5703" id="434" index="27" uid="a2a71bbd-7559-4609-b6cb-c8dcf47d440c" >
<father id="517" num="0" />
-<cdparam x="1119" y="585" />
+<cdparam x="873" y="412" />
<sizeparam width="200" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Prototyping" />
+<cdrectangleparam minX="0" maxX="550" minY="0" maxY="255" />
+<infoparam name="TGComponent" value="Analysis" />
<TGConnectingPoint num="0" id="413" />
<TGConnectingPoint num="1" id="414" />
<TGConnectingPoint num="2" id="415" />
@@ -801,14 +801,15 @@
<TGConnectingPoint num="18" id="431" />
<TGConnectingPoint num="19" id="432" />
<TGConnectingPoint num="20" id="433" />
+<color value="-10027162" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5704" id="456" index="28" uid="addfb764-3038-4156-8c16-d91b2e7927b7" >
+<SUBCOMPONENT type="5705" id="456" index="28" uid="84567e94-5550-4b70-a671-9ba505d4c00f" >
<father id="517" num="1" />
-<cdparam x="1019" y="485" />
-<sizeparam width="200" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="652" y="446" />
+<sizeparam width="180" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Design" />
+<infoparam name="TGComponent" value="Properties" />
<TGConnectingPoint num="0" id="435" />
<TGConnectingPoint num="1" id="436" />
<TGConnectingPoint num="2" id="437" />
@@ -831,13 +832,13 @@
<TGConnectingPoint num="19" id="454" />
<TGConnectingPoint num="20" id="455" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5705" id="478" index="29" uid="84567e94-5550-4b70-a671-9ba505d4c00f" >
+<SUBCOMPONENT type="5704" id="478" index="29" uid="addfb764-3038-4156-8c16-d91b2e7927b7" >
<father id="517" num="2" />
-<cdparam x="652" y="446" />
-<sizeparam width="180" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1019" y="485" />
+<sizeparam width="200" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Properties" />
+<infoparam name="TGComponent" value="Design" />
<TGConnectingPoint num="0" id="457" />
<TGConnectingPoint num="1" id="458" />
<TGConnectingPoint num="2" id="459" />
@@ -860,13 +861,13 @@
<TGConnectingPoint num="19" id="476" />
<TGConnectingPoint num="20" id="477" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5703" id="500" index="30" uid="a2a71bbd-7559-4609-b6cb-c8dcf47d440c" >
+<SUBCOMPONENT type="5706" id="500" index="30" uid="e0ff3e6e-1e15-4426-8332-e13a7e1c550c" >
<father id="517" num="3" />
-<cdparam x="873" y="412" />
+<cdparam x="1119" y="585" />
<sizeparam width="200" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="550" minY="0" maxY="255" />
-<infoparam name="TGComponent" value="Analysis" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="Prototyping" />
<TGConnectingPoint num="0" id="479" />
<TGConnectingPoint num="1" id="480" />
<TGConnectingPoint num="2" id="481" />
@@ -888,7 +889,6 @@
<TGConnectingPoint num="18" id="497" />
<TGConnectingPoint num="19" id="498" />
<TGConnectingPoint num="20" id="499" />
-<color value="-10027162" />
</SUBCOMPONENT>
<COMPONENT type="5712" id="539" index="20" uid="6ade1061-b234-4b85-8519-837517860b2c" >
diff --git a/modeling/DIPLODOCUS/testBusSlice.xml b/modeling/DIPLODOCUS/testBusSlice.xml
index 47fa4a7269..24889613fe 100644
--- a/modeling/DIPLODOCUS/testBusSlice.xml
+++ b/modeling/DIPLODOCUS/testBusSlice.xml
@@ -8,8 +8,8 @@
<cdparam x="373" y="220" />
<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="373" y="220" id="13" />
-<P2 x="682" y="223" id="2" />
+<P1 x="360" y="207" id="13" />
+<P2 x="695" y="210" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" index="1" uid="588dfa64-71a6-4080-b48a-c725e3093aeb" >
@@ -39,7 +39,7 @@
<infoparam name="Primitive port" value="Channel comm_0" />
<TGConnectingPoint num="0" id="2" />
<extraparam>
-<Prop commName="comm_0" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40000" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" vc="0" />
+<Prop commName="comm_0" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4000" 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="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -75,7 +75,7 @@
<infoparam name="Primitive port" value="Channel comm_0" />
<TGConnectingPoint num="0" id="13" />
<extraparam>
-<Prop commName="comm_0" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="40000" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" vc="0" />
+<Prop commName="comm_0" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4000" 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="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index 3c10adda04..19f99b822d 100644
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -329,6 +329,8 @@ public class ActionPerformer {
mgui.actionOnButton(TGComponentManager.EDIT, -1);
} else if (command.equals(mgui.actions[TGUIAction.UML_NOTE].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.UML_NOTE);
+ } else if (command.equals(mgui.actions[TGUIAction.DEPENDENCY_MATRIX].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.DEPENDENCY_MATRIX);
} else if (command.equals(mgui.actions[TGUIAction.PRAGMA].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.PRAGMA);
} else if (command.equals(mgui.actions[TGUIAction.SAFETY_PRAGMA].getActionCommand())) {
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 7701511276..25350f6e7d 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -6418,6 +6418,57 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
return foundPanels;
}
+ public ArrayList<String> getAllPanelNames() {
+ TURTLEPanel tp;
+ ArrayList<String> foundPanels = new ArrayList<>();
+ for (int i = 0; i < tabs.size(); i++) {
+ tp = tabs.elementAt(i);
+ foundPanels.add(tp.getNameOfTab());
+ }
+ return foundPanels;
+ }
+
+ public String[] getAllDiagNamesFromPanel( int index) {
+ TURTLEPanel tp = tabs.elementAt(index);
+ if (tp == null) {
+ return null;
+ }
+ return tp.getAllTabsName().split("\\$");
+
+ }
+
+ public ArrayList<TGComponent> getAllElementsOfCategories(int index1, int index2, List<String> categories) {
+ TURTLEPanel tp = getTURTLEPanel(index1);
+ if (tp == null) {
+ TraceManager.addDev("Null tp");
+ return null;
+ }
+
+ TDiagramPanel tdp = tp.getPanels().get(index2);
+ if (tdp == null) {
+ TraceManager.addDev("Null tdp");
+ return null;
+ }
+
+ return tdp.getAllElementsOfCategories(categories);
+ }
+
+ public HashSet<String> getAllCategories( int index1, int index2) {
+ TURTLEPanel tp = getTURTLEPanel(index1);
+ if (tp == null) {
+ TraceManager.addDev("Null tp");
+ return null;
+ }
+
+ TDiagramPanel tdp = tp.getPanels().get(index2);
+ if (tdp == null) {
+ TraceManager.addDev("Null tdp");
+ return null;
+ }
+
+ return tdp.getCategories();
+ }
+
public void removeTClass(TURTLEPanel tp, String s) {
if (!(tp instanceof DesignPanel)) {
return;
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index 9ec654880f..e6658fb280 100644
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -1065,6 +1065,24 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
}
+ public HashSet<String> getCategories() {
+ HashSet<String> classes = new HashSet<>();
+ for(TGComponent tgc: getAllComponentList()) {
+ classes.add(tgc.getClass().toString());
+ }
+ return classes;
+ }
+
+ public ArrayList<TGComponent> getAllElementsOfCategories(List<String> categories) {
+ ArrayList<TGComponent> comps = new ArrayList<>();
+ for(TGComponent tgc: getAllComponentList()) {
+ if (categories.contains(tgc.getClass().toString())) {
+ comps.add(tgc);
+ }
+ }
+ return comps;
+ }
+
public SwallowTGComponent findSwallowTGComponent(int x, int y) {
return findSwallowTGComponent(x, y, null);
}
diff --git a/src/main/java/ui/TGCDependencyMatrix.java b/src/main/java/ui/TGCDependencyMatrix.java
new file mode 100644
index 0000000000..d5d023f615
--- /dev/null
+++ b/src/main/java/ui/TGCDependencyMatrix.java
@@ -0,0 +1,289 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui;
+
+import java.awt.*;
+import java.util.ArrayList;
+
+import myutil.Conversion;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import myutil.GraphicLib;
+import ui.atd.ATDAttack;
+import ui.atd.ATDConstraint;
+import ui.atd.ATDCountermeasure;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramReference;
+import ui.util.IconManager;
+import ui.window.JDialogDependencyMatrix;
+import ui.window.JDialogInfoPanel;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+
+/**
+ * Class TGCDependencyMatrix
+ * Component for handling a dependency matrix
+ * Creation: 23/06/2021
+ * @version 1.0 23/06/2021
+ * @author Ludovic APVRILLE
+ */
+public class TGCDependencyMatrix extends TGCScalableWithInternalComponent implements ColorCustomizable {
+
+
+ private static final int MARGIN_X = 5;
+ private static final int MARGIN_Y = 5;
+
+ protected Graphics myg;
+
+
+ private int currentFontSize = -1;
+
+ protected Graphics graphics;
+
+ protected String columnDiag = "";
+ protected String rowDiag = "";
+
+
+ protected String columns = ""; // separated by ";"
+ protected String rows = ""; // separated by ;
+
+ protected ArrayList<Point> dependencies;
+
+
+
+ public TGCDependencyMatrix(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ width = 150;
+ height = 150;
+ minWidth = 20;
+ minHeight = 20;
+
+ // Issue #31
+ //oldScaleFactor = tdp.getZoom();
+
+ nbConnectingPoint = 0;
+ //addTGConnectingPointsComment();
+
+ int len = makeTGConnectingPointsComment(16);
+ int decw = 0;
+ int dech = 0;
+
+ for(int i=0; i<2; i++) {
+ connectingPoint[len] = new TGConnectingPointComment(this, 0, 0, true, true, 0.0 + decw, 0.0 + dech);
+ connectingPoint[len + 1 ] = new TGConnectingPointComment(this, 0, 0, true, true, 0.5 + decw, 0.0 + dech);
+ connectingPoint[len + 2 ] = new TGConnectingPointComment(this, 0, 0, true, true, 1.0 + decw, 0.0 + dech);
+ connectingPoint[len + 3 ] = new TGConnectingPointComment(this, 0, 0, true, true, 0.0 + decw, 0.5 + dech);
+ connectingPoint[len + 4 ] = new TGConnectingPointComment(this, 0, 0, true, true, 1.0 + decw, 0.5 + dech);
+ connectingPoint[len + 5 ] = new TGConnectingPointComment(this, 0, 0, true, true, 0.0 + decw, 1.0 + dech);
+ connectingPoint[len + 6 ] = new TGConnectingPointComment(this, 0, 0, true, true, 0.5 + decw, 1.0 + dech);
+ connectingPoint[len + 7 ] = new TGConnectingPointComment(this, 0, 0, true, true, 0.9 + decw, 1.0 + dech);
+ len += 8;
+ }
+
+ moveable = true;
+ editable = true;
+ removable = true;
+ userResizable = true;
+
+ dependencies = new ArrayList<Point>();
+
+ name = "Matrix";
+ value = "Dependency Matrix";
+
+ rescaled = true;
+
+ myImageIcon = IconManager.imgic320;
+ }
+
+ @Override
+ protected void internalDrawing(Graphics g) {
+ Font f = g.getFont();
+
+
+ if (((rescaled) && (!tdp.isScaled()))) {
+ currentFontSize = tdp.getFontSize();
+
+ if (rescaled) {
+ rescaled = false;
+ }
+ }
+
+ Color c = g.getColor();
+
+ g.setColor(getCurrentColor());
+ g.fillRect(x, y, width, height);
+ g.setColor(c);
+ g.drawRect(x, y, width, height);
+
+ int xStr = x, yStr = y;
+ Font f0 = g.getFont();
+ g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
+
+ // Issue #31
+ final int marginX = scale( MARGIN_X );
+ final int marginY = scale( MARGIN_Y );
+
+ xStr += width/2 - w/2;
+ yStr += marginY + currentFontSize;
+
+ g.drawString(value, xStr, yStr);
+ g.setFont(f0);
+ g.setColor(c);
+ }
+
+ public TGComponent isOnOnlyMe(int x1, int y1) {
+
+ if (GraphicLib.isInRectangle(x1, y1, x, y, width, height)) {
+ return this;
+ }
+ return null;
+ }
+
+ @Override
+ public boolean editOnDoubleClick(JFrame frame) {
+ String oldValue = value;
+
+ JDialogDependencyMatrix jddm = new JDialogDependencyMatrix(frame, tdp.getMainGUI(), "Dependency Matrix", columnDiag, rowDiag,
+ columns, rows, dependencies);
+ GraphicLib.centerOnParent(jddm, 800, 500);
+ jddm.setVisible( true );
+
+ if (!jddm.hasBeenCancelled()) {
+
+ }
+
+ return false;
+ }
+
+
+
+
+ @Override
+ public int getType() {
+ return TGComponentManager.DEPENDENCY_MATRIX;
+ }
+
+
+
+ protected String translateExtraParam() {
+ // TAttribute a;
+// AvatarMethod am;
+// AvatarSignal as;
+
+ //
+ //value = "";
+ StringBuffer sb = new StringBuffer("<extraparam>\n");
+ sb.append("<columnDiag v=\"" + columnDiag + "\" />\n");
+ sb.append("<rowDiag v=\"" + rowDiag + "\" />\n");
+ StringBuffer sbT = new StringBuffer();
+ sb.append("<rows v=\"" + rows + "\" />\n");
+ sb.append("<columns v=\"" + columns + "\" />\n");
+ for(Point pt: dependencies) {
+ sb.append("<p x=\"" + pt.x + "\" y=\"" + pt.y + "\" />\n");
+ }
+ sb.append("</extraparam>\n");
+
+ return new String(sb);
+ }
+
+ @Override
+ public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+ String xP, yP;
+
+ try {
+ NodeList nli;
+ Node n1, n2;
+ Element elt;
+
+ for(int i=0; i<nl.getLength(); i++) {
+ n1 = nl.item(i);
+ //
+ if (n1.getNodeType() == Node.ELEMENT_NODE) {
+ nli = n1.getChildNodes();
+ for(int j=0; j<nli.getLength(); j++) {
+ n2 = nli.item(j);
+ //
+ if (n2.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element) n2;
+ if (elt.getTagName().equals("columnDiag")) {
+ columnDiag = elt.getAttribute("v");
+ }
+
+ if (elt.getTagName().equals("rowDiag")) {
+ rowDiag = elt.getAttribute("v");
+ }
+
+ if (elt.getTagName().equals("rows")) {
+ rows = elt.getAttribute("v");
+ }
+
+ if (elt.getTagName().equals("columns")) {
+ columns = elt.getAttribute("v");
+ }
+
+ if (elt.getTagName().equals("p")) {
+ xP = elt.getAttribute("x");
+ yP = elt.getAttribute("y");
+ if ((xP != null) && (yP != null) && (xP.length() > 0) && (yP.length() > 0)) {
+ int xT = Integer.decode(xP);
+ int yT = Integer.decode(yP);
+ dependencies.add(new Point(xT, yT));
+ }
+ }
+
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ throw new MalformedModelingException();
+ }
+ }
+
+
+ // Color management
+ public Color getMainColor() {
+ return Color.LIGHT_GRAY;
+ }
+
+}//Class
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index 609816725d..709f7cd34a 100644
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -188,6 +188,7 @@ public class TGComponentManager {
public static final int AVATAR_FIREWALL = 306;
public static final int PERFORMANCE_PRAGMA = 307;
public static final int TML_PRAGMA = 308;
+ public static final int DEPENDENCY_MATRIX = 309;
public static final int IOD_CHOICE = 501;
public static final int IOD_START_STATE = 502;
@@ -956,6 +957,9 @@ public class TGComponentManager {
case UML_NOTE:
tgc = new TGCNote(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
+ case DEPENDENCY_MATRIX:
+ tgc = new TGCDependencyMatrix(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
case INFO_PANEL:
tgc = new TGCPanelInfo(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
@@ -1974,6 +1978,8 @@ public class TGComponentManager {
return CONNECTOR_INTERACTION;
} else if (tgc instanceof TGCNote) {
return UML_NOTE;
+ } else if (tgc instanceof TGCDependencyMatrix) {
+ return DEPENDENCY_MATRIX;
} else if (tgc instanceof TGCPanelInfo) {
return INFO_PANEL;
} else if (tgc instanceof IODChoice) {
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index b9b014ee8f..3334127a8b 100644
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -609,6 +609,7 @@ public class TGUIAction extends AbstractAction {
public static final int ACT_VIEW_PM_SAVED_AUT = 267;
public static final int UML_NOTE = 42;
+ public static final int DEPENDENCY_MATRIX = 554;
public static final int PRAGMA = 424;
public static final int SAFETY_PRAGMA = 425;
public static final int PERFORMANCE_PRAGMA = 438;
@@ -711,7 +712,7 @@ public class TGUIAction extends AbstractAction {
public static final int M_PANEL_INFO = 553;
- public static final int NB_ACTION = 554; // Last + 1
+ public static final int NB_ACTION = 555; // Last + 1
private static final TAction [] actions = new TAction[NB_ACTION];
@@ -1038,6 +1039,9 @@ public class TGUIAction extends AbstractAction {
actions[TCD_INVOCATION_OPERATOR] = new TAction("add-invocation-operator", "Add Invocation composition operator", IconManager.imgic126, IconManager.imgic126, "Invocation composition operator", "Adds an invocation composition operator to the currently opened class diagram", 0);
actions[TCD_ASSOCIATION_NAVIGATION] = new TAction("add-association-navigation", "Add association with navigation", IconManager.imgic106, IconManager.imgic108, "Association with navigation", "Adds an association with a navigation indication between two tclasses of the currently opened class diagram", 0);
actions[UML_NOTE] = new TAction("edit-note", "Add a note to a diagram", IconManager.imgic320, IconManager.imgic321, "Add a comment", "Add a comment to the currently opened TTool diagram", 0);
+ actions[DEPENDENCY_MATRIX] = new TAction("dep-matrix", "Add a dependency matrix", IconManager.imgic320,
+ IconManager.imgic321, "Dependency matrix",
+ "Add a dependency matrix to the currently opened TTool diagram", 0);
actions[PRAGMA] = new TAction("pragma", "Security pragmas", IconManager.imgic6000, IconManager.imgic6001, "Security pragmas", "Add security pragmas to the currently opened TTool diagram", 0);
actions[SAFETY_PRAGMA] = new TAction("safety_pragma", "Add a safety (UPPAAL) property to a diagram", IconManager.imgic6002, IconManager.imgic6003, "Safety property (UPPAAL)", "Add a safety (UPPAAL) property to the currently opened TTool diagram", 0);
actions[TML_PRAGMA] = new TAction("tml_pragma", "Add a TML pragma", IconManager.imgic6006, IconManager.imgic6007,"TML pragma", "Add a TML pragma to the currently opened TTool diagram", 0);
diff --git a/src/main/java/ui/avatarrd/AvatarRDToolBar.java b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
index 54b56ab818..dfd7071d2b 100755
--- a/src/main/java/ui/avatarrd/AvatarRDToolBar.java
+++ b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
@@ -72,6 +72,7 @@ public class AvatarRDToolBar extends TToolBar {
mgui.actions[TGUIAction.ARD_EDIT].setEnabled(b);
mgui.actions[TGUIAction.UML_NOTE].setEnabled(b);
+ mgui.actions[TGUIAction.DEPENDENCY_MATRIX].setEnabled(b);
mgui.actions[TGUIAction.CONNECTOR_COMMENT].setEnabled(b);
mgui.actions[TGUIAction.ARD_REQUIREMENT].setEnabled(b);
mgui.actions[TGUIAction.ARD_REQUIREMENT_REFERENCE].setEnabled(b);
@@ -108,6 +109,11 @@ public class AvatarRDToolBar extends TToolBar {
this.addSeparator();
+ button = this.add(mgui.actions[TGUIAction.DEPENDENCY_MATRIX]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
button = this.add(mgui.actions[TGUIAction.ARD_REQUIREMENT]);
button.addMouseListener(mgui.mouseHandler);
diff --git a/src/main/java/ui/window/DependencyTableModel.java b/src/main/java/ui/window/DependencyTableModel.java
new file mode 100644
index 0000000000..b8f0a2a331
--- /dev/null
+++ b/src/main/java/ui/window/DependencyTableModel.java
@@ -0,0 +1,98 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package ui.window;
+
+import myutil.TraceManager;
+import ui.TGComponent;
+import ui.avatarrd.AvatarRDRequirement;
+import ui.req.Requirement;
+
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+
+/**
+ * Class DependencyTableModel
+ * Main data for dependency matrices
+ * Creation: 23/06/2021
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 23/06/2021
+ */
+public class DependencyTableModel extends AbstractTableModel {
+ private String[] cols, rows;
+ private ArrayList<Point> points;
+
+
+ public DependencyTableModel(String[] _rows, String[] _cols, ArrayList<Point> _points) {
+ rows = _rows;
+ cols = _cols;
+ points = _points;
+ }
+
+ // From AbstractTableModel
+ public int getRowCount() {
+ return rows.length;
+ }
+
+ public int getColumnCount() {
+ return cols.length + 1;
+ }
+
+ public Object getValueAt(int row, int column) {
+ if (column == 0) {
+ return rows[row];
+ }
+ return "-";
+ }
+
+ public String getRowName(int rowIndex) {
+ return rows[rowIndex];
+ }
+
+ public String getColumnName(int columnIndex) {
+ if (columnIndex == 0) {
+ return "row / col";
+ }
+ return cols[columnIndex-1];
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/ui/window/JDialogDependencyMatrix.java b/src/main/java/ui/window/JDialogDependencyMatrix.java
new file mode 100644
index 0000000000..d5930ab575
--- /dev/null
+++ b/src/main/java/ui/window/JDialogDependencyMatrix.java
@@ -0,0 +1,457 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package ui.window;
+
+import myutil.TableSorter;
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGComponent;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+
+/**
+ * Class JDialogDependencyMatrix
+ * Dialog for setting requirement tables
+ * Creation: 19/02/2009
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 19/02/2009
+ */
+public class JDialogDependencyMatrix extends JDialogBase implements ActionListener, ListSelectionListener {
+
+
+ private boolean hasBeenCancelled = true;
+ private MainGUI mgui;
+
+ private JComboBox<String> rowPanelBox, rowDiagBox, colPanelBox, colDiagBox;
+ private JList<String> rowClassList, colClassList;
+ private DefaultListModel<String> rowClassListModel, colClassListModel;
+ private JButton generateMatrix;
+
+ private String rowDiag;
+ private String columnDiag;
+ private String rows;
+ private String columns;
+ private ArrayList<Point> dependencies;
+
+ private JPanel panelMatrix;
+ private JLabel labelMatrix;
+ private JTable matrix;
+
+
+ /* Creates new form */
+ public JDialogDependencyMatrix(JFrame f, MainGUI _mgui, String title, String _columnDiag, String _rowDiag,
+ String _columns, String _rows, ArrayList<Point> _dependencies) {
+ super(f, title, true);
+
+ mgui = _mgui;
+
+ rowDiag = _rowDiag;
+ columnDiag = _columnDiag;
+ rows = _rows;
+ columns = _columns;
+ dependencies = new ArrayList<>();
+ dependencies.addAll(dependencies);
+
+ myInitComponents();
+ initComponents();
+ pack();
+
+ makeMatrix();
+ }
+
+ private void myInitComponents() {
+
+ }
+
+ private void initComponents() {
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+
+ Container c = getContentPane();
+ JTabbedPane mainPane = new JTabbedPane();
+ c.add(BorderLayout.CENTER, mainPane);
+
+ // Tab to generate Matrix
+
+ GridBagLayout gsp = new GridBagLayout();
+ GridBagConstraints csp = new GridBagConstraints();
+ JPanel panelConfiguration = new JPanel(gsp);
+
+
+ generateMatrix = new JButton("Generate Dependency Matrix");
+ generateMatrix.addActionListener(this);
+ checkButtons();
+
+
+ // rows
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+
+
+ JPanel panel0 = new JPanel(gridbag0);
+ panel0.setBorder(new javax.swing.border.TitledBorder("Setting row parameters "));
+ c0.gridwidth = 1;
+ c0.gridheight = 2;
+ c0.weighty = GridBagConstraints.BOTH;
+ c0.weightx = GridBagConstraints.BOTH;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+ panel0.add(new JLabel("Main diagram:"), c0);
+
+
+ rowPanelBox = new JComboBox<String>();
+ panel0.add(rowPanelBox, c0);
+
+ panel0.add(new JLabel("Sub diagram:"), c0);
+ rowDiagBox = new JComboBox<>();
+ panel0.add(rowDiagBox, c0);
+
+ panel0.add(new JLabel("Elements:"), c0);
+ rowClassListModel = new DefaultListModel<>();
+ rowClassList = new JList<>(rowClassListModel);
+ rowClassList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ JScrollPane scroll = new JScrollPane(rowClassList);
+ //scroll.setPreferredSize(new Dimension(400, 300));
+ panel0.add(scroll, c0);
+
+ generateMatrix = new JButton("Generate Dependency Matrix");
+ generateMatrix.addActionListener(this);
+ checkButtons();
+
+ rowClassList.addListSelectionListener(this);
+ rowDiagBox.addActionListener(this);
+ rowPanelBox.addActionListener(this);
+
+ ArrayList<String> allPanels = mgui.getAllPanelNames();
+ for (String s : allPanels) {
+ rowPanelBox.addItem(s);
+ }
+
+ csp.gridwidth = 1;
+ csp.gridheight = 30;
+ csp.weighty = GridBagConstraints.BOTH;
+ csp.weightx = GridBagConstraints.BOTH;
+ panelConfiguration.add(panel0, csp);
+
+
+ // Columns
+ gridbag0 = new GridBagLayout();
+ c0 = new GridBagConstraints();
+
+ panel0 = new JPanel(gridbag0);
+ panel0.setBorder(new javax.swing.border.TitledBorder("Setting column parameters "));
+
+ c0.gridwidth = 1;
+ c0.gridheight = 2;
+ c0.weighty = GridBagConstraints.BOTH;
+ c0.weightx = GridBagConstraints.BOTH;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+ panel0.add(new JLabel("Main diagram:"), c0);
+
+ colPanelBox = new JComboBox<String>();
+ panel0.add(colPanelBox, c0);
+
+ panel0.add(new JLabel("Sub diagram:"), c0);
+ colDiagBox = new JComboBox<>();
+ panel0.add(colDiagBox, c0);
+
+ panel0.add(new JLabel("Elements:"), c0);
+ colClassListModel = new DefaultListModel<>();
+ colClassList = new JList<>(colClassListModel);
+ colClassList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ scroll = new JScrollPane(colClassList);
+ //scroll.setPreferredSize(new Dimension(400, 300));
+ panel0.add(scroll, c0);
+
+
+ colClassList.addListSelectionListener(this);
+ colDiagBox.addActionListener(this);
+ colPanelBox.addActionListener(this);
+
+ allPanels = mgui.getAllPanelNames();
+ for (String s : allPanels) {
+ colPanelBox.addItem(s);
+ }
+
+ csp.gridwidth = GridBagConstraints.REMAINDER; //end row
+ panelConfiguration.add(panel0, csp);
+
+ csp.gridheight = 1;
+ panelConfiguration.add(generateMatrix, csp);
+
+ mainPane.add("Configuration", panelConfiguration);
+ // Tab to edit Matrix
+ // Empty if no matrix
+ panelMatrix = new JPanel(new BorderLayout());
+ labelMatrix = new JLabel("");
+ panelMatrix.add(BorderLayout.NORTH, labelMatrix);
+ mainPane.add("Matrix", panelMatrix);
+
+
+ // main panel;
+
+
+ initButtons(c, this);
+
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+
+ // Compare the action command to the known actions.
+ if (evt.getSource() == closeButton) {
+ closeDialog();
+ } else if (evt.getSource() == cancelButton) {
+ cancelDialog();
+ } else if (evt.getSource() == rowPanelBox) {
+ fillDiagBox(rowPanelBox, rowDiagBox);
+ checkButtons();
+ } else if (evt.getSource() == rowDiagBox) {
+ fillClassBox(rowPanelBox, rowDiagBox, rowClassList, rowClassListModel);
+ checkButtons();
+ } else if (evt.getSource() == colPanelBox) {
+ fillDiagBox(colPanelBox, colDiagBox);
+ checkButtons();
+ } else if (evt.getSource() == colDiagBox) {
+ fillClassBox(colPanelBox, colDiagBox, colClassList, colClassListModel);
+ checkButtons();
+ } else if (evt.getSource() == generateMatrix) {
+ prepareMatrixElements();
+ makeMatrix();
+ }
+ }
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ //TraceManager.addDev("List selection listener");
+ checkButtons();
+ }
+
+
+ private void closeDialog() {
+ hasBeenCancelled = false;
+ dispose();
+ }
+
+ private void cancelDialog() {
+ dispose();
+ }
+
+
+ public boolean hasBeenCancelled() {
+ return hasBeenCancelled;
+ }
+
+ private void prepareMatrixElements() {
+ TraceManager.addDev("Preparing matrix elements");
+
+ // row
+ int index1 = rowPanelBox.getSelectedIndex();
+ if (index1 == -1) {
+ return;
+ }
+
+ int index2 = rowDiagBox.getSelectedIndex();
+ if (index2 == -1) {
+ return;
+ }
+
+ rowDiag = (String) rowDiagBox.getSelectedItem();
+
+ List<String> categories = rowClassList.getSelectedValuesList();
+ if (categories == null) {
+ return;
+ }
+
+ ArrayList<TGComponent> allElts = mgui.getAllElementsOfCategories(index1, index2, categories);
+ rows = "";
+ for (TGComponent tgc : allElts) {
+ if (rows.length() > 0) {
+ rows += "$";
+ }
+ String val = tgc.getValue();
+ rows += val.substring(0, Math.min(20, val.length())) + "/" + tgc.getUUID();
+ }
+ TraceManager.addDev("Rows=" + rows);
+
+ // col
+ index1 = colPanelBox.getSelectedIndex();
+ if (index1 == -1) {
+ return;
+ }
+
+ index2 = colDiagBox.getSelectedIndex();
+ if (index2 == -1) {
+ return;
+ }
+ columnDiag = (String) colDiagBox.getSelectedItem();
+
+ categories = colClassList.getSelectedValuesList();
+ if (categories == null) {
+ return;
+ }
+
+ allElts = mgui.getAllElementsOfCategories(index1, index2, categories);
+ columns = "";
+ for (TGComponent tgc : allElts) {
+ if (columns.length() > 0) {
+ columns += "$";
+ }
+ String val = tgc.getValue();
+ columns += val.substring(0, Math.min(20, val.length())) + "/" + tgc.getUUID();
+ }
+ TraceManager.addDev("Columns=" + columns);
+
+ }
+
+
+ private void makeMatrix() {
+ if ((columnDiag == null) || (columnDiag.length() == 0)) {
+ makeMatrixIssue("invalid diagram for column");
+ return;
+ }
+
+ if ((rowDiag == null) || (rowDiag.length() == 0)) {
+ makeMatrixIssue("invalid diagram for row");
+ return;
+ }
+
+ if ((columns == null) || (columns.length() == 0)) {
+ makeMatrixIssue("No element in column");
+ return;
+ }
+
+ if ((rows == null) || (rows.length() == 0)) {
+ makeMatrixIssue("No element in row");
+ return;
+ }
+
+ TraceManager.addDev("Going to make the matrix / rows=" + rows + " / cols=" + columns);
+
+ labelMatrix.setText("Matrix between " + rowDiag + " and " + columnDiag);
+
+ DependencyTableModel dtm = new DependencyTableModel(rows.split("\\$"), columns.split("\\$"),
+ dependencies);
+ TableSorter sorterRTM = new TableSorter(dtm);
+ matrix = new JTable(sorterRTM);
+ matrix.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ JScrollPane jspRTM = new JScrollPane(matrix);
+ jspRTM.setWheelScrollingEnabled(true);
+ jspRTM.getVerticalScrollBar().setUnitIncrement(10);
+ panelMatrix.add(BorderLayout.CENTER, jspRTM);
+
+ }
+
+ private void makeMatrixIssue(String s) {
+ if (labelMatrix != null) {
+ labelMatrix.setText("Error: " + s);
+ }
+ }
+
+ private void checkButtons() {
+ generateMatrix.setEnabled(
+ (rowClassList != null) &&
+ (colClassList != null) &&
+ (rowClassList.getSelectedIndex() != -1) &&
+ (colClassList.getSelectedIndex() != -1) &&
+ (matrix == null));
+ }
+
+ private void fillDiagBox(JComboBox<String> panelBox, JComboBox<String> diagBox) {
+ //TraceManager.addDev("Fill Diag Box");
+ int index = panelBox.getSelectedIndex();
+ if (index == -1) {
+ return;
+ }
+
+ //TraceManager.addDev("Fill Diag Box 1");
+
+
+ diagBox.removeAllItems();
+ String[] elts = mgui.getAllDiagNamesFromPanel(index);
+ if (elts != null) {
+ for (String st : elts) {
+ diagBox.addItem(st);
+ }
+ }
+ }
+
+ private void fillClassBox(JComboBox<String> panelBox, JComboBox<String> diagBox, JList<String> classList, DefaultListModel<String> model) {
+ //TraceManager.addDev("Fill Class List");
+ int index1 = panelBox.getSelectedIndex();
+ if (index1 == -1) {
+ return;
+ }
+
+ //TraceManager.addDev("Fill Class List 1");
+
+ int index2 = diagBox.getSelectedIndex();
+ if (index2 == -1) {
+ return;
+ }
+ //TraceManager.addDev("Fill Class List 2");
+
+
+ HashSet<String> elts = mgui.getAllCategories(index1, index2);
+ if (elts == null) {
+ return;
+ }
+
+ //TraceManager.addDev("Fill Class List 3");
+
+ model.removeAllElements();
+ for (String st : elts) {
+ model.addElement(st);
+ }
+
+ }
+
+
+}
\ No newline at end of file
--
GitLab