diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 164fead3d37bfd02e8a604f83e92744ac0f8a53c..68c920251480ac891c66f97705f055d9cacfa322 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c
\ No newline at end of file
+SRCS = generated_src/main.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/MicroWaveOven_SimpleAsynchronous.xml b/modeling/MicroWaveOven_SimpleAsynchronous.xml
index 4fd59e50d3b8127ee2fd30e7c008e135cf0a4290..29ea4f5e0a3eabc6604b42e1c2f0f0d662b89d18 100644
--- a/modeling/MicroWaveOven_SimpleAsynchronous.xml
+++ b/modeling/MicroWaveOven_SimpleAsynchronous.xml
@@ -824,24 +824,6 @@
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5104" id="1384" >
-<cdparam x="464" y="159" />
-<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="startM()" />
-<TGConnectingPoint num="0" id="1385" />
-<TGConnectingPoint num="1" id="1386" />
-<TGConnectingPoint num="2" id="1387" />
-<TGConnectingPoint num="3" id="1388" />
-<TGConnectingPoint num="4" id="1389" />
-<TGConnectingPoint num="5" id="1390" />
-<TGConnectingPoint num="6" id="1391" />
-<TGConnectingPoint num="7" id="1392" />
-<TGConnectingPoint num="8" id="1393" />
-<TGConnectingPoint num="9" id="1394" />
-</COMPONENT>
-
<CONNECTOR type="5102" id="406" >
<cdparam x="407" y="380" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -850,7 +832,7 @@
<TGConnectingPoint num="1" id="403" />
<TGConnectingPoint num="2" id="404" />
<TGConnectingPoint num="3" id="405" />
-<P1 x="407" y="310" id="436" />
+<P1 x="407" y="310" id="447" />
<P2 x="365" y="113" id="503" />
<Point x="407" y="327" />
<Point x="323" y="327" />
@@ -905,8 +887,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from to " value="null" />
<TGConnectingPoint num="0" id="412" />
-<P1 x="408" y="242" id="452" />
-<P2 x="407" y="280" id="435" />
+<P1 x="408" y="242" id="463" />
+<P2 x="407" y="280" id="446" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="411" >
<father id="413" num="0" />
@@ -928,17 +910,73 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="434" >
+<CONNECTOR type="5102" id="420" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from to " value="null" />
-<TGConnectingPoint num="0" id="433" />
+<TGConnectingPoint num="0" id="419" />
<P1 x="407" y="70" id="498" />
<P2 x="407" y="96" id="501" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="418" >
+<father id="420" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="414" />
+<TGConnectingPoint num="1" id="415" />
+<TGConnectingPoint num="2" id="416" />
+<TGConnectingPoint num="3" id="417" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="427" >
+<cdparam x="449" y="131" />
+<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="426" />
+<P1 x="449" y="131" id="507" />
+<P2 x="495" y="154" id="435" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="425" >
+<father id="427" num="0" />
+<cdparam x="449" y="171" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="421" />
+<TGConnectingPoint num="1" id="422" />
+<TGConnectingPoint num="2" id="423" />
+<TGConnectingPoint num="3" id="424" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="434" >
+<cdparam x="495" y="184" />
+<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="433" />
+<P1 x="495" y="184" id="436" />
+<P2 x="444" y="202" id="459" />
+<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="432" >
<father id="434" num="0" />
-<cdparam x="407" y="110" />
+<cdparam x="495" y="224" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -957,11 +995,11 @@
</SUBCOMPONENT>
<COMPONENT type="5104" id="445" >
-<cdparam x="377" y="285" />
-<sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="464" y="159" />
+<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="stopM()" />
+<infoparam name="Receive signal" value="startM()" />
<TGConnectingPoint num="0" id="435" />
<TGConnectingPoint num="1" id="436" />
<TGConnectingPoint num="2" id="437" />
@@ -974,12 +1012,12 @@
<TGConnectingPoint num="9" id="444" />
</COMPONENT>
-<COMPONENT type="5106" id="486" >
-<cdparam x="373" y="202" />
-<sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="456" >
+<cdparam x="377" y="285" />
+<sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state1" value="Running" />
+<infoparam name="Send signal" value="stopM()" />
<TGConnectingPoint num="0" id="446" />
<TGConnectingPoint num="1" id="447" />
<TGConnectingPoint num="2" id="448" />
@@ -990,36 +1028,54 @@
<TGConnectingPoint num="7" id="453" />
<TGConnectingPoint num="8" id="454" />
<TGConnectingPoint num="9" id="455" />
-<TGConnectingPoint num="10" id="456" />
-<TGConnectingPoint num="11" id="457" />
-<TGConnectingPoint num="12" id="458" />
-<TGConnectingPoint num="13" id="459" />
-<TGConnectingPoint num="14" id="460" />
-<TGConnectingPoint num="15" id="461" />
-<TGConnectingPoint num="16" id="462" />
-<TGConnectingPoint num="17" id="463" />
-<TGConnectingPoint num="18" id="464" />
-<TGConnectingPoint num="19" id="465" />
-<TGConnectingPoint num="20" id="466" />
-<TGConnectingPoint num="21" id="467" />
-<TGConnectingPoint num="22" id="468" />
-<TGConnectingPoint num="23" id="469" />
-<TGConnectingPoint num="24" id="470" />
-<TGConnectingPoint num="25" id="471" />
-<TGConnectingPoint num="26" id="472" />
-<TGConnectingPoint num="27" id="473" />
-<TGConnectingPoint num="28" id="474" />
-<TGConnectingPoint num="29" id="475" />
-<TGConnectingPoint num="30" id="476" />
-<TGConnectingPoint num="31" id="477" />
-<TGConnectingPoint num="32" id="478" />
-<TGConnectingPoint num="33" id="479" />
-<TGConnectingPoint num="34" id="480" />
-<TGConnectingPoint num="35" id="481" />
-<TGConnectingPoint num="36" id="482" />
-<TGConnectingPoint num="37" id="483" />
-<TGConnectingPoint num="38" id="484" />
-<TGConnectingPoint num="39" id="485" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="497" >
+<cdparam x="373" y="202" />
+<sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state1" value="Running" />
+<TGConnectingPoint num="0" id="457" />
+<TGConnectingPoint num="1" id="458" />
+<TGConnectingPoint num="2" id="459" />
+<TGConnectingPoint num="3" id="460" />
+<TGConnectingPoint num="4" id="461" />
+<TGConnectingPoint num="5" id="462" />
+<TGConnectingPoint num="6" id="463" />
+<TGConnectingPoint num="7" id="464" />
+<TGConnectingPoint num="8" id="465" />
+<TGConnectingPoint num="9" id="466" />
+<TGConnectingPoint num="10" id="467" />
+<TGConnectingPoint num="11" id="468" />
+<TGConnectingPoint num="12" id="469" />
+<TGConnectingPoint num="13" id="470" />
+<TGConnectingPoint num="14" id="471" />
+<TGConnectingPoint num="15" id="472" />
+<TGConnectingPoint num="16" id="473" />
+<TGConnectingPoint num="17" id="474" />
+<TGConnectingPoint num="18" id="475" />
+<TGConnectingPoint num="19" id="476" />
+<TGConnectingPoint num="20" id="477" />
+<TGConnectingPoint num="21" id="478" />
+<TGConnectingPoint num="22" id="479" />
+<TGConnectingPoint num="23" id="480" />
+<TGConnectingPoint num="24" id="481" />
+<TGConnectingPoint num="25" id="482" />
+<TGConnectingPoint num="26" id="483" />
+<TGConnectingPoint num="27" id="484" />
+<TGConnectingPoint num="28" id="485" />
+<TGConnectingPoint num="29" id="486" />
+<TGConnectingPoint num="30" id="487" />
+<TGConnectingPoint num="31" id="488" />
+<TGConnectingPoint num="32" id="489" />
+<TGConnectingPoint num="33" id="490" />
+<TGConnectingPoint num="34" id="491" />
+<TGConnectingPoint num="35" id="492" />
+<TGConnectingPoint num="36" id="493" />
+<TGConnectingPoint num="37" id="494" />
+<TGConnectingPoint num="38" id="495" />
+<TGConnectingPoint num="39" id="496" />
<extraparam>
</extraparam>
</COMPONENT>
@@ -1083,62 +1139,6 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="5102" id="1395" >
-<cdparam x="449" y="131" />
-<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="1396" />
-<P1 x="449" y="131" id="507" />
-<P2 x="495" y="154" id="1385" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1397" >
-<father id="1395" num="0" />
-<cdparam x="449" y="171" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1398" />
-<TGConnectingPoint num="1" id="1399" />
-<TGConnectingPoint num="2" id="1400" />
-<TGConnectingPoint num="3" id="1401" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1402" >
-<cdparam x="495" y="184" />
-<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="1403" />
-<P1 x="495" y="184" id="1386" />
-<P2 x="444" y="202" id="448" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1404" >
-<father id="1402" num="0" />
-<cdparam x="495" y="224" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1405" />
-<TGConnectingPoint num="1" id="1406" />
-<TGConnectingPoint num="2" id="1407" />
-<TGConnectingPoint num="3" id="1408" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
</AVATARStateMachineDiagramPanel>
@@ -2861,48 +2861,12 @@
<Modeling type="ADD" nameTab="Avatar Deployment" >
<ADDDiagramPanel name="Avatar Deployment Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="5355" id="1312" >
+<COMPONENT type="5355" id="1337" >
<cdparam x="543" y="92" />
<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1288" />
-<TGConnectingPoint num="1" id="1289" />
-<TGConnectingPoint num="2" id="1290" />
-<TGConnectingPoint num="3" id="1291" />
-<TGConnectingPoint num="4" id="1292" />
-<TGConnectingPoint num="5" id="1293" />
-<TGConnectingPoint num="6" id="1294" />
-<TGConnectingPoint num="7" id="1295" />
-<TGConnectingPoint num="8" id="1296" />
-<TGConnectingPoint num="9" id="1297" />
-<TGConnectingPoint num="10" id="1298" />
-<TGConnectingPoint num="11" id="1299" />
-<TGConnectingPoint num="12" id="1300" />
-<TGConnectingPoint num="13" id="1301" />
-<TGConnectingPoint num="14" id="1302" />
-<TGConnectingPoint num="15" id="1303" />
-<TGConnectingPoint num="16" id="1304" />
-<TGConnectingPoint num="17" id="1305" />
-<TGConnectingPoint num="18" id="1306" />
-<TGConnectingPoint num="19" id="1307" />
-<TGConnectingPoint num="20" id="1308" />
-<TGConnectingPoint num="21" id="1309" />
-<TGConnectingPoint num="22" id="1310" />
-<TGConnectingPoint num="23" id="1311" />
-<extraparam>
-<info stereotype="RAM" nodeName="Memory0" />
-<attributes byteDataSize="4" index="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5353" id="1337" >
-<cdparam x="308" y="368" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Vgmn0" value="name" />
<TGConnectingPoint num="0" id="1313" />
<TGConnectingPoint num="1" id="1314" />
<TGConnectingPoint num="2" id="1315" />
@@ -2928,99 +2892,135 @@
<TGConnectingPoint num="22" id="1335" />
<TGConnectingPoint num="23" id="1336" />
<extraparam>
+<info stereotype="RAM" nodeName="Memory0" />
+<attributes byteDataSize="4" index="3" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5353" id="1362" >
+<cdparam x="308" y="368" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Vgmn0" value="name" />
+<TGConnectingPoint num="0" id="1338" />
+<TGConnectingPoint num="1" id="1339" />
+<TGConnectingPoint num="2" id="1340" />
+<TGConnectingPoint num="3" id="1341" />
+<TGConnectingPoint num="4" id="1342" />
+<TGConnectingPoint num="5" id="1343" />
+<TGConnectingPoint num="6" id="1344" />
+<TGConnectingPoint num="7" id="1345" />
+<TGConnectingPoint num="8" id="1346" />
+<TGConnectingPoint num="9" id="1347" />
+<TGConnectingPoint num="10" id="1348" />
+<TGConnectingPoint num="11" id="1349" />
+<TGConnectingPoint num="12" id="1350" />
+<TGConnectingPoint num="13" id="1351" />
+<TGConnectingPoint num="14" id="1352" />
+<TGConnectingPoint num="15" id="1353" />
+<TGConnectingPoint num="16" id="1354" />
+<TGConnectingPoint num="17" id="1355" />
+<TGConnectingPoint num="18" id="1356" />
+<TGConnectingPoint num="19" id="1357" />
+<TGConnectingPoint num="20" id="1358" />
+<TGConnectingPoint num="21" id="1359" />
+<TGConnectingPoint num="22" id="1360" />
+<TGConnectingPoint num="23" id="1361" />
+<extraparam>
<info stereotype="VGMN" nodeName="Vgmn0" />
<attributes index="0" nbAttachedInitiat="1" nbAttachedTarget="2" minLatency="4" fifoDepth="3" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5351" id="1380" >
+<COMPONENT type="5351" id="1405" >
<cdparam x="159" y="89" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="1356" />
-<TGConnectingPoint num="1" id="1357" />
-<TGConnectingPoint num="2" id="1358" />
-<TGConnectingPoint num="3" id="1359" />
-<TGConnectingPoint num="4" id="1360" />
-<TGConnectingPoint num="5" id="1361" />
-<TGConnectingPoint num="6" id="1362" />
-<TGConnectingPoint num="7" id="1363" />
-<TGConnectingPoint num="8" id="1364" />
-<TGConnectingPoint num="9" id="1365" />
-<TGConnectingPoint num="10" id="1366" />
-<TGConnectingPoint num="11" id="1367" />
-<TGConnectingPoint num="12" id="1368" />
-<TGConnectingPoint num="13" id="1369" />
-<TGConnectingPoint num="14" id="1370" />
-<TGConnectingPoint num="15" id="1371" />
-<TGConnectingPoint num="16" id="1372" />
-<TGConnectingPoint num="17" id="1373" />
-<TGConnectingPoint num="18" id="1374" />
-<TGConnectingPoint num="19" id="1375" />
-<TGConnectingPoint num="20" id="1376" />
-<TGConnectingPoint num="21" id="1377" />
-<TGConnectingPoint num="22" id="1378" />
-<TGConnectingPoint num="23" id="1379" />
+<TGConnectingPoint num="0" id="1381" />
+<TGConnectingPoint num="1" id="1382" />
+<TGConnectingPoint num="2" id="1383" />
+<TGConnectingPoint num="3" id="1384" />
+<TGConnectingPoint num="4" id="1385" />
+<TGConnectingPoint num="5" id="1386" />
+<TGConnectingPoint num="6" id="1387" />
+<TGConnectingPoint num="7" id="1388" />
+<TGConnectingPoint num="8" id="1389" />
+<TGConnectingPoint num="9" id="1390" />
+<TGConnectingPoint num="10" id="1391" />
+<TGConnectingPoint num="11" id="1392" />
+<TGConnectingPoint num="12" id="1393" />
+<TGConnectingPoint num="13" id="1394" />
+<TGConnectingPoint num="14" id="1395" />
+<TGConnectingPoint num="15" id="1396" />
+<TGConnectingPoint num="16" id="1397" />
+<TGConnectingPoint num="17" id="1398" />
+<TGConnectingPoint num="18" id="1399" />
+<TGConnectingPoint num="19" id="1400" />
+<TGConnectingPoint num="20" id="1401" />
+<TGConnectingPoint num="21" id="1402" />
+<TGConnectingPoint num="22" id="1403" />
+<TGConnectingPoint num="23" id="1404" />
<extraparam>
<info stereotype="CPU" nodeName="CPU0" />
<attributes nbOfIrq="6" iCacheWays="0" iCacheSets="0" iCacheWords="0" dCacheWays="0" dCacheSets="0" dCacheWords="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5352" id="1346" >
-<father id="1380" num="0" />
+<SUBCOMPONENT type="5352" id="1371" >
+<father id="1405" num="0" />
<cdparam x="255" y="199" />
<sizeparam width="110" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="140" minY="0" maxY="160" />
<infoparam name="TGComponent" value="Design::Door" />
-<TGConnectingPoint num="0" id="1338" />
-<TGConnectingPoint num="1" id="1339" />
-<TGConnectingPoint num="2" id="1340" />
-<TGConnectingPoint num="3" id="1341" />
-<TGConnectingPoint num="4" id="1342" />
-<TGConnectingPoint num="5" id="1343" />
-<TGConnectingPoint num="6" id="1344" />
-<TGConnectingPoint num="7" id="1345" />
+<TGConnectingPoint num="0" id="1363" />
+<TGConnectingPoint num="1" id="1364" />
+<TGConnectingPoint num="2" id="1365" />
+<TGConnectingPoint num="3" id="1366" />
+<TGConnectingPoint num="4" id="1367" />
+<TGConnectingPoint num="5" id="1368" />
+<TGConnectingPoint num="6" id="1369" />
+<TGConnectingPoint num="7" id="1370" />
<extraparam>
<info value="Design::Door" taskName="Door" referenceTaskName="Design" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5352" id="1355" >
-<father id="1380" num="1" />
+<SUBCOMPONENT type="5352" id="1380" >
+<father id="1405" num="1" />
<cdparam x="182" y="131" />
<sizeparam width="154" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="96" minY="0" maxY="160" />
<infoparam name="TGComponent" value="Design::ControlPanel" />
-<TGConnectingPoint num="0" id="1347" />
-<TGConnectingPoint num="1" id="1348" />
-<TGConnectingPoint num="2" id="1349" />
-<TGConnectingPoint num="3" id="1350" />
-<TGConnectingPoint num="4" id="1351" />
-<TGConnectingPoint num="5" id="1352" />
-<TGConnectingPoint num="6" id="1353" />
-<TGConnectingPoint num="7" id="1354" />
+<TGConnectingPoint num="0" id="1372" />
+<TGConnectingPoint num="1" id="1373" />
+<TGConnectingPoint num="2" id="1374" />
+<TGConnectingPoint num="3" id="1375" />
+<TGConnectingPoint num="4" id="1376" />
+<TGConnectingPoint num="5" id="1377" />
+<TGConnectingPoint num="6" id="1378" />
+<TGConnectingPoint num="7" id="1379" />
<extraparam>
<info value="Design::ControlPanel" taskName="ControlPanel" referenceTaskName="Design" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5350" id="1381" >
+<CONNECTOR type="5350" id="1406" >
<cdparam x="619" y="331" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Memory0 to Vgmn0" value="{info}" />
-<P1 x="593" y="292" id="1302" />
-<P2 x="495" y="368" id="1322" />
+<P1 x="593" y="292" id="1327" />
+<P2 x="495" y="368" id="1347" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5350" id="1382" >
+<CONNECTOR type="5350" id="1407" >
<cdparam x="284" y="289" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0 to Vgmn0" value="{info}" />
-<P1 x="284" y="289" id="1362" />
-<P2 x="370" y="368" id="1321" />
+<P1 x="284" y="289" id="1387" />
+<P2 x="370" y="368" id="1346" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/src/ui/avatardd/ADDMemoryNode.java b/src/ui/avatardd/ADDMemoryNode.java
new file mode 100755
index 0000000000000000000000000000000000000000..7af79d0e66b2b96f726e7f7791e9ac986184bb94
--- /dev/null
+++ b/src/ui/avatardd/ADDMemoryNode.java
@@ -0,0 +1,287 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ludovic.apvrille AT enst.fr
+
+This software is a computer program whose purpose is to allow the
+edition of TURTLE analysis, design and deployment diagrams, to
+allow the generation of RT-LOTOS or Java code from this diagram,
+and at last to allow the analysis of formal validation traces
+obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+from INRIA Rhone-Alpes.
+
+This software is governed by the CeCILL license under French law and
+abiding by the rules of distribution of free software. You can use,
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors have only limited
+liability.
+
+In this respect, the user's attention is drawn to the risks associated
+with loading, using, modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean that it is complicated to manipulate, and that also
+therefore means that it is reserved for developers and experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and, more generally, to use and operate it in the
+same conditions as regards security.
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.
+
+/**
+ * Class ADDMemoryNode
+ * Node. To be used in avatar deployment diagrams.
+ * Creation: 21/08/2014
+ * @version 1.0 21/08/2014
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.avatardd;
+
+import java.awt.*;
+import java.util.*;
+import javax.swing.*;
+
+import org.w3c.dom.*;
+
+import myutil.*;
+import ui.*;
+import ui.window.*;
+
+import tmltranslator.*;
+
+public abstract class ADDMemoryNode extends ADDCommunicationNode implements WithAttributes {
+ protected int textY1 = 15;
+ protected int textY2 = 30;
+ protected int derivationx = 2;
+ protected int derivationy = 3;
+ protected String stereotype = "RAM";
+
+ protected int index = 0;
+ protected int byteDataSize = HwMemory.DEFAULT_BYTE_DATA_SIZE;
+
+ public ADDMemoryNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ }
+
+ public void internalDrawing(Graphics g) {
+ Color c = g.getColor();
+ g.draw3DRect(x, y, width, height, true);
+
+ // Top lines
+ g.drawLine(x, y, x + derivationx, y - derivationy);
+ g.drawLine(x + width, y, x + width + derivationx, y - derivationy);
+ g.drawLine(x + derivationx, y - derivationy, x + width + derivationx, y - derivationy);
+
+ // Right lines
+ g.drawLine(x + width, y + height, x + width + derivationx, y - derivationy + height);
+ g.drawLine(x + derivationx + width, y - derivationy, x + width + derivationx, y - derivationy + height);
+
+ // Filling color
+ g.setColor(ColorManager.MEMORY_BOX);
+ g.fill3DRect(x+1, y+1, width-1, height-1, true);
+ g.setColor(c);
+
+ // Strings
+ String ster = "<<" + stereotype + ">>";
+ int w = g.getFontMetrics().stringWidth(ster);
+ Font f = g.getFont();
+ g.setFont(f.deriveFont(Font.BOLD));
+ g.drawString(ster, x + (width - w)/2, y + textY1);
+ w = g.getFontMetrics().stringWidth(name);
+ g.setFont(f);
+ g.drawString(name, x + (width - w)/2, y + textY2);
+
+ // Icon
+ //g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
+ g.drawImage(IconManager.imgic1108.getImage(), x + 4, y + 4, null);
+ g.drawImage(IconManager.img9, x + width - 20, y + 4, null);
+ }
+
+ public TGComponent isOnOnlyMe(int x1, int y1) {
+
+ Polygon pol = new Polygon();
+ pol.addPoint(x, y);
+ pol.addPoint(x + derivationx, y - derivationy);
+ pol.addPoint(x + derivationx + width, y - derivationy);
+ pol.addPoint(x + derivationx + width, y + height - derivationy);
+ pol.addPoint(x + width, y + height);
+ pol.addPoint(x, y + height);
+ if (pol.contains(x1, y1)) {
+ return this;
+ }
+
+ return null;
+ }
+
+ public String getStereotype() {
+ return stereotype;
+
+ }
+
+ public String getNodeName() {
+ return name;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public int getDataSize() {
+ return byteDataSize;
+ }
+
+ public boolean editOndoubleClick(JFrame frame) {
+ boolean error = false;
+ String errors = "";
+ int tmp;
+ String tmpName;
+
+ JDialogADDMemoryNode dialog = new JDialogADDMemoryNode(frame, "Setting " + stereotype + " attributes", this);
+ dialog.setSize(500, 450);
+ GraphicLib.centerOnParent(dialog);
+ dialog.show(); // blocked until dialog has been closed
+
+ if (!dialog.isRegularClose()) {
+ return false;
+ }
+
+ if (dialog.getNodeName().length() != 0) {
+ tmpName = dialog.getNodeName();
+ tmpName = tmpName.trim();
+ if (!TAttribute.isAValidId(tmpName, false, false)) {
+ error = true;
+ errors += "Name of the node ";
+ } else {
+ name = tmpName;
+ }
+ }
+
+
+
+ if (dialog.getIndex().length() != 0) {
+ try {
+ tmp = index;
+ index = Integer.decode(dialog.getIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "index ";
+ }
+ }
+
+ if (dialog.getDataSize().length() != 0) {
+ try {
+ tmp = byteDataSize;
+ byteDataSize = Integer.decode(dialog.getDataSize()).intValue();
+ if (index < 0) {
+ byteDataSize = tmp;
+ error = true;
+ errors += "byteDataSize ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "byteDataSize ";
+ }
+ }
+
+ if (error) {
+ JOptionPane.showMessageDialog(frame,
+ "Invalid value for the following attributes: " + errors,
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
+ return false;
+ }
+
+ return true;
+
+
+ }
+
+
+
+
+ protected String translateExtraParam() {
+ StringBuffer sb = new StringBuffer("<extraparam>\n");
+ sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
+ sb.append("\" />\n");
+ sb.append("<attributes byteDataSize=\"" + byteDataSize + "\" ");
+ sb.append(" index=\"" + index + "\" ");
+ sb.append("/>\n");
+ sb.append("</extraparam>\n");
+ return new String(sb);
+ }
+
+ public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+ //System.out.println("*** load extra synchro ***");
+ try {
+
+ NodeList nli;
+ Node n1, n2;
+ Element elt;
+ int t1id;
+ String sstereotype = null, snodeName = null;
+
+ for(int i=0; i<nl.getLength(); i++) {
+ n1 = nl.item(i);
+ //System.out.println(n1);
+ if (n1.getNodeType() == Node.ELEMENT_NODE) {
+ nli = n1.getChildNodes();
+ for(int j=0; i<nli.getLength(); i++) {
+ n2 = nli.item(i);
+ //System.out.println(n2);
+ if (n2.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element) n2;
+ if (elt.getTagName().equals("info")) {
+ sstereotype = elt.getAttribute("stereotype");
+ snodeName = elt.getAttribute("nodeName");
+ }
+ if (sstereotype != null) {
+ stereotype = sstereotype;
+ }
+ if (snodeName != null){
+ name = snodeName;
+ }
+
+ if (elt.getTagName().equals("attributes")) {
+ byteDataSize = Integer.decode(elt.getAttribute("byteDataSize")).intValue();
+ index = Integer.decode(elt.getAttribute("index")).intValue();
+
+ }
+ }
+ }
+ }
+ }
+
+ } catch (Exception e) {
+ throw new MalformedModelingException();
+ }
+ }
+
+
+ public int getByteDataSize(){
+ return byteDataSize;
+ }
+
+ public String getAttributes() {
+ String attr = "";
+ attr += "Data size (in byte) = " + byteDataSize + "\n";
+ attr += "Index = " + index + "\n";
+ return attr;
+ }
+
+
+}
diff --git a/src/ui/avatardd/ADDRAMNode.java b/src/ui/avatardd/ADDRAMNode.java
index d97b9e35a14a44f94a74973664215dd2f1ef3b70..848b83c7af84a6783385b962880d1c1bca093274 100755
--- a/src/ui/avatardd/ADDRAMNode.java
+++ b/src/ui/avatardd/ADDRAMNode.java
@@ -58,15 +58,7 @@ import ui.window.*;
import tmltranslator.*;
-public class ADDRAMNode extends ADDCommunicationNode implements WithAttributes {
- private int textY1 = 15;
- private int textY2 = 30;
- private int derivationx = 2;
- private int derivationy = 3;
- private String stereotype = "RAM";
-
- private int index = 0;
- private int byteDataSize = HwMemory.DEFAULT_BYTE_DATA_SIZE;
+public class ADDRAMNode extends ADDMemoryNode implements WithAttributes {
public ADDRAMNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -106,211 +98,22 @@ public class ADDRAMNode extends ADDCommunicationNode implements WithAttributes {
removable = true;
userResizable = true;
+ stereotype = "RAM";
+
name = tdp.findNodeName("Memory");
value = "name";
myImageIcon = IconManager.imgic700;
}
- public void internalDrawing(Graphics g) {
- Color c = g.getColor();
- g.draw3DRect(x, y, width, height, true);
-
- // Top lines
- g.drawLine(x, y, x + derivationx, y - derivationy);
- g.drawLine(x + width, y, x + width + derivationx, y - derivationy);
- g.drawLine(x + derivationx, y - derivationy, x + width + derivationx, y - derivationy);
-
- // Right lines
- g.drawLine(x + width, y + height, x + width + derivationx, y - derivationy + height);
- g.drawLine(x + derivationx + width, y - derivationy, x + width + derivationx, y - derivationy + height);
-
- // Filling color
- g.setColor(ColorManager.MEMORY_BOX);
- g.fill3DRect(x+1, y+1, width-1, height-1, true);
- g.setColor(c);
-
- // Strings
- String ster = "<<" + stereotype + ">>";
- int w = g.getFontMetrics().stringWidth(ster);
- Font f = g.getFont();
- g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(ster, x + (width - w)/2, y + textY1);
- w = g.getFontMetrics().stringWidth(name);
- g.setFont(f);
- g.drawString(name, x + (width - w)/2, y + textY2);
-
- // Icon
- //g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
- g.drawImage(IconManager.imgic1108.getImage(), x + 4, y + 4, null);
- g.drawImage(IconManager.img9, x + width - 20, y + 4, null);
- }
-
- public TGComponent isOnOnlyMe(int x1, int y1) {
-
- Polygon pol = new Polygon();
- pol.addPoint(x, y);
- pol.addPoint(x + derivationx, y - derivationy);
- pol.addPoint(x + derivationx + width, y - derivationy);
- pol.addPoint(x + derivationx + width, y + height - derivationy);
- pol.addPoint(x + width, y + height);
- pol.addPoint(x, y + height);
- if (pol.contains(x1, y1)) {
- return this;
- }
-
- return null;
- }
-
- public String getStereotype() {
- return stereotype;
-
- }
-
- public String getNodeName() {
- return name;
- }
-
- public boolean editOndoubleClick(JFrame frame) {
- boolean error = false;
- String errors = "";
- int tmp;
- String tmpName;
-
- /*JDialogMemoryNode dialog = new JDialogMemoryNode(frame, "Setting Memory attributes", this);
- dialog.setSize(400, 300);
- GraphicLib.centerOnParent(dialog);
- dialog.show(); // blocked until dialog has been closed
-
- if (!dialog.isRegularClose()) {
- return false;
- }
-
- if (dialog.getNodeName().length() != 0) {
- tmpName = dialog.getNodeName();
- tmpName = tmpName.trim();
- if (!TAttribute.isAValidId(tmpName, false, false)) {
- error = true;
- errors += "Name of the node ";
- } else {
- name = tmpName;
- }
- }
-
- if (dialog.getByteDataSize().length() != 0) {
- try {
- tmp = byteDataSize;
- byteDataSize = Integer.decode(dialog.getByteDataSize()).intValue();
- if (byteDataSize <= 0) {
- byteDataSize = tmp;
- error = true;
- errors += "Data size ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Data size ";
- }
- }
-
- if (dialog.getClockRatio().length() != 0) {
- try {
- tmp = clockRatio;
- clockRatio = Integer.decode(dialog.getClockRatio()).intValue();
- if (clockRatio <= 0) {
- clockRatio = tmp;
- error = true;
- errors += "Clock ratio ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Clock ratio ";
- }
- }
-
- if (error) {
- JOptionPane.showMessageDialog(frame,
- "Invalid value for the following attributes: " + errors,
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- return false;
- }*/
-
- return true;
- }
+
public int getType() {
return TGComponentManager.ADD_RAMNODE;
}
- protected String translateExtraParam() {
- StringBuffer sb = new StringBuffer("<extraparam>\n");
- sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
- sb.append("\" />\n");
- sb.append("<attributes byteDataSize=\"" + byteDataSize + "\" ");
- sb.append(" index=\"" + index + "\" ");
- sb.append("/>\n");
- sb.append("</extraparam>\n");
- return new String(sb);
- }
-
- public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
- //System.out.println("*** load extra synchro ***");
- try {
-
- NodeList nli;
- Node n1, n2;
- Element elt;
- int t1id;
- String sstereotype = null, snodeName = null;
-
- for(int i=0; i<nl.getLength(); i++) {
- n1 = nl.item(i);
- //System.out.println(n1);
- if (n1.getNodeType() == Node.ELEMENT_NODE) {
- nli = n1.getChildNodes();
- for(int j=0; i<nli.getLength(); i++) {
- n2 = nli.item(i);
- //System.out.println(n2);
- if (n2.getNodeType() == Node.ELEMENT_NODE) {
- elt = (Element) n2;
- if (elt.getTagName().equals("info")) {
- sstereotype = elt.getAttribute("stereotype");
- snodeName = elt.getAttribute("nodeName");
- }
- if (sstereotype != null) {
- stereotype = sstereotype;
- }
- if (snodeName != null){
- name = snodeName;
- }
-
- if (elt.getTagName().equals("attributes")) {
- byteDataSize = Integer.decode(elt.getAttribute("byteDataSize")).intValue();
- index = Integer.decode(elt.getAttribute("index")).intValue();
-
- }
- }
- }
- }
- }
-
- } catch (Exception e) {
- throw new MalformedModelingException();
- }
- }
-
-
- public int getByteDataSize(){
- return byteDataSize;
- }
-
- public String getAttributes() {
- String attr = "";
- attr += "Data size (in byte) = " + byteDataSize + "\n";
- attr += "Index = " + index + "\n";
- return attr;
- }
+
}
diff --git a/src/ui/avatardd/ADDROMNode.java b/src/ui/avatardd/ADDROMNode.java
index 5bb7324f155fd016fb1bd9ccc0864fb756cd83d3..7f6de6c0834893a1d1327db0944049ca0f7c075a 100755
--- a/src/ui/avatardd/ADDROMNode.java
+++ b/src/ui/avatardd/ADDROMNode.java
@@ -58,15 +58,7 @@ import ui.window.*;
import tmltranslator.*;
-public class ADDROMNode extends ADDCommunicationNode implements WithAttributes {
- private int textY1 = 15;
- private int textY2 = 30;
- private int derivationx = 2;
- private int derivationy = 3;
- private String stereotype = "ROM";
-
- private int index = 0;
- private int byteDataSize = HwMemory.DEFAULT_BYTE_DATA_SIZE;
+public class ADDROMNode extends ADDMemoryNode implements WithAttributes {
public ADDROMNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -106,211 +98,24 @@ public class ADDROMNode extends ADDCommunicationNode implements WithAttributes
removable = true;
userResizable = true;
+ stereotype = "ROM";
+
name = tdp.findNodeName("Memory");
value = "name";
myImageIcon = IconManager.imgic700;
}
- public void internalDrawing(Graphics g) {
- Color c = g.getColor();
- g.draw3DRect(x, y, width, height, true);
-
- // Top lines
- g.drawLine(x, y, x + derivationx, y - derivationy);
- g.drawLine(x + width, y, x + width + derivationx, y - derivationy);
- g.drawLine(x + derivationx, y - derivationy, x + width + derivationx, y - derivationy);
-
- // Right lines
- g.drawLine(x + width, y + height, x + width + derivationx, y - derivationy + height);
- g.drawLine(x + derivationx + width, y - derivationy, x + width + derivationx, y - derivationy + height);
-
- // Filling color
- g.setColor(ColorManager.MEMORY_BOX);
- g.fill3DRect(x+1, y+1, width-1, height-1, true);
- g.setColor(c);
-
- // Strings
- String ster = "<<" + stereotype + ">>";
- int w = g.getFontMetrics().stringWidth(ster);
- Font f = g.getFont();
- g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(ster, x + (width - w)/2, y + textY1);
- w = g.getFontMetrics().stringWidth(name);
- g.setFont(f);
- g.drawString(name, x + (width - w)/2, y + textY2);
-
- // Icon
- //g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
- g.drawImage(IconManager.imgic1108.getImage(), x + 4, y + 4, null);
- g.drawImage(IconManager.img9, x + width - 20, y + 4, null);
- }
-
- public TGComponent isOnOnlyMe(int x1, int y1) {
-
- Polygon pol = new Polygon();
- pol.addPoint(x, y);
- pol.addPoint(x + derivationx, y - derivationy);
- pol.addPoint(x + derivationx + width, y - derivationy);
- pol.addPoint(x + derivationx + width, y + height - derivationy);
- pol.addPoint(x + width, y + height);
- pol.addPoint(x, y + height);
- if (pol.contains(x1, y1)) {
- return this;
- }
-
- return null;
- }
-
- public String getStereotype() {
- return stereotype;
-
- }
-
- public String getNodeName() {
- return name;
- }
+
- public boolean editOndoubleClick(JFrame frame) {
- boolean error = false;
- String errors = "";
- int tmp;
- String tmpName;
-
- /*JDialogMemoryNode dialog = new JDialogMemoryNode(frame, "Setting Memory attributes", this);
- dialog.setSize(400, 300);
- GraphicLib.centerOnParent(dialog);
- dialog.show(); // blocked until dialog has been closed
-
- if (!dialog.isRegularClose()) {
- return false;
- }
-
- if (dialog.getNodeName().length() != 0) {
- tmpName = dialog.getNodeName();
- tmpName = tmpName.trim();
- if (!TAttribute.isAValidId(tmpName, false, false)) {
- error = true;
- errors += "Name of the node ";
- } else {
- name = tmpName;
- }
- }
-
- if (dialog.getByteDataSize().length() != 0) {
- try {
- tmp = byteDataSize;
- byteDataSize = Integer.decode(dialog.getByteDataSize()).intValue();
- if (byteDataSize <= 0) {
- byteDataSize = tmp;
- error = true;
- errors += "Data size ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Data size ";
- }
- }
-
- if (dialog.getClockRatio().length() != 0) {
- try {
- tmp = clockRatio;
- clockRatio = Integer.decode(dialog.getClockRatio()).intValue();
- if (clockRatio <= 0) {
- clockRatio = tmp;
- error = true;
- errors += "Clock ratio ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Clock ratio ";
- }
- }
-
- if (error) {
- JOptionPane.showMessageDialog(frame,
- "Invalid value for the following attributes: " + errors,
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- return false;
- }*/
-
- return true;
- }
+
public int getType() {
return TGComponentManager.ADD_ROMNODE;
}
- protected String translateExtraParam() {
- StringBuffer sb = new StringBuffer("<extraparam>\n");
- sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
- sb.append("\" />\n");
- sb.append("<attributes byteDataSize=\"" + byteDataSize + "\" ");
- sb.append(" index=\"" + index + "\" ");
- sb.append("/>\n");
- sb.append("</extraparam>\n");
- return new String(sb);
- }
-
- public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
- //System.out.println("*** load extra synchro ***");
- try {
-
- NodeList nli;
- Node n1, n2;
- Element elt;
- int t1id;
- String sstereotype = null, snodeName = null;
-
- for(int i=0; i<nl.getLength(); i++) {
- n1 = nl.item(i);
- //System.out.println(n1);
- if (n1.getNodeType() == Node.ELEMENT_NODE) {
- nli = n1.getChildNodes();
- for(int j=0; i<nli.getLength(); i++) {
- n2 = nli.item(i);
- //System.out.println(n2);
- if (n2.getNodeType() == Node.ELEMENT_NODE) {
- elt = (Element) n2;
- if (elt.getTagName().equals("info")) {
- sstereotype = elt.getAttribute("stereotype");
- snodeName = elt.getAttribute("nodeName");
- }
- if (sstereotype != null) {
- stereotype = sstereotype;
- }
- if (snodeName != null){
- name = snodeName;
- }
-
- if (elt.getTagName().equals("attributes")) {
- byteDataSize = Integer.decode(elt.getAttribute("byteDataSize")).intValue();
- index = Integer.decode(elt.getAttribute("index")).intValue();
-
- }
- }
- }
- }
- }
-
- } catch (Exception e) {
- throw new MalformedModelingException();
- }
- }
-
-
- public int getByteDataSize(){
- return byteDataSize;
- }
-
- public String getAttributes() {
- String attr = "";
- attr += "Data size (in byte) = " + byteDataSize + "\n";
- attr += "Index = " + index + "\n";
- return attr;
- }
+
}
diff --git a/src/ui/avatardd/ADDTTYNode.java b/src/ui/avatardd/ADDTTYNode.java
index 7322cff4d77353c6ba04eebea266a0a107658567..f3f32e2c3772c3d9dc41b35c2da5e1aff4c32494 100755
--- a/src/ui/avatardd/ADDTTYNode.java
+++ b/src/ui/avatardd/ADDTTYNode.java
@@ -171,230 +171,63 @@ public class ADDTTYNode extends ADDNode implements WithAttributes {
return name;
}
+ public int getIndex() {
+ return index;
+ }
+
+
public boolean editOndoubleClick(JFrame frame) {
- boolean error = false;
- String errors = "";
- int tmp;
- String tmpName;
-
- /*JDialogCPUNode dialog = new JDialogCPUNode(frame, "Setting CPU attributes", this);
- dialog.setSize(500, 450);
- GraphicLib.centerOnParent(dialog);
- dialog.show(); // blocked until dialog has been closed
-
- if (!dialog.isRegularClose()) {
- return false;
- }
-
- if (dialog.getNodeName().length() != 0) {
- tmpName = dialog.getNodeName();
- tmpName = tmpName.trim();
- if (!TAttribute.isAValidId(tmpName, false, false)) {
- error = true;
- errors += "Name of the node ";
- } else {
- name = tmpName;
- }
- }
-
- schedulingPolicy = dialog.getSchedulingPolicy();
- if (schedulingPolicy == HwCPU.BASIC_ROUND_ROBIN) {
- stereotype = "CPURR";
- }
-
- if (schedulingPolicy == HwCPU.ROUND_ROBIN_PRIORITY_BASED) {
- stereotype = "CPURRPB";
- }
-
- if (dialog.getSliceTime().length() != 0) {
- try {
- tmp = sliceTime;
- sliceTime = Integer.decode(dialog.getSliceTime()).intValue();
- if (sliceTime <= 0) {
- sliceTime = tmp;
- error = true;
- errors += "Slice time ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Slice time ";
- }
- }
-
- if (dialog.getNbOfCores().length() != 0) {
- try {
- tmp = nbOfCores;
- nbOfCores = Integer.decode(dialog.getNbOfCores()).intValue();
- if (nbOfCores <= 0) {
- nbOfCores = tmp;
- error = true;
- errors += "Data size ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Data size ";
- }
- }
-
- if (dialog.getByteDataSize().length() != 0) {
- try {
- tmp = byteDataSize;
- byteDataSize = Integer.decode(dialog.getByteDataSize()).intValue();
- if (byteDataSize <= 0) {
- byteDataSize = tmp;
- error = true;
- errors += "Data size ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Data size ";
- }
- }
-
- if (dialog.getPipelineSize().length() != 0) {
- try {
- tmp = pipelineSize;
- pipelineSize = Integer.decode(dialog.getPipelineSize()).intValue();
- if (pipelineSize <= 0) {
- pipelineSize = tmp;
- error = true;
- errors += "Pipeline size ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Pipeline size ";
- }
- }
-
- if (dialog.getGoIdleTime().length() != 0) {
- try {
- tmp = goIdleTime;
- goIdleTime = Integer.decode(dialog.getGoIdleTime()).intValue();
- if (goIdleTime < 0) {
- goIdleTime = tmp;
- error = true;
- errors += "Go idle time ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Go idle time ";
- }
- }
-
- if (dialog.getMaxConsecutiveIdleCycles().length() != 0) {
- try {
- tmp = goIdleTime;
- maxConsecutiveIdleCycles = Integer.decode(dialog.getMaxConsecutiveIdleCycles()).intValue();
- if (maxConsecutiveIdleCycles < 0) {
- maxConsecutiveIdleCycles = tmp;
- error = true;
- errors += "Max consecutive idle cycles ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Max consecutive idle cycles ";
- }
- }
-
- if (dialog.getExeciTime().length() != 0) {
- try {
- tmp = execiTime;
- execiTime = Integer.decode(dialog.getExeciTime()).intValue();
- if (execiTime < 0) {
- execiTime = tmp;
- error = true;
- errors += "execi time ";
- }
- } catch (Exception e) {
- error = true;
- errors += "execi time ";
- }
- }
-
- if (dialog.getExeccTime().length() != 0) {
- try {
- tmp = execcTime;
- execcTime = Integer.decode(dialog.getExeccTime()).intValue();
- if (execcTime < 0) {
- execcTime = tmp;
- error = true;
- errors += "execc time ";
- }
- } catch (Exception e) {
- error = true;
- errors += "execc time ";
- }
- }
-
- if (dialog.getTaskSwitchingTime().length() != 0) {
- try {
- tmp = taskSwitchingTime;
- taskSwitchingTime = Integer.decode(dialog.getTaskSwitchingTime()).intValue();
- if (taskSwitchingTime <= 0) {
- taskSwitchingTime = tmp;
- error = true;
- errors += "Task switching time ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Task switching time ";
+ boolean error = false;
+ String errors = "";
+ int tmp;
+ String tmpName;
+
+ JDialogADDTTYNode dialog = new JDialogADDTTYNode(frame, "Setting TTY attributes", this);
+ dialog.setSize(500, 450);
+ GraphicLib.centerOnParent(dialog);
+ dialog.show(); // blocked until dialog has been closed
+
+ if (!dialog.isRegularClose()) {
+ return false;
}
- }
-
- if (dialog.getBranchingPredictionPenalty().length() != 0) {
- try {
- tmp = branchingPredictionPenalty;
- branchingPredictionPenalty = Integer.decode(dialog.getBranchingPredictionPenalty()).intValue();
- if ((branchingPredictionPenalty < 0) || (branchingPredictionPenalty > 100)) {
- branchingPredictionPenalty = tmp;
- error = true;
- errors += "Mis-branching prediction ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Mis-branching prediction ";
+
+ if (dialog.getNodeName().length() != 0) {
+ tmpName = dialog.getNodeName();
+ tmpName = tmpName.trim();
+ if (!TAttribute.isAValidId(tmpName, false, false)) {
+ error = true;
+ errors += "Name of the node ";
+ } else {
+ name = tmpName;
+ }
}
- }
-
- if (dialog.getCacheMiss().length() != 0) {
- try {
- tmp = cacheMiss;
- cacheMiss = Integer.decode(dialog.getCacheMiss()).intValue();
- if ((cacheMiss < 0) || (cacheMiss > 100)) {
- cacheMiss = tmp;
- error = true;
- errors += "Cache-miss ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Cache-miss ";
+
+
+
+ if (dialog.getIndex().length() != 0) {
+ try {
+ tmp = index;
+ index = Integer.decode(dialog.getIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "index ";
+ }
}
- }
-
- if (dialog.getClockRatio().length() != 0) {
- try {
- tmp = clockRatio;
- clockRatio = Integer.decode(dialog.getClockRatio()).intValue();
- if (clockRatio < 1) {
- clockRatio = tmp;
- error = true;
- errors += "Clock ratio ";
- }
- } catch (Exception e) {
- error = true;
- errors += "Clock ratio ";
+
+ if (error) {
+ JOptionPane.showMessageDialog(frame,
+ "Invalid value for the following attributes: " + errors,
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
+ return false;
}
- }
-
- if (error) {
- JOptionPane.showMessageDialog(frame,
- "Invalid value for the following attributes: " + errors,
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- return false;
- }*/
-
- return true;
+
+ return true;
}
diff --git a/src/ui/window/JDialogADDMemoryNode.java b/src/ui/window/JDialogADDMemoryNode.java
new file mode 100755
index 0000000000000000000000000000000000000000..fdb0a6c7ad49af877aa6b8da11df0c8bb0dc58a4
--- /dev/null
+++ b/src/ui/window/JDialogADDMemoryNode.java
@@ -0,0 +1,213 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class JDialogADDMemoryNode
+ * Dialog for managing attributes of Memory nodes
+ * Creation: 21/08/2014
+ * @version 1.0 21/08/2014
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.window;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+//import javax.swing.event.*;
+//import java.util.*;
+
+import ui.*;
+
+import ui.avatardd.*;
+
+
+public class JDialogADDMemoryNode extends javax.swing.JDialog implements ActionListener {
+
+ private boolean regularClose;
+
+ private JPanel panel2;
+ private Frame frame;
+ private ADDMemoryNode node;
+
+
+ // Panel1
+ protected JTextField nodeName;
+
+ // Panel2
+ protected JTextField index;
+ protected JTextField dataSize;
+
+
+
+ // Main Panel
+ private JButton closeButton;
+ private JButton cancelButton;
+
+ /** Creates new form */
+ public JDialogADDMemoryNode(Frame _frame, String _title, ADDMemoryNode _node) {
+ super(_frame, _title, true);
+ frame = _frame;
+ node = _node;
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+ private void myInitComponents() {
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(gridbag0);
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("Memory attributes"));
+ panel2.setPreferredSize(new Dimension(400, 200));
+
+ c1.gridwidth = 1;
+ c1.gridheight = 1;
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("Memory name:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ nodeName = new JTextField(node.getNodeName(), 30);
+ nodeName.setEditable(true);
+ nodeName.setFont(new Font("times", Font.PLAIN, 12));
+ panel2.add(nodeName, c1);
+
+
+ c2.gridwidth = 1;
+ c2.gridheight = 1;
+ c2.weighty = 1.0;
+ c2.weightx = 1.0;
+ c2.fill = GridBagConstraints.HORIZONTAL;
+
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(index, c2);
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Data size (in byte):"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ dataSize = new JTextField(""+node.getDataSize(), 15);
+ panel2.add(dataSize, c2);
+
+
+ // main panel;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c.add(panel2, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+ closeButton = new JButton("Save and Close", IconManager.imgic25);
+ //closeButton.setPreferredSize(new Dimension(600, 50));
+ closeButton.addActionListener(this);
+ c.add(closeButton, c0);
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cancelButton = new JButton("Cancel", IconManager.imgic27);
+ cancelButton.addActionListener(this);
+ c.add(cancelButton, c0);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ /* if (evt.getSource() == typeBox) {
+ boolean b = ((Boolean)(initValues.elementAt(typeBox.getSelectedIndex()))).booleanValue();
+ initialValue.setEnabled(b);
+ return;
+ }*/
+
+
+ String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public void closeDialog() {
+ regularClose = true;
+ dispose();
+ }
+
+ public void cancelDialog() {
+ dispose();
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public String getNodeName() {
+ return nodeName.getText();
+ }
+
+ public String getIndex() {
+ return index.getText();
+ }
+
+ public String getDataSize() {
+ return dataSize.getText();
+ }
+
+
+}
diff --git a/src/ui/window/JDialogADDTTYNode.java b/src/ui/window/JDialogADDTTYNode.java
new file mode 100755
index 0000000000000000000000000000000000000000..74274b02deb830404ef5493a8713e5f8228265fd
--- /dev/null
+++ b/src/ui/window/JDialogADDTTYNode.java
@@ -0,0 +1,201 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class JDialogADDTTYNode
+ * Dialog for managing attributes of TTY nodes
+ * Creation: 21/08/2014
+ * @version 1.0 21/08/2014
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.window;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+//import javax.swing.event.*;
+//import java.util.*;
+
+import ui.*;
+
+import ui.avatardd.*;
+
+
+public class JDialogADDTTYNode extends javax.swing.JDialog implements ActionListener {
+
+ private boolean regularClose;
+
+ private JPanel panel2;
+ private Frame frame;
+ private ADDTTYNode node;
+
+
+ // Panel1
+ protected JTextField nodeName;
+
+ // Panel2
+ protected JTextField index;
+
+
+ // Main Panel
+ private JButton closeButton;
+ private JButton cancelButton;
+
+ /** Creates new form */
+ public JDialogADDTTYNode(Frame _frame, String _title, ADDTTYNode _node) {
+ super(_frame, _title, true);
+ frame = _frame;
+ node = _node;
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+ private void myInitComponents() {
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(gridbag0);
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("TTY attributes"));
+ panel2.setPreferredSize(new Dimension(400, 200));
+
+ c1.gridwidth = 1;
+ c1.gridheight = 1;
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("TTY name:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ nodeName = new JTextField(node.getNodeName(), 30);
+ nodeName.setEditable(true);
+ nodeName.setFont(new Font("times", Font.PLAIN, 12));
+ panel2.add(nodeName, c1);
+
+
+ c2.gridwidth = 1;
+ c2.gridheight = 1;
+ c2.weighty = 1.0;
+ c2.weightx = 1.0;
+ c2.fill = GridBagConstraints.HORIZONTAL;
+
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(index, c2);
+
+
+ // main panel;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c.add(panel2, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+ closeButton = new JButton("Save and Close", IconManager.imgic25);
+ //closeButton.setPreferredSize(new Dimension(600, 50));
+ closeButton.addActionListener(this);
+ c.add(closeButton, c0);
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cancelButton = new JButton("Cancel", IconManager.imgic27);
+ cancelButton.addActionListener(this);
+ c.add(cancelButton, c0);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ /* if (evt.getSource() == typeBox) {
+ boolean b = ((Boolean)(initValues.elementAt(typeBox.getSelectedIndex()))).booleanValue();
+ initialValue.setEnabled(b);
+ return;
+ }*/
+
+
+ String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public void closeDialog() {
+ regularClose = true;
+ dispose();
+ }
+
+ public void cancelDialog() {
+ dispose();
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public String getNodeName() {
+ return nodeName.getText();
+ }
+
+ public String getIndex() {
+ return index.getText();
+ }
+
+
+}