diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 113e8cf1ad931cf8c743bd91a9dd8954488d009b..99ac3277f6acf0149730cf005f800fe553012254 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -643,7 +643,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="373" />
-<P1 x="302" y="261" id="417" />
+<P1 x="302" y="261" id="404" />
<P2 x="361" y="261" id="392" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -661,7 +661,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="377" />
-<P1 x="305" y="211" id="404" />
+<P1 x="305" y="211" id="417" />
<P2 x="361" y="211" id="391" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -750,11 +750,11 @@
</COMPONENT>
<SUBCOMPONENT type="5304" id="414" >
<father id="452" num="0" />
-<cdparam x="166" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="154" y="241" />
+<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
<TGConnectingPoint num="0" id="402" />
<TGConnectingPoint num="1" id="403" />
<TGConnectingPoint num="2" id="404" />
@@ -770,11 +770,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5304" id="427" >
<father id="452" num="1" />
-<cdparam x="154" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="166" y="191" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
<TGConnectingPoint num="0" id="415" />
<TGConnectingPoint num="1" id="416" />
<TGConnectingPoint num="2" id="417" />
@@ -904,7 +904,7 @@
<TGConnectingPoint num="0" id="511" />
<TGConnectingPoint num="1" id="512" />
<TGConnectingPoint num="2" id="513" />
-<P1 x="581" y="154" id="587" />
+<P1 x="581" y="154" id="600" />
<P2 x="546" y="305" id="657" />
<Point x="518" y="154" />
<Point x="518" y="305" />
@@ -932,7 +932,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="516" />
<TGConnectingPoint num="1" id="517" />
-<P1 x="631" y="164" id="582" />
+<P1 x="631" y="164" id="595" />
<P2 x="667" y="310" id="644" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
@@ -960,7 +960,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="522" />
<TGConnectingPoint num="1" id="523" />
-<P1 x="721" y="158" id="593" />
+<P1 x="721" y="158" id="580" />
<P2 x="700" y="204" id="634" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
@@ -1115,13 +1115,13 @@
<TGConnectingPoint num="22" id="627" />
<TGConnectingPoint num="23" id="628" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="591" >
+<SUBCOMPONENT type="5303" id="591" >
<father id="629" num="0" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
+<infoparam name="TGComponent" value="nbOfCoins" />
<TGConnectingPoint num="0" id="579" />
<TGConnectingPoint num="1" id="580" />
<TGConnectingPoint num="2" id="581" />
@@ -1134,14 +1134,17 @@
<TGConnectingPoint num="9" id="588" />
<TGConnectingPoint num="10" id="589" />
<TGConnectingPoint num="11" id="590" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="604" >
+<SUBCOMPONENT type="5304" id="604" >
<father id="629" num="1" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
-<infoparam name="TGComponent" value="nbOfCoins" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
<TGConnectingPoint num="0" id="592" />
<TGConnectingPoint num="1" id="593" />
<TGConnectingPoint num="2" id="594" />
@@ -1154,9 +1157,6 @@
<TGConnectingPoint num="9" id="601" />
<TGConnectingPoint num="10" id="602" />
<TGConnectingPoint num="11" id="603" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5306" id="641" >
@@ -1287,7 +1287,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="694" />
-<P1 x="559" y="330" id="756" />
+<P1 x="559" y="330" id="731" />
<P2 x="560" y="377" id="789" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -1317,7 +1317,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="698" />
-<P1 x="789" y="326" id="731" />
+<P1 x="789" y="326" id="756" />
<P2 x="790" y="377" id="790" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -1418,11 +1418,11 @@
</COMPONENT>
<SUBCOMPONENT type="5000" id="749" >
<father id="799" num="0" />
-<cdparam x="695" y="224" />
-<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="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="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
<TGConnectingPoint num="0" id="725" />
<TGConnectingPoint num="1" id="726" />
<TGConnectingPoint num="2" id="727" />
@@ -1456,11 +1456,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="774" >
<father id="799" num="1" />
-<cdparam x="464" y="228" />
-<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
<TGConnectingPoint num="0" id="750" />
<TGConnectingPoint num="1" id="751" />
<TGConnectingPoint num="2" id="752" />
@@ -1502,8 +1502,8 @@
<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="805" />
-<P1 x="340" y="233" id="976" />
-<P2 x="353" y="252" id="978" />
+<P1 x="340" y="233" id="987" />
+<P2 x="353" y="252" id="976" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="804" >
<father id="806" num="0" />
@@ -1592,7 +1592,7 @@
<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="826" />
-<P1 x="353" y="282" id="979" />
+<P1 x="353" y="282" id="977" />
<P2 x="399" y="352" id="829" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="825" >
@@ -1874,33 +1874,33 @@
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5100" id="977" >
+<SUBCOMPONENT type="5103" id="986" >
<father id="1061" num="0" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="976" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="988" >
-<father id="1061" num="1" />
<cdparam x="330" y="257" />
<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="978" />
-<TGConnectingPoint num="1" id="979" />
-<TGConnectingPoint num="2" id="980" />
-<TGConnectingPoint num="3" id="981" />
-<TGConnectingPoint num="4" id="982" />
-<TGConnectingPoint num="5" id="983" />
-<TGConnectingPoint num="6" id="984" />
-<TGConnectingPoint num="7" id="985" />
-<TGConnectingPoint num="8" id="986" />
-<TGConnectingPoint num="9" id="987" />
+<TGConnectingPoint num="0" id="976" />
+<TGConnectingPoint num="1" id="977" />
+<TGConnectingPoint num="2" id="978" />
+<TGConnectingPoint num="3" id="979" />
+<TGConnectingPoint num="4" id="980" />
+<TGConnectingPoint num="5" id="981" />
+<TGConnectingPoint num="6" id="982" />
+<TGConnectingPoint num="7" id="983" />
+<TGConnectingPoint num="8" id="984" />
+<TGConnectingPoint num="9" id="985" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="988" >
+<father id="1061" num="1" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="987" />
</SUBCOMPONENT>
@@ -2238,7 +2238,7 @@
<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="1255" />
-<P1 x="442" y="527" id="1766" />
+<P1 x="442" y="527" id="1863" />
<P2 x="323" y="748" id="1628" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1254" >
@@ -2269,8 +2269,8 @@
<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="1262" />
-<P1 x="326" y="457" id="1793" />
-<P2 x="442" y="497" id="1765" />
+<P1 x="326" y="457" id="1780" />
+<P2 x="442" y="497" id="1862" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1261" >
<father id="1263" num="0" />
@@ -2299,7 +2299,7 @@
<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="1269" />
-<P1 x="298" y="554" id="1863" />
+<P1 x="298" y="554" id="1766" />
<P2 x="289" y="748" id="1620" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1268" >
@@ -2331,8 +2331,8 @@
<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="1276" />
-<P1 x="293" y="477" id="1804" />
-<P2 x="298" y="524" id="1862" />
+<P1 x="293" y="477" id="1791" />
+<P2 x="298" y="524" id="1765" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1275" >
<father id="1277" num="0" />
@@ -2361,7 +2361,7 @@
<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="1283" />
-<P1 x="126" y="554" id="1777" />
+<P1 x="126" y="554" id="1852" />
<P2 x="255" y="748" id="1627" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1282" >
@@ -2393,8 +2393,8 @@
<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="1290" />
-<P1 x="227" y="477" id="1803" />
-<P2 x="126" y="524" id="1776" />
+<P1 x="227" y="477" id="1790" />
+<P2 x="126" y="524" id="1851" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1289" >
<father id="1291" num="0" />
@@ -2423,8 +2423,8 @@
<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="1297" />
-<P1 x="261" y="421" id="1787" />
-<P2 x="260" y="437" id="1790" />
+<P1 x="261" y="421" id="1849" />
+<P2 x="260" y="437" id="1777" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1296" >
<father id="1298" num="0" />
@@ -3253,14 +3253,14 @@
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5103" id="1775" >
+<SUBCOMPONENT type="5104" id="1775" >
<father id="1945" num="0" />
-<cdparam x="377" y="502" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="1" 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="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
<TGConnectingPoint num="0" id="1765" />
<TGConnectingPoint num="1" id="1766" />
<TGConnectingPoint num="2" id="1767" />
@@ -3273,14 +3273,14 @@
<TGConnectingPoint num="9" id="1774" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1786" >
+<SUBCOMPONENT type="5106" id="1848" >
<father id="1945" num="1" />
-<cdparam x="63" y="529" />
-<sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="194" y="437" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushCoffeeButton()" />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
<TGConnectingPoint num="0" id="1776" />
<TGConnectingPoint num="1" id="1777" />
<TGConnectingPoint num="2" id="1778" />
@@ -3291,109 +3291,109 @@
<TGConnectingPoint num="7" id="1783" />
<TGConnectingPoint num="8" id="1784" />
<TGConnectingPoint num="9" id="1785" />
-<accessibility />
+<TGConnectingPoint num="10" id="1786" />
+<TGConnectingPoint num="11" id="1787" />
+<TGConnectingPoint num="12" id="1788" />
+<TGConnectingPoint num="13" id="1789" />
+<TGConnectingPoint num="14" id="1790" />
+<TGConnectingPoint num="15" id="1791" />
+<TGConnectingPoint num="16" id="1792" />
+<TGConnectingPoint num="17" id="1793" />
+<TGConnectingPoint num="18" id="1794" />
+<TGConnectingPoint num="19" id="1795" />
+<TGConnectingPoint num="20" id="1796" />
+<TGConnectingPoint num="21" id="1797" />
+<TGConnectingPoint num="22" id="1798" />
+<TGConnectingPoint num="23" id="1799" />
+<TGConnectingPoint num="24" id="1800" />
+<TGConnectingPoint num="25" id="1801" />
+<TGConnectingPoint num="26" id="1802" />
+<TGConnectingPoint num="27" id="1803" />
+<TGConnectingPoint num="28" id="1804" />
+<TGConnectingPoint num="29" id="1805" />
+<TGConnectingPoint num="30" id="1806" />
+<TGConnectingPoint num="31" id="1807" />
+<TGConnectingPoint num="32" id="1808" />
+<TGConnectingPoint num="33" id="1809" />
+<TGConnectingPoint num="34" id="1810" />
+<TGConnectingPoint num="35" id="1811" />
+<TGConnectingPoint num="36" id="1812" />
+<TGConnectingPoint num="37" id="1813" />
+<TGConnectingPoint num="38" id="1814" />
+<TGConnectingPoint num="39" id="1815" />
+<TGConnectingPoint num="40" id="1816" />
+<TGConnectingPoint num="41" id="1817" />
+<TGConnectingPoint num="42" id="1818" />
+<TGConnectingPoint num="43" id="1819" />
+<TGConnectingPoint num="44" id="1820" />
+<TGConnectingPoint num="45" id="1821" />
+<TGConnectingPoint num="46" id="1822" />
+<TGConnectingPoint num="47" id="1823" />
+<TGConnectingPoint num="48" id="1824" />
+<TGConnectingPoint num="49" id="1825" />
+<TGConnectingPoint num="50" id="1826" />
+<TGConnectingPoint num="51" id="1827" />
+<TGConnectingPoint num="52" id="1828" />
+<TGConnectingPoint num="53" id="1829" />
+<TGConnectingPoint num="54" id="1830" />
+<TGConnectingPoint num="55" id="1831" />
+<TGConnectingPoint num="56" id="1832" />
+<TGConnectingPoint num="57" id="1833" />
+<TGConnectingPoint num="58" id="1834" />
+<TGConnectingPoint num="59" id="1835" />
+<TGConnectingPoint num="60" id="1836" />
+<TGConnectingPoint num="61" id="1837" />
+<TGConnectingPoint num="62" id="1838" />
+<TGConnectingPoint num="63" id="1839" />
+<TGConnectingPoint num="64" id="1840" />
+<TGConnectingPoint num="65" id="1841" />
+<TGConnectingPoint num="66" id="1842" />
+<TGConnectingPoint num="67" id="1843" />
+<TGConnectingPoint num="68" id="1844" />
+<TGConnectingPoint num="69" id="1845" />
+<TGConnectingPoint num="70" id="1846" />
+<TGConnectingPoint num="71" id="1847" />
+<latencyCheck />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1788" >
+<SUBCOMPONENT type="5100" id="1850" >
<father id="1945" num="2" />
<cdparam x="254" y="401" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1787" />
+<TGConnectingPoint num="0" id="1849" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1861" >
+<SUBCOMPONENT type="5104" id="1861" >
<father id="1945" num="3" />
-<cdparam x="194" y="437" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="63" y="529" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1789" />
-<TGConnectingPoint num="1" id="1790" />
-<TGConnectingPoint num="2" id="1791" />
-<TGConnectingPoint num="3" id="1792" />
-<TGConnectingPoint num="4" id="1793" />
-<TGConnectingPoint num="5" id="1794" />
-<TGConnectingPoint num="6" id="1795" />
-<TGConnectingPoint num="7" id="1796" />
-<TGConnectingPoint num="8" id="1797" />
-<TGConnectingPoint num="9" id="1798" />
-<TGConnectingPoint num="10" id="1799" />
-<TGConnectingPoint num="11" id="1800" />
-<TGConnectingPoint num="12" id="1801" />
-<TGConnectingPoint num="13" id="1802" />
-<TGConnectingPoint num="14" id="1803" />
-<TGConnectingPoint num="15" id="1804" />
-<TGConnectingPoint num="16" id="1805" />
-<TGConnectingPoint num="17" id="1806" />
-<TGConnectingPoint num="18" id="1807" />
-<TGConnectingPoint num="19" id="1808" />
-<TGConnectingPoint num="20" id="1809" />
-<TGConnectingPoint num="21" id="1810" />
-<TGConnectingPoint num="22" id="1811" />
-<TGConnectingPoint num="23" id="1812" />
-<TGConnectingPoint num="24" id="1813" />
-<TGConnectingPoint num="25" id="1814" />
-<TGConnectingPoint num="26" id="1815" />
-<TGConnectingPoint num="27" id="1816" />
-<TGConnectingPoint num="28" id="1817" />
-<TGConnectingPoint num="29" id="1818" />
-<TGConnectingPoint num="30" id="1819" />
-<TGConnectingPoint num="31" id="1820" />
-<TGConnectingPoint num="32" id="1821" />
-<TGConnectingPoint num="33" id="1822" />
-<TGConnectingPoint num="34" id="1823" />
-<TGConnectingPoint num="35" id="1824" />
-<TGConnectingPoint num="36" id="1825" />
-<TGConnectingPoint num="37" id="1826" />
-<TGConnectingPoint num="38" id="1827" />
-<TGConnectingPoint num="39" id="1828" />
-<TGConnectingPoint num="40" id="1829" />
-<TGConnectingPoint num="41" id="1830" />
-<TGConnectingPoint num="42" id="1831" />
-<TGConnectingPoint num="43" id="1832" />
-<TGConnectingPoint num="44" id="1833" />
-<TGConnectingPoint num="45" id="1834" />
-<TGConnectingPoint num="46" id="1835" />
-<TGConnectingPoint num="47" id="1836" />
-<TGConnectingPoint num="48" id="1837" />
-<TGConnectingPoint num="49" id="1838" />
-<TGConnectingPoint num="50" id="1839" />
-<TGConnectingPoint num="51" id="1840" />
-<TGConnectingPoint num="52" id="1841" />
-<TGConnectingPoint num="53" id="1842" />
-<TGConnectingPoint num="54" id="1843" />
-<TGConnectingPoint num="55" id="1844" />
-<TGConnectingPoint num="56" id="1845" />
-<TGConnectingPoint num="57" id="1846" />
-<TGConnectingPoint num="58" id="1847" />
-<TGConnectingPoint num="59" id="1848" />
-<TGConnectingPoint num="60" id="1849" />
-<TGConnectingPoint num="61" id="1850" />
-<TGConnectingPoint num="62" id="1851" />
-<TGConnectingPoint num="63" id="1852" />
-<TGConnectingPoint num="64" id="1853" />
-<TGConnectingPoint num="65" id="1854" />
-<TGConnectingPoint num="66" id="1855" />
-<TGConnectingPoint num="67" id="1856" />
-<TGConnectingPoint num="68" id="1857" />
-<TGConnectingPoint num="69" id="1858" />
-<TGConnectingPoint num="70" id="1859" />
-<TGConnectingPoint num="71" id="1860" />
-<latencyCheck />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="1851" />
+<TGConnectingPoint num="1" id="1852" />
+<TGConnectingPoint num="2" id="1853" />
+<TGConnectingPoint num="3" id="1854" />
+<TGConnectingPoint num="4" id="1855" />
+<TGConnectingPoint num="5" id="1856" />
+<TGConnectingPoint num="6" id="1857" />
+<TGConnectingPoint num="7" id="1858" />
+<TGConnectingPoint num="8" id="1859" />
+<TGConnectingPoint num="9" id="1860" />
+<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1872" >
+<SUBCOMPONENT type="5103" id="1872" >
<father id="1945" num="4" />
-<cdparam x="242" y="529" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="1" 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="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
<TGConnectingPoint num="0" id="1862" />
<TGConnectingPoint num="1" id="1863" />
<TGConnectingPoint num="2" id="1864" />
diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index c1565a61255fb01eaedfb6e4363e4c80504014a6..7830e6d21cf4f3b90abc0253d361425582f7c461 100644
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -348,7 +348,7 @@ public class ActionPerformer {
} else if (command.equals(mgui.actions[TGUIAction.ABD_BLOCK].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARBD_BLOCK);
} else if (command.equals(mgui.actions[TGUIAction.AMS_INTERFACE].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARBD_BLOCK);
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARBD_AMS_INTERFACE);
} else if (command.equals(mgui.actions[TGUIAction.ABD_CRYPTOBLOCK].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARBD_CRYPTOBLOCK);
} else if (command.equals(mgui.actions[TGUIAction.ABD_DATATYPE].getActionCommand())) {
diff --git a/src/main/java/ui/ColorManager.java b/src/main/java/ui/ColorManager.java
index 66a0d522885e71b6521b71073f67843f9c0b26a2..78fbe7fd75e251846d91fc6980e5587d7ce74408 100644
--- a/src/main/java/ui/ColorManager.java
+++ b/src/main/java/ui/ColorManager.java
@@ -173,7 +173,7 @@ public class ColorManager {
//public static final Color AVATAR_BLOCK = new Color(158, 218, 227);
//public static final Color AVATAR_BLOCK = new Color(149, 193, 210);
public static Color AVATAR_BLOCK = new Color(193, 218, 241);
- public static Color AVATAR_INTERFACE = new Color(0, 220, 162);
+ public static Color AVATAR_INTERFACE = new Color(215, 217, 219);
public static Color AVATAR_LIBRARYFUNCTION = new Color(237, 208, 14);
//public static final Color AVATAR_DATATYPE = new Color(109, 193, 210);
public static Color AVATAR_DATATYPE = new Color(156, 220, 162);
@@ -285,7 +285,7 @@ public class ColorManager {
public static void noColor() {
UML_NOTE_BG = Color.white;
AVATAR_BLOCK = Color.white;
- AVATAR_INTERFACE = Color.white;
+ AVATAR_INTERFACE = Color.white;
AVATAR_DATATYPE = Color.white;
AVATAR_STATE = Color.white;
AVATAR_REQUIREMENT_TOP = Color.white;
@@ -313,7 +313,7 @@ public class ColorManager {
MEMORY_BOX = Color.white;
DMA_BOX = Color.white;
HWA_BOX = Color.white;
- CAMS_BOX = Color.white;
+ CAMS_BOX = Color.white;
ATD_BLOCK = Color.white;
ATD_ATTACK = Color.white;
ATD_ROOT_ATTACK = Color.white;
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index 41457c7293f5b66d38d8054a4453d77715f85a94..817668c6636f869f589eff95afa08ca8963f6b10 100644
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -430,6 +430,7 @@ public class TGComponentManager {
public static final int AVATARBD_CRYPTOBLOCK = 5004;
public static final int AVATARBD_LIBRARYFUNCTION = 5005;
public static final int AVATARBD_CRYPTOLIBRARYFUNCTION = 5006;
+ public static final int AVATARBD_AMS_INTERFACE = 5008;
// AVATAR SMD -> starts at 5100
public static final int AVATARSMD_START_STATE = 5100;
@@ -583,6 +584,9 @@ public class TGComponentManager {
case AVATARBD_BLOCK:
tgc = new AvatarBDBlock(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
+ case AVATARBD_AMS_INTERFACE:
+ tgc = new AvatarBDInterface(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
case AVATARBD_CRYPTOBLOCK:
tgc = new AvatarBDBlock(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
((AvatarBDBlock) tgc).addCryptoElements();
@@ -1577,6 +1581,8 @@ public class TGComponentManager {
// AVATAR BD
} else if (tgc instanceof AvatarBDBlock) {
return AVATARBD_BLOCK;
+ } else if (tgc instanceof AvatarBDInterface) {
+ return AVATARBD_AMS_INTERFACE;
} else if (tgc instanceof AvatarBDDataType) {
return AVATARBD_DATATYPE;
} else if (tgc instanceof AvatarBDCompositionConnector) {
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index c1b44bb6d74ce7f7baa4cf6313fe5b85813e8355..d73cc1ee5ddf82cd22888b952f8e3f89b0c99072 100644
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -1115,7 +1115,7 @@ public class TGUIAction extends AbstractAction {
actions[TMLAD_SEND_EVENT] = new TAction("add-tmladd-send-event", "Send event", IconManager.imgic904, IconManager.imgic904, "Send event", "Add a send event operator to the currently opened TML activity diagram", 0);
actions[TMLAD_WAIT_EVENT] = new TAction("add-tmladd-wait-event", "Wait event", IconManager.imgic908, IconManager.imgic908, "Wait event", "Add a wait event operator to the currently opened TML activity diagram", 0);
actions[TMLAD_NOTIFIED_EVENT] = new TAction("add-tmladd-notified-event", "Notified event", IconManager.imgic918, IconManager.imgic918, "Notified event", "Add a notified event operator to the currently opened TML activity diagram", 0);
- actions[TMLAD_WRITE_CAMS] = new TAction("add-tmladd-write-cams", "Write to CAMS", IconManager.imgic904, IconManager.imgic905, "Write to CAMS", "Add a write CAMS operator to the currently opened TML activity diagram", 0);
+ actions[TMLAD_WRITE_CAMS] = new TAction("add-tmladd-write-cams", "Write to CAMS", IconManager.imgic904, IconManager.imgic905, "Write to CAMS", "Add a write CAMS operator to the currently opened TML activity diagram", 0);
actions[TMLAD_READ_CAMS] = new TAction("add-tmladd-read-cams", "Read CAMS", IconManager.imgic908, IconManager.imgic907, "Read CAMS", "Add a read CAMS operator to the currently opened TML activity diagram", 0);
actions[TMLAD_READ_CHANNEL] = new TAction("add-tmladd-read-channel", "Read in channel", IconManager.imgic906, IconManager.imgic906, "Read in channel", "Add a read to channel operator opened TML activity diagram", 0);
@@ -1201,7 +1201,7 @@ public class TGUIAction extends AbstractAction {
actions[CAMS_CLUSTER] = new TAction("C-AMS-cluster", "Add a cluster", IconManager.imgic8003, IconManager.imgic8003, "Cluster", "Add a cluster to the currently opened SystemC-AMS Diagram", 0);
actions[CAMS_GENCODE] = new TAction("C-AMS-gencode", "SystemC-AMS code generation",IconManager.imgic94, IconManager.imgic94, "Generate SystemC-AMS code", "SystemC-AMS diagram without check syntax", 0);
actions[CAMS_BLOCK_GPIO2VCI] = new TAction("C-AMS-block-GPIO2VCI", "Add a block GPIO2VCI",IconManager.imgic8006, IconManager.imgic8006, "GPIO2VCI block", "Add a GPIO2VCI block to the currently opened SystemC-AMS Diagram", 0);
- actions[CAMS_CLOCK] = new TAction("C-AMS-Clock", "Clock", IconManager.imgic8007, IconManager.imgic8007, "Clock", "Add a clock to the currently opened SystemC-AMS diagram", 0);
+ actions[CAMS_CLOCK] = new TAction("C-AMS-Clock", "Clock", IconManager.imgic8007, IconManager.imgic8007, "Clock", "Add a clock to the currently opened SystemC-AMS diagram", 0);
// ELN
actions[ELN_EDIT] = new TAction("add-action-eln", "Action state", IconManager.imgic100, IconManager.imgic101, "Action state", "Add an action state to the currently opened ELN diagram", 0);
actions[ELN_CONNECTOR] = new TAction("eln-connector", "Add a connection", IconManager.imgic202, IconManager.imgic202, "Connector", "Connects two block of the currently opened ELN Diagram", 0);
@@ -1314,7 +1314,8 @@ public class TGUIAction extends AbstractAction {
// AVATAR Block Diagrams
actions[ABD_BLOCK] = new TAction("abd-block", "Add a block", IconManager.imgic5000, IconManager.imgic5000, "Block", "Add a SysML Block to the currently opened AVATAR Block Diagram", 0);
actions[ABD_CRYPTOBLOCK] = new TAction("abd-cryptoblock", "Add a crypto block", IconManager.imgic5000, IconManager.imgic5000, "Crypto block", "Add a SysML Crypto Block to the currently opened AVATAR Block Diagram", 0);
- actions[AMS_INTERFACE] = new TAction("interface", "Add an AMS interface", IconManager.imgic5000, IconManager.imgic5000, "interface", "Add an AMS interface to the currently opened AVATAR Block Diagram", 0);
+ actions[AMS_INTERFACE] = new TAction("interface", "Add an AMS interface", IconManager.imgic5076, IconManager.imgic5076, "interface",
+ "Add an AMS interface to the currently opened AVATAR Block Diagram", 0);
actions[ABD_DATATYPE] = new TAction("abd-datatype", "Add a data type", IconManager.imgic5034, IconManager.imgic5034, "Data type", "Add a SysML Block representing a Data Type to the currently opened AVATAR Block Diagram", 0);
actions[ABD_COMPOSITION_CONNECTOR] = new TAction("abd-composition-connector", "Add a composition connector between blocks", IconManager.imgic5002, IconManager.imgic5002, "Composition connector", "Add a composition between blocks of the currently opened AVATAR Block Diagram", 0);
actions[ABD_PORT_CONNECTOR] = new TAction("abd-port-connector", "Add a composition connector between blocks", IconManager.imgic5004, IconManager.imgic5004, "Port connector", "Add a port link between blocks of the currently opened AVATAR Block Diagram", 0);
diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index f5ea6a138636877d1fdb601d1a856746d588689a..6d3278c40a3c7ec927ffd90d14984a0760c39a77 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -74,9 +74,9 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
private static String stereotype = "block";
- protected static List<String> BLOCK_TYPE_STR = new ArrayList<String>(Arrays.asList("block", "cryptoblock","AMSinterface"));
- protected static List<Color> BLOCK_TYPE_COLOR = new ArrayList<Color>(Arrays.asList(ColorManager.AVATAR_BLOCK, ColorManager.AVATAR_BLOCK,
- ColorManager.AVATAR_INTERFACE));
+ protected static List<String> BLOCK_TYPE_STR = new ArrayList<String>(Arrays.asList("block", "cryptoblock"));
+ protected static List<Color> BLOCK_TYPE_COLOR = new ArrayList<Color>(Arrays.asList(ColorManager.AVATAR_BLOCK, ColorManager.AVATAR_BLOCK
+ ));
private int typeStereotype = 0; // <<block>> by default
private int maxFontSize = 12;
diff --git a/src/main/java/ui/avatarbd/AvatarBDInterface.java b/src/main/java/ui/avatarbd/AvatarBDInterface.java
index 673a06a0c9797ef3db117415e85a38b379ebb762..24cfb70d34cc729db1c52fd8efd433779d60b1f9 100644
--- a/src/main/java/ui/avatarbd/AvatarBDInterface.java
+++ b/src/main/java/ui/avatarbd/AvatarBDInterface.java
@@ -76,13 +76,9 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
// private int textY1 = 3;
// private int textX = 7;
- private static String stereotype = "block";
-// private static String stereotypeCrypto = "cryptoblock";
+ private static String stereotype = "amsinterface";
+ private static Color stereotypeColor = ColorManager.AVATAR_INTERFACE;
- protected static List<String> BLOCK_TYPE_STR = new ArrayList<String>(Arrays.asList("block", "cryptoblock"));
- //protected static List<Color> BLOCK_TYPE_COLOR = new ArrayList<Color>(Arrays.asList(ColorManager.AVATAR_BLOCK, ColorManager.AVATAR_BLOCK));
- protected static List<Color> BLOCK_TYPE_COLOR = new ArrayList<Color>(Arrays.asList(ColorManager.AVATAR_INTERFACE, ColorManager.AVATAR_INTERFACE));
- private int typeStereotype = 0; // <<block>> by default
private int maxFontSize = 12;
// private int minFontSize = 4;
@@ -196,7 +192,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
//Rectangle
Color c = graph.getColor();
graph.drawRect(this.x, this.y, this.width, this.height);
- graph.setColor(BLOCK_TYPE_COLOR.get(typeStereotype));
+ graph.setColor(stereotypeColor);
graph.fillRect(this.x + 1, this.y + 1, this.width - 1, this.height - 1);
graph.setColor(c);
@@ -229,7 +225,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
// Font font = graph.getFont();
- String ster = BLOCK_TYPE_STR.get(typeStereotype);
+ String ster = stereotype;
int w = graph.getFontMetrics().stringWidth(ster);
h = graph.getFontMetrics().getAscent() + graph.getFontMetrics().getLeading() + textY;
graph.setFont(f.deriveFont(Font.BOLD));
@@ -849,20 +845,10 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
// On the name ?
//TraceManager.addDev("_y=" + _y + " limitName=" + limitName);
if ((limitName == -1) || _y < limitName) {
- JDialogIDAndStereotype dialog = new JDialogIDAndStereotype(frame, "Setting Interface ID",
- BLOCK_TYPE_STR.toArray(new String[0]), getValue
- (), typeStereotype, BLOCK_TYPE_COLOR.toArray(new Color[0]), ColorManager.AVATAR_INTERFACE);
- //dialog.setSize(400, 300);
- GraphicLib.centerOnParent(dialog, 400, 300);
- // dialog.show(); // blocked until dialog has been closed
- oldValue = value;
- dialog.setVisible(true);
-
- if (dialog.hasBeenCancelled()) {
- return false;
- }
-
- String s = dialog.getName();
+ String s = (String) JOptionPane.showInputDialog(frame, "Library Function Name",
+ "setting value", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101,
+ null,
+ this.getValue());
if ((s != null) && (s.length() > 0)) {
//boolean b;
@@ -899,33 +885,6 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
}
- // Setting stereotype
- s = dialog.getStereotype().trim();
-
- if (!TAttribute.isAValidId(s, false, false, false)) {
- JOptionPane.showMessageDialog(frame,
- "Could not use the new stereotype: the new stereotype name is not valid",
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- return false;
- }
-
- int rgb = dialog.getColor();
-
- //TraceManager.addDev("RGBColor:" + rgb + " vs default color:" + ColorManager.AVATAR_BLOCK.getRGB());
-
- addStereotype(s, rgb);
-
- //TraceManager.addDev("My stereotype=" + BLOCK_TYPE_STR.get(typeStereotype) + " color=" + BLOCK_TYPE_COLOR.get(typeStereotype).getRGB());
-
-
- if (isCryptoBlock()) {
- addCryptoElements();
- } else {
- int tmpSter = typeStereotype;
- removeCryptoElements();
- typeStereotype = tmpSter;
- }
return true;
@@ -1035,7 +994,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
@Override
public int getType() {
- return TGComponentManager.AVATARBD_BLOCK;
+ return TGComponentManager.AVATARBD_AMS_INTERFACE;
}
@Override
@@ -1133,12 +1092,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
@Override
protected String translateExtraParam() {
StringBuffer sb = new StringBuffer("<extraparam>\n");
- sb.append("<blockType data=\"");
- sb.append(BLOCK_TYPE_STR.get(typeStereotype));
- sb.append("\" color=\"");
- sb.append(BLOCK_TYPE_COLOR.get(typeStereotype).getRGB());
- sb.append("\" />\n");
- sb.append("<CryptoBlock value=\"" + isCryptoBlock() + "\" />\n");
+
for (TAttribute a : this.myAttributes) {
sb.append("<Attribute access=\"");
sb.append(a.getAccess());
@@ -1245,30 +1199,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
this.myAttributes.add(ta);
}
}
- if (elt.getTagName().equals("blockType")) {
- //
- s = elt.getAttribute("data");
- String tmp3 = elt.getAttribute("color");
- //TraceManager.addDev("stereotype=" + s + " color=" + tmp3);
- int rgb = ColorManager.AVATAR_REQUIREMENT_TOP.getRGB();
- try {
- rgb = Integer.decode(tmp3).intValue();
- } catch (Exception e) {
- }
- if (s.equals("null")) {
- typeStereotype = 0;
- } else {
- try {
- typeStereotype = Integer.decode(s).intValue(); // default stereo: old way
- } catch (Exception e) {
- addStereotype(s, rgb);
- }
- }
- if (typeStereotype > (BLOCK_TYPE_STR.size() - 1)) {
- typeStereotype = 0;
- }
- }
if (elt.getTagName().equals("Method")) {
//
method = elt.getAttribute("value");
@@ -1285,7 +1216,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
//TraceManager.addDev("Method = " + method + ". Starting with aencrypt?");
if (method.startsWith("bool verifyMAC(")) {
- typeStereotype = 1;
+
//TraceManager.addDev("Add crypto methods");
//addCryptoElements();
@@ -1335,9 +1266,6 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
}
- if (isCryptoBlock()) {
- addCryptoElements();
- }
if (tmpGlobalCode.trim().length() == 0) {
globalCode = null;
@@ -1348,37 +1276,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
//TraceManager.addDev("LEP End Block = " + this);
}
- public boolean addStereotype(String s, int rgb) {
- //TraceManager.addDev("Adding stereotype for " + s + " with color " + rgb);
- int index = -1;
- String sLower = s.toLowerCase();
- for (int i = 0; i < BLOCK_TYPE_STR.size(); i++) {
- if (BLOCK_TYPE_STR.get(i).toLowerCase().compareTo(sLower) == 0) {
- index = i;
- break;
- }
- }
-
- // Found stereotype
- if (index != -1) {
- //TraceManager.addDev("Found stereotype");
- typeStereotype = index;
- if (index > 0) {
- //TraceManager.addDev("Setting new color");
- BLOCK_TYPE_COLOR.set(index, new Color(rgb));
- }
- return false;
- // Must add a new stereotype
- } else {
- //TraceManager.addDev("No stereotype found: adding" + s + " with color " + rgb);
- BLOCK_TYPE_STR.add(s);
- BLOCK_TYPE_COLOR.add(new Color(rgb));
- typeStereotype = BLOCK_TYPE_STR.size() - 1;
- //TraceManager.addDev("Stereotype =" + BLOCK_TYPE_STR.get(typeStereotype) + " typestereotype=" + typeStereotype);
- return true;
- }
- }
public String getInterfaceName() {
return value;
@@ -1622,23 +1520,7 @@ public class AvatarBDInterface extends TGCScalableWithInternalComponent implemen
return ((AvatarDesignPanel) (tdp.tp)).getAvatarSMDPanel(getInterfaceName());
}
- public boolean isCryptoBlock() {
- return typeStereotype == 1;
- }
-
- public void removeCryptoElements() {
- typeStereotype = 0;
-
- for (String method : AvatarMethod.cryptoMethods)
- this.removeMethodIfApplicable(method);
- }
- public void addCryptoElements() {
- typeStereotype = 1;
-
- for (String method : AvatarMethod.cryptoMethods)
- this.addMethodIfApplicable(method);
- }
private void removeMethodIfApplicable(String methodString) {
Iterator<AvatarMethod> iterator = this.myMethods.iterator();
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index a92a97adc592cc818caf2efcce9ae2ea84a415a1..d014a037f05bdab989427aea27510bf1446cd266 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -158,7 +158,7 @@ public class IconManager {
public static ImageIcon imgic5040, imgic5042, imgic5044, imgic5046, imgic5048;
public static ImageIcon imgic5050, imgic5052, imgic5054, imgic5056, imgic5058;
public static ImageIcon imgic5060, imgic5062, imgic5064, imgic5066, imgic5068;
- public static ImageIcon imgic5070, imgic5072, imgic5074;
+ public static ImageIcon imgic5070, imgic5072, imgic5074, imgic5076;
public static ImageIcon imgic5100, imgic5102, imgic5104, imgic5106, imgic5108;
public static ImageIcon imgic5110, imgic5112, imgic5113, imgic5114, imgic5116;
@@ -640,6 +640,7 @@ public class IconManager {
private static String icon5070 = "avatarlibfunction.gif";
private static String icon5072 = "scissors.png";
private static String icon5074 = "avatarrdreqref.gif";
+ private static String icon5076 = "avataramsinterface.gif";
private static String icon5100 = "avatarhead16.gif";
private static String icon5102 = "avatarhead32.gif";
@@ -1115,7 +1116,7 @@ public class IconManager {
imgic2014 = getIcon(icon2014);
imgic2016 = getIcon(icon2016);
imgic2018 = getIcon(icon2018);
- imgic2015 = getIcon(icon2015);
+ imgic2015 = getIcon(icon2015);
imgic2017 = getIcon(icon2017);
imgic2100 = getIcon(icon2100);
@@ -1133,7 +1134,7 @@ public class IconManager {
// AVATAR
//imgic3000 = getIcon(icon3000);
imgic5000 = getIcon(icon5000);
- imgic5001 = getIcon(icon5001);
+ imgic5001 = getIcon(icon5001);
imgic5002 = getIcon(icon5002);
imgic5004 = getIcon(icon5004);
imgic5006 = getIcon(icon5006);
@@ -1174,6 +1175,7 @@ public class IconManager {
img5072 = imgic5072.getImage();
}
imgic5074 = getIcon(icon5074);
+ imgic5076 = getIcon(icon5076);
imgic5100 = getIcon(icon5100);
imgic5102 = getIcon(icon5102);
diff --git a/src/main/resources/ui/util/avataramsinterface.gif b/src/main/resources/ui/util/avataramsinterface.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0e35d83041ddf308a39527bb45f110fabf24bb89
Binary files /dev/null and b/src/main/resources/ui/util/avataramsinterface.gif differ