diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 03acf3e5a914b4f20c7b333f24cbe6d48b473ecd..7952f28b49066bae0177469536a0ec87015a4108 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="0.99-beta4">
<Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
<AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
@@ -1297,8 +1297,8 @@
<Attribute access="0" id="minUserDelay" value="50" type="8" typeOther="" />
<Attribute access="0" id="maxUserDelay" value="70" type="8" typeOther="" />
<Method value="contentOfWallet(int nbOfCoins)" />
-<Signal value="in getCoin(int nbOfCoins)" />
-<Signal value="out putCoin(int nbOfCoins)" />
+<Signal value="in getCoin(int nbOfCoins)" attached="false" />
+<Signal value="out putCoin(int nbOfCoins)" attached="false" />
</extraparam>
</COMPONENT>
@@ -1342,10 +1342,10 @@
<Attribute access="0" id="x" value="0" type="8" typeOther="" />
<Attribute access="0" id="nbOfCoins" value="0" type="8" typeOther="" />
<Method value="beverageReady()" />
-<Signal value="in pushCoffeeButton()" />
-<Signal value="in pushTeaButton()" />
-<Signal value="in getCoin(int nbOfCoins)" />
-<Signal value="out ejectCoin(int nbOfCoins)" />
+<Signal value="in pushCoffeeButton()" attached="false" />
+<Signal value="in pushTeaButton()" attached="false" />
+<Signal value="in getCoin(int nbOfCoins)" attached="false" />
+<Signal value="out ejectCoin(int nbOfCoins)" attached="false" />
</extraparam>
</COMPONENT>
<SUBCOMPONENT type="5000" id="713" >
@@ -1382,7 +1382,7 @@
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
-<Signal value="out push()" />
+<Signal value="out push()" attached="false" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="738" >
@@ -1419,7 +1419,7 @@
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="80" type="8" typeOther="" />
-<Signal value="out push()" />
+<Signal value="out push()" attached="false" />
</extraparam>
</SUBCOMPONENT>
@@ -3208,7 +3208,7 @@
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
-<Validated value="" />
+<Validated value="Wallet;CoffeeMachine;TeaButton;CoffeeButton;" />
<Ignored value="" />
<CONNECTOR type="5002" id="1691" >
@@ -3216,8 +3216,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="1690" />
-<P1 x="559" y="330" id="1727" />
-<P2 x="560" y="377" id="1785" />
+<P1 x="559" y="330" id="1744" />
+<P2 x="560" y="377" id="1802" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushCoffeeButton()" />
@@ -3230,8 +3230,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
<TGConnectingPoint num="0" id="1692" />
-<P1 x="306" y="109" id="1707" />
-<P2 x="445" y="108" id="1781" />
+<P1 x="306" y="109" id="1724" />
+<P2 x="445" y="108" id="1798" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in getCoin(int nbOfCoins)" />
@@ -3246,8 +3246,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="1694" />
-<P1 x="789" y="326" id="1752" />
-<P2 x="790" y="377" id="1786" />
+<P1 x="789" y="326" id="1769" />
+<P2 x="790" y="377" id="1803" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushTeaButton()" />
@@ -3255,12 +3255,16 @@
<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
</extraparam>
</CONNECTOR>
-<COMPONENT type="5000" id="1720" >
-<cdparam x="106" y="55" />
-<sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="303" id="1712" >
+<cdparam x="92" y="418" />
+<sizeparam width="273" height="84" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="Wallet" />
+<infoparam name="UPPAAL Pragma" value="A[] Wallet.nbOfCoins<1
+A[] CoffeeButton.main
+A[] CoffeeMachine.WaitingForSelection
+E<> CoffeeMachine.WaitingForSelection
+" />
<TGConnectingPoint num="0" id="1696" />
<TGConnectingPoint num="1" id="1697" />
<TGConnectingPoint num="2" id="1698" />
@@ -3277,14 +3281,44 @@
<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" />
+<extraparam>
+<Line value="A[] Wallet.nbOfCoins<1" />
+<Line value="A[] CoffeeButton.main" />
+<Line value="A[] CoffeeMachine.WaitingForSelection" />
+<Line value="E<> CoffeeMachine.WaitingForSelection" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5000" id="1737" >
+<cdparam x="106" y="55" />
+<sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="Wallet" />
+<TGConnectingPoint num="0" id="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" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
@@ -3292,41 +3326,41 @@
<Attribute access="0" id="minUserDelay" value="50" type="8" typeOther="" />
<Attribute access="0" id="maxUserDelay" value="70" type="8" typeOther="" />
<Method value="contentOfWallet(int nbOfCoins)" />
-<Signal value="in getCoin(int nbOfCoins)" />
-<Signal value="out putCoin(int nbOfCoins)" />
+<Signal value="in getCoin(int nbOfCoins)" attached="true" />
+<Signal value="out putCoin(int nbOfCoins)" attached="true" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="1795" >
+<COMPONENT type="5000" id="1812" >
<cdparam x="445" y="19" />
<sizeparam width="461" height="358" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="1771" />
-<TGConnectingPoint num="1" id="1772" />
-<TGConnectingPoint num="2" id="1773" />
-<TGConnectingPoint num="3" id="1774" />
-<TGConnectingPoint num="4" id="1775" />
-<TGConnectingPoint num="5" id="1776" />
-<TGConnectingPoint num="6" id="1777" />
-<TGConnectingPoint num="7" id="1778" />
-<TGConnectingPoint num="8" id="1779" />
-<TGConnectingPoint num="9" id="1780" />
-<TGConnectingPoint num="10" id="1781" />
-<TGConnectingPoint num="11" id="1782" />
-<TGConnectingPoint num="12" id="1783" />
-<TGConnectingPoint num="13" id="1784" />
-<TGConnectingPoint num="14" id="1785" />
-<TGConnectingPoint num="15" id="1786" />
-<TGConnectingPoint num="16" id="1787" />
-<TGConnectingPoint num="17" id="1788" />
-<TGConnectingPoint num="18" id="1789" />
-<TGConnectingPoint num="19" id="1790" />
-<TGConnectingPoint num="20" id="1791" />
-<TGConnectingPoint num="21" id="1792" />
-<TGConnectingPoint num="22" id="1793" />
-<TGConnectingPoint num="23" id="1794" />
+<TGConnectingPoint num="0" id="1788" />
+<TGConnectingPoint num="1" id="1789" />
+<TGConnectingPoint num="2" id="1790" />
+<TGConnectingPoint num="3" id="1791" />
+<TGConnectingPoint num="4" id="1792" />
+<TGConnectingPoint num="5" id="1793" />
+<TGConnectingPoint num="6" id="1794" />
+<TGConnectingPoint num="7" id="1795" />
+<TGConnectingPoint num="8" id="1796" />
+<TGConnectingPoint num="9" id="1797" />
+<TGConnectingPoint num="10" id="1798" />
+<TGConnectingPoint num="11" id="1799" />
+<TGConnectingPoint num="12" id="1800" />
+<TGConnectingPoint num="13" id="1801" />
+<TGConnectingPoint num="14" id="1802" />
+<TGConnectingPoint num="15" id="1803" />
+<TGConnectingPoint num="16" id="1804" />
+<TGConnectingPoint num="17" id="1805" />
+<TGConnectingPoint num="18" id="1806" />
+<TGConnectingPoint num="19" id="1807" />
+<TGConnectingPoint num="20" id="1808" />
+<TGConnectingPoint num="21" id="1809" />
+<TGConnectingPoint num="22" id="1810" />
+<TGConnectingPoint num="23" id="1811" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
@@ -3337,84 +3371,84 @@
<Attribute access="0" id="x" value="0" type="8" typeOther="" />
<Attribute access="0" id="nbOfCoins" value="0" type="8" typeOther="" />
<Method value="beverageReady()" />
-<Signal value="in pushCoffeeButton()" />
-<Signal value="in pushTeaButton()" />
-<Signal value="in getCoin(int nbOfCoins)" />
-<Signal value="out ejectCoin(int nbOfCoins)" />
+<Signal value="in pushCoffeeButton()" attached="true" />
+<Signal value="in pushTeaButton()" attached="true" />
+<Signal value="in getCoin(int nbOfCoins)" attached="true" />
+<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="1745" >
-<father id="1795" num="0" />
+<SUBCOMPONENT type="5000" id="1762" >
+<father id="1812" num="0" />
<cdparam x="464" y="228" />
<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
<infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="1721" />
-<TGConnectingPoint num="1" id="1722" />
-<TGConnectingPoint num="2" id="1723" />
-<TGConnectingPoint num="3" id="1724" />
-<TGConnectingPoint num="4" id="1725" />
-<TGConnectingPoint num="5" id="1726" />
-<TGConnectingPoint num="6" id="1727" />
-<TGConnectingPoint num="7" id="1728" />
-<TGConnectingPoint num="8" id="1729" />
-<TGConnectingPoint num="9" id="1730" />
-<TGConnectingPoint num="10" id="1731" />
-<TGConnectingPoint num="11" id="1732" />
-<TGConnectingPoint num="12" id="1733" />
-<TGConnectingPoint num="13" id="1734" />
-<TGConnectingPoint num="14" id="1735" />
-<TGConnectingPoint num="15" id="1736" />
-<TGConnectingPoint num="16" id="1737" />
-<TGConnectingPoint num="17" id="1738" />
-<TGConnectingPoint num="18" id="1739" />
-<TGConnectingPoint num="19" id="1740" />
-<TGConnectingPoint num="20" id="1741" />
-<TGConnectingPoint num="21" id="1742" />
-<TGConnectingPoint num="22" id="1743" />
-<TGConnectingPoint num="23" id="1744" />
+<TGConnectingPoint num="0" id="1738" />
+<TGConnectingPoint num="1" id="1739" />
+<TGConnectingPoint num="2" id="1740" />
+<TGConnectingPoint num="3" id="1741" />
+<TGConnectingPoint num="4" id="1742" />
+<TGConnectingPoint num="5" id="1743" />
+<TGConnectingPoint num="6" id="1744" />
+<TGConnectingPoint num="7" id="1745" />
+<TGConnectingPoint num="8" id="1746" />
+<TGConnectingPoint num="9" id="1747" />
+<TGConnectingPoint num="10" id="1748" />
+<TGConnectingPoint num="11" id="1749" />
+<TGConnectingPoint num="12" id="1750" />
+<TGConnectingPoint num="13" id="1751" />
+<TGConnectingPoint num="14" id="1752" />
+<TGConnectingPoint num="15" id="1753" />
+<TGConnectingPoint num="16" id="1754" />
+<TGConnectingPoint num="17" id="1755" />
+<TGConnectingPoint num="18" id="1756" />
+<TGConnectingPoint num="19" id="1757" />
+<TGConnectingPoint num="20" id="1758" />
+<TGConnectingPoint num="21" id="1759" />
+<TGConnectingPoint num="22" id="1760" />
+<TGConnectingPoint num="23" id="1761" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="80" type="8" typeOther="" />
-<Signal value="out push()" />
+<Signal value="out push()" attached="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="1770" >
-<father id="1795" num="1" />
+<SUBCOMPONENT type="5000" id="1787" >
+<father id="1812" num="1" />
<cdparam x="695" y="224" />
<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
<infoparam name="Block1" value="TeaButton" />
-<TGConnectingPoint num="0" id="1746" />
-<TGConnectingPoint num="1" id="1747" />
-<TGConnectingPoint num="2" id="1748" />
-<TGConnectingPoint num="3" id="1749" />
-<TGConnectingPoint num="4" id="1750" />
-<TGConnectingPoint num="5" id="1751" />
-<TGConnectingPoint num="6" id="1752" />
-<TGConnectingPoint num="7" id="1753" />
-<TGConnectingPoint num="8" id="1754" />
-<TGConnectingPoint num="9" id="1755" />
-<TGConnectingPoint num="10" id="1756" />
-<TGConnectingPoint num="11" id="1757" />
-<TGConnectingPoint num="12" id="1758" />
-<TGConnectingPoint num="13" id="1759" />
-<TGConnectingPoint num="14" id="1760" />
-<TGConnectingPoint num="15" id="1761" />
-<TGConnectingPoint num="16" id="1762" />
-<TGConnectingPoint num="17" id="1763" />
-<TGConnectingPoint num="18" id="1764" />
-<TGConnectingPoint num="19" id="1765" />
-<TGConnectingPoint num="20" id="1766" />
-<TGConnectingPoint num="21" id="1767" />
-<TGConnectingPoint num="22" id="1768" />
-<TGConnectingPoint num="23" id="1769" />
+<TGConnectingPoint num="0" id="1763" />
+<TGConnectingPoint num="1" id="1764" />
+<TGConnectingPoint num="2" id="1765" />
+<TGConnectingPoint num="3" id="1766" />
+<TGConnectingPoint num="4" id="1767" />
+<TGConnectingPoint num="5" id="1768" />
+<TGConnectingPoint num="6" id="1769" />
+<TGConnectingPoint num="7" id="1770" />
+<TGConnectingPoint num="8" id="1771" />
+<TGConnectingPoint num="9" id="1772" />
+<TGConnectingPoint num="10" id="1773" />
+<TGConnectingPoint num="11" id="1774" />
+<TGConnectingPoint num="12" id="1775" />
+<TGConnectingPoint num="13" id="1776" />
+<TGConnectingPoint num="14" id="1777" />
+<TGConnectingPoint num="15" id="1778" />
+<TGConnectingPoint num="16" id="1779" />
+<TGConnectingPoint num="17" id="1780" />
+<TGConnectingPoint num="18" id="1781" />
+<TGConnectingPoint num="19" id="1782" />
+<TGConnectingPoint num="20" id="1783" />
+<TGConnectingPoint num="21" id="1784" />
+<TGConnectingPoint num="22" id="1785" />
+<TGConnectingPoint num="23" id="1786" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
-<Signal value="out push()" />
+<Signal value="out push()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -3422,25 +3456,25 @@
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1802" >
+<CONNECTOR type="5102" id="1819" >
<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="1801" />
-<P1 x="485" y="219" id="1843" />
-<P2 x="485" y="274" id="1854" />
+<TGConnectingPoint num="0" id="1818" />
+<P1 x="485" y="219" id="1860" />
+<P2 x="485" y="274" id="1871" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1800" >
-<father id="1802" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1817" >
+<father id="1819" num="0" />
<cdparam x="493" y="251" />
<sizeparam width="173" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1796" />
-<TGConnectingPoint num="1" id="1797" />
-<TGConnectingPoint num="2" id="1798" />
-<TGConnectingPoint num="3" id="1799" />
+<TGConnectingPoint num="0" id="1813" />
+<TGConnectingPoint num="1" id="1814" />
+<TGConnectingPoint num="2" id="1815" />
+<TGConnectingPoint num="3" id="1816" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3452,25 +3486,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1809" >
+<CONNECTOR type="5102" id="1826" >
<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="1808" />
-<P1 x="382" y="165" id="1950" />
-<P2 x="485" y="189" id="1842" />
+<TGConnectingPoint num="0" id="1825" />
+<P1 x="382" y="165" id="1967" />
+<P2 x="485" y="189" id="1859" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1807" >
-<father id="1809" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1824" >
+<father id="1826" num="0" />
<cdparam x="382" y="205" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1803" />
-<TGConnectingPoint num="1" id="1804" />
-<TGConnectingPoint num="2" id="1805" />
-<TGConnectingPoint num="3" id="1806" />
+<TGConnectingPoint num="0" id="1820" />
+<TGConnectingPoint num="1" id="1821" />
+<TGConnectingPoint num="2" id="1822" />
+<TGConnectingPoint num="3" id="1823" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3480,25 +3514,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1816" >
+<CONNECTOR type="5102" id="1833" >
<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="1815" />
-<P1 x="251" y="231" id="1832" />
-<P2 x="252" y="300" id="1895" />
+<TGConnectingPoint num="0" id="1832" />
+<P1 x="251" y="231" id="1849" />
+<P2 x="252" y="300" id="1912" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1814" >
-<father id="1816" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1831" >
+<father id="1833" num="0" />
<cdparam x="163" y="252" />
<sizeparam width="221" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1810" />
-<TGConnectingPoint num="1" id="1811" />
-<TGConnectingPoint num="2" id="1812" />
-<TGConnectingPoint num="3" id="1813" />
+<TGConnectingPoint num="0" id="1827" />
+<TGConnectingPoint num="1" id="1828" />
+<TGConnectingPoint num="2" id="1829" />
+<TGConnectingPoint num="3" id="1830" />
<extraparam>
<guard value="[ ]" />
<afterMin value="minUserDelay" />
@@ -3510,25 +3544,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1823" >
+<CONNECTOR type="5102" id="1840" >
<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="1822" />
-<P1 x="357" y="165" id="1949" />
-<P2 x="251" y="201" id="1831" />
+<TGConnectingPoint num="0" id="1839" />
+<P1 x="357" y="165" id="1966" />
+<P2 x="251" y="201" id="1848" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1821" >
-<father id="1823" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1838" >
+<father id="1840" num="0" />
<cdparam x="220" y="174" />
<sizeparam width="99" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1817" />
-<TGConnectingPoint num="1" id="1818" />
-<TGConnectingPoint num="2" id="1819" />
-<TGConnectingPoint num="3" id="1820" />
+<TGConnectingPoint num="0" id="1834" />
+<TGConnectingPoint num="1" id="1835" />
+<TGConnectingPoint num="2" id="1836" />
+<TGConnectingPoint num="3" id="1837" />
<extraparam>
<guard value="[nbOfCoins > 0]" />
<afterMin value="" />
@@ -3538,25 +3572,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1830" >
+<CONNECTOR type="5102" id="1847" >
<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="1829" />
-<P1 x="370" y="64" id="1976" />
-<P2 x="370" y="135" id="1936" />
+<TGConnectingPoint num="0" id="1846" />
+<P1 x="370" y="64" id="1993" />
+<P2 x="370" y="135" id="1953" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1828" >
-<father id="1830" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1845" >
+<father id="1847" num="0" />
<cdparam x="376" y="105" />
<sizeparam width="173" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1824" />
-<TGConnectingPoint num="1" id="1825" />
-<TGConnectingPoint num="2" id="1826" />
-<TGConnectingPoint num="3" id="1827" />
+<TGConnectingPoint num="0" id="1841" />
+<TGConnectingPoint num="1" id="1842" />
+<TGConnectingPoint num="2" id="1843" />
+<TGConnectingPoint num="3" id="1844" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3567,224 +3601,224 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="1841" >
+<COMPONENT type="5103" id="1858" >
<cdparam x="214" y="206" />
<sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="putCoin(x)" />
-<TGConnectingPoint num="0" id="1831" />
-<TGConnectingPoint num="1" id="1832" />
-<TGConnectingPoint num="2" id="1833" />
-<TGConnectingPoint num="3" id="1834" />
-<TGConnectingPoint num="4" id="1835" />
-<TGConnectingPoint num="5" id="1836" />
-<TGConnectingPoint num="6" id="1837" />
-<TGConnectingPoint num="7" id="1838" />
-<TGConnectingPoint num="8" id="1839" />
-<TGConnectingPoint num="9" id="1840" />
+<TGConnectingPoint num="0" id="1848" />
+<TGConnectingPoint num="1" id="1849" />
+<TGConnectingPoint num="2" id="1850" />
+<TGConnectingPoint num="3" id="1851" />
+<TGConnectingPoint num="4" id="1852" />
+<TGConnectingPoint num="5" id="1853" />
+<TGConnectingPoint num="6" id="1854" />
+<TGConnectingPoint num="7" id="1855" />
+<TGConnectingPoint num="8" id="1856" />
+<TGConnectingPoint num="9" id="1857" />
</COMPONENT>
-<COMPONENT type="5104" id="1852" >
+<COMPONENT type="5104" id="1869" >
<cdparam x="444" y="194" />
<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="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="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" />
</COMPONENT>
-<COMPONENT type="5106" id="1893" >
+<COMPONENT type="5106" id="1910" >
<cdparam x="460" y="274" />
<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1853" />
-<TGConnectingPoint num="1" id="1854" />
-<TGConnectingPoint num="2" id="1855" />
-<TGConnectingPoint num="3" id="1856" />
-<TGConnectingPoint num="4" id="1857" />
-<TGConnectingPoint num="5" id="1858" />
-<TGConnectingPoint num="6" id="1859" />
-<TGConnectingPoint num="7" id="1860" />
-<TGConnectingPoint num="8" id="1861" />
-<TGConnectingPoint num="9" id="1862" />
-<TGConnectingPoint num="10" id="1863" />
-<TGConnectingPoint num="11" id="1864" />
-<TGConnectingPoint num="12" id="1865" />
-<TGConnectingPoint num="13" id="1866" />
-<TGConnectingPoint num="14" id="1867" />
-<TGConnectingPoint num="15" id="1868" />
-<TGConnectingPoint num="16" id="1869" />
-<TGConnectingPoint num="17" id="1870" />
-<TGConnectingPoint num="18" id="1871" />
-<TGConnectingPoint num="19" id="1872" />
-<TGConnectingPoint num="20" id="1873" />
-<TGConnectingPoint num="21" id="1874" />
-<TGConnectingPoint num="22" id="1875" />
-<TGConnectingPoint num="23" id="1876" />
-<TGConnectingPoint num="24" id="1877" />
-<TGConnectingPoint num="25" id="1878" />
-<TGConnectingPoint num="26" id="1879" />
-<TGConnectingPoint num="27" id="1880" />
-<TGConnectingPoint num="28" id="1881" />
-<TGConnectingPoint num="29" id="1882" />
-<TGConnectingPoint num="30" id="1883" />
-<TGConnectingPoint num="31" id="1884" />
-<TGConnectingPoint num="32" id="1885" />
-<TGConnectingPoint num="33" id="1886" />
-<TGConnectingPoint num="34" id="1887" />
-<TGConnectingPoint num="35" id="1888" />
-<TGConnectingPoint num="36" id="1889" />
-<TGConnectingPoint num="37" id="1890" />
-<TGConnectingPoint num="38" id="1891" />
-<TGConnectingPoint num="39" id="1892" />
+<TGConnectingPoint num="0" id="1870" />
+<TGConnectingPoint num="1" id="1871" />
+<TGConnectingPoint num="2" id="1872" />
+<TGConnectingPoint num="3" id="1873" />
+<TGConnectingPoint num="4" id="1874" />
+<TGConnectingPoint num="5" id="1875" />
+<TGConnectingPoint num="6" id="1876" />
+<TGConnectingPoint num="7" id="1877" />
+<TGConnectingPoint num="8" id="1878" />
+<TGConnectingPoint num="9" id="1879" />
+<TGConnectingPoint num="10" id="1880" />
+<TGConnectingPoint num="11" id="1881" />
+<TGConnectingPoint num="12" id="1882" />
+<TGConnectingPoint num="13" id="1883" />
+<TGConnectingPoint num="14" id="1884" />
+<TGConnectingPoint num="15" id="1885" />
+<TGConnectingPoint num="16" id="1886" />
+<TGConnectingPoint num="17" id="1887" />
+<TGConnectingPoint num="18" id="1888" />
+<TGConnectingPoint num="19" id="1889" />
+<TGConnectingPoint num="20" id="1890" />
+<TGConnectingPoint num="21" id="1891" />
+<TGConnectingPoint num="22" id="1892" />
+<TGConnectingPoint num="23" id="1893" />
+<TGConnectingPoint num="24" id="1894" />
+<TGConnectingPoint num="25" id="1895" />
+<TGConnectingPoint num="26" id="1896" />
+<TGConnectingPoint num="27" id="1897" />
+<TGConnectingPoint num="28" id="1898" />
+<TGConnectingPoint num="29" id="1899" />
+<TGConnectingPoint num="30" id="1900" />
+<TGConnectingPoint num="31" id="1901" />
+<TGConnectingPoint num="32" id="1902" />
+<TGConnectingPoint num="33" id="1903" />
+<TGConnectingPoint num="34" id="1904" />
+<TGConnectingPoint num="35" id="1905" />
+<TGConnectingPoint num="36" id="1906" />
+<TGConnectingPoint num="37" id="1907" />
+<TGConnectingPoint num="38" id="1908" />
+<TGConnectingPoint num="39" id="1909" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1934" >
+<COMPONENT type="5106" id="1951" >
<cdparam x="227" y="300" />
<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1894" />
-<TGConnectingPoint num="1" id="1895" />
-<TGConnectingPoint num="2" id="1896" />
-<TGConnectingPoint num="3" id="1897" />
-<TGConnectingPoint num="4" id="1898" />
-<TGConnectingPoint num="5" id="1899" />
-<TGConnectingPoint num="6" id="1900" />
-<TGConnectingPoint num="7" id="1901" />
-<TGConnectingPoint num="8" id="1902" />
-<TGConnectingPoint num="9" id="1903" />
-<TGConnectingPoint num="10" id="1904" />
-<TGConnectingPoint num="11" id="1905" />
-<TGConnectingPoint num="12" id="1906" />
-<TGConnectingPoint num="13" id="1907" />
-<TGConnectingPoint num="14" id="1908" />
-<TGConnectingPoint num="15" id="1909" />
-<TGConnectingPoint num="16" id="1910" />
-<TGConnectingPoint num="17" id="1911" />
-<TGConnectingPoint num="18" id="1912" />
-<TGConnectingPoint num="19" id="1913" />
-<TGConnectingPoint num="20" id="1914" />
-<TGConnectingPoint num="21" id="1915" />
-<TGConnectingPoint num="22" id="1916" />
-<TGConnectingPoint num="23" id="1917" />
-<TGConnectingPoint num="24" id="1918" />
-<TGConnectingPoint num="25" id="1919" />
-<TGConnectingPoint num="26" id="1920" />
-<TGConnectingPoint num="27" id="1921" />
-<TGConnectingPoint num="28" id="1922" />
-<TGConnectingPoint num="29" id="1923" />
-<TGConnectingPoint num="30" id="1924" />
-<TGConnectingPoint num="31" id="1925" />
-<TGConnectingPoint num="32" id="1926" />
-<TGConnectingPoint num="33" id="1927" />
-<TGConnectingPoint num="34" id="1928" />
-<TGConnectingPoint num="35" id="1929" />
-<TGConnectingPoint num="36" id="1930" />
-<TGConnectingPoint num="37" id="1931" />
-<TGConnectingPoint num="38" id="1932" />
-<TGConnectingPoint num="39" id="1933" />
+<TGConnectingPoint num="0" id="1911" />
+<TGConnectingPoint num="1" id="1912" />
+<TGConnectingPoint num="2" id="1913" />
+<TGConnectingPoint num="3" id="1914" />
+<TGConnectingPoint num="4" id="1915" />
+<TGConnectingPoint num="5" id="1916" />
+<TGConnectingPoint num="6" id="1917" />
+<TGConnectingPoint num="7" id="1918" />
+<TGConnectingPoint num="8" id="1919" />
+<TGConnectingPoint num="9" id="1920" />
+<TGConnectingPoint num="10" id="1921" />
+<TGConnectingPoint num="11" id="1922" />
+<TGConnectingPoint num="12" id="1923" />
+<TGConnectingPoint num="13" id="1924" />
+<TGConnectingPoint num="14" id="1925" />
+<TGConnectingPoint num="15" id="1926" />
+<TGConnectingPoint num="16" id="1927" />
+<TGConnectingPoint num="17" id="1928" />
+<TGConnectingPoint num="18" id="1929" />
+<TGConnectingPoint num="19" id="1930" />
+<TGConnectingPoint num="20" id="1931" />
+<TGConnectingPoint num="21" id="1932" />
+<TGConnectingPoint num="22" id="1933" />
+<TGConnectingPoint num="23" id="1934" />
+<TGConnectingPoint num="24" id="1935" />
+<TGConnectingPoint num="25" id="1936" />
+<TGConnectingPoint num="26" id="1937" />
+<TGConnectingPoint num="27" id="1938" />
+<TGConnectingPoint num="28" id="1939" />
+<TGConnectingPoint num="29" id="1940" />
+<TGConnectingPoint num="30" id="1941" />
+<TGConnectingPoint num="31" id="1942" />
+<TGConnectingPoint num="32" id="1943" />
+<TGConnectingPoint num="33" id="1944" />
+<TGConnectingPoint num="34" id="1945" />
+<TGConnectingPoint num="35" id="1946" />
+<TGConnectingPoint num="36" id="1947" />
+<TGConnectingPoint num="37" id="1948" />
+<TGConnectingPoint num="38" id="1949" />
+<TGConnectingPoint num="39" id="1950" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1975" >
+<COMPONENT type="5106" id="1992" >
<cdparam x="345" y="135" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1935" />
-<TGConnectingPoint num="1" id="1936" />
-<TGConnectingPoint num="2" id="1937" />
-<TGConnectingPoint num="3" id="1938" />
-<TGConnectingPoint num="4" id="1939" />
-<TGConnectingPoint num="5" id="1940" />
-<TGConnectingPoint num="6" id="1941" />
-<TGConnectingPoint num="7" id="1942" />
-<TGConnectingPoint num="8" id="1943" />
-<TGConnectingPoint num="9" id="1944" />
-<TGConnectingPoint num="10" id="1945" />
-<TGConnectingPoint num="11" id="1946" />
-<TGConnectingPoint num="12" id="1947" />
-<TGConnectingPoint num="13" id="1948" />
-<TGConnectingPoint num="14" id="1949" />
-<TGConnectingPoint num="15" id="1950" />
-<TGConnectingPoint num="16" id="1951" />
-<TGConnectingPoint num="17" id="1952" />
-<TGConnectingPoint num="18" id="1953" />
-<TGConnectingPoint num="19" id="1954" />
-<TGConnectingPoint num="20" id="1955" />
-<TGConnectingPoint num="21" id="1956" />
-<TGConnectingPoint num="22" id="1957" />
-<TGConnectingPoint num="23" id="1958" />
-<TGConnectingPoint num="24" id="1959" />
-<TGConnectingPoint num="25" id="1960" />
-<TGConnectingPoint num="26" id="1961" />
-<TGConnectingPoint num="27" id="1962" />
-<TGConnectingPoint num="28" id="1963" />
-<TGConnectingPoint num="29" id="1964" />
-<TGConnectingPoint num="30" id="1965" />
-<TGConnectingPoint num="31" id="1966" />
-<TGConnectingPoint num="32" id="1967" />
-<TGConnectingPoint num="33" id="1968" />
-<TGConnectingPoint num="34" id="1969" />
-<TGConnectingPoint num="35" id="1970" />
-<TGConnectingPoint num="36" id="1971" />
-<TGConnectingPoint num="37" id="1972" />
-<TGConnectingPoint num="38" id="1973" />
-<TGConnectingPoint num="39" id="1974" />
+<TGConnectingPoint num="0" id="1952" />
+<TGConnectingPoint num="1" id="1953" />
+<TGConnectingPoint num="2" id="1954" />
+<TGConnectingPoint num="3" id="1955" />
+<TGConnectingPoint num="4" id="1956" />
+<TGConnectingPoint num="5" id="1957" />
+<TGConnectingPoint num="6" id="1958" />
+<TGConnectingPoint num="7" id="1959" />
+<TGConnectingPoint num="8" id="1960" />
+<TGConnectingPoint num="9" id="1961" />
+<TGConnectingPoint num="10" id="1962" />
+<TGConnectingPoint num="11" id="1963" />
+<TGConnectingPoint num="12" id="1964" />
+<TGConnectingPoint num="13" id="1965" />
+<TGConnectingPoint num="14" id="1966" />
+<TGConnectingPoint num="15" id="1967" />
+<TGConnectingPoint num="16" id="1968" />
+<TGConnectingPoint num="17" id="1969" />
+<TGConnectingPoint num="18" id="1970" />
+<TGConnectingPoint num="19" id="1971" />
+<TGConnectingPoint num="20" id="1972" />
+<TGConnectingPoint num="21" id="1973" />
+<TGConnectingPoint num="22" id="1974" />
+<TGConnectingPoint num="23" id="1975" />
+<TGConnectingPoint num="24" id="1976" />
+<TGConnectingPoint num="25" id="1977" />
+<TGConnectingPoint num="26" id="1978" />
+<TGConnectingPoint num="27" id="1979" />
+<TGConnectingPoint num="28" id="1980" />
+<TGConnectingPoint num="29" id="1981" />
+<TGConnectingPoint num="30" id="1982" />
+<TGConnectingPoint num="31" id="1983" />
+<TGConnectingPoint num="32" id="1984" />
+<TGConnectingPoint num="33" id="1985" />
+<TGConnectingPoint num="34" id="1986" />
+<TGConnectingPoint num="35" id="1987" />
+<TGConnectingPoint num="36" id="1988" />
+<TGConnectingPoint num="37" id="1989" />
+<TGConnectingPoint num="38" id="1990" />
+<TGConnectingPoint num="39" id="1991" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1977" >
+<COMPONENT type="5100" id="1994" >
<cdparam x="363" y="44" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1976" />
+<TGConnectingPoint num="0" id="1993" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="1984" >
+<CONNECTOR type="5102" id="2001" >
<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="1983" />
-<P1 x="699" y="289" id="2189" />
-<P2 x="699" y="316" id="2161" />
+<TGConnectingPoint num="0" id="2000" />
+<P1 x="699" y="289" id="2206" />
+<P2 x="699" y="316" id="2178" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1982" >
-<father id="1984" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1999" >
+<father id="2001" num="0" />
<cdparam x="691" y="328" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1978" />
-<TGConnectingPoint num="1" id="1979" />
-<TGConnectingPoint num="2" id="1980" />
-<TGConnectingPoint num="3" id="1981" />
+<TGConnectingPoint num="0" id="1995" />
+<TGConnectingPoint num="1" id="1996" />
+<TGConnectingPoint num="2" id="1997" />
+<TGConnectingPoint num="3" id="1998" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3794,25 +3828,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1991" >
+<CONNECTOR type="5102" id="2008" >
<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="1990" />
-<P1 x="433" y="526" id="2088" />
-<P2 x="323" y="748" id="2317" />
+<TGConnectingPoint num="0" id="2007" />
+<P1 x="433" y="526" id="2105" />
+<P2 x="323" y="748" id="2334" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1989" >
-<father id="1991" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2006" >
+<father id="2008" num="0" />
<cdparam x="420" y="552" />
<sizeparam width="89" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1985" />
-<TGConnectingPoint num="1" id="1986" />
-<TGConnectingPoint num="2" id="1987" />
-<TGConnectingPoint num="3" id="1988" />
+<TGConnectingPoint num="0" id="2002" />
+<TGConnectingPoint num="1" id="2003" />
+<TGConnectingPoint num="2" id="2004" />
+<TGConnectingPoint num="3" id="2005" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3823,25 +3857,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1998" >
+<CONNECTOR type="5102" id="2015" >
<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="1997" />
-<P1 x="317" y="456" id="2113" />
-<P2 x="433" y="496" id="2087" />
+<TGConnectingPoint num="0" id="2014" />
+<P1 x="317" y="456" id="2130" />
+<P2 x="433" y="496" id="2104" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1996" >
-<father id="1998" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2013" >
+<father id="2015" num="0" />
<cdparam x="395" y="448" />
<sizeparam width="104" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1992" />
-<TGConnectingPoint num="1" id="1993" />
-<TGConnectingPoint num="2" id="1994" />
-<TGConnectingPoint num="3" id="1995" />
+<TGConnectingPoint num="0" id="2009" />
+<TGConnectingPoint num="1" id="2010" />
+<TGConnectingPoint num="2" id="2011" />
+<TGConnectingPoint num="3" id="2012" />
<extraparam>
<guard value="[ ]" />
<afterMin value="coinDelay" />
@@ -3851,25 +3885,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2005" >
+<CONNECTOR type="5102" id="2022" >
<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="2004" />
-<P1 x="289" y="553" id="2099" />
-<P2 x="289" y="748" id="2309" />
+<TGConnectingPoint num="0" id="2021" />
+<P1 x="289" y="553" id="2116" />
+<P2 x="289" y="748" id="2326" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2003" >
-<father id="2005" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2020" >
+<father id="2022" num="0" />
<cdparam x="284" y="594" />
<sizeparam width="248" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1999" />
-<TGConnectingPoint num="1" id="2000" />
-<TGConnectingPoint num="2" id="2001" />
-<TGConnectingPoint num="3" id="2002" />
+<TGConnectingPoint num="0" id="2016" />
+<TGConnectingPoint num="1" id="2017" />
+<TGConnectingPoint num="2" id="2018" />
+<TGConnectingPoint num="3" id="2019" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3881,25 +3915,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2012" >
+<CONNECTOR type="5102" id="2029" >
<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="2011" />
-<P1 x="284" y="476" id="2124" />
-<P2 x="289" y="523" id="2098" />
+<TGConnectingPoint num="0" id="2028" />
+<P1 x="284" y="476" id="2141" />
+<P2 x="289" y="523" id="2115" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2010" >
-<father id="2012" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2027" >
+<father id="2029" num="0" />
<cdparam x="295" y="505" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2006" />
-<TGConnectingPoint num="1" id="2007" />
-<TGConnectingPoint num="2" id="2008" />
-<TGConnectingPoint num="3" id="2009" />
+<TGConnectingPoint num="0" id="2023" />
+<TGConnectingPoint num="1" id="2024" />
+<TGConnectingPoint num="2" id="2025" />
+<TGConnectingPoint num="3" id="2026" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3909,25 +3943,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2019" >
+<CONNECTOR type="5102" id="2036" >
<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="2018" />
-<P1 x="117" y="553" id="2077" />
-<P2 x="255" y="748" id="2316" />
+<TGConnectingPoint num="0" id="2035" />
+<P1 x="117" y="553" id="2094" />
+<P2 x="255" y="748" id="2333" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2017" >
-<father id="2019" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2034" >
+<father id="2036" num="0" />
<cdparam x="32" y="587" />
<sizeparam width="284" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2013" />
-<TGConnectingPoint num="1" id="2014" />
-<TGConnectingPoint num="2" id="2015" />
-<TGConnectingPoint num="3" id="2016" />
+<TGConnectingPoint num="0" id="2030" />
+<TGConnectingPoint num="1" id="2031" />
+<TGConnectingPoint num="2" id="2032" />
+<TGConnectingPoint num="3" id="2033" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3939,25 +3973,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2026" >
+<CONNECTOR type="5102" id="2043" >
<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="2025" />
-<P1 x="218" y="476" id="2123" />
-<P2 x="117" y="523" id="2076" />
+<TGConnectingPoint num="0" id="2042" />
+<P1 x="218" y="476" id="2140" />
+<P2 x="117" y="523" id="2093" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2024" >
-<father id="2026" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2041" >
+<father id="2043" num="0" />
<cdparam x="229" y="505" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2020" />
-<TGConnectingPoint num="1" id="2021" />
-<TGConnectingPoint num="2" id="2022" />
-<TGConnectingPoint num="3" id="2023" />
+<TGConnectingPoint num="0" id="2037" />
+<TGConnectingPoint num="1" id="2038" />
+<TGConnectingPoint num="2" id="2039" />
+<TGConnectingPoint num="3" id="2040" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3967,25 +4001,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2033" >
+<CONNECTOR type="5102" id="2050" >
<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="2032" />
-<P1 x="699" y="346" id="2162" />
-<P2 x="699" y="381" id="2350" />
+<TGConnectingPoint num="0" id="2049" />
+<P1 x="699" y="346" id="2179" />
+<P2 x="699" y="381" id="2367" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2031" >
-<father id="2033" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2048" >
+<father id="2050" num="0" />
<cdparam x="707" y="368" />
<sizeparam width="89" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2027" />
-<TGConnectingPoint num="1" id="2028" />
-<TGConnectingPoint num="2" id="2029" />
-<TGConnectingPoint num="3" id="2030" />
+<TGConnectingPoint num="0" id="2044" />
+<TGConnectingPoint num="1" id="2045" />
+<TGConnectingPoint num="2" id="2046" />
+<TGConnectingPoint num="3" id="2047" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -3996,25 +4030,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2040" >
+<CONNECTOR type="5102" id="2057" >
<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="2039" />
-<P1 x="388" y="208" id="2228" />
-<P2 x="649" y="264" id="2186" />
+<TGConnectingPoint num="0" id="2056" />
+<P1 x="388" y="208" id="2245" />
+<P2 x="649" y="264" id="2203" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2038" >
-<father id="2040" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2055" >
+<father id="2057" num="0" />
<cdparam x="411" y="206" />
<sizeparam width="104" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2034" />
-<TGConnectingPoint num="1" id="2035" />
-<TGConnectingPoint num="2" id="2036" />
-<TGConnectingPoint num="3" id="2037" />
+<TGConnectingPoint num="0" id="2051" />
+<TGConnectingPoint num="1" id="2052" />
+<TGConnectingPoint num="2" id="2053" />
+<TGConnectingPoint num="3" id="2054" />
<extraparam>
<guard value="[ ]" />
<afterMin value="coinDelay" />
@@ -4024,25 +4058,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2047" >
+<CONNECTOR type="5102" id="2064" >
<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="2046" />
-<P1 x="277" y="305" id="2173" />
-<P2 x="251" y="436" id="2110" />
+<TGConnectingPoint num="0" id="2063" />
+<P1 x="277" y="305" id="2190" />
+<P2 x="251" y="436" id="2127" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2045" >
-<father id="2047" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2062" >
+<father id="2064" num="0" />
<cdparam x="243" y="359" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2041" />
-<TGConnectingPoint num="1" id="2042" />
-<TGConnectingPoint num="2" id="2043" />
-<TGConnectingPoint num="3" id="2044" />
+<TGConnectingPoint num="0" id="2058" />
+<TGConnectingPoint num="1" id="2059" />
+<TGConnectingPoint num="2" id="2060" />
+<TGConnectingPoint num="3" id="2061" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4052,25 +4086,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2054" >
+<CONNECTOR type="5102" id="2071" >
<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="2053" />
-<P1 x="270" y="228" id="2238" />
-<P2 x="277" y="275" id="2172" />
+<TGConnectingPoint num="0" id="2070" />
+<P1 x="270" y="228" id="2255" />
+<P2 x="277" y="275" id="2189" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2052" >
-<father id="2054" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2069" >
+<father id="2071" num="0" />
<cdparam x="270" y="264" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2048" />
-<TGConnectingPoint num="1" id="2049" />
-<TGConnectingPoint num="2" id="2050" />
-<TGConnectingPoint num="3" id="2051" />
+<TGConnectingPoint num="0" id="2065" />
+<TGConnectingPoint num="1" id="2066" />
+<TGConnectingPoint num="2" id="2067" />
+<TGConnectingPoint num="3" id="2068" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4080,25 +4114,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2061" >
+<CONNECTOR type="5102" id="2078" >
<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="2060" />
-<P1 x="306" y="166" id="2151" />
-<P2 x="309" y="188" id="2225" />
+<TGConnectingPoint num="0" id="2077" />
+<P1 x="306" y="166" id="2168" />
+<P2 x="309" y="188" id="2242" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2059" >
-<father id="2061" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2076" >
+<father id="2078" num="0" />
<cdparam x="328" y="178" />
<sizeparam width="168" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2055" />
-<TGConnectingPoint num="1" id="2056" />
-<TGConnectingPoint num="2" id="2057" />
-<TGConnectingPoint num="3" id="2058" />
+<TGConnectingPoint num="0" id="2072" />
+<TGConnectingPoint num="1" id="2073" />
+<TGConnectingPoint num="2" id="2074" />
+<TGConnectingPoint num="3" id="2075" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4109,25 +4143,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2068" >
+<CONNECTOR type="5102" id="2085" >
<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="2067" />
-<P1 x="303" y="103" id="2273" />
-<P2 x="306" y="136" id="2150" />
+<TGConnectingPoint num="0" id="2084" />
+<P1 x="303" y="103" id="2290" />
+<P2 x="306" y="136" id="2167" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2066" >
-<father id="2068" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2083" >
+<father id="2085" num="0" />
<cdparam x="303" y="143" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2062" />
-<TGConnectingPoint num="1" id="2063" />
-<TGConnectingPoint num="2" id="2064" />
-<TGConnectingPoint num="3" id="2065" />
+<TGConnectingPoint num="0" id="2079" />
+<TGConnectingPoint num="1" id="2080" />
+<TGConnectingPoint num="2" id="2081" />
+<TGConnectingPoint num="3" id="2082" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4137,25 +4171,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2075" >
+<CONNECTOR type="5102" id="2092" >
<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="2074" />
-<P1 x="303" y="40" id="2265" />
-<P2 x="303" y="63" id="2268" />
+<TGConnectingPoint num="0" id="2091" />
+<P1 x="303" y="40" id="2282" />
+<P2 x="303" y="63" id="2285" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2073" >
-<father id="2075" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2090" >
+<father id="2092" num="0" />
<cdparam x="303" y="80" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2069" />
-<TGConnectingPoint num="1" id="2070" />
-<TGConnectingPoint num="2" id="2071" />
-<TGConnectingPoint num="3" id="2072" />
+<TGConnectingPoint num="0" id="2086" />
+<TGConnectingPoint num="1" id="2087" />
+<TGConnectingPoint num="2" id="2088" />
+<TGConnectingPoint num="3" id="2089" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4165,423 +4199,423 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5104" id="2086" >
+<COMPONENT type="5104" id="2103" >
<cdparam x="47" y="528" />
<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="2076" />
-<TGConnectingPoint num="1" id="2077" />
-<TGConnectingPoint num="2" id="2078" />
-<TGConnectingPoint num="3" id="2079" />
-<TGConnectingPoint num="4" id="2080" />
-<TGConnectingPoint num="5" id="2081" />
-<TGConnectingPoint num="6" id="2082" />
-<TGConnectingPoint num="7" id="2083" />
-<TGConnectingPoint num="8" id="2084" />
-<TGConnectingPoint num="9" id="2085" />
+<TGConnectingPoint num="0" id="2093" />
+<TGConnectingPoint num="1" id="2094" />
+<TGConnectingPoint num="2" id="2095" />
+<TGConnectingPoint num="3" id="2096" />
+<TGConnectingPoint num="4" id="2097" />
+<TGConnectingPoint num="5" id="2098" />
+<TGConnectingPoint num="6" id="2099" />
+<TGConnectingPoint num="7" id="2100" />
+<TGConnectingPoint num="8" id="2101" />
+<TGConnectingPoint num="9" id="2102" />
<accessibility />
</COMPONENT>
-<COMPONENT type="5103" id="2097" >
+<COMPONENT type="5103" id="2114" >
<cdparam x="363" y="501" />
<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="2087" />
-<TGConnectingPoint num="1" id="2088" />
-<TGConnectingPoint num="2" id="2089" />
-<TGConnectingPoint num="3" id="2090" />
-<TGConnectingPoint num="4" id="2091" />
-<TGConnectingPoint num="5" id="2092" />
-<TGConnectingPoint num="6" id="2093" />
-<TGConnectingPoint num="7" id="2094" />
-<TGConnectingPoint num="8" id="2095" />
-<TGConnectingPoint num="9" id="2096" />
+<TGConnectingPoint num="0" id="2104" />
+<TGConnectingPoint num="1" id="2105" />
+<TGConnectingPoint num="2" id="2106" />
+<TGConnectingPoint num="3" id="2107" />
+<TGConnectingPoint num="4" id="2108" />
+<TGConnectingPoint num="5" id="2109" />
+<TGConnectingPoint num="6" id="2110" />
+<TGConnectingPoint num="7" id="2111" />
+<TGConnectingPoint num="8" id="2112" />
+<TGConnectingPoint num="9" id="2113" />
<accessibility />
</COMPONENT>
-<COMPONENT type="5104" id="2108" >
+<COMPONENT type="5104" id="2125" >
<cdparam x="227" y="528" />
<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="2098" />
-<TGConnectingPoint num="1" id="2099" />
-<TGConnectingPoint num="2" id="2100" />
-<TGConnectingPoint num="3" id="2101" />
-<TGConnectingPoint num="4" id="2102" />
-<TGConnectingPoint num="5" id="2103" />
-<TGConnectingPoint num="6" id="2104" />
-<TGConnectingPoint num="7" id="2105" />
-<TGConnectingPoint num="8" id="2106" />
-<TGConnectingPoint num="9" id="2107" />
+<TGConnectingPoint num="0" id="2115" />
+<TGConnectingPoint num="1" id="2116" />
+<TGConnectingPoint num="2" id="2117" />
+<TGConnectingPoint num="3" id="2118" />
+<TGConnectingPoint num="4" id="2119" />
+<TGConnectingPoint num="5" id="2120" />
+<TGConnectingPoint num="6" id="2121" />
+<TGConnectingPoint num="7" id="2122" />
+<TGConnectingPoint num="8" id="2123" />
+<TGConnectingPoint num="9" id="2124" />
<accessibility />
</COMPONENT>
-<COMPONENT type="5106" id="2149" >
+<COMPONENT type="5106" id="2166" >
<cdparam x="185" y="436" />
<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="2109" />
-<TGConnectingPoint num="1" id="2110" />
-<TGConnectingPoint num="2" id="2111" />
-<TGConnectingPoint num="3" id="2112" />
-<TGConnectingPoint num="4" id="2113" />
-<TGConnectingPoint num="5" id="2114" />
-<TGConnectingPoint num="6" id="2115" />
-<TGConnectingPoint num="7" id="2116" />
-<TGConnectingPoint num="8" id="2117" />
-<TGConnectingPoint num="9" id="2118" />
-<TGConnectingPoint num="10" id="2119" />
-<TGConnectingPoint num="11" id="2120" />
-<TGConnectingPoint num="12" id="2121" />
-<TGConnectingPoint num="13" id="2122" />
-<TGConnectingPoint num="14" id="2123" />
-<TGConnectingPoint num="15" id="2124" />
-<TGConnectingPoint num="16" id="2125" />
-<TGConnectingPoint num="17" id="2126" />
-<TGConnectingPoint num="18" id="2127" />
-<TGConnectingPoint num="19" id="2128" />
-<TGConnectingPoint num="20" id="2129" />
-<TGConnectingPoint num="21" id="2130" />
-<TGConnectingPoint num="22" id="2131" />
-<TGConnectingPoint num="23" id="2132" />
-<TGConnectingPoint num="24" id="2133" />
-<TGConnectingPoint num="25" id="2134" />
-<TGConnectingPoint num="26" id="2135" />
-<TGConnectingPoint num="27" id="2136" />
-<TGConnectingPoint num="28" id="2137" />
-<TGConnectingPoint num="29" id="2138" />
-<TGConnectingPoint num="30" id="2139" />
-<TGConnectingPoint num="31" id="2140" />
-<TGConnectingPoint num="32" id="2141" />
-<TGConnectingPoint num="33" id="2142" />
-<TGConnectingPoint num="34" id="2143" />
-<TGConnectingPoint num="35" id="2144" />
-<TGConnectingPoint num="36" id="2145" />
-<TGConnectingPoint num="37" id="2146" />
-<TGConnectingPoint num="38" id="2147" />
-<TGConnectingPoint num="39" id="2148" />
+<TGConnectingPoint num="0" id="2126" />
+<TGConnectingPoint num="1" id="2127" />
+<TGConnectingPoint num="2" id="2128" />
+<TGConnectingPoint num="3" id="2129" />
+<TGConnectingPoint num="4" id="2130" />
+<TGConnectingPoint num="5" id="2131" />
+<TGConnectingPoint num="6" id="2132" />
+<TGConnectingPoint num="7" id="2133" />
+<TGConnectingPoint num="8" id="2134" />
+<TGConnectingPoint num="9" id="2135" />
+<TGConnectingPoint num="10" id="2136" />
+<TGConnectingPoint num="11" id="2137" />
+<TGConnectingPoint num="12" id="2138" />
+<TGConnectingPoint num="13" id="2139" />
+<TGConnectingPoint num="14" id="2140" />
+<TGConnectingPoint num="15" id="2141" />
+<TGConnectingPoint num="16" id="2142" />
+<TGConnectingPoint num="17" id="2143" />
+<TGConnectingPoint num="18" id="2144" />
+<TGConnectingPoint num="19" id="2145" />
+<TGConnectingPoint num="20" id="2146" />
+<TGConnectingPoint num="21" id="2147" />
+<TGConnectingPoint num="22" id="2148" />
+<TGConnectingPoint num="23" id="2149" />
+<TGConnectingPoint num="24" id="2150" />
+<TGConnectingPoint num="25" id="2151" />
+<TGConnectingPoint num="26" id="2152" />
+<TGConnectingPoint num="27" id="2153" />
+<TGConnectingPoint num="28" id="2154" />
+<TGConnectingPoint num="29" id="2155" />
+<TGConnectingPoint num="30" id="2156" />
+<TGConnectingPoint num="31" id="2157" />
+<TGConnectingPoint num="32" id="2158" />
+<TGConnectingPoint num="33" id="2159" />
+<TGConnectingPoint num="34" id="2160" />
+<TGConnectingPoint num="35" id="2161" />
+<TGConnectingPoint num="36" id="2162" />
+<TGConnectingPoint num="37" id="2163" />
+<TGConnectingPoint num="38" id="2164" />
+<TGConnectingPoint num="39" id="2165" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5104" id="2160" >
+<COMPONENT type="5104" id="2177" >
<cdparam x="265" y="141" />
<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="2150" />
-<TGConnectingPoint num="1" id="2151" />
-<TGConnectingPoint num="2" id="2152" />
-<TGConnectingPoint num="3" id="2153" />
-<TGConnectingPoint num="4" id="2154" />
-<TGConnectingPoint num="5" id="2155" />
-<TGConnectingPoint num="6" id="2156" />
-<TGConnectingPoint num="7" id="2157" />
-<TGConnectingPoint num="8" id="2158" />
-<TGConnectingPoint num="9" id="2159" />
+<TGConnectingPoint num="0" id="2167" />
+<TGConnectingPoint num="1" id="2168" />
+<TGConnectingPoint num="2" id="2169" />
+<TGConnectingPoint num="3" id="2170" />
+<TGConnectingPoint num="4" id="2171" />
+<TGConnectingPoint num="5" id="2172" />
+<TGConnectingPoint num="6" id="2173" />
+<TGConnectingPoint num="7" id="2174" />
+<TGConnectingPoint num="8" id="2175" />
+<TGConnectingPoint num="9" id="2176" />
</COMPONENT>
-<COMPONENT type="5103" id="2171" >
+<COMPONENT type="5103" id="2188" >
<cdparam x="629" y="321" />
<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="2161" />
-<TGConnectingPoint num="1" id="2162" />
-<TGConnectingPoint num="2" id="2163" />
-<TGConnectingPoint num="3" id="2164" />
-<TGConnectingPoint num="4" id="2165" />
-<TGConnectingPoint num="5" id="2166" />
-<TGConnectingPoint num="6" id="2167" />
-<TGConnectingPoint num="7" id="2168" />
-<TGConnectingPoint num="8" id="2169" />
-<TGConnectingPoint num="9" id="2170" />
+<TGConnectingPoint num="0" id="2178" />
+<TGConnectingPoint num="1" id="2179" />
+<TGConnectingPoint num="2" id="2180" />
+<TGConnectingPoint num="3" id="2181" />
+<TGConnectingPoint num="4" id="2182" />
+<TGConnectingPoint num="5" id="2183" />
+<TGConnectingPoint num="6" id="2184" />
+<TGConnectingPoint num="7" id="2185" />
+<TGConnectingPoint num="8" id="2186" />
+<TGConnectingPoint num="9" id="2187" />
</COMPONENT>
-<COMPONENT type="5104" id="2182" >
+<COMPONENT type="5104" id="2199" >
<cdparam x="236" y="280" />
<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="2172" />
-<TGConnectingPoint num="1" id="2173" />
-<TGConnectingPoint num="2" id="2174" />
-<TGConnectingPoint num="3" id="2175" />
-<TGConnectingPoint num="4" id="2176" />
-<TGConnectingPoint num="5" id="2177" />
-<TGConnectingPoint num="6" id="2178" />
-<TGConnectingPoint num="7" id="2179" />
-<TGConnectingPoint num="8" id="2180" />
-<TGConnectingPoint num="9" id="2181" />
+<TGConnectingPoint num="0" id="2189" />
+<TGConnectingPoint num="1" id="2190" />
+<TGConnectingPoint num="2" id="2191" />
+<TGConnectingPoint num="3" id="2192" />
+<TGConnectingPoint num="4" id="2193" />
+<TGConnectingPoint num="5" id="2194" />
+<TGConnectingPoint num="6" id="2195" />
+<TGConnectingPoint num="7" id="2196" />
+<TGConnectingPoint num="8" id="2197" />
+<TGConnectingPoint num="9" id="2198" />
<accessibility />
</COMPONENT>
-<COMPONENT type="5106" id="2223" >
+<COMPONENT type="5106" id="2240" >
<cdparam x="649" y="239" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="ejectState" />
-<TGConnectingPoint num="0" id="2183" />
-<TGConnectingPoint num="1" id="2184" />
-<TGConnectingPoint num="2" id="2185" />
-<TGConnectingPoint num="3" id="2186" />
-<TGConnectingPoint num="4" id="2187" />
-<TGConnectingPoint num="5" id="2188" />
-<TGConnectingPoint num="6" id="2189" />
-<TGConnectingPoint num="7" id="2190" />
-<TGConnectingPoint num="8" id="2191" />
-<TGConnectingPoint num="9" id="2192" />
-<TGConnectingPoint num="10" id="2193" />
-<TGConnectingPoint num="11" id="2194" />
-<TGConnectingPoint num="12" id="2195" />
-<TGConnectingPoint num="13" id="2196" />
-<TGConnectingPoint num="14" id="2197" />
-<TGConnectingPoint num="15" id="2198" />
-<TGConnectingPoint num="16" id="2199" />
-<TGConnectingPoint num="17" id="2200" />
-<TGConnectingPoint num="18" id="2201" />
-<TGConnectingPoint num="19" id="2202" />
-<TGConnectingPoint num="20" id="2203" />
-<TGConnectingPoint num="21" id="2204" />
-<TGConnectingPoint num="22" id="2205" />
-<TGConnectingPoint num="23" id="2206" />
-<TGConnectingPoint num="24" id="2207" />
-<TGConnectingPoint num="25" id="2208" />
-<TGConnectingPoint num="26" id="2209" />
-<TGConnectingPoint num="27" id="2210" />
-<TGConnectingPoint num="28" id="2211" />
-<TGConnectingPoint num="29" id="2212" />
-<TGConnectingPoint num="30" id="2213" />
-<TGConnectingPoint num="31" id="2214" />
-<TGConnectingPoint num="32" id="2215" />
-<TGConnectingPoint num="33" id="2216" />
-<TGConnectingPoint num="34" id="2217" />
-<TGConnectingPoint num="35" id="2218" />
-<TGConnectingPoint num="36" id="2219" />
-<TGConnectingPoint num="37" id="2220" />
-<TGConnectingPoint num="38" id="2221" />
-<TGConnectingPoint num="39" id="2222" />
+<TGConnectingPoint num="0" id="2200" />
+<TGConnectingPoint num="1" id="2201" />
+<TGConnectingPoint num="2" id="2202" />
+<TGConnectingPoint num="3" id="2203" />
+<TGConnectingPoint num="4" id="2204" />
+<TGConnectingPoint num="5" id="2205" />
+<TGConnectingPoint num="6" id="2206" />
+<TGConnectingPoint num="7" id="2207" />
+<TGConnectingPoint num="8" id="2208" />
+<TGConnectingPoint num="9" id="2209" />
+<TGConnectingPoint num="10" id="2210" />
+<TGConnectingPoint num="11" id="2211" />
+<TGConnectingPoint num="12" id="2212" />
+<TGConnectingPoint num="13" id="2213" />
+<TGConnectingPoint num="14" id="2214" />
+<TGConnectingPoint num="15" id="2215" />
+<TGConnectingPoint num="16" id="2216" />
+<TGConnectingPoint num="17" id="2217" />
+<TGConnectingPoint num="18" id="2218" />
+<TGConnectingPoint num="19" id="2219" />
+<TGConnectingPoint num="20" id="2220" />
+<TGConnectingPoint num="21" id="2221" />
+<TGConnectingPoint num="22" id="2222" />
+<TGConnectingPoint num="23" id="2223" />
+<TGConnectingPoint num="24" id="2224" />
+<TGConnectingPoint num="25" id="2225" />
+<TGConnectingPoint num="26" id="2226" />
+<TGConnectingPoint num="27" id="2227" />
+<TGConnectingPoint num="28" id="2228" />
+<TGConnectingPoint num="29" id="2229" />
+<TGConnectingPoint num="30" id="2230" />
+<TGConnectingPoint num="31" id="2231" />
+<TGConnectingPoint num="32" id="2232" />
+<TGConnectingPoint num="33" id="2233" />
+<TGConnectingPoint num="34" id="2234" />
+<TGConnectingPoint num="35" id="2235" />
+<TGConnectingPoint num="36" id="2236" />
+<TGConnectingPoint num="37" id="2237" />
+<TGConnectingPoint num="38" id="2238" />
+<TGConnectingPoint num="39" id="2239" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2264" >
+<COMPONENT type="5106" id="2281" >
<cdparam x="231" y="188" />
<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="2224" />
-<TGConnectingPoint num="1" id="2225" />
-<TGConnectingPoint num="2" id="2226" />
-<TGConnectingPoint num="3" id="2227" />
-<TGConnectingPoint num="4" id="2228" />
-<TGConnectingPoint num="5" id="2229" />
-<TGConnectingPoint num="6" id="2230" />
-<TGConnectingPoint num="7" id="2231" />
-<TGConnectingPoint num="8" id="2232" />
-<TGConnectingPoint num="9" id="2233" />
-<TGConnectingPoint num="10" id="2234" />
-<TGConnectingPoint num="11" id="2235" />
-<TGConnectingPoint num="12" id="2236" />
-<TGConnectingPoint num="13" id="2237" />
-<TGConnectingPoint num="14" id="2238" />
-<TGConnectingPoint num="15" id="2239" />
-<TGConnectingPoint num="16" id="2240" />
-<TGConnectingPoint num="17" id="2241" />
-<TGConnectingPoint num="18" id="2242" />
-<TGConnectingPoint num="19" id="2243" />
-<TGConnectingPoint num="20" id="2244" />
-<TGConnectingPoint num="21" id="2245" />
-<TGConnectingPoint num="22" id="2246" />
-<TGConnectingPoint num="23" id="2247" />
-<TGConnectingPoint num="24" id="2248" />
-<TGConnectingPoint num="25" id="2249" />
-<TGConnectingPoint num="26" id="2250" />
-<TGConnectingPoint num="27" id="2251" />
-<TGConnectingPoint num="28" id="2252" />
-<TGConnectingPoint num="29" id="2253" />
-<TGConnectingPoint num="30" id="2254" />
-<TGConnectingPoint num="31" id="2255" />
-<TGConnectingPoint num="32" id="2256" />
-<TGConnectingPoint num="33" id="2257" />
-<TGConnectingPoint num="34" id="2258" />
-<TGConnectingPoint num="35" id="2259" />
-<TGConnectingPoint num="36" id="2260" />
-<TGConnectingPoint num="37" id="2261" />
-<TGConnectingPoint num="38" id="2262" />
-<TGConnectingPoint num="39" id="2263" />
+<TGConnectingPoint num="0" id="2241" />
+<TGConnectingPoint num="1" id="2242" />
+<TGConnectingPoint num="2" id="2243" />
+<TGConnectingPoint num="3" id="2244" />
+<TGConnectingPoint num="4" id="2245" />
+<TGConnectingPoint num="5" id="2246" />
+<TGConnectingPoint num="6" id="2247" />
+<TGConnectingPoint num="7" id="2248" />
+<TGConnectingPoint num="8" id="2249" />
+<TGConnectingPoint num="9" id="2250" />
+<TGConnectingPoint num="10" id="2251" />
+<TGConnectingPoint num="11" id="2252" />
+<TGConnectingPoint num="12" id="2253" />
+<TGConnectingPoint num="13" id="2254" />
+<TGConnectingPoint num="14" id="2255" />
+<TGConnectingPoint num="15" id="2256" />
+<TGConnectingPoint num="16" id="2257" />
+<TGConnectingPoint num="17" id="2258" />
+<TGConnectingPoint num="18" id="2259" />
+<TGConnectingPoint num="19" id="2260" />
+<TGConnectingPoint num="20" id="2261" />
+<TGConnectingPoint num="21" id="2262" />
+<TGConnectingPoint num="22" id="2263" />
+<TGConnectingPoint num="23" id="2264" />
+<TGConnectingPoint num="24" id="2265" />
+<TGConnectingPoint num="25" id="2266" />
+<TGConnectingPoint num="26" id="2267" />
+<TGConnectingPoint num="27" id="2268" />
+<TGConnectingPoint num="28" id="2269" />
+<TGConnectingPoint num="29" id="2270" />
+<TGConnectingPoint num="30" id="2271" />
+<TGConnectingPoint num="31" id="2272" />
+<TGConnectingPoint num="32" id="2273" />
+<TGConnectingPoint num="33" id="2274" />
+<TGConnectingPoint num="34" id="2275" />
+<TGConnectingPoint num="35" id="2276" />
+<TGConnectingPoint num="36" id="2277" />
+<TGConnectingPoint num="37" id="2278" />
+<TGConnectingPoint num="38" id="2279" />
+<TGConnectingPoint num="39" id="2280" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="2266" >
+<COMPONENT type="5100" id="2283" >
<cdparam x="296" y="20" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2265" />
+<TGConnectingPoint num="0" id="2282" />
</COMPONENT>
-<COMPONENT type="5106" id="2307" >
+<COMPONENT type="5106" id="2324" >
<cdparam x="235" y="63" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="2267" />
-<TGConnectingPoint num="1" id="2268" />
-<TGConnectingPoint num="2" id="2269" />
-<TGConnectingPoint num="3" id="2270" />
-<TGConnectingPoint num="4" id="2271" />
-<TGConnectingPoint num="5" id="2272" />
-<TGConnectingPoint num="6" id="2273" />
-<TGConnectingPoint num="7" id="2274" />
-<TGConnectingPoint num="8" id="2275" />
-<TGConnectingPoint num="9" id="2276" />
-<TGConnectingPoint num="10" id="2277" />
-<TGConnectingPoint num="11" id="2278" />
-<TGConnectingPoint num="12" id="2279" />
-<TGConnectingPoint num="13" id="2280" />
-<TGConnectingPoint num="14" id="2281" />
-<TGConnectingPoint num="15" id="2282" />
-<TGConnectingPoint num="16" id="2283" />
-<TGConnectingPoint num="17" id="2284" />
-<TGConnectingPoint num="18" id="2285" />
-<TGConnectingPoint num="19" id="2286" />
-<TGConnectingPoint num="20" id="2287" />
-<TGConnectingPoint num="21" id="2288" />
-<TGConnectingPoint num="22" id="2289" />
-<TGConnectingPoint num="23" id="2290" />
-<TGConnectingPoint num="24" id="2291" />
-<TGConnectingPoint num="25" id="2292" />
-<TGConnectingPoint num="26" id="2293" />
-<TGConnectingPoint num="27" id="2294" />
-<TGConnectingPoint num="28" id="2295" />
-<TGConnectingPoint num="29" id="2296" />
-<TGConnectingPoint num="30" id="2297" />
-<TGConnectingPoint num="31" id="2298" />
-<TGConnectingPoint num="32" id="2299" />
-<TGConnectingPoint num="33" id="2300" />
-<TGConnectingPoint num="34" id="2301" />
-<TGConnectingPoint num="35" id="2302" />
-<TGConnectingPoint num="36" id="2303" />
-<TGConnectingPoint num="37" id="2304" />
-<TGConnectingPoint num="38" id="2305" />
-<TGConnectingPoint num="39" id="2306" />
+<TGConnectingPoint num="0" id="2284" />
+<TGConnectingPoint num="1" id="2285" />
+<TGConnectingPoint num="2" id="2286" />
+<TGConnectingPoint num="3" id="2287" />
+<TGConnectingPoint num="4" id="2288" />
+<TGConnectingPoint num="5" id="2289" />
+<TGConnectingPoint num="6" id="2290" />
+<TGConnectingPoint num="7" id="2291" />
+<TGConnectingPoint num="8" id="2292" />
+<TGConnectingPoint num="9" id="2293" />
+<TGConnectingPoint num="10" id="2294" />
+<TGConnectingPoint num="11" id="2295" />
+<TGConnectingPoint num="12" id="2296" />
+<TGConnectingPoint num="13" id="2297" />
+<TGConnectingPoint num="14" id="2298" />
+<TGConnectingPoint num="15" id="2299" />
+<TGConnectingPoint num="16" id="2300" />
+<TGConnectingPoint num="17" id="2301" />
+<TGConnectingPoint num="18" id="2302" />
+<TGConnectingPoint num="19" id="2303" />
+<TGConnectingPoint num="20" id="2304" />
+<TGConnectingPoint num="21" id="2305" />
+<TGConnectingPoint num="22" id="2306" />
+<TGConnectingPoint num="23" id="2307" />
+<TGConnectingPoint num="24" id="2308" />
+<TGConnectingPoint num="25" id="2309" />
+<TGConnectingPoint num="26" id="2310" />
+<TGConnectingPoint num="27" id="2311" />
+<TGConnectingPoint num="28" id="2312" />
+<TGConnectingPoint num="29" id="2313" />
+<TGConnectingPoint num="30" id="2314" />
+<TGConnectingPoint num="31" id="2315" />
+<TGConnectingPoint num="32" id="2316" />
+<TGConnectingPoint num="33" id="2317" />
+<TGConnectingPoint num="34" id="2318" />
+<TGConnectingPoint num="35" id="2319" />
+<TGConnectingPoint num="36" id="2320" />
+<TGConnectingPoint num="37" id="2321" />
+<TGConnectingPoint num="38" id="2322" />
+<TGConnectingPoint num="39" id="2323" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2348" >
+<COMPONENT type="5106" id="2365" >
<cdparam x="221" y="748" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="2308" />
-<TGConnectingPoint num="1" id="2309" />
-<TGConnectingPoint num="2" id="2310" />
-<TGConnectingPoint num="3" id="2311" />
-<TGConnectingPoint num="4" id="2312" />
-<TGConnectingPoint num="5" id="2313" />
-<TGConnectingPoint num="6" id="2314" />
-<TGConnectingPoint num="7" id="2315" />
-<TGConnectingPoint num="8" id="2316" />
-<TGConnectingPoint num="9" id="2317" />
-<TGConnectingPoint num="10" id="2318" />
-<TGConnectingPoint num="11" id="2319" />
-<TGConnectingPoint num="12" id="2320" />
-<TGConnectingPoint num="13" id="2321" />
-<TGConnectingPoint num="14" id="2322" />
-<TGConnectingPoint num="15" id="2323" />
-<TGConnectingPoint num="16" id="2324" />
-<TGConnectingPoint num="17" id="2325" />
-<TGConnectingPoint num="18" id="2326" />
-<TGConnectingPoint num="19" id="2327" />
-<TGConnectingPoint num="20" id="2328" />
-<TGConnectingPoint num="21" id="2329" />
-<TGConnectingPoint num="22" id="2330" />
-<TGConnectingPoint num="23" id="2331" />
-<TGConnectingPoint num="24" id="2332" />
-<TGConnectingPoint num="25" id="2333" />
-<TGConnectingPoint num="26" id="2334" />
-<TGConnectingPoint num="27" id="2335" />
-<TGConnectingPoint num="28" id="2336" />
-<TGConnectingPoint num="29" id="2337" />
-<TGConnectingPoint num="30" id="2338" />
-<TGConnectingPoint num="31" id="2339" />
-<TGConnectingPoint num="32" id="2340" />
-<TGConnectingPoint num="33" id="2341" />
-<TGConnectingPoint num="34" id="2342" />
-<TGConnectingPoint num="35" id="2343" />
-<TGConnectingPoint num="36" id="2344" />
-<TGConnectingPoint num="37" id="2345" />
-<TGConnectingPoint num="38" id="2346" />
-<TGConnectingPoint num="39" id="2347" />
+<TGConnectingPoint num="0" id="2325" />
+<TGConnectingPoint num="1" id="2326" />
+<TGConnectingPoint num="2" id="2327" />
+<TGConnectingPoint num="3" id="2328" />
+<TGConnectingPoint num="4" id="2329" />
+<TGConnectingPoint num="5" id="2330" />
+<TGConnectingPoint num="6" id="2331" />
+<TGConnectingPoint num="7" id="2332" />
+<TGConnectingPoint num="8" id="2333" />
+<TGConnectingPoint num="9" id="2334" />
+<TGConnectingPoint num="10" id="2335" />
+<TGConnectingPoint num="11" id="2336" />
+<TGConnectingPoint num="12" id="2337" />
+<TGConnectingPoint num="13" id="2338" />
+<TGConnectingPoint num="14" id="2339" />
+<TGConnectingPoint num="15" id="2340" />
+<TGConnectingPoint num="16" id="2341" />
+<TGConnectingPoint num="17" id="2342" />
+<TGConnectingPoint num="18" id="2343" />
+<TGConnectingPoint num="19" id="2344" />
+<TGConnectingPoint num="20" id="2345" />
+<TGConnectingPoint num="21" id="2346" />
+<TGConnectingPoint num="22" id="2347" />
+<TGConnectingPoint num="23" id="2348" />
+<TGConnectingPoint num="24" id="2349" />
+<TGConnectingPoint num="25" id="2350" />
+<TGConnectingPoint num="26" id="2351" />
+<TGConnectingPoint num="27" id="2352" />
+<TGConnectingPoint num="28" id="2353" />
+<TGConnectingPoint num="29" id="2354" />
+<TGConnectingPoint num="30" id="2355" />
+<TGConnectingPoint num="31" id="2356" />
+<TGConnectingPoint num="32" id="2357" />
+<TGConnectingPoint num="33" id="2358" />
+<TGConnectingPoint num="34" id="2359" />
+<TGConnectingPoint num="35" id="2360" />
+<TGConnectingPoint num="36" id="2361" />
+<TGConnectingPoint num="37" id="2362" />
+<TGConnectingPoint num="38" id="2363" />
+<TGConnectingPoint num="39" id="2364" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2389" >
+<COMPONENT type="5106" id="2406" >
<cdparam x="631" y="381" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="2349" />
-<TGConnectingPoint num="1" id="2350" />
-<TGConnectingPoint num="2" id="2351" />
-<TGConnectingPoint num="3" id="2352" />
-<TGConnectingPoint num="4" id="2353" />
-<TGConnectingPoint num="5" id="2354" />
-<TGConnectingPoint num="6" id="2355" />
-<TGConnectingPoint num="7" id="2356" />
-<TGConnectingPoint num="8" id="2357" />
-<TGConnectingPoint num="9" id="2358" />
-<TGConnectingPoint num="10" id="2359" />
-<TGConnectingPoint num="11" id="2360" />
-<TGConnectingPoint num="12" id="2361" />
-<TGConnectingPoint num="13" id="2362" />
-<TGConnectingPoint num="14" id="2363" />
-<TGConnectingPoint num="15" id="2364" />
-<TGConnectingPoint num="16" id="2365" />
-<TGConnectingPoint num="17" id="2366" />
-<TGConnectingPoint num="18" id="2367" />
-<TGConnectingPoint num="19" id="2368" />
-<TGConnectingPoint num="20" id="2369" />
-<TGConnectingPoint num="21" id="2370" />
-<TGConnectingPoint num="22" id="2371" />
-<TGConnectingPoint num="23" id="2372" />
-<TGConnectingPoint num="24" id="2373" />
-<TGConnectingPoint num="25" id="2374" />
-<TGConnectingPoint num="26" id="2375" />
-<TGConnectingPoint num="27" id="2376" />
-<TGConnectingPoint num="28" id="2377" />
-<TGConnectingPoint num="29" id="2378" />
-<TGConnectingPoint num="30" id="2379" />
-<TGConnectingPoint num="31" id="2380" />
-<TGConnectingPoint num="32" id="2381" />
-<TGConnectingPoint num="33" id="2382" />
-<TGConnectingPoint num="34" id="2383" />
-<TGConnectingPoint num="35" id="2384" />
-<TGConnectingPoint num="36" id="2385" />
-<TGConnectingPoint num="37" id="2386" />
-<TGConnectingPoint num="38" id="2387" />
-<TGConnectingPoint num="39" id="2388" />
+<TGConnectingPoint num="0" id="2366" />
+<TGConnectingPoint num="1" id="2367" />
+<TGConnectingPoint num="2" id="2368" />
+<TGConnectingPoint num="3" id="2369" />
+<TGConnectingPoint num="4" id="2370" />
+<TGConnectingPoint num="5" id="2371" />
+<TGConnectingPoint num="6" id="2372" />
+<TGConnectingPoint num="7" id="2373" />
+<TGConnectingPoint num="8" id="2374" />
+<TGConnectingPoint num="9" id="2375" />
+<TGConnectingPoint num="10" id="2376" />
+<TGConnectingPoint num="11" id="2377" />
+<TGConnectingPoint num="12" id="2378" />
+<TGConnectingPoint num="13" id="2379" />
+<TGConnectingPoint num="14" id="2380" />
+<TGConnectingPoint num="15" id="2381" />
+<TGConnectingPoint num="16" id="2382" />
+<TGConnectingPoint num="17" id="2383" />
+<TGConnectingPoint num="18" id="2384" />
+<TGConnectingPoint num="19" id="2385" />
+<TGConnectingPoint num="20" id="2386" />
+<TGConnectingPoint num="21" id="2387" />
+<TGConnectingPoint num="22" id="2388" />
+<TGConnectingPoint num="23" id="2389" />
+<TGConnectingPoint num="24" id="2390" />
+<TGConnectingPoint num="25" id="2391" />
+<TGConnectingPoint num="26" id="2392" />
+<TGConnectingPoint num="27" id="2393" />
+<TGConnectingPoint num="28" id="2394" />
+<TGConnectingPoint num="29" id="2395" />
+<TGConnectingPoint num="30" id="2396" />
+<TGConnectingPoint num="31" id="2397" />
+<TGConnectingPoint num="32" id="2398" />
+<TGConnectingPoint num="33" id="2399" />
+<TGConnectingPoint num="34" id="2400" />
+<TGConnectingPoint num="35" id="2401" />
+<TGConnectingPoint num="36" id="2402" />
+<TGConnectingPoint num="37" id="2403" />
+<TGConnectingPoint num="38" id="2404" />
+<TGConnectingPoint num="39" id="2405" />
<extraparam>
</extraparam>
</COMPONENT>
@@ -4590,25 +4624,25 @@
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2396" >
+<CONNECTOR type="5102" id="2413" >
<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="2395" />
-<P1 x="363" y="204" id="2412" />
-<P2 x="362" y="257" id="2423" />
+<TGConnectingPoint num="0" id="2412" />
+<P1 x="363" y="204" id="2429" />
+<P2 x="362" y="257" id="2440" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2394" >
-<father id="2396" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2411" >
+<father id="2413" num="0" />
<cdparam x="380" y="228" />
<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2390" />
-<TGConnectingPoint num="1" id="2391" />
-<TGConnectingPoint num="2" id="2392" />
-<TGConnectingPoint num="3" id="2393" />
+<TGConnectingPoint num="0" id="2407" />
+<TGConnectingPoint num="1" id="2408" />
+<TGConnectingPoint num="2" id="2409" />
+<TGConnectingPoint num="3" id="2410" />
<extraparam>
<guard value="[ ]" />
<afterMin value="mechanicalDelay" />
@@ -4618,25 +4652,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2403" >
+<CONNECTOR type="5102" id="2420" >
<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="2402" />
-<P1 x="363" y="150" id="2469" />
-<P2 x="363" y="174" id="2411" />
+<TGConnectingPoint num="0" id="2419" />
+<P1 x="363" y="150" id="2486" />
+<P2 x="363" y="174" id="2428" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2401" >
-<father id="2403" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2418" >
+<father id="2420" num="0" />
<cdparam x="363" y="190" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2397" />
-<TGConnectingPoint num="1" id="2398" />
-<TGConnectingPoint num="2" id="2399" />
-<TGConnectingPoint num="3" id="2400" />
+<TGConnectingPoint num="0" id="2414" />
+<TGConnectingPoint num="1" id="2415" />
+<TGConnectingPoint num="2" id="2416" />
+<TGConnectingPoint num="3" id="2417" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4646,25 +4680,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2410" >
+<CONNECTOR type="5102" id="2427" >
<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="2409" />
-<P1 x="362" y="101" id="2504" />
-<P2 x="363" y="120" id="2464" />
+<TGConnectingPoint num="0" id="2426" />
+<P1 x="362" y="101" id="2521" />
+<P2 x="363" y="120" id="2481" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2408" >
-<father id="2410" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2425" >
+<father id="2427" num="0" />
<cdparam x="362" y="141" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2404" />
-<TGConnectingPoint num="1" id="2405" />
-<TGConnectingPoint num="2" id="2406" />
-<TGConnectingPoint num="3" id="2407" />
+<TGConnectingPoint num="0" id="2421" />
+<TGConnectingPoint num="1" id="2422" />
+<TGConnectingPoint num="2" id="2423" />
+<TGConnectingPoint num="3" id="2424" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4674,156 +4708,156 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="2421" >
+<COMPONENT type="5103" id="2438" >
<cdparam x="338" y="179" />
<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="2411" />
-<TGConnectingPoint num="1" id="2412" />
-<TGConnectingPoint num="2" id="2413" />
-<TGConnectingPoint num="3" id="2414" />
-<TGConnectingPoint num="4" id="2415" />
-<TGConnectingPoint num="5" id="2416" />
-<TGConnectingPoint num="6" id="2417" />
-<TGConnectingPoint num="7" id="2418" />
-<TGConnectingPoint num="8" id="2419" />
-<TGConnectingPoint num="9" id="2420" />
+<TGConnectingPoint num="0" id="2428" />
+<TGConnectingPoint num="1" id="2429" />
+<TGConnectingPoint num="2" id="2430" />
+<TGConnectingPoint num="3" id="2431" />
+<TGConnectingPoint num="4" id="2432" />
+<TGConnectingPoint num="5" id="2433" />
+<TGConnectingPoint num="6" id="2434" />
+<TGConnectingPoint num="7" id="2435" />
+<TGConnectingPoint num="8" id="2436" />
+<TGConnectingPoint num="9" id="2437" />
</COMPONENT>
-<COMPONENT type="5106" id="2462" >
+<COMPONENT type="5106" id="2479" >
<cdparam x="337" y="257" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2422" />
-<TGConnectingPoint num="1" id="2423" />
-<TGConnectingPoint num="2" id="2424" />
-<TGConnectingPoint num="3" id="2425" />
-<TGConnectingPoint num="4" id="2426" />
-<TGConnectingPoint num="5" id="2427" />
-<TGConnectingPoint num="6" id="2428" />
-<TGConnectingPoint num="7" id="2429" />
-<TGConnectingPoint num="8" id="2430" />
-<TGConnectingPoint num="9" id="2431" />
-<TGConnectingPoint num="10" id="2432" />
-<TGConnectingPoint num="11" id="2433" />
-<TGConnectingPoint num="12" id="2434" />
-<TGConnectingPoint num="13" id="2435" />
-<TGConnectingPoint num="14" id="2436" />
-<TGConnectingPoint num="15" id="2437" />
-<TGConnectingPoint num="16" id="2438" />
-<TGConnectingPoint num="17" id="2439" />
-<TGConnectingPoint num="18" id="2440" />
-<TGConnectingPoint num="19" id="2441" />
-<TGConnectingPoint num="20" id="2442" />
-<TGConnectingPoint num="21" id="2443" />
-<TGConnectingPoint num="22" id="2444" />
-<TGConnectingPoint num="23" id="2445" />
-<TGConnectingPoint num="24" id="2446" />
-<TGConnectingPoint num="25" id="2447" />
-<TGConnectingPoint num="26" id="2448" />
-<TGConnectingPoint num="27" id="2449" />
-<TGConnectingPoint num="28" id="2450" />
-<TGConnectingPoint num="29" id="2451" />
-<TGConnectingPoint num="30" id="2452" />
-<TGConnectingPoint num="31" id="2453" />
-<TGConnectingPoint num="32" id="2454" />
-<TGConnectingPoint num="33" id="2455" />
-<TGConnectingPoint num="34" id="2456" />
-<TGConnectingPoint num="35" id="2457" />
-<TGConnectingPoint num="36" id="2458" />
-<TGConnectingPoint num="37" id="2459" />
-<TGConnectingPoint num="38" id="2460" />
-<TGConnectingPoint num="39" id="2461" />
+<TGConnectingPoint num="0" id="2439" />
+<TGConnectingPoint num="1" id="2440" />
+<TGConnectingPoint num="2" id="2441" />
+<TGConnectingPoint num="3" id="2442" />
+<TGConnectingPoint num="4" id="2443" />
+<TGConnectingPoint num="5" id="2444" />
+<TGConnectingPoint num="6" id="2445" />
+<TGConnectingPoint num="7" id="2446" />
+<TGConnectingPoint num="8" id="2447" />
+<TGConnectingPoint num="9" id="2448" />
+<TGConnectingPoint num="10" id="2449" />
+<TGConnectingPoint num="11" id="2450" />
+<TGConnectingPoint num="12" id="2451" />
+<TGConnectingPoint num="13" id="2452" />
+<TGConnectingPoint num="14" id="2453" />
+<TGConnectingPoint num="15" id="2454" />
+<TGConnectingPoint num="16" id="2455" />
+<TGConnectingPoint num="17" id="2456" />
+<TGConnectingPoint num="18" id="2457" />
+<TGConnectingPoint num="19" id="2458" />
+<TGConnectingPoint num="20" id="2459" />
+<TGConnectingPoint num="21" id="2460" />
+<TGConnectingPoint num="22" id="2461" />
+<TGConnectingPoint num="23" id="2462" />
+<TGConnectingPoint num="24" id="2463" />
+<TGConnectingPoint num="25" id="2464" />
+<TGConnectingPoint num="26" id="2465" />
+<TGConnectingPoint num="27" id="2466" />
+<TGConnectingPoint num="28" id="2467" />
+<TGConnectingPoint num="29" id="2468" />
+<TGConnectingPoint num="30" id="2469" />
+<TGConnectingPoint num="31" id="2470" />
+<TGConnectingPoint num="32" id="2471" />
+<TGConnectingPoint num="33" id="2472" />
+<TGConnectingPoint num="34" id="2473" />
+<TGConnectingPoint num="35" id="2474" />
+<TGConnectingPoint num="36" id="2475" />
+<TGConnectingPoint num="37" id="2476" />
+<TGConnectingPoint num="38" id="2477" />
+<TGConnectingPoint num="39" id="2478" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2503" >
+<COMPONENT type="5106" id="2520" >
<cdparam x="338" y="120" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2463" />
-<TGConnectingPoint num="1" id="2464" />
-<TGConnectingPoint num="2" id="2465" />
-<TGConnectingPoint num="3" id="2466" />
-<TGConnectingPoint num="4" id="2467" />
-<TGConnectingPoint num="5" id="2468" />
-<TGConnectingPoint num="6" id="2469" />
-<TGConnectingPoint num="7" id="2470" />
-<TGConnectingPoint num="8" id="2471" />
-<TGConnectingPoint num="9" id="2472" />
-<TGConnectingPoint num="10" id="2473" />
-<TGConnectingPoint num="11" id="2474" />
-<TGConnectingPoint num="12" id="2475" />
-<TGConnectingPoint num="13" id="2476" />
-<TGConnectingPoint num="14" id="2477" />
-<TGConnectingPoint num="15" id="2478" />
-<TGConnectingPoint num="16" id="2479" />
-<TGConnectingPoint num="17" id="2480" />
-<TGConnectingPoint num="18" id="2481" />
-<TGConnectingPoint num="19" id="2482" />
-<TGConnectingPoint num="20" id="2483" />
-<TGConnectingPoint num="21" id="2484" />
-<TGConnectingPoint num="22" id="2485" />
-<TGConnectingPoint num="23" id="2486" />
-<TGConnectingPoint num="24" id="2487" />
-<TGConnectingPoint num="25" id="2488" />
-<TGConnectingPoint num="26" id="2489" />
-<TGConnectingPoint num="27" id="2490" />
-<TGConnectingPoint num="28" id="2491" />
-<TGConnectingPoint num="29" id="2492" />
-<TGConnectingPoint num="30" id="2493" />
-<TGConnectingPoint num="31" id="2494" />
-<TGConnectingPoint num="32" id="2495" />
-<TGConnectingPoint num="33" id="2496" />
-<TGConnectingPoint num="34" id="2497" />
-<TGConnectingPoint num="35" id="2498" />
-<TGConnectingPoint num="36" id="2499" />
-<TGConnectingPoint num="37" id="2500" />
-<TGConnectingPoint num="38" id="2501" />
-<TGConnectingPoint num="39" id="2502" />
+<TGConnectingPoint num="0" id="2480" />
+<TGConnectingPoint num="1" id="2481" />
+<TGConnectingPoint num="2" id="2482" />
+<TGConnectingPoint num="3" id="2483" />
+<TGConnectingPoint num="4" id="2484" />
+<TGConnectingPoint num="5" id="2485" />
+<TGConnectingPoint num="6" id="2486" />
+<TGConnectingPoint num="7" id="2487" />
+<TGConnectingPoint num="8" id="2488" />
+<TGConnectingPoint num="9" id="2489" />
+<TGConnectingPoint num="10" id="2490" />
+<TGConnectingPoint num="11" id="2491" />
+<TGConnectingPoint num="12" id="2492" />
+<TGConnectingPoint num="13" id="2493" />
+<TGConnectingPoint num="14" id="2494" />
+<TGConnectingPoint num="15" id="2495" />
+<TGConnectingPoint num="16" id="2496" />
+<TGConnectingPoint num="17" id="2497" />
+<TGConnectingPoint num="18" id="2498" />
+<TGConnectingPoint num="19" id="2499" />
+<TGConnectingPoint num="20" id="2500" />
+<TGConnectingPoint num="21" id="2501" />
+<TGConnectingPoint num="22" id="2502" />
+<TGConnectingPoint num="23" id="2503" />
+<TGConnectingPoint num="24" id="2504" />
+<TGConnectingPoint num="25" id="2505" />
+<TGConnectingPoint num="26" id="2506" />
+<TGConnectingPoint num="27" id="2507" />
+<TGConnectingPoint num="28" id="2508" />
+<TGConnectingPoint num="29" id="2509" />
+<TGConnectingPoint num="30" id="2510" />
+<TGConnectingPoint num="31" id="2511" />
+<TGConnectingPoint num="32" id="2512" />
+<TGConnectingPoint num="33" id="2513" />
+<TGConnectingPoint num="34" id="2514" />
+<TGConnectingPoint num="35" id="2515" />
+<TGConnectingPoint num="36" id="2516" />
+<TGConnectingPoint num="37" id="2517" />
+<TGConnectingPoint num="38" id="2518" />
+<TGConnectingPoint num="39" id="2519" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="2505" >
+<COMPONENT type="5100" id="2522" >
<cdparam x="355" y="81" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2504" />
+<TGConnectingPoint num="0" id="2521" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2512" >
+<CONNECTOR type="5102" id="2529" >
<cdparam x="323" y="118" />
<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="2511" />
-<P1 x="323" y="118" id="2585" />
-<P2 x="341" y="200" id="2527" />
+<TGConnectingPoint num="0" id="2528" />
+<P1 x="323" y="118" id="2602" />
+<P2 x="341" y="200" id="2544" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2510" >
-<father id="2512" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2527" >
+<father id="2529" num="0" />
<cdparam x="323" y="158" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2506" />
-<TGConnectingPoint num="1" id="2507" />
-<TGConnectingPoint num="2" id="2508" />
-<TGConnectingPoint num="3" id="2509" />
+<TGConnectingPoint num="0" id="2523" />
+<TGConnectingPoint num="1" id="2524" />
+<TGConnectingPoint num="2" id="2525" />
+<TGConnectingPoint num="3" id="2526" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4833,25 +4867,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2519" >
+<CONNECTOR type="5102" id="2536" >
<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="2518" />
-<P1 x="322" y="69" id="2620" />
-<P2 x="323" y="88" id="2580" />
+<TGConnectingPoint num="0" id="2535" />
+<P1 x="322" y="69" id="2637" />
+<P2 x="323" y="88" id="2597" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2517" >
-<father id="2519" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2534" >
+<father id="2536" num="0" />
<cdparam x="322" y="109" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2513" />
-<TGConnectingPoint num="1" id="2514" />
-<TGConnectingPoint num="2" id="2515" />
-<TGConnectingPoint num="3" id="2516" />
+<TGConnectingPoint num="0" id="2530" />
+<TGConnectingPoint num="1" id="2531" />
+<TGConnectingPoint num="2" id="2532" />
+<TGConnectingPoint num="3" id="2533" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -4861,25 +4895,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2526" >
+<CONNECTOR type="5102" id="2543" >
<cdparam x="365" y="135" />
<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="2525" />
-<P1 x="341" y="230" id="2528" />
-<P2 x="387" y="300" id="2539" />
+<TGConnectingPoint num="0" id="2542" />
+<P1 x="341" y="230" id="2545" />
+<P2 x="387" y="300" id="2556" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2524" >
-<father id="2526" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2541" >
+<father id="2543" num="0" />
<cdparam x="405" y="283" />
<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2520" />
-<TGConnectingPoint num="1" id="2521" />
-<TGConnectingPoint num="2" id="2522" />
-<TGConnectingPoint num="3" id="2523" />
+<TGConnectingPoint num="0" id="2537" />
+<TGConnectingPoint num="1" id="2538" />
+<TGConnectingPoint num="2" id="2539" />
+<TGConnectingPoint num="3" id="2540" />
<extraparam>
<guard value="[ ]" />
<afterMin value="mechanicalDelay" />
@@ -4889,131 +4923,131 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="2537" >
+<COMPONENT type="5103" id="2554" >
<cdparam x="316" y="205" />
<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="2527" />
-<TGConnectingPoint num="1" id="2528" />
-<TGConnectingPoint num="2" id="2529" />
-<TGConnectingPoint num="3" id="2530" />
-<TGConnectingPoint num="4" id="2531" />
-<TGConnectingPoint num="5" id="2532" />
-<TGConnectingPoint num="6" id="2533" />
-<TGConnectingPoint num="7" id="2534" />
-<TGConnectingPoint num="8" id="2535" />
-<TGConnectingPoint num="9" id="2536" />
+<TGConnectingPoint num="0" id="2544" />
+<TGConnectingPoint num="1" id="2545" />
+<TGConnectingPoint num="2" id="2546" />
+<TGConnectingPoint num="3" id="2547" />
+<TGConnectingPoint num="4" id="2548" />
+<TGConnectingPoint num="5" id="2549" />
+<TGConnectingPoint num="6" id="2550" />
+<TGConnectingPoint num="7" id="2551" />
+<TGConnectingPoint num="8" id="2552" />
+<TGConnectingPoint num="9" id="2553" />
</COMPONENT>
-<COMPONENT type="5106" id="2578" >
+<COMPONENT type="5106" id="2595" >
<cdparam x="362" y="300" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2538" />
-<TGConnectingPoint num="1" id="2539" />
-<TGConnectingPoint num="2" id="2540" />
-<TGConnectingPoint num="3" id="2541" />
-<TGConnectingPoint num="4" id="2542" />
-<TGConnectingPoint num="5" id="2543" />
-<TGConnectingPoint num="6" id="2544" />
-<TGConnectingPoint num="7" id="2545" />
-<TGConnectingPoint num="8" id="2546" />
-<TGConnectingPoint num="9" id="2547" />
-<TGConnectingPoint num="10" id="2548" />
-<TGConnectingPoint num="11" id="2549" />
-<TGConnectingPoint num="12" id="2550" />
-<TGConnectingPoint num="13" id="2551" />
-<TGConnectingPoint num="14" id="2552" />
-<TGConnectingPoint num="15" id="2553" />
-<TGConnectingPoint num="16" id="2554" />
-<TGConnectingPoint num="17" id="2555" />
-<TGConnectingPoint num="18" id="2556" />
-<TGConnectingPoint num="19" id="2557" />
-<TGConnectingPoint num="20" id="2558" />
-<TGConnectingPoint num="21" id="2559" />
-<TGConnectingPoint num="22" id="2560" />
-<TGConnectingPoint num="23" id="2561" />
-<TGConnectingPoint num="24" id="2562" />
-<TGConnectingPoint num="25" id="2563" />
-<TGConnectingPoint num="26" id="2564" />
-<TGConnectingPoint num="27" id="2565" />
-<TGConnectingPoint num="28" id="2566" />
-<TGConnectingPoint num="29" id="2567" />
-<TGConnectingPoint num="30" id="2568" />
-<TGConnectingPoint num="31" id="2569" />
-<TGConnectingPoint num="32" id="2570" />
-<TGConnectingPoint num="33" id="2571" />
-<TGConnectingPoint num="34" id="2572" />
-<TGConnectingPoint num="35" id="2573" />
-<TGConnectingPoint num="36" id="2574" />
-<TGConnectingPoint num="37" id="2575" />
-<TGConnectingPoint num="38" id="2576" />
-<TGConnectingPoint num="39" id="2577" />
+<TGConnectingPoint num="0" id="2555" />
+<TGConnectingPoint num="1" id="2556" />
+<TGConnectingPoint num="2" id="2557" />
+<TGConnectingPoint num="3" id="2558" />
+<TGConnectingPoint num="4" id="2559" />
+<TGConnectingPoint num="5" id="2560" />
+<TGConnectingPoint num="6" id="2561" />
+<TGConnectingPoint num="7" id="2562" />
+<TGConnectingPoint num="8" id="2563" />
+<TGConnectingPoint num="9" id="2564" />
+<TGConnectingPoint num="10" id="2565" />
+<TGConnectingPoint num="11" id="2566" />
+<TGConnectingPoint num="12" id="2567" />
+<TGConnectingPoint num="13" id="2568" />
+<TGConnectingPoint num="14" id="2569" />
+<TGConnectingPoint num="15" id="2570" />
+<TGConnectingPoint num="16" id="2571" />
+<TGConnectingPoint num="17" id="2572" />
+<TGConnectingPoint num="18" id="2573" />
+<TGConnectingPoint num="19" id="2574" />
+<TGConnectingPoint num="20" id="2575" />
+<TGConnectingPoint num="21" id="2576" />
+<TGConnectingPoint num="22" id="2577" />
+<TGConnectingPoint num="23" id="2578" />
+<TGConnectingPoint num="24" id="2579" />
+<TGConnectingPoint num="25" id="2580" />
+<TGConnectingPoint num="26" id="2581" />
+<TGConnectingPoint num="27" id="2582" />
+<TGConnectingPoint num="28" id="2583" />
+<TGConnectingPoint num="29" id="2584" />
+<TGConnectingPoint num="30" id="2585" />
+<TGConnectingPoint num="31" id="2586" />
+<TGConnectingPoint num="32" id="2587" />
+<TGConnectingPoint num="33" id="2588" />
+<TGConnectingPoint num="34" id="2589" />
+<TGConnectingPoint num="35" id="2590" />
+<TGConnectingPoint num="36" id="2591" />
+<TGConnectingPoint num="37" id="2592" />
+<TGConnectingPoint num="38" id="2593" />
+<TGConnectingPoint num="39" id="2594" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2619" >
+<COMPONENT type="5106" id="2636" >
<cdparam x="298" y="88" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2579" />
-<TGConnectingPoint num="1" id="2580" />
-<TGConnectingPoint num="2" id="2581" />
-<TGConnectingPoint num="3" id="2582" />
-<TGConnectingPoint num="4" id="2583" />
-<TGConnectingPoint num="5" id="2584" />
-<TGConnectingPoint num="6" id="2585" />
-<TGConnectingPoint num="7" id="2586" />
-<TGConnectingPoint num="8" id="2587" />
-<TGConnectingPoint num="9" id="2588" />
-<TGConnectingPoint num="10" id="2589" />
-<TGConnectingPoint num="11" id="2590" />
-<TGConnectingPoint num="12" id="2591" />
-<TGConnectingPoint num="13" id="2592" />
-<TGConnectingPoint num="14" id="2593" />
-<TGConnectingPoint num="15" id="2594" />
-<TGConnectingPoint num="16" id="2595" />
-<TGConnectingPoint num="17" id="2596" />
-<TGConnectingPoint num="18" id="2597" />
-<TGConnectingPoint num="19" id="2598" />
-<TGConnectingPoint num="20" id="2599" />
-<TGConnectingPoint num="21" id="2600" />
-<TGConnectingPoint num="22" id="2601" />
-<TGConnectingPoint num="23" id="2602" />
-<TGConnectingPoint num="24" id="2603" />
-<TGConnectingPoint num="25" id="2604" />
-<TGConnectingPoint num="26" id="2605" />
-<TGConnectingPoint num="27" id="2606" />
-<TGConnectingPoint num="28" id="2607" />
-<TGConnectingPoint num="29" id="2608" />
-<TGConnectingPoint num="30" id="2609" />
-<TGConnectingPoint num="31" id="2610" />
-<TGConnectingPoint num="32" id="2611" />
-<TGConnectingPoint num="33" id="2612" />
-<TGConnectingPoint num="34" id="2613" />
-<TGConnectingPoint num="35" id="2614" />
-<TGConnectingPoint num="36" id="2615" />
-<TGConnectingPoint num="37" id="2616" />
-<TGConnectingPoint num="38" id="2617" />
-<TGConnectingPoint num="39" id="2618" />
+<TGConnectingPoint num="0" id="2596" />
+<TGConnectingPoint num="1" id="2597" />
+<TGConnectingPoint num="2" id="2598" />
+<TGConnectingPoint num="3" id="2599" />
+<TGConnectingPoint num="4" id="2600" />
+<TGConnectingPoint num="5" id="2601" />
+<TGConnectingPoint num="6" id="2602" />
+<TGConnectingPoint num="7" id="2603" />
+<TGConnectingPoint num="8" id="2604" />
+<TGConnectingPoint num="9" id="2605" />
+<TGConnectingPoint num="10" id="2606" />
+<TGConnectingPoint num="11" id="2607" />
+<TGConnectingPoint num="12" id="2608" />
+<TGConnectingPoint num="13" id="2609" />
+<TGConnectingPoint num="14" id="2610" />
+<TGConnectingPoint num="15" id="2611" />
+<TGConnectingPoint num="16" id="2612" />
+<TGConnectingPoint num="17" id="2613" />
+<TGConnectingPoint num="18" id="2614" />
+<TGConnectingPoint num="19" id="2615" />
+<TGConnectingPoint num="20" id="2616" />
+<TGConnectingPoint num="21" id="2617" />
+<TGConnectingPoint num="22" id="2618" />
+<TGConnectingPoint num="23" id="2619" />
+<TGConnectingPoint num="24" id="2620" />
+<TGConnectingPoint num="25" id="2621" />
+<TGConnectingPoint num="26" id="2622" />
+<TGConnectingPoint num="27" id="2623" />
+<TGConnectingPoint num="28" id="2624" />
+<TGConnectingPoint num="29" id="2625" />
+<TGConnectingPoint num="30" id="2626" />
+<TGConnectingPoint num="31" id="2627" />
+<TGConnectingPoint num="32" id="2628" />
+<TGConnectingPoint num="33" id="2629" />
+<TGConnectingPoint num="34" id="2630" />
+<TGConnectingPoint num="35" id="2631" />
+<TGConnectingPoint num="36" id="2632" />
+<TGConnectingPoint num="37" id="2633" />
+<TGConnectingPoint num="38" id="2634" />
+<TGConnectingPoint num="39" id="2635" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="2621" >
+<COMPONENT type="5100" id="2638" >
<cdparam x="315" y="49" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2620" />
+<TGConnectingPoint num="0" id="2637" />
</COMPONENT>
diff --git a/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java b/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
index 17b99582ac483ec55e0ad9263f1f514c4dfc4cf6..37f9c4ba0e8a72d30e8883569fcc2cf7fa3073ee 100755
--- a/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
+++ b/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
@@ -108,7 +108,7 @@ public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent
protected String conflictMessage;
protected String dataFlowType = "VOID";
protected String associatedEvent = "VOID";
- public String referenceReq;
+ public String referenceReq = "";
public int verification;
public TMLCPrimitivePort(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);
diff --git a/src/main/java/ui/window/JDialogUPPAALValidation.java b/src/main/java/ui/window/JDialogUPPAALValidation.java
index 045b68225e96792270352049fa11af593859a028..5bb4b3142f0f5443889075978444521378be33d9 100755
--- a/src/main/java/ui/window/JDialogUPPAALValidation.java
+++ b/src/main/java/ui/window/JDialogUPPAALValidation.java
@@ -97,7 +97,9 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
static {
for ( final String label : ConfigurationTTool.UPPAALPropertyVerifMessage.split( "," ) ) {
- PROP_VERIFIED_LABELS.add( label.trim() );
+ if (!label.trim().isEmpty()){
+ PROP_VERIFIED_LABELS.add( label.trim() );
+ }
}
// Handle the case where nothing is defined in the configuration
@@ -107,7 +109,9 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
}
for ( final String label : ConfigurationTTool.UPPAALPropertyNotVerifMessage.split( "," ) ) {
- PROP_NOT_VERIFIED_LABELS.add( label.trim() );
+ if (!label.trim().isEmpty()){
+ PROP_NOT_VERIFIED_LABELS.add( label.trim() );
+ }
}
// Handle the case where nothing is defined in the configuration
@@ -692,6 +696,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
private static boolean checkAnalysisResult( final String resultData,
final Collection<String> labels ) {
+
for ( final String verifiedLabel : labels ) {
if ( resultData.contains( verifiedLabel ) ) {
return true;
@@ -729,13 +734,15 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
if(showDetails.isSelected()) {
jta.append(data);
}
+
//NOTE: [error] is only visible if Error Stream is parsed
if (mode != NOT_STARTED) {
if (data.trim().length() == 0) {
//jta.append("The verifier of UPPAAL could not be started: error\n");
throw new LauncherException("The verifier of UPPAAL could not be started.\nProbably, UPPAAL is badly installed, or TTool is badly configured:\nCheck for UPPAALVerifierPath and UPPAALVerifierHost configurations.");
}
-
+
+
// Issue #35: Different labels for UPPAAL 4.1.19
else if ( checkAnalysisResult( data, PROP_VERIFIED_LABELS ) ) {
// else if (data.indexOf("Property is satisfied") >-1){