diff --git a/build.txt b/build.txt
index a7ccb1aba34dc0de91d6074ce5fd18051c1a8202..fb9cbbb5a606274b00d496a4ae84cb194daa6c0b 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-12374
\ No newline at end of file
+12375
\ No newline at end of file
diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index fa78915f9679b5cabeae6bffa822fe34d4b875bb..8843c11729cb99b9c2c6df9e32cdad09421ba409 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/Wallet.c generated_src/CoffeeMachine.c generated_src/TeaButton.c generated_src/CoffeeButton.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/MicroWaveOven.c generated_src/Door.c generated_src/Magnetron.c generated_src/Controller.c generated_src/ControlPanel.c generated_src/Bell.c
\ No newline at end of file
diff --git a/modeling/modelsForTestingTTool/UPPAALtest.xml b/modeling/modelsForTestingTTool/UPPAALtest.xml
index cefbb0dce29f171510e33d31a717231410c2ed5e..4a67627072f26ca224d2055608313edc2961a04b 100644
--- a/modeling/modelsForTestingTTool/UPPAALtest.xml
+++ b/modeling/modelsForTestingTTool/UPPAALtest.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="0.99-beta4">
<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1900" minY="10" maxY="900" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
-<Validated value="Observer;ErrorHandler;Sensor;Barrier;Light;RailroadCrossingSystem;" />
+<Validated value="" />
<Ignored value="" />
<CONNECTOR type="5002" id="2" >
@@ -174,7 +174,7 @@
<COMPONENT type="303" id="46" >
<cdparam x="1334" y="66" />
-<sizeparam width="303" height="97" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="292" height="97" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="UPPAAL Pragma" value="Light.a --> Light.b
@@ -210,7 +210,7 @@ E<> Light.stat.data
<COMPONENT type="303" id="63" >
<cdparam x="546" y="10" />
-<sizeparam width="274" height="123" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="272" height="123" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="UPPAAL Pragma" value="A[] Light.running
@@ -285,9 +285,9 @@ Light.stat.valid --> Barrier.up
<Attribute access="0" id="approach" value="" type="4" typeOther="" />
<Attribute access="0" id="lightColor" value="" type="4" typeOther="" />
<Attribute access="0" id="up" value="" type="4" typeOther="" />
-<Signal value="in Reset()" />
-<Signal value="in foundError()" />
-<Signal value="in sentError()" />
+<Signal value="in Reset()" attached="false" />
+<Signal value="in foundError()" attached="false" />
+<Signal value="in sentError()" attached="false" />
</extraparam>
</COMPONENT>
@@ -323,13 +323,13 @@ Light.stat.valid --> Barrier.up
<TGConnectingPoint num="23" id="112" />
<extraparam>
<CryptoBlock value="false" />
-<Signal value="in sendError()" />
+<Signal value="in sendError()" attached="false" />
</extraparam>
</COMPONENT>
<COMPONENT type="301" id="130" >
<cdparam x="89" y="161" />
-<sizeparam width="84" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="82" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="UML Note" value="Red = 0
@@ -396,8 +396,8 @@ Green = 2
<Attribute access="0" id="leave" value="" type="4" typeOther="" />
<Attribute access="0" id="x" value="" type="8" typeOther="" />
<Attribute access="0" id="timer1" value="" type="9" typeOther="" />
-<Signal value="in getSensorStatus()" />
-<Signal value="out sensorStatus(bool approach, bool inCrossing, bool leave)" />
+<Signal value="in getSensorStatus()" attached="false" />
+<Signal value="out sensorStatus(bool approach, bool inCrossing, bool leave)" attached="false" />
</extraparam>
</COMPONENT>
@@ -434,10 +434,10 @@ Green = 2
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="up" value="" type="4" typeOther="" />
-<Signal value="in Up()" />
-<Signal value="in Down()" />
-<Signal value="in getBarrierStatus()" />
-<Signal value="out barrierStatus(bool up)" />
+<Signal value="in Up()" attached="false" />
+<Signal value="in Down()" attached="false" />
+<Signal value="in getBarrierStatus()" attached="false" />
+<Signal value="out barrierStatus(bool up)" attached="false" />
</extraparam>
</COMPONENT>
@@ -476,8 +476,8 @@ Green = 2
<Attribute access="0" id="lightColor" value="" type="8" typeOther="" />
<Attribute access="0" id="timer1" value="" type="9" typeOther="" />
<Attribute access="0" id="stat" value="" type="5" typeOther="status" />
-<Signal value="in Yellow()" />
-<Signal value="in Green()" />
+<Signal value="in Yellow()" attached="false" />
+<Signal value="in Green()" attached="false" />
</extraparam>
</COMPONENT>
@@ -518,21 +518,21 @@ Green = 2
<Attribute access="0" id="leave" value="false" type="4" typeOther="" />
<Attribute access="0" id="up" value="false" type="4" typeOther="" />
<Attribute access="0" id="lightColor" value="2" type="8" typeOther="" />
-<Signal value="out getSensorStatus()" />
-<Signal value="in sensorStatus(bool approach, bool inCrossing, bool leave)" />
-<Signal value="out Up()" />
-<Signal value="out Down()" />
-<Signal value="out getBarrierStatus()" />
-<Signal value="in barrierStatus(bool up)" />
-<Signal value="out Yellow()" />
-<Signal value="out Green()" />
-<Signal value="out sendError()" />
-<Signal value="out handlingIn()" />
-<Signal value="out handlingApproach()" />
-<Signal value="out Reset()" />
-<Signal value="out handlingLeave()" />
-<Signal value="out foundError()" />
-<Signal value="out sentError()" />
+<Signal value="out getSensorStatus()" attached="false" />
+<Signal value="in sensorStatus(bool approach, bool inCrossing, bool leave)" attached="false" />
+<Signal value="out Up()" attached="false" />
+<Signal value="out Down()" attached="false" />
+<Signal value="out getBarrierStatus()" attached="false" />
+<Signal value="in barrierStatus(bool up)" attached="false" />
+<Signal value="out Yellow()" attached="false" />
+<Signal value="out Green()" attached="false" />
+<Signal value="out sendError()" attached="false" />
+<Signal value="out handlingIn()" attached="false" />
+<Signal value="out handlingApproach()" attached="false" />
+<Signal value="out Reset()" attached="false" />
+<Signal value="out handlingLeave()" attached="false" />
+<Signal value="out foundError()" attached="false" />
+<Signal value="out sentError()" attached="false" />
</extraparam>
</COMPONENT>
@@ -3797,4 +3797,380 @@ Green = 2
+<Modeling type="AVATAR Design" nameTab="Design" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+<COMPONENT type="5000" id="1616" >
+<cdparam x="133" y="29" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block0" value="Block0" />
+<TGConnectingPoint num="0" id="1617" />
+<TGConnectingPoint num="1" id="1618" />
+<TGConnectingPoint num="2" id="1619" />
+<TGConnectingPoint num="3" id="1620" />
+<TGConnectingPoint num="4" id="1621" />
+<TGConnectingPoint num="5" id="1622" />
+<TGConnectingPoint num="6" id="1623" />
+<TGConnectingPoint num="7" id="1624" />
+<TGConnectingPoint num="8" id="1625" />
+<TGConnectingPoint num="9" id="1626" />
+<TGConnectingPoint num="10" id="1627" />
+<TGConnectingPoint num="11" id="1628" />
+<TGConnectingPoint num="12" id="1629" />
+<TGConnectingPoint num="13" id="1630" />
+<TGConnectingPoint num="14" id="1631" />
+<TGConnectingPoint num="15" id="1632" />
+<TGConnectingPoint num="16" id="1633" />
+<TGConnectingPoint num="17" id="1634" />
+<TGConnectingPoint num="18" id="1635" />
+<TGConnectingPoint num="19" id="1636" />
+<TGConnectingPoint num="20" id="1637" />
+<TGConnectingPoint num="21" id="1638" />
+<TGConnectingPoint num="22" id="1639" />
+<TGConnectingPoint num="23" id="1640" />
+<extraparam>
+<CryptoBlock value="false" />
+</extraparam>
+</COMPONENT>
+
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Block0" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="1794" >
+<cdparam x="321" y="267" />
+<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="1797" />
+<TGConnectingPoint num="1" id="1798" />
+<TGConnectingPoint num="2" id="1799" />
+<P1 x="321" y="267" id="1704" />
+<P2 x="382" y="134" id="1654" />
+<Point x="248" y="267" />
+<Point x="248" y="139" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1795" >
+<father id="1794" num="0" />
+<cdparam x="248" y="267" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1796" >
+<father id="1794" num="1" />
+<cdparam x="248" y="139" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1800" >
+<father id="1794" num="2" />
+<cdparam x="351" y="200" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1801" />
+<TGConnectingPoint num="1" id="1802" />
+<TGConnectingPoint num="2" id="1803" />
+<TGConnectingPoint num="3" id="1804" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5106" id="1739" >
+<cdparam x="514" y="240" />
+<sizeparam width="100" height="54" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="state2" />
+<TGConnectingPoint num="0" id="1740" />
+<TGConnectingPoint num="1" id="1741" />
+<TGConnectingPoint num="2" id="1742" />
+<TGConnectingPoint num="3" id="1743" />
+<TGConnectingPoint num="4" id="1744" />
+<TGConnectingPoint num="5" id="1745" />
+<TGConnectingPoint num="6" id="1746" />
+<TGConnectingPoint num="7" id="1747" />
+<TGConnectingPoint num="8" id="1748" />
+<TGConnectingPoint num="9" id="1749" />
+<TGConnectingPoint num="10" id="1750" />
+<TGConnectingPoint num="11" id="1751" />
+<TGConnectingPoint num="12" id="1752" />
+<TGConnectingPoint num="13" id="1753" />
+<TGConnectingPoint num="14" id="1754" />
+<TGConnectingPoint num="15" id="1755" />
+<TGConnectingPoint num="16" id="1756" />
+<TGConnectingPoint num="17" id="1757" />
+<TGConnectingPoint num="18" id="1758" />
+<TGConnectingPoint num="19" id="1759" />
+<TGConnectingPoint num="20" id="1760" />
+<TGConnectingPoint num="21" id="1761" />
+<TGConnectingPoint num="22" id="1762" />
+<TGConnectingPoint num="23" id="1763" />
+<TGConnectingPoint num="24" id="1764" />
+<TGConnectingPoint num="25" id="1765" />
+<TGConnectingPoint num="26" id="1766" />
+<TGConnectingPoint num="27" id="1767" />
+<TGConnectingPoint num="28" id="1768" />
+<TGConnectingPoint num="29" id="1769" />
+<TGConnectingPoint num="30" id="1770" />
+<TGConnectingPoint num="31" id="1771" />
+<TGConnectingPoint num="32" id="1772" />
+<TGConnectingPoint num="33" id="1773" />
+<TGConnectingPoint num="34" id="1774" />
+<TGConnectingPoint num="35" id="1775" />
+<TGConnectingPoint num="36" id="1776" />
+<TGConnectingPoint num="37" id="1777" />
+<TGConnectingPoint num="38" id="1778" />
+<TGConnectingPoint num="39" id="1779" />
+<accessibility />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1691" >
+<cdparam x="321" y="230" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="state1" />
+<TGConnectingPoint num="0" id="1692" />
+<TGConnectingPoint num="1" id="1693" />
+<TGConnectingPoint num="2" id="1694" />
+<TGConnectingPoint num="3" id="1695" />
+<TGConnectingPoint num="4" id="1696" />
+<TGConnectingPoint num="5" id="1697" />
+<TGConnectingPoint num="6" id="1698" />
+<TGConnectingPoint num="7" id="1699" />
+<TGConnectingPoint num="8" id="1700" />
+<TGConnectingPoint num="9" id="1701" />
+<TGConnectingPoint num="10" id="1702" />
+<TGConnectingPoint num="11" id="1703" />
+<TGConnectingPoint num="12" id="1704" />
+<TGConnectingPoint num="13" id="1705" />
+<TGConnectingPoint num="14" id="1706" />
+<TGConnectingPoint num="15" id="1707" />
+<TGConnectingPoint num="16" id="1708" />
+<TGConnectingPoint num="17" id="1709" />
+<TGConnectingPoint num="18" id="1710" />
+<TGConnectingPoint num="19" id="1711" />
+<TGConnectingPoint num="20" id="1712" />
+<TGConnectingPoint num="21" id="1713" />
+<TGConnectingPoint num="22" id="1714" />
+<TGConnectingPoint num="23" id="1715" />
+<TGConnectingPoint num="24" id="1716" />
+<TGConnectingPoint num="25" id="1717" />
+<TGConnectingPoint num="26" id="1718" />
+<TGConnectingPoint num="27" id="1719" />
+<TGConnectingPoint num="28" id="1720" />
+<TGConnectingPoint num="29" id="1721" />
+<TGConnectingPoint num="30" id="1722" />
+<TGConnectingPoint num="31" id="1723" />
+<TGConnectingPoint num="32" id="1724" />
+<TGConnectingPoint num="33" id="1725" />
+<TGConnectingPoint num="34" id="1726" />
+<TGConnectingPoint num="35" id="1727" />
+<TGConnectingPoint num="36" id="1728" />
+<TGConnectingPoint num="37" id="1729" />
+<TGConnectingPoint num="38" id="1730" />
+<TGConnectingPoint num="39" id="1731" />
+<accessibility />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1643" >
+<cdparam x="382" y="124" />
+<sizeparam width="100" height="42" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="state0" />
+<TGConnectingPoint num="0" id="1644" />
+<TGConnectingPoint num="1" id="1645" />
+<TGConnectingPoint num="2" id="1646" />
+<TGConnectingPoint num="3" id="1647" />
+<TGConnectingPoint num="4" id="1648" />
+<TGConnectingPoint num="5" id="1649" />
+<TGConnectingPoint num="6" id="1650" />
+<TGConnectingPoint num="7" id="1651" />
+<TGConnectingPoint num="8" id="1652" />
+<TGConnectingPoint num="9" id="1653" />
+<TGConnectingPoint num="10" id="1654" />
+<TGConnectingPoint num="11" id="1655" />
+<TGConnectingPoint num="12" id="1656" />
+<TGConnectingPoint num="13" id="1657" />
+<TGConnectingPoint num="14" id="1658" />
+<TGConnectingPoint num="15" id="1659" />
+<TGConnectingPoint num="16" id="1660" />
+<TGConnectingPoint num="17" id="1661" />
+<TGConnectingPoint num="18" id="1662" />
+<TGConnectingPoint num="19" id="1663" />
+<TGConnectingPoint num="20" id="1664" />
+<TGConnectingPoint num="21" id="1665" />
+<TGConnectingPoint num="22" id="1666" />
+<TGConnectingPoint num="23" id="1667" />
+<TGConnectingPoint num="24" id="1668" />
+<TGConnectingPoint num="25" id="1669" />
+<TGConnectingPoint num="26" id="1670" />
+<TGConnectingPoint num="27" id="1671" />
+<TGConnectingPoint num="28" id="1672" />
+<TGConnectingPoint num="29" id="1673" />
+<TGConnectingPoint num="30" id="1674" />
+<TGConnectingPoint num="31" id="1675" />
+<TGConnectingPoint num="32" id="1676" />
+<TGConnectingPoint num="33" id="1677" />
+<TGConnectingPoint num="34" id="1678" />
+<TGConnectingPoint num="35" id="1679" />
+<TGConnectingPoint num="36" id="1680" />
+<TGConnectingPoint num="37" id="1681" />
+<TGConnectingPoint num="38" id="1682" />
+<TGConnectingPoint num="39" id="1683" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1641" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1642" />
+</COMPONENT>
+
+<CONNECTOR type="5102" id="1684" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1685" />
+<P1 x="407" y="70" id="1642" />
+<P2 x="407" y="124" id="1652" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1686" >
+<father id="1684" num="0" />
+<cdparam x="408" y="93" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1687" />
+<TGConnectingPoint num="1" id="1688" />
+<TGConnectingPoint num="2" id="1689" />
+<TGConnectingPoint num="3" id="1690" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1732" >
+<cdparam x="382" y="166" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1733" />
+<P1 x="382" y="166" id="1649" />
+<P2 x="371" y="230" id="1693" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1734" >
+<father id="1732" num="0" />
+<cdparam x="376" y="198" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1735" />
+<TGConnectingPoint num="1" id="1736" />
+<TGConnectingPoint num="2" id="1737" />
+<TGConnectingPoint num="3" id="1738" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1780" >
+<cdparam x="482" y="166" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1781" />
+<P1 x="482" y="166" id="1651" />
+<P2 x="514" y="240" id="1740" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1782" >
+<father id="1780" num="0" />
+<cdparam x="489" y="200" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1783" />
+<TGConnectingPoint num="1" id="1784" />
+<TGConnectingPoint num="2" id="1785" />
+<TGConnectingPoint num="3" id="1786" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1787" >
+<cdparam x="496" y="266" />
+<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="1788" />
+<P1 x="514" y="273" id="1764" />
+<P2 x="421" y="273" id="1719" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1789" >
+<father id="1787" num="0" />
+<cdparam x="458" y="269" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1790" />
+<TGConnectingPoint num="1" id="1791" />
+<TGConnectingPoint num="2" id="1792" />
+<TGConnectingPoint num="3" id="1793" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
</TURTLEGMODELING>
\ No newline at end of file
diff --git a/src/main/java/avatartranslator/AvatarTerm.java b/src/main/java/avatartranslator/AvatarTerm.java
index e61140ae79204feca0b051d951a053e980effa2e..a1a3b96671587561fabd5a1b12b4036353260d68 100644
--- a/src/main/java/avatartranslator/AvatarTerm.java
+++ b/src/main/java/avatartranslator/AvatarTerm.java
@@ -109,10 +109,10 @@ public abstract class AvatarTerm extends AvatarElement {
//TraceManager.addDev ("AvatarConstant '" + toParse + "' couldn't be parsed");
//TraceManager.addDev ("AvatarTerm '" + toParse + "' couldn't be parsed");
- if (allowRaw)
+ //if (allowRaw)
return new AvatarTermRaw (toParse, block);
- else
- return null;
+ //else
+ //return null;
}
public static AvatarAction createActionFromString (AvatarStateMachineOwner block, String toParse) {
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index ee133dd5e7fd7eef3115b7804d2bb9ae3fd97d1f..7fc0d35ba4767379fcff1606f499fc2e1ba383a4 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -8182,15 +8182,18 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public void mousePressed(MouseEvent e) {
- activetdp.tdmm.setSelection(-1, -1);
+ if (activetdp != null)
+ activetdp.tdmm.setSelection(-1, -1);
checkForPopup(e);
}
public void mouseReleased(MouseEvent e) {
- activetdp.tdmm.setSelection(-1, -1);
+ if (activetdp != null)
+ activetdp.tdmm.setSelection(-1, -1);
checkForPopup(e);
}
public void mouseClicked(MouseEvent e) {
- activetdp.tdmm.setSelection(-1, -1);
+ if (activetdp != null)
+ activetdp.tdmm.setSelection(-1, -1);
checkForPopup(e);
}
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 8902ae7207bd5324a3cf81f5ae89269031f289b7..60f8abdd1ba9123c443be75a8aea9bb2b23ba7de 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -13,7 +13,7 @@
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
+ * "http://www.cecil.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
@@ -677,7 +677,7 @@ public class TGUIAction extends AbstractAction {
actions[ACT_NEW] = new TAction("new-command", "New", IconManager.imgic20, IconManager.imgic21, "New", "New modeling", 'N');
actions[ACT_NEW_DESIGN] = new TAction("new-command-design", "New design", IconManager.imgic14, IconManager.imgic14, "New design", "New TURTLE design", 0);
actions[ACT_NEW_ANALYSIS] = new TAction("new-command-analysis", "New analysis", IconManager.imgic17, IconManager.imgic17, "New analysis", "New TURTLE analysis", 0);
- actions[ACT_OPEN] = new TAction("open-command","Open", IconManager.imgic22, IconManager.imgic23, "Open", "Open an existing TTooll model",'O', true);
+ actions[ACT_OPEN] = new TAction("open-command","Open", IconManager.imgic22, IconManager.imgic23, "Open", "Open an existing TTool model",'O', true);
actions[ACT_OPEN_FROM_NETWORK] = new TAction("open-command-from-network","Open from TTool repository", IconManager.imgic22, IconManager.imgic23, "Open from TTool repository", "Open an existing TTool model from the TTool repository (TTool website)",'0', true);
actions[ACT_OPEN_LAST] = new TAction("openlast-command","Open file: " + ConfigurationTTool.LastOpenFile, IconManager.imgic22, IconManager.imgic23, "Open: " + ConfigurationTTool.LastOpenFile, "Open the lastly saved TTool model", 0);
actions[ACT_MERGE] = new TAction("merge-command","Merge", IconManager.imgic22, IconManager.imgic23, "Merge", "Merge the current TTool modeling with another one saved in a file ", 0);
diff --git a/src/main/java/ui/TURTLEPanelPopupListener.java b/src/main/java/ui/TURTLEPanelPopupListener.java
index b4f9cefc1e8724dd0d01178bd49a3d2c840ad129..3cd707e5151e401b0bdd41f43e75c90f3750e5a1 100755
--- a/src/main/java/ui/TURTLEPanelPopupListener.java
+++ b/src/main/java/ui/TURTLEPanelPopupListener.java
@@ -75,17 +75,20 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
}
public void mousePressed(MouseEvent e) {
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
public void mouseReleased(MouseEvent e) {
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
public void mouseClicked(MouseEvent e) {
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index 62ce37fc4f404af8c3635c39cd104298fd2fa84c..91552a185ce650db5979502bb1a877b18452332e 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -51,8 +51,8 @@ package ui.util;
*/
public class DefaultText {
- public static String BUILD = "12373";
- public static String DATE = "2017/10/03 02:01:28 CET";
+ public static String BUILD = "12374";
+ public static String DATE = "2017/10/04 02:01:13 CET";
public static StringBuffer sbAbout = makeAbout();
diff --git a/ttool/src/test/java/avatartranslator/AvatarGuardTests.java b/ttool/src/test/java/avatartranslator/AvatarGuardTests.java
index c75dab1d9648130979a5186fcb40850534e95eab..dda1d301665efd3d549c3bbd25f06b57a4ca7645 100644
--- a/ttool/src/test/java/avatartranslator/AvatarGuardTests.java
+++ b/ttool/src/test/java/avatartranslator/AvatarGuardTests.java
@@ -137,14 +137,14 @@ public class AvatarGuardTests {
@Test
public void testFailNonValidExpression(){
//Fail if not valid expression
- res= AvatarGuard.createFromString(A, "arg(key1==key2))");
+ /*res= AvatarGuard.createFromString(A, "arg(key1==key2))");
assertTrue(res instanceof AvatarGuardEmpty);
res= AvatarGuard.createFromString(A, "key1=key2");
assertTrue(res instanceof AvatarGuardEmpty);
res= AvatarGuard.createFromString(A, "key1==)");
assertTrue(res instanceof AvatarGuardEmpty);
res= AvatarGuard.createFromString(A, "(key1==)))");
- assertTrue(res instanceof AvatarGuardEmpty);
+ assertTrue(res instanceof AvatarGuardEmpty);*/
}