diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index d7c3270bc276cb9cd0cb65f69e323746f445afb4..6d0d93279ba3116405f8f9574cf270d417afa6db 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -29,6 +29,7 @@
<TGConnectingPoint num="15" id="16" />
<tags value="" />
<extraparam>
+<Line value="" />
</extraparam>
</COMPONENT>
@@ -812,7 +813,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="449" />
-<P1 x="302" y="261" id="480" />
+<P1 x="302" y="261" id="493" />
<P2 x="361" y="261" id="468" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -834,7 +835,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="453" />
-<P1 x="305" y="211" id="493" />
+<P1 x="305" y="211" id="480" />
<P2 x="361" y="211" id="467" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -931,13 +932,13 @@
<TGConnectingPoint num="23" id="527" />
<tags value="" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="490" index="13" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
+<SUBCOMPONENT type="5304" id="490" index="13" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
<father id="528" num="0" />
-<cdparam x="154" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="166" y="191" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
<new d="false" />
<TGConnectingPoint num="0" id="478" />
<TGConnectingPoint num="1" id="479" />
@@ -953,13 +954,13 @@
<TGConnectingPoint num="11" id="489" />
<tags value="" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="503" index="14" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
+<SUBCOMPONENT type="5304" id="503" index="14" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
<father id="528" num="1" />
-<cdparam x="166" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="154" y="241" />
+<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
<new d="false" />
<TGConnectingPoint num="0" id="491" />
<TGConnectingPoint num="1" id="492" />
@@ -1103,7 +1104,7 @@
<TGConnectingPoint num="0" id="587" />
<TGConnectingPoint num="1" id="588" />
<TGConnectingPoint num="2" id="589" />
-<P1 x="581" y="154" id="676" />
+<P1 x="581" y="154" id="663" />
<P2 x="546" y="305" id="733" />
<Point x="518" y="154" />
<Point x="518" y="305" />
@@ -1137,7 +1138,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="592" />
<TGConnectingPoint num="1" id="593" />
-<P1 x="631" y="164" id="671" />
+<P1 x="631" y="164" id="658" />
<P2 x="667" y="310" id="720" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
@@ -1171,7 +1172,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="598" />
<TGConnectingPoint num="1" id="599" />
-<P1 x="721" y="158" id="656" />
+<P1 x="721" y="158" id="669" />
<P2 x="700" y="204" id="710" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
@@ -1346,13 +1347,13 @@
<TGConnectingPoint num="23" id="704" />
<tags value="" />
</COMPONENT>
-<SUBCOMPONENT type="5303" id="667" index="24" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
+<SUBCOMPONENT type="5304" id="667" index="24" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
<father id="705" num="0" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
-<infoparam name="TGComponent" value="nbOfCoins" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
<new d="false" />
<TGConnectingPoint num="0" id="655" />
<TGConnectingPoint num="1" id="656" />
@@ -1367,17 +1368,14 @@
<TGConnectingPoint num="10" id="665" />
<TGConnectingPoint num="11" id="666" />
<tags value="" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="680" index="25" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
+<SUBCOMPONENT type="5303" id="680" index="25" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
<father id="705" num="1" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
+<infoparam name="TGComponent" value="nbOfCoins" />
<new d="false" />
<TGConnectingPoint num="0" id="668" />
<TGConnectingPoint num="1" id="669" />
@@ -1392,6 +1390,9 @@
<TGConnectingPoint num="10" id="678" />
<TGConnectingPoint num="11" id="679" />
<tags value="" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5306" id="717" index="14" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" >
@@ -1542,7 +1543,7 @@
<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="771" />
-<P1 x="556" y="346" id="875" />
+<P1 x="556" y="346" id="916" />
<P2 x="557" y="373" id="965" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -1558,7 +1559,7 @@
<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="773" />
-<P1 x="302" y="106" id="839" />
+<P1 x="289" y="106" id="839" />
<P2 x="442" y="106" id="961" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -1576,7 +1577,7 @@
<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="775" />
-<P1 x="787" y="345" id="916" />
+<P1 x="787" y="345" id="875" />
<P2 x="787" y="373" id="966" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -1714,7 +1715,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</COMPONENT>
<COMPONENT type="5000" id="868" index="7" uid="bfe1f65b-e947-4455-a4f9-e84d772ca5b5" >
-<cdparam x="102" y="52" />
+<cdparam x="89" y="52" />
<sizeparam width="200" height="216" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="1524" />
@@ -1839,13 +1840,13 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="909" index="9" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
+<SUBCOMPONENT type="5000" id="909" index="9" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
<father id="991" num="0" />
-<cdparam x="462" y="246" />
-<sizeparam width="188" height="100" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="694" y="245" />
+<sizeparam width="186" height="100" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
+<cdrectangleparam minX="0" maxX="274" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
<new d="false" />
<TGConnectingPoint num="0" id="869" />
<TGConnectingPoint num="1" id="870" />
@@ -1895,13 +1896,13 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out push()" attached="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="950" index="10" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
+<SUBCOMPONENT type="5000" id="950" index="10" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
<father id="991" num="1" />
-<cdparam x="694" y="245" />
-<sizeparam width="186" height="100" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="462" y="246" />
+<sizeparam width="188" height="100" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="274" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
<new d="false" />
<TGConnectingPoint num="0" id="910" />
<TGConnectingPoint num="1" id="911" />
@@ -1961,8 +1962,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to Send signal" value="null" />
<TGConnectingPoint num="0" id="997" />
-<P1 x="340" y="233" id="1179" />
-<P2 x="363" y="255" id="1168" />
+<P1 x="340" y="233" id="1168" />
+<P2 x="363" y="255" id="1170" />
<AutomaticDrawing data="true" />
<new d="false" />
<tags value="" />
@@ -2072,7 +2073,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
<TGConnectingPoint num="0" id="1018" />
-<P1 x="363" y="285" id="1169" />
+<P1 x="363" y="285" id="1171" />
<P2 x="399" y="352" id="1021" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -2370,36 +2371,36 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5103" id="1178" index="12" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
+<SUBCOMPONENT type="5100" id="1169" index="12" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
<father id="1253" num="0" />
-<cdparam x="340" y="260" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
-<infoparam name="Send signal" value="push()" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
<new d="false" />
<TGConnectingPoint num="0" id="1168" />
-<TGConnectingPoint num="1" id="1169" />
-<TGConnectingPoint num="2" id="1170" />
-<TGConnectingPoint num="3" id="1171" />
-<TGConnectingPoint num="4" id="1172" />
-<TGConnectingPoint num="5" id="1173" />
-<TGConnectingPoint num="6" id="1174" />
-<TGConnectingPoint num="7" id="1175" />
-<TGConnectingPoint num="8" id="1176" />
-<TGConnectingPoint num="9" id="1177" />
<tags value="" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1180" index="13" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
+<SUBCOMPONENT type="5103" id="1180" index="13" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
<father id="1253" num="1" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="340" y="260" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
+<infoparam name="Send signal" value="push()" />
<new d="false" />
-<TGConnectingPoint num="0" id="1179" />
+<TGConnectingPoint num="0" id="1170" />
+<TGConnectingPoint num="1" id="1171" />
+<TGConnectingPoint num="2" id="1172" />
+<TGConnectingPoint num="3" id="1173" />
+<TGConnectingPoint num="4" id="1174" />
+<TGConnectingPoint num="5" id="1175" />
+<TGConnectingPoint num="6" id="1176" />
+<TGConnectingPoint num="7" id="1177" />
+<TGConnectingPoint num="8" id="1178" />
+<TGConnectingPoint num="9" id="1179" />
<tags value="" />
</SUBCOMPONENT>
@@ -3033,8 +3034,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
<TGConnectingPoint num="0" id="1495" />
-<P1 x="261" y="421" id="2130" />
-<P2 x="261" y="434" id="2058" />
+<P1 x="261" y="421" id="2141" />
+<P2 x="261" y="434" id="2144" />
<AutomaticDrawing data="true" />
<new d="false" />
<tags value="" />
@@ -3070,8 +3071,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1502" />
-<P1 x="228" y="474" id="2071" />
-<P2 x="126" y="524" id="2132" />
+<P1 x="228" y="474" id="2157" />
+<P2 x="126" y="524" id="2130" />
<AutomaticDrawing data="true" />
<new d="false" />
<tags value="" />
@@ -3107,8 +3108,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="1509" />
-<P1 x="126" y="554" id="2133" />
-<P2 x="126" y="653" id="2155" />
+<P1 x="126" y="554" id="2131" />
+<P2 x="126" y="653" id="2047" />
<AutomaticDrawing data="true" />
<new d="false" />
<tags value="" />
@@ -3146,8 +3147,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1516" />
-<P1 x="294" y="474" id="2072" />
-<P2 x="298" y="524" id="2046" />
+<P1 x="294" y="474" id="2158" />
+<P2 x="298" y="524" id="2216" />
<AutomaticDrawing data="true" />
<new d="false" />
<tags value="" />
@@ -3183,7 +3184,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="1523" />
-<P1 x="298" y="554" id="2047" />
+<P1 x="298" y="554" id="2217" />
<P2 x="296" y="650" id="1974" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -3222,8 +3223,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1530" />
-<P1 x="327" y="454" id="2061" />
-<P2 x="442" y="497" id="2143" />
+<P1 x="327" y="454" id="2147" />
+<P2 x="442" y="497" id="2119" />
<AutomaticDrawing data="true" />
<new d="false" />
<tags value="" />
@@ -3260,7 +3261,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="1538" />
<TGConnectingPoint num="1" id="1539" />
-<P1 x="442" y="527" id="2144" />
+<P1 x="442" y="527" id="2120" />
<P2 x="323" y="748" id="1836" />
<Point x="442" y="737" />
<AutomaticDrawing data="true" />
@@ -3357,7 +3358,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="1554" />
-<P1 x="126" y="702" id="2160" />
+<P1 x="126" y="702" id="2052" />
<P2 x="221" y="758" id="1837" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -4097,14 +4098,14 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5104" id="2056" index="48" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
+<SUBCOMPONENT type="5106" id="2118" index="48" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
<father id="2299" num="0" />
-<cdparam x="242" y="529" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="53" y="653" />
+<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
+<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
+<infoparam name="state0" value="CoffeeDelivered" />
<new d="false" />
<TGConnectingPoint num="0" id="2046" />
<TGConnectingPoint num="1" id="2047" />
@@ -4116,110 +4117,96 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<TGConnectingPoint num="7" id="2053" />
<TGConnectingPoint num="8" id="2054" />
<TGConnectingPoint num="9" id="2055" />
-<accessibility />
+<TGConnectingPoint num="10" id="2056" />
+<TGConnectingPoint num="11" id="2057" />
+<TGConnectingPoint num="12" id="2058" />
+<TGConnectingPoint num="13" id="2059" />
+<TGConnectingPoint num="14" id="2060" />
+<TGConnectingPoint num="15" id="2061" />
+<TGConnectingPoint num="16" id="2062" />
+<TGConnectingPoint num="17" id="2063" />
+<TGConnectingPoint num="18" id="2064" />
+<TGConnectingPoint num="19" id="2065" />
+<TGConnectingPoint num="20" id="2066" />
+<TGConnectingPoint num="21" id="2067" />
+<TGConnectingPoint num="22" id="2068" />
+<TGConnectingPoint num="23" id="2069" />
+<TGConnectingPoint num="24" id="2070" />
+<TGConnectingPoint num="25" id="2071" />
+<TGConnectingPoint num="26" id="2072" />
+<TGConnectingPoint num="27" id="2073" />
+<TGConnectingPoint num="28" id="2074" />
+<TGConnectingPoint num="29" id="2075" />
+<TGConnectingPoint num="30" id="2076" />
+<TGConnectingPoint num="31" id="2077" />
+<TGConnectingPoint num="32" id="2078" />
+<TGConnectingPoint num="33" id="2079" />
+<TGConnectingPoint num="34" id="2080" />
+<TGConnectingPoint num="35" id="2081" />
+<TGConnectingPoint num="36" id="2082" />
+<TGConnectingPoint num="37" id="2083" />
+<TGConnectingPoint num="38" id="2084" />
+<TGConnectingPoint num="39" id="2085" />
+<TGConnectingPoint num="40" id="2086" />
+<TGConnectingPoint num="41" id="2087" />
+<TGConnectingPoint num="42" id="2088" />
+<TGConnectingPoint num="43" id="2089" />
+<TGConnectingPoint num="44" id="2090" />
+<TGConnectingPoint num="45" id="2091" />
+<TGConnectingPoint num="46" id="2092" />
+<TGConnectingPoint num="47" id="2093" />
+<TGConnectingPoint num="48" id="2094" />
+<TGConnectingPoint num="49" id="2095" />
+<TGConnectingPoint num="50" id="2096" />
+<TGConnectingPoint num="51" id="2097" />
+<TGConnectingPoint num="52" id="2098" />
+<TGConnectingPoint num="53" id="2099" />
+<TGConnectingPoint num="54" id="2100" />
+<TGConnectingPoint num="55" id="2101" />
+<TGConnectingPoint num="56" id="2102" />
+<TGConnectingPoint num="57" id="2103" />
+<TGConnectingPoint num="58" id="2104" />
+<TGConnectingPoint num="59" id="2105" />
+<TGConnectingPoint num="60" id="2106" />
+<TGConnectingPoint num="61" id="2107" />
+<TGConnectingPoint num="62" id="2108" />
+<TGConnectingPoint num="63" id="2109" />
+<TGConnectingPoint num="64" id="2110" />
+<TGConnectingPoint num="65" id="2111" />
+<TGConnectingPoint num="66" id="2112" />
+<TGConnectingPoint num="67" id="2113" />
+<TGConnectingPoint num="68" id="2114" />
+<TGConnectingPoint num="69" id="2115" />
+<TGConnectingPoint num="70" id="2116" />
+<TGConnectingPoint num="71" id="2117" />
<tags value="" />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2129" index="49" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
+<SUBCOMPONENT type="5103" id="2129" index="49" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
<father id="2299" num="1" />
-<cdparam x="195" y="434" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="377" y="502" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
<new d="false" />
-<TGConnectingPoint num="0" id="2057" />
-<TGConnectingPoint num="1" id="2058" />
-<TGConnectingPoint num="2" id="2059" />
-<TGConnectingPoint num="3" id="2060" />
-<TGConnectingPoint num="4" id="2061" />
-<TGConnectingPoint num="5" id="2062" />
-<TGConnectingPoint num="6" id="2063" />
-<TGConnectingPoint num="7" id="2064" />
-<TGConnectingPoint num="8" id="2065" />
-<TGConnectingPoint num="9" id="2066" />
-<TGConnectingPoint num="10" id="2067" />
-<TGConnectingPoint num="11" id="2068" />
-<TGConnectingPoint num="12" id="2069" />
-<TGConnectingPoint num="13" id="2070" />
-<TGConnectingPoint num="14" id="2071" />
-<TGConnectingPoint num="15" id="2072" />
-<TGConnectingPoint num="16" id="2073" />
-<TGConnectingPoint num="17" id="2074" />
-<TGConnectingPoint num="18" id="2075" />
-<TGConnectingPoint num="19" id="2076" />
-<TGConnectingPoint num="20" id="2077" />
-<TGConnectingPoint num="21" id="2078" />
-<TGConnectingPoint num="22" id="2079" />
-<TGConnectingPoint num="23" id="2080" />
-<TGConnectingPoint num="24" id="2081" />
-<TGConnectingPoint num="25" id="2082" />
-<TGConnectingPoint num="26" id="2083" />
-<TGConnectingPoint num="27" id="2084" />
-<TGConnectingPoint num="28" id="2085" />
-<TGConnectingPoint num="29" id="2086" />
-<TGConnectingPoint num="30" id="2087" />
-<TGConnectingPoint num="31" id="2088" />
-<TGConnectingPoint num="32" id="2089" />
-<TGConnectingPoint num="33" id="2090" />
-<TGConnectingPoint num="34" id="2091" />
-<TGConnectingPoint num="35" id="2092" />
-<TGConnectingPoint num="36" id="2093" />
-<TGConnectingPoint num="37" id="2094" />
-<TGConnectingPoint num="38" id="2095" />
-<TGConnectingPoint num="39" id="2096" />
-<TGConnectingPoint num="40" id="2097" />
-<TGConnectingPoint num="41" id="2098" />
-<TGConnectingPoint num="42" id="2099" />
-<TGConnectingPoint num="43" id="2100" />
-<TGConnectingPoint num="44" id="2101" />
-<TGConnectingPoint num="45" id="2102" />
-<TGConnectingPoint num="46" id="2103" />
-<TGConnectingPoint num="47" id="2104" />
-<TGConnectingPoint num="48" id="2105" />
-<TGConnectingPoint num="49" id="2106" />
-<TGConnectingPoint num="50" id="2107" />
-<TGConnectingPoint num="51" id="2108" />
-<TGConnectingPoint num="52" id="2109" />
-<TGConnectingPoint num="53" id="2110" />
-<TGConnectingPoint num="54" id="2111" />
-<TGConnectingPoint num="55" id="2112" />
-<TGConnectingPoint num="56" id="2113" />
-<TGConnectingPoint num="57" id="2114" />
-<TGConnectingPoint num="58" id="2115" />
-<TGConnectingPoint num="59" id="2116" />
-<TGConnectingPoint num="60" id="2117" />
-<TGConnectingPoint num="61" id="2118" />
-<TGConnectingPoint num="62" id="2119" />
-<TGConnectingPoint num="63" id="2120" />
-<TGConnectingPoint num="64" id="2121" />
-<TGConnectingPoint num="65" id="2122" />
-<TGConnectingPoint num="66" id="2123" />
-<TGConnectingPoint num="67" id="2124" />
-<TGConnectingPoint num="68" id="2125" />
-<TGConnectingPoint num="69" id="2126" />
-<TGConnectingPoint num="70" id="2127" />
-<TGConnectingPoint num="71" id="2128" />
-<latencyCheck />
-<invariant />
-<color value="-13057" />
+<TGConnectingPoint num="0" id="2119" />
+<TGConnectingPoint num="1" id="2120" />
+<TGConnectingPoint num="2" id="2121" />
+<TGConnectingPoint num="3" id="2122" />
+<TGConnectingPoint num="4" id="2123" />
+<TGConnectingPoint num="5" id="2124" />
+<TGConnectingPoint num="6" id="2125" />
+<TGConnectingPoint num="7" id="2126" />
+<TGConnectingPoint num="8" id="2127" />
+<TGConnectingPoint num="9" id="2128" />
+<accessibility />
<tags value="" />
-<extraparam>
-</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="2131" index="50" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
+<SUBCOMPONENT type="5104" id="2140" index="50" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
<father id="2299" num="2" />
-<cdparam x="254" y="401" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
-<infoparam name="start state" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="2130" />
-<tags value="" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2142" index="51" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
-<father id="2299" num="3" />
<cdparam x="63" y="529" />
<sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -4227,27 +4214,38 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
<infoparam name="Send signal" value="pushCoffeeButton()" />
<new d="false" />
-<TGConnectingPoint num="0" id="2132" />
-<TGConnectingPoint num="1" id="2133" />
-<TGConnectingPoint num="2" id="2134" />
-<TGConnectingPoint num="3" id="2135" />
-<TGConnectingPoint num="4" id="2136" />
-<TGConnectingPoint num="5" id="2137" />
-<TGConnectingPoint num="6" id="2138" />
-<TGConnectingPoint num="7" id="2139" />
-<TGConnectingPoint num="8" id="2140" />
-<TGConnectingPoint num="9" id="2141" />
+<TGConnectingPoint num="0" id="2130" />
+<TGConnectingPoint num="1" id="2131" />
+<TGConnectingPoint num="2" id="2132" />
+<TGConnectingPoint num="3" id="2133" />
+<TGConnectingPoint num="4" id="2134" />
+<TGConnectingPoint num="5" id="2135" />
+<TGConnectingPoint num="6" id="2136" />
+<TGConnectingPoint num="7" id="2137" />
+<TGConnectingPoint num="8" id="2138" />
+<TGConnectingPoint num="9" id="2139" />
<accessibility />
<tags value="" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="2153" index="52" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
+<SUBCOMPONENT type="5100" id="2142" index="51" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
+<father id="2299" num="3" />
+<cdparam x="254" y="401" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
+<infoparam name="start state" value="null" />
+<new d="false" />
+<TGConnectingPoint num="0" id="2141" />
+<tags value="" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="2215" index="52" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
<father id="2299" num="4" />
-<cdparam x="377" y="502" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="195" y="434" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
<new d="false" />
<TGConnectingPoint num="0" id="2143" />
<TGConnectingPoint num="1" id="2144" />
@@ -4259,93 +4257,96 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<TGConnectingPoint num="7" id="2150" />
<TGConnectingPoint num="8" id="2151" />
<TGConnectingPoint num="9" id="2152" />
-<accessibility />
+<TGConnectingPoint num="10" id="2153" />
+<TGConnectingPoint num="11" id="2154" />
+<TGConnectingPoint num="12" id="2155" />
+<TGConnectingPoint num="13" id="2156" />
+<TGConnectingPoint num="14" id="2157" />
+<TGConnectingPoint num="15" id="2158" />
+<TGConnectingPoint num="16" id="2159" />
+<TGConnectingPoint num="17" id="2160" />
+<TGConnectingPoint num="18" id="2161" />
+<TGConnectingPoint num="19" id="2162" />
+<TGConnectingPoint num="20" id="2163" />
+<TGConnectingPoint num="21" id="2164" />
+<TGConnectingPoint num="22" id="2165" />
+<TGConnectingPoint num="23" id="2166" />
+<TGConnectingPoint num="24" id="2167" />
+<TGConnectingPoint num="25" id="2168" />
+<TGConnectingPoint num="26" id="2169" />
+<TGConnectingPoint num="27" id="2170" />
+<TGConnectingPoint num="28" id="2171" />
+<TGConnectingPoint num="29" id="2172" />
+<TGConnectingPoint num="30" id="2173" />
+<TGConnectingPoint num="31" id="2174" />
+<TGConnectingPoint num="32" id="2175" />
+<TGConnectingPoint num="33" id="2176" />
+<TGConnectingPoint num="34" id="2177" />
+<TGConnectingPoint num="35" id="2178" />
+<TGConnectingPoint num="36" id="2179" />
+<TGConnectingPoint num="37" id="2180" />
+<TGConnectingPoint num="38" id="2181" />
+<TGConnectingPoint num="39" id="2182" />
+<TGConnectingPoint num="40" id="2183" />
+<TGConnectingPoint num="41" id="2184" />
+<TGConnectingPoint num="42" id="2185" />
+<TGConnectingPoint num="43" id="2186" />
+<TGConnectingPoint num="44" id="2187" />
+<TGConnectingPoint num="45" id="2188" />
+<TGConnectingPoint num="46" id="2189" />
+<TGConnectingPoint num="47" id="2190" />
+<TGConnectingPoint num="48" id="2191" />
+<TGConnectingPoint num="49" id="2192" />
+<TGConnectingPoint num="50" id="2193" />
+<TGConnectingPoint num="51" id="2194" />
+<TGConnectingPoint num="52" id="2195" />
+<TGConnectingPoint num="53" id="2196" />
+<TGConnectingPoint num="54" id="2197" />
+<TGConnectingPoint num="55" id="2198" />
+<TGConnectingPoint num="56" id="2199" />
+<TGConnectingPoint num="57" id="2200" />
+<TGConnectingPoint num="58" id="2201" />
+<TGConnectingPoint num="59" id="2202" />
+<TGConnectingPoint num="60" id="2203" />
+<TGConnectingPoint num="61" id="2204" />
+<TGConnectingPoint num="62" id="2205" />
+<TGConnectingPoint num="63" id="2206" />
+<TGConnectingPoint num="64" id="2207" />
+<TGConnectingPoint num="65" id="2208" />
+<TGConnectingPoint num="66" id="2209" />
+<TGConnectingPoint num="67" id="2210" />
+<TGConnectingPoint num="68" id="2211" />
+<TGConnectingPoint num="69" id="2212" />
+<TGConnectingPoint num="70" id="2213" />
+<TGConnectingPoint num="71" id="2214" />
+<latencyCheck />
+<invariant />
+<color value="-13057" />
<tags value="" />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2226" index="53" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
+<SUBCOMPONENT type="5104" id="2226" index="53" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
<father id="2299" num="5" />
-<cdparam x="53" y="653" />
-<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="242" y="529" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
-<infoparam name="state0" value="CoffeeDelivered" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
<new d="false" />
-<TGConnectingPoint num="0" id="2154" />
-<TGConnectingPoint num="1" id="2155" />
-<TGConnectingPoint num="2" id="2156" />
-<TGConnectingPoint num="3" id="2157" />
-<TGConnectingPoint num="4" id="2158" />
-<TGConnectingPoint num="5" id="2159" />
-<TGConnectingPoint num="6" id="2160" />
-<TGConnectingPoint num="7" id="2161" />
-<TGConnectingPoint num="8" id="2162" />
-<TGConnectingPoint num="9" id="2163" />
-<TGConnectingPoint num="10" id="2164" />
-<TGConnectingPoint num="11" id="2165" />
-<TGConnectingPoint num="12" id="2166" />
-<TGConnectingPoint num="13" id="2167" />
-<TGConnectingPoint num="14" id="2168" />
-<TGConnectingPoint num="15" id="2169" />
-<TGConnectingPoint num="16" id="2170" />
-<TGConnectingPoint num="17" id="2171" />
-<TGConnectingPoint num="18" id="2172" />
-<TGConnectingPoint num="19" id="2173" />
-<TGConnectingPoint num="20" id="2174" />
-<TGConnectingPoint num="21" id="2175" />
-<TGConnectingPoint num="22" id="2176" />
-<TGConnectingPoint num="23" id="2177" />
-<TGConnectingPoint num="24" id="2178" />
-<TGConnectingPoint num="25" id="2179" />
-<TGConnectingPoint num="26" id="2180" />
-<TGConnectingPoint num="27" id="2181" />
-<TGConnectingPoint num="28" id="2182" />
-<TGConnectingPoint num="29" id="2183" />
-<TGConnectingPoint num="30" id="2184" />
-<TGConnectingPoint num="31" id="2185" />
-<TGConnectingPoint num="32" id="2186" />
-<TGConnectingPoint num="33" id="2187" />
-<TGConnectingPoint num="34" id="2188" />
-<TGConnectingPoint num="35" id="2189" />
-<TGConnectingPoint num="36" id="2190" />
-<TGConnectingPoint num="37" id="2191" />
-<TGConnectingPoint num="38" id="2192" />
-<TGConnectingPoint num="39" id="2193" />
-<TGConnectingPoint num="40" id="2194" />
-<TGConnectingPoint num="41" id="2195" />
-<TGConnectingPoint num="42" id="2196" />
-<TGConnectingPoint num="43" id="2197" />
-<TGConnectingPoint num="44" id="2198" />
-<TGConnectingPoint num="45" id="2199" />
-<TGConnectingPoint num="46" id="2200" />
-<TGConnectingPoint num="47" id="2201" />
-<TGConnectingPoint num="48" id="2202" />
-<TGConnectingPoint num="49" id="2203" />
-<TGConnectingPoint num="50" id="2204" />
-<TGConnectingPoint num="51" id="2205" />
-<TGConnectingPoint num="52" id="2206" />
-<TGConnectingPoint num="53" id="2207" />
-<TGConnectingPoint num="54" id="2208" />
-<TGConnectingPoint num="55" id="2209" />
-<TGConnectingPoint num="56" id="2210" />
-<TGConnectingPoint num="57" id="2211" />
-<TGConnectingPoint num="58" id="2212" />
-<TGConnectingPoint num="59" id="2213" />
-<TGConnectingPoint num="60" id="2214" />
-<TGConnectingPoint num="61" id="2215" />
-<TGConnectingPoint num="62" id="2216" />
-<TGConnectingPoint num="63" id="2217" />
-<TGConnectingPoint num="64" id="2218" />
-<TGConnectingPoint num="65" id="2219" />
-<TGConnectingPoint num="66" id="2220" />
-<TGConnectingPoint num="67" id="2221" />
-<TGConnectingPoint num="68" id="2222" />
-<TGConnectingPoint num="69" id="2223" />
-<TGConnectingPoint num="70" id="2224" />
-<TGConnectingPoint num="71" id="2225" />
+<TGConnectingPoint num="0" id="2216" />
+<TGConnectingPoint num="1" id="2217" />
+<TGConnectingPoint num="2" id="2218" />
+<TGConnectingPoint num="3" id="2219" />
+<TGConnectingPoint num="4" id="2220" />
+<TGConnectingPoint num="5" id="2221" />
+<TGConnectingPoint num="6" id="2222" />
+<TGConnectingPoint num="7" id="2223" />
+<TGConnectingPoint num="8" id="2224" />
+<TGConnectingPoint num="9" id="2225" />
+<accessibility />
<tags value="" />
-<extraparam>
-</extraparam>
</SUBCOMPONENT>
diff --git a/src/main/java/avatartranslator/AvatarBlock.java b/src/main/java/avatartranslator/AvatarBlock.java
index 428a0733b46d50fee66284f2c250b18516bc2498..0ee1cc0fadabaeb35f69c4db461270200136130c 100644
--- a/src/main/java/avatartranslator/AvatarBlock.java
+++ b/src/main/java/avatartranslator/AvatarBlock.java
@@ -361,7 +361,8 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
public String toString() {
//Thread.currentThread().dumpStack();
- StringBuffer sb = new StringBuffer("block:" + getName() + characteristicsToString() + " tags=" + tagsToString() + " \n");
+ StringBuffer sb = new StringBuffer("block:" + getName() + characteristicsToString() + referencesToString() + " tags=" + tagsToString() + " " +
+ "\n");
if (getFather() != null) {
sb.append(" subblock of: " + getFather().getName() + "\n");
} else {
diff --git a/src/main/java/avatartranslator/AvatarElement.java b/src/main/java/avatartranslator/AvatarElement.java
index 5645e51192eda873662c0a3a0618c4c77cc7f233..c24f0dc7a8b66482b913387cd686354c2d131a91 100644
--- a/src/main/java/avatartranslator/AvatarElement.java
+++ b/src/main/java/avatartranslator/AvatarElement.java
@@ -43,6 +43,7 @@ import common.Tag;
import common.Tags;
import myutil.NameChecker;
import myutil.TraceManager;
+import ui.CDElement;
import java.util.*;
@@ -65,6 +66,7 @@ public class AvatarElement implements NameChecker.NamedElement, CanBeTagged {
protected Tags tags;
+
public AvatarElement(String _name, Object _referenceObject) {
myID=++ID;
name = _name;
@@ -72,6 +74,37 @@ public class AvatarElement implements NameChecker.NamedElement, CanBeTagged {
tags = new Tags();
}
+ public String referencesToString() {
+ String ret = "";
+ ret += referencesToString(referenceObject);
+ if (otherReferenceObjects != null) {
+ for (Object o : otherReferenceObjects) {
+ ret += referencesToString(o);
+ }
+ }
+ return ret;
+ }
+
+ public String referencesToString(Object ref) {
+ String ret = "";
+ if (ref == null) {
+ return ret;
+ }
+
+ if (ref instanceof CDElement) {
+ CDElement cd = (CDElement)ref;
+ ret += " coord[" + cd.getX() + "," + cd.getY() + "," + cd.getWidth() + "," + cd.getHeight() + "]";
+ } else if (ref instanceof java.awt.Point) {
+ java.awt.Point pt = (java.awt.Point)ref;
+ ret += " point[" + pt.getX() + "," + pt.getY() + "]";
+ } else {
+ ret += " ref class[" + ref.getClass() + "]";
+ }
+ return ret;
+
+
+ }
+
public void addReferenceObjectFrom(AvatarElement _elt) {
addReferenceObject(_elt.getReferenceObject());
Vector<Object> others = _elt.getReferenceObjects();
diff --git a/src/main/java/avatartranslator/AvatarStateMachineElement.java b/src/main/java/avatartranslator/AvatarStateMachineElement.java
index 9abef74fda7eb0d8be2e1dc9eae1346657b856e9..5475e401f6c627cb1d340faf4afa59ef031813ec 100644
--- a/src/main/java/avatartranslator/AvatarStateMachineElement.java
+++ b/src/main/java/avatartranslator/AvatarStateMachineElement.java
@@ -235,11 +235,11 @@ public abstract class AvatarStateMachineElement extends AvatarElement implements
}
protected String toString(String val) {
- String ret = getExtendedName() + characteristicsToString() + " tags=" + tagsToString();
+ String ret = getExtendedName() + characteristicsToString() + referencesToString() + " tags=" + tagsToString();
if (myState == null) {
ret += " / top level operator\n";
} else {
- ret += " / in state " + myState.getName() + " ref=" + block.getStateMachine().getIndexOf(this) + "\n";
+ ret += " / in state " + myState.getName() + " ref=" + block.getStateMachine().getIndexOf(this) + referencesToString() + "\n";
}
if (val != null) {