From bfadfae4504741b9322d7c9f767d3b21706cf0d6 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Fri, 2 Feb 2018 16:08:39 +0100
Subject: [PATCH] Resolving bug on popup in Windows for trees
---
modeling/AVATAR/faulttreetest.xml | 10 +-
modeling/DIPLODOCUS/SmartCardProtocol.xml | 1012 +++++++++--------
src/main/java/ui/tree/JDiagramTree.java | 16 +-
.../window/JDialogProverifVerification.java | 3 +-
.../ui/window/JDialogTMatrixManagement.java | 234 ++--
5 files changed, 698 insertions(+), 577 deletions(-)
diff --git a/modeling/AVATAR/faulttreetest.xml b/modeling/AVATAR/faulttreetest.xml
index 49cce9753a..1bc0bb0944 100644
--- a/modeling/AVATAR/faulttreetest.xml
+++ b/modeling/AVATAR/faulttreetest.xml
@@ -109,7 +109,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="55" />
-<P1 x="459" y="361" id="166" />
+<P1 x="523" y="388" id="166" />
<P2 x="352" y="292" id="160" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -127,8 +127,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="59" />
-<P1 x="534" y="370" id="181" />
-<P2 x="580" y="401" id="137" />
+<P1 x="598" y="397" id="181" />
+<P2 x="692" y="397" id="137" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="6101" id="85" >
@@ -241,7 +241,7 @@
</COMPONENT>
<COMPONENT type="6103" id="148" >
-<cdparam x="592" y="382" />
+<cdparam x="704" y="378" />
<sizeparam width="164" height="39" minWidth="78" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1601" minY="10" maxY="962" />
@@ -284,7 +284,7 @@
</COMPONENT>
<COMPONENT type="6101" id="186" >
-<cdparam x="435" y="361" />
+<cdparam x="499" y="388" />
<sizeparam width="99" height="39" minWidth="99" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index b1faeb138b..11f224360a 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -6155,12 +6155,156 @@ the smart card and the terminal
<Modeling type="TML Architecture" nameTab="Mapping1" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1114" id="1407" >
-<cdparam x="592" y="186" />
+<COMPONENT type="1114" id="1843" >
+<cdparam x="43" y="544" />
+<sizeparam width="250" height="100" 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="Firewall0" value="name" />
+<TGConnectingPoint num="0" id="1844" />
+<TGConnectingPoint num="1" id="1845" />
+<TGConnectingPoint num="2" id="1846" />
+<TGConnectingPoint num="3" id="1847" />
+<TGConnectingPoint num="4" id="1848" />
+<TGConnectingPoint num="5" id="1849" />
+<TGConnectingPoint num="6" id="1850" />
+<TGConnectingPoint num="7" id="1851" />
+<TGConnectingPoint num="8" id="1852" />
+<TGConnectingPoint num="9" id="1853" />
+<TGConnectingPoint num="10" id="1854" />
+<TGConnectingPoint num="11" id="1855" />
+<TGConnectingPoint num="12" id="1856" />
+<TGConnectingPoint num="13" id="1857" />
+<TGConnectingPoint num="14" id="1858" />
+<TGConnectingPoint num="15" id="1859" />
+<TGConnectingPoint num="16" id="1860" />
+<TGConnectingPoint num="17" id="1861" />
+<TGConnectingPoint num="18" id="1862" />
+<TGConnectingPoint num="19" id="1863" />
+<TGConnectingPoint num="20" id="1864" />
+<TGConnectingPoint num="21" id="1865" />
+<TGConnectingPoint num="22" id="1866" />
+<TGConnectingPoint num="23" id="1867" />
+<extraparam>
+<info stereotype="FIREWALL" nodeName="Firewall0" />
+<attributes latency="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1114" id="1818" >
+<cdparam x="290" y="510" />
+<sizeparam width="250" height="100" 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="Firewall0" value="name" />
+<TGConnectingPoint num="0" id="1819" />
+<TGConnectingPoint num="1" id="1820" />
+<TGConnectingPoint num="2" id="1821" />
+<TGConnectingPoint num="3" id="1822" />
+<TGConnectingPoint num="4" id="1823" />
+<TGConnectingPoint num="5" id="1824" />
+<TGConnectingPoint num="6" id="1825" />
+<TGConnectingPoint num="7" id="1826" />
+<TGConnectingPoint num="8" id="1827" />
+<TGConnectingPoint num="9" id="1828" />
+<TGConnectingPoint num="10" id="1829" />
+<TGConnectingPoint num="11" id="1830" />
+<TGConnectingPoint num="12" id="1831" />
+<TGConnectingPoint num="13" id="1832" />
+<TGConnectingPoint num="14" id="1833" />
+<TGConnectingPoint num="15" id="1834" />
+<TGConnectingPoint num="16" id="1835" />
+<TGConnectingPoint num="17" id="1836" />
+<TGConnectingPoint num="18" id="1837" />
+<TGConnectingPoint num="19" id="1838" />
+<TGConnectingPoint num="20" id="1839" />
+<TGConnectingPoint num="21" id="1840" />
+<TGConnectingPoint num="22" id="1841" />
+<TGConnectingPoint num="23" id="1842" />
+<extraparam>
+<info stereotype="FIREWALL" nodeName="Firewall0" />
+<attributes latency="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1114" id="1793" >
+<cdparam x="626" y="135" />
+<sizeparam width="250" height="100" 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="Firewall0" value="name" />
+<TGConnectingPoint num="0" id="1794" />
+<TGConnectingPoint num="1" id="1795" />
+<TGConnectingPoint num="2" id="1796" />
+<TGConnectingPoint num="3" id="1797" />
+<TGConnectingPoint num="4" id="1798" />
+<TGConnectingPoint num="5" id="1799" />
+<TGConnectingPoint num="6" id="1800" />
+<TGConnectingPoint num="7" id="1801" />
+<TGConnectingPoint num="8" id="1802" />
+<TGConnectingPoint num="9" id="1803" />
+<TGConnectingPoint num="10" id="1804" />
+<TGConnectingPoint num="11" id="1805" />
+<TGConnectingPoint num="12" id="1806" />
+<TGConnectingPoint num="13" id="1807" />
+<TGConnectingPoint num="14" id="1808" />
+<TGConnectingPoint num="15" id="1809" />
+<TGConnectingPoint num="16" id="1810" />
+<TGConnectingPoint num="17" id="1811" />
+<TGConnectingPoint num="18" id="1812" />
+<TGConnectingPoint num="19" id="1813" />
+<TGConnectingPoint num="20" id="1814" />
+<TGConnectingPoint num="21" id="1815" />
+<TGConnectingPoint num="22" id="1816" />
+<TGConnectingPoint num="23" id="1817" />
+<extraparam>
+<info stereotype="FIREWALL" nodeName="Firewall0" />
+<attributes latency="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1114" id="1768" >
+<cdparam x="576" y="133" />
<sizeparam width="250" height="100" 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="Firewall0" value="name" />
+<TGConnectingPoint num="0" id="1769" />
+<TGConnectingPoint num="1" id="1770" />
+<TGConnectingPoint num="2" id="1771" />
+<TGConnectingPoint num="3" id="1772" />
+<TGConnectingPoint num="4" id="1773" />
+<TGConnectingPoint num="5" id="1774" />
+<TGConnectingPoint num="6" id="1775" />
+<TGConnectingPoint num="7" id="1776" />
+<TGConnectingPoint num="8" id="1777" />
+<TGConnectingPoint num="9" id="1778" />
+<TGConnectingPoint num="10" id="1779" />
+<TGConnectingPoint num="11" id="1780" />
+<TGConnectingPoint num="12" id="1781" />
+<TGConnectingPoint num="13" id="1782" />
+<TGConnectingPoint num="14" id="1783" />
+<TGConnectingPoint num="15" id="1784" />
+<TGConnectingPoint num="16" id="1785" />
+<TGConnectingPoint num="17" id="1786" />
+<TGConnectingPoint num="18" id="1787" />
+<TGConnectingPoint num="19" id="1788" />
+<TGConnectingPoint num="20" id="1789" />
+<TGConnectingPoint num="21" id="1790" />
+<TGConnectingPoint num="22" id="1791" />
+<TGConnectingPoint num="23" id="1792" />
+<extraparam>
+<info stereotype="FIREWALL" nodeName="Firewall0" />
+<attributes latency="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1102" id="1407" >
+<cdparam x="612" y="448" />
+<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="Bus0" value="name" />
<TGConnectingPoint num="0" id="1383" />
<TGConnectingPoint num="1" id="1384" />
<TGConnectingPoint num="2" id="1385" />
@@ -6186,17 +6330,17 @@ the smart card and the terminal
<TGConnectingPoint num="22" id="1405" />
<TGConnectingPoint num="23" id="1406" />
<extraparam>
-<info stereotype="FIREWALL" nodeName="Firewall0" />
-<attributes latency="0" />
+<info stereotype="BUS-RR" nodeName="Bus0" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1114" id="1432" >
-<cdparam x="459" y="172" />
-<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="1432" >
+<cdparam x="796" y="121" />
+<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="Firewall0" value="name" />
+<infoparam name="Memory0" value="name" />
<TGConnectingPoint num="0" id="1408" />
<TGConnectingPoint num="1" id="1409" />
<TGConnectingPoint num="2" id="1410" />
@@ -6222,142 +6366,238 @@ the smart card and the terminal
<TGConnectingPoint num="22" id="1430" />
<TGConnectingPoint num="23" id="1431" />
<extraparam>
+<info stereotype="MEMORY" nodeName="Memory0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1114" id="1457" >
+<cdparam x="592" y="186" />
+<sizeparam width="250" height="100" 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="Firewall0" value="name" />
+<TGConnectingPoint num="0" id="1433" />
+<TGConnectingPoint num="1" id="1434" />
+<TGConnectingPoint num="2" id="1435" />
+<TGConnectingPoint num="3" id="1436" />
+<TGConnectingPoint num="4" id="1437" />
+<TGConnectingPoint num="5" id="1438" />
+<TGConnectingPoint num="6" id="1439" />
+<TGConnectingPoint num="7" id="1440" />
+<TGConnectingPoint num="8" id="1441" />
+<TGConnectingPoint num="9" id="1442" />
+<TGConnectingPoint num="10" id="1443" />
+<TGConnectingPoint num="11" id="1444" />
+<TGConnectingPoint num="12" id="1445" />
+<TGConnectingPoint num="13" id="1446" />
+<TGConnectingPoint num="14" id="1447" />
+<TGConnectingPoint num="15" id="1448" />
+<TGConnectingPoint num="16" id="1449" />
+<TGConnectingPoint num="17" id="1450" />
+<TGConnectingPoint num="18" id="1451" />
+<TGConnectingPoint num="19" id="1452" />
+<TGConnectingPoint num="20" id="1453" />
+<TGConnectingPoint num="21" id="1454" />
+<TGConnectingPoint num="22" id="1455" />
+<TGConnectingPoint num="23" id="1456" />
+<extraparam>
+<info stereotype="FIREWALL" nodeName="Firewall0" />
+<attributes latency="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1114" id="1482" >
+<cdparam x="459" y="172" />
+<sizeparam width="250" height="100" 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="Firewall0" value="name" />
+<TGConnectingPoint num="0" id="1458" />
+<TGConnectingPoint num="1" id="1459" />
+<TGConnectingPoint num="2" id="1460" />
+<TGConnectingPoint num="3" id="1461" />
+<TGConnectingPoint num="4" id="1462" />
+<TGConnectingPoint num="5" id="1463" />
+<TGConnectingPoint num="6" id="1464" />
+<TGConnectingPoint num="7" id="1465" />
+<TGConnectingPoint num="8" id="1466" />
+<TGConnectingPoint num="9" id="1467" />
+<TGConnectingPoint num="10" id="1468" />
+<TGConnectingPoint num="11" id="1469" />
+<TGConnectingPoint num="12" id="1470" />
+<TGConnectingPoint num="13" id="1471" />
+<TGConnectingPoint num="14" id="1472" />
+<TGConnectingPoint num="15" id="1473" />
+<TGConnectingPoint num="16" id="1474" />
+<TGConnectingPoint num="17" id="1475" />
+<TGConnectingPoint num="18" id="1476" />
+<TGConnectingPoint num="19" id="1477" />
+<TGConnectingPoint num="20" id="1478" />
+<TGConnectingPoint num="21" id="1479" />
+<TGConnectingPoint num="22" id="1480" />
+<TGConnectingPoint num="23" id="1481" />
+<extraparam>
<info stereotype="FIREWALL" nodeName="Firewall0" />
<attributes latency="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="1502" >
+<COMPONENT type="1100" id="1552" >
<cdparam x="51" y="90" />
<sizeparam width="459" height="321" minWidth="150" minHeight="150" 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="1478" />
-<TGConnectingPoint num="1" id="1479" />
-<TGConnectingPoint num="2" id="1480" />
-<TGConnectingPoint num="3" id="1481" />
-<TGConnectingPoint num="4" id="1482" />
-<TGConnectingPoint num="5" id="1483" />
-<TGConnectingPoint num="6" id="1484" />
-<TGConnectingPoint num="7" id="1485" />
-<TGConnectingPoint num="8" id="1486" />
-<TGConnectingPoint num="9" id="1487" />
-<TGConnectingPoint num="10" id="1488" />
-<TGConnectingPoint num="11" id="1489" />
-<TGConnectingPoint num="12" id="1490" />
-<TGConnectingPoint num="13" id="1491" />
-<TGConnectingPoint num="14" id="1492" />
-<TGConnectingPoint num="15" id="1493" />
-<TGConnectingPoint num="16" id="1494" />
-<TGConnectingPoint num="17" id="1495" />
-<TGConnectingPoint num="18" id="1496" />
-<TGConnectingPoint num="19" id="1497" />
-<TGConnectingPoint num="20" id="1498" />
-<TGConnectingPoint num="21" id="1499" />
-<TGConnectingPoint num="22" id="1500" />
-<TGConnectingPoint num="23" id="1501" />
+<TGConnectingPoint num="0" id="1528" />
+<TGConnectingPoint num="1" id="1529" />
+<TGConnectingPoint num="2" id="1530" />
+<TGConnectingPoint num="3" id="1531" />
+<TGConnectingPoint num="4" id="1532" />
+<TGConnectingPoint num="5" id="1533" />
+<TGConnectingPoint num="6" id="1534" />
+<TGConnectingPoint num="7" id="1535" />
+<TGConnectingPoint num="8" id="1536" />
+<TGConnectingPoint num="9" id="1537" />
+<TGConnectingPoint num="10" id="1538" />
+<TGConnectingPoint num="11" id="1539" />
+<TGConnectingPoint num="12" id="1540" />
+<TGConnectingPoint num="13" id="1541" />
+<TGConnectingPoint num="14" id="1542" />
+<TGConnectingPoint num="15" id="1543" />
+<TGConnectingPoint num="16" id="1544" />
+<TGConnectingPoint num="17" id="1545" />
+<TGConnectingPoint num="18" id="1546" />
+<TGConnectingPoint num="19" id="1547" />
+<TGConnectingPoint num="20" id="1548" />
+<TGConnectingPoint num="21" id="1549" />
+<TGConnectingPoint num="22" id="1550" />
+<TGConnectingPoint num="23" id="1551" />
<extraparam>
<info stereotype="CPURRPB" nodeName="cpu0" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="99" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1441" >
-<father id="1502" num="0" />
+<SUBCOMPONENT type="1101" id="1491" >
+<father id="1552" num="0" />
<cdparam x="92" y="154" />
<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1433" />
-<TGConnectingPoint num="1" id="1434" />
-<TGConnectingPoint num="2" id="1435" />
-<TGConnectingPoint num="3" id="1436" />
-<TGConnectingPoint num="4" id="1437" />
-<TGConnectingPoint num="5" id="1438" />
-<TGConnectingPoint num="6" id="1439" />
-<TGConnectingPoint num="7" id="1440" />
+<TGConnectingPoint num="0" id="1483" />
+<TGConnectingPoint num="1" id="1484" />
+<TGConnectingPoint num="2" id="1485" />
+<TGConnectingPoint num="3" id="1486" />
+<TGConnectingPoint num="4" id="1487" />
+<TGConnectingPoint num="5" id="1488" />
+<TGConnectingPoint num="6" id="1489" />
+<TGConnectingPoint num="7" id="1490" />
<extraparam>
<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1450" >
-<father id="1502" num="1" />
+<SUBCOMPONENT type="1101" id="1500" >
+<father id="1552" num="1" />
<cdparam x="291" y="153" />
<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1442" />
-<TGConnectingPoint num="1" id="1443" />
-<TGConnectingPoint num="2" id="1444" />
-<TGConnectingPoint num="3" id="1445" />
-<TGConnectingPoint num="4" id="1446" />
-<TGConnectingPoint num="5" id="1447" />
-<TGConnectingPoint num="6" id="1448" />
-<TGConnectingPoint num="7" id="1449" />
+<TGConnectingPoint num="0" id="1492" />
+<TGConnectingPoint num="1" id="1493" />
+<TGConnectingPoint num="2" id="1494" />
+<TGConnectingPoint num="3" id="1495" />
+<TGConnectingPoint num="4" id="1496" />
+<TGConnectingPoint num="5" id="1497" />
+<TGConnectingPoint num="6" id="1498" />
+<TGConnectingPoint num="7" id="1499" />
<extraparam>
<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1459" >
-<father id="1502" num="2" />
+<SUBCOMPONENT type="1101" id="1509" >
+<father id="1552" num="2" />
<cdparam x="96" y="246" />
<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1451" />
-<TGConnectingPoint num="1" id="1452" />
-<TGConnectingPoint num="2" id="1453" />
-<TGConnectingPoint num="3" id="1454" />
-<TGConnectingPoint num="4" id="1455" />
-<TGConnectingPoint num="5" id="1456" />
-<TGConnectingPoint num="6" id="1457" />
-<TGConnectingPoint num="7" id="1458" />
+<TGConnectingPoint num="0" id="1501" />
+<TGConnectingPoint num="1" id="1502" />
+<TGConnectingPoint num="2" id="1503" />
+<TGConnectingPoint num="3" id="1504" />
+<TGConnectingPoint num="4" id="1505" />
+<TGConnectingPoint num="5" id="1506" />
+<TGConnectingPoint num="6" id="1507" />
+<TGConnectingPoint num="7" id="1508" />
<extraparam>
<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1468" >
-<father id="1502" num="3" />
+<SUBCOMPONENT type="1101" id="1518" >
+<father id="1552" num="3" />
<cdparam x="290" y="234" />
<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1460" />
-<TGConnectingPoint num="1" id="1461" />
-<TGConnectingPoint num="2" id="1462" />
-<TGConnectingPoint num="3" id="1463" />
-<TGConnectingPoint num="4" id="1464" />
-<TGConnectingPoint num="5" id="1465" />
-<TGConnectingPoint num="6" id="1466" />
-<TGConnectingPoint num="7" id="1467" />
+<TGConnectingPoint num="0" id="1510" />
+<TGConnectingPoint num="1" id="1511" />
+<TGConnectingPoint num="2" id="1512" />
+<TGConnectingPoint num="3" id="1513" />
+<TGConnectingPoint num="4" id="1514" />
+<TGConnectingPoint num="5" id="1515" />
+<TGConnectingPoint num="6" id="1516" />
+<TGConnectingPoint num="7" id="1517" />
<extraparam>
<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1477" >
-<father id="1502" num="4" />
+<SUBCOMPONENT type="1101" id="1527" >
+<father id="1552" num="4" />
<cdparam x="226" y="304" />
<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1469" />
-<TGConnectingPoint num="1" id="1470" />
-<TGConnectingPoint num="2" id="1471" />
-<TGConnectingPoint num="3" id="1472" />
-<TGConnectingPoint num="4" id="1473" />
-<TGConnectingPoint num="5" id="1474" />
-<TGConnectingPoint num="6" id="1475" />
-<TGConnectingPoint num="7" id="1476" />
+<TGConnectingPoint num="0" id="1519" />
+<TGConnectingPoint num="1" id="1520" />
+<TGConnectingPoint num="2" id="1521" />
+<TGConnectingPoint num="3" id="1522" />
+<TGConnectingPoint num="4" id="1523" />
+<TGConnectingPoint num="5" id="1524" />
+<TGConnectingPoint num="6" id="1525" />
+<TGConnectingPoint num="7" id="1526" />
<extraparam>
<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
+<CONNECTOR type="125" id="1553" >
+<cdparam x="800" y="322" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="846" y="321" id="1422" />
+<P2 x="799" y="448" id="1392" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="1554" >
+<cdparam x="510" y="411" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="510" y="411" id="1535" />
+<P2 x="612" y="460" id="1393" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
</TMLArchiDiagramPanel>
@@ -6368,455 +6608,323 @@ the smart card and the terminal
<Modeling type="TML Architecture" nameTab="Mapping2" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1114" id="1527" >
-<cdparam x="729" y="188" />
-<sizeparam width="250" height="100" 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="Firewall0" value="name" />
-<TGConnectingPoint num="0" id="1503" />
-<TGConnectingPoint num="1" id="1504" />
-<TGConnectingPoint num="2" id="1505" />
-<TGConnectingPoint num="3" id="1506" />
-<TGConnectingPoint num="4" id="1507" />
-<TGConnectingPoint num="5" id="1508" />
-<TGConnectingPoint num="6" id="1509" />
-<TGConnectingPoint num="7" id="1510" />
-<TGConnectingPoint num="8" id="1511" />
-<TGConnectingPoint num="9" id="1512" />
-<TGConnectingPoint num="10" id="1513" />
-<TGConnectingPoint num="11" id="1514" />
-<TGConnectingPoint num="12" id="1515" />
-<TGConnectingPoint num="13" id="1516" />
-<TGConnectingPoint num="14" id="1517" />
-<TGConnectingPoint num="15" id="1518" />
-<TGConnectingPoint num="16" id="1519" />
-<TGConnectingPoint num="17" id="1520" />
-<TGConnectingPoint num="18" id="1521" />
-<TGConnectingPoint num="19" id="1522" />
-<TGConnectingPoint num="20" id="1523" />
-<TGConnectingPoint num="21" id="1524" />
-<TGConnectingPoint num="22" id="1525" />
-<TGConnectingPoint num="23" id="1526" />
-<extraparam>
-<info stereotype="FIREWALL" nodeName="Firewall0" />
-<attributes latency="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="1552" >
-<cdparam x="1102" y="187" />
-<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="1528" />
-<TGConnectingPoint num="1" id="1529" />
-<TGConnectingPoint num="2" id="1530" />
-<TGConnectingPoint num="3" id="1531" />
-<TGConnectingPoint num="4" id="1532" />
-<TGConnectingPoint num="5" id="1533" />
-<TGConnectingPoint num="6" id="1534" />
-<TGConnectingPoint num="7" id="1535" />
-<TGConnectingPoint num="8" id="1536" />
-<TGConnectingPoint num="9" id="1537" />
-<TGConnectingPoint num="10" id="1538" />
-<TGConnectingPoint num="11" id="1539" />
-<TGConnectingPoint num="12" id="1540" />
-<TGConnectingPoint num="13" id="1541" />
-<TGConnectingPoint num="14" id="1542" />
-<TGConnectingPoint num="15" id="1543" />
-<TGConnectingPoint num="16" id="1544" />
-<TGConnectingPoint num="17" id="1545" />
-<TGConnectingPoint num="18" id="1546" />
-<TGConnectingPoint num="19" id="1547" />
-<TGConnectingPoint num="20" id="1548" />
-<TGConnectingPoint num="21" id="1549" />
-<TGConnectingPoint num="22" id="1550" />
-<TGConnectingPoint num="23" id="1551" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="1577" >
-<cdparam x="684" y="164" />
-<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="Bus1" value="name" />
-<TGConnectingPoint num="0" id="1553" />
-<TGConnectingPoint num="1" id="1554" />
-<TGConnectingPoint num="2" id="1555" />
-<TGConnectingPoint num="3" id="1556" />
-<TGConnectingPoint num="4" id="1557" />
-<TGConnectingPoint num="5" id="1558" />
-<TGConnectingPoint num="6" id="1559" />
-<TGConnectingPoint num="7" id="1560" />
-<TGConnectingPoint num="8" id="1561" />
-<TGConnectingPoint num="9" id="1562" />
-<TGConnectingPoint num="10" id="1563" />
-<TGConnectingPoint num="11" id="1564" />
-<TGConnectingPoint num="12" id="1565" />
-<TGConnectingPoint num="13" id="1566" />
-<TGConnectingPoint num="14" id="1567" />
-<TGConnectingPoint num="15" id="1568" />
-<TGConnectingPoint num="16" id="1569" />
-<TGConnectingPoint num="17" id="1570" />
-<TGConnectingPoint num="18" id="1571" />
-<TGConnectingPoint num="19" id="1572" />
-<TGConnectingPoint num="20" id="1573" />
-<TGConnectingPoint num="21" id="1574" />
-<TGConnectingPoint num="22" id="1575" />
-<TGConnectingPoint num="23" id="1576" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus1" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="1602" >
+<COMPONENT type="1105" id="1579" >
<cdparam x="420" y="527" />
<sizeparam width="189" height="131" 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="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1578" />
-<TGConnectingPoint num="1" id="1579" />
-<TGConnectingPoint num="2" id="1580" />
-<TGConnectingPoint num="3" id="1581" />
-<TGConnectingPoint num="4" id="1582" />
-<TGConnectingPoint num="5" id="1583" />
-<TGConnectingPoint num="6" id="1584" />
-<TGConnectingPoint num="7" id="1585" />
-<TGConnectingPoint num="8" id="1586" />
-<TGConnectingPoint num="9" id="1587" />
-<TGConnectingPoint num="10" id="1588" />
-<TGConnectingPoint num="11" id="1589" />
-<TGConnectingPoint num="12" id="1590" />
-<TGConnectingPoint num="13" id="1591" />
-<TGConnectingPoint num="14" id="1592" />
-<TGConnectingPoint num="15" id="1593" />
-<TGConnectingPoint num="16" id="1594" />
-<TGConnectingPoint num="17" id="1595" />
-<TGConnectingPoint num="18" id="1596" />
-<TGConnectingPoint num="19" id="1597" />
-<TGConnectingPoint num="20" id="1598" />
-<TGConnectingPoint num="21" id="1599" />
-<TGConnectingPoint num="22" id="1600" />
-<TGConnectingPoint num="23" id="1601" />
+<TGConnectingPoint num="0" id="1555" />
+<TGConnectingPoint num="1" id="1556" />
+<TGConnectingPoint num="2" id="1557" />
+<TGConnectingPoint num="3" id="1558" />
+<TGConnectingPoint num="4" id="1559" />
+<TGConnectingPoint num="5" id="1560" />
+<TGConnectingPoint num="6" id="1561" />
+<TGConnectingPoint num="7" id="1562" />
+<TGConnectingPoint num="8" id="1563" />
+<TGConnectingPoint num="9" id="1564" />
+<TGConnectingPoint num="10" id="1565" />
+<TGConnectingPoint num="11" id="1566" />
+<TGConnectingPoint num="12" id="1567" />
+<TGConnectingPoint num="13" id="1568" />
+<TGConnectingPoint num="14" id="1569" />
+<TGConnectingPoint num="15" id="1570" />
+<TGConnectingPoint num="16" id="1571" />
+<TGConnectingPoint num="17" id="1572" />
+<TGConnectingPoint num="18" id="1573" />
+<TGConnectingPoint num="19" id="1574" />
+<TGConnectingPoint num="20" id="1575" />
+<TGConnectingPoint num="21" id="1576" />
+<TGConnectingPoint num="22" id="1577" />
+<TGConnectingPoint num="23" id="1578" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1627" >
+<COMPONENT type="1102" id="1604" >
<cdparam x="389" y="438" />
<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="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1603" />
-<TGConnectingPoint num="1" id="1604" />
-<TGConnectingPoint num="2" id="1605" />
-<TGConnectingPoint num="3" id="1606" />
-<TGConnectingPoint num="4" id="1607" />
-<TGConnectingPoint num="5" id="1608" />
-<TGConnectingPoint num="6" id="1609" />
-<TGConnectingPoint num="7" id="1610" />
-<TGConnectingPoint num="8" id="1611" />
-<TGConnectingPoint num="9" id="1612" />
-<TGConnectingPoint num="10" id="1613" />
-<TGConnectingPoint num="11" id="1614" />
-<TGConnectingPoint num="12" id="1615" />
-<TGConnectingPoint num="13" id="1616" />
-<TGConnectingPoint num="14" id="1617" />
-<TGConnectingPoint num="15" id="1618" />
-<TGConnectingPoint num="16" id="1619" />
-<TGConnectingPoint num="17" id="1620" />
-<TGConnectingPoint num="18" id="1621" />
-<TGConnectingPoint num="19" id="1622" />
-<TGConnectingPoint num="20" id="1623" />
-<TGConnectingPoint num="21" id="1624" />
-<TGConnectingPoint num="22" id="1625" />
-<TGConnectingPoint num="23" id="1626" />
+<TGConnectingPoint num="0" id="1580" />
+<TGConnectingPoint num="1" id="1581" />
+<TGConnectingPoint num="2" id="1582" />
+<TGConnectingPoint num="3" id="1583" />
+<TGConnectingPoint num="4" id="1584" />
+<TGConnectingPoint num="5" id="1585" />
+<TGConnectingPoint num="6" id="1586" />
+<TGConnectingPoint num="7" id="1587" />
+<TGConnectingPoint num="8" id="1588" />
+<TGConnectingPoint num="9" id="1589" />
+<TGConnectingPoint num="10" id="1590" />
+<TGConnectingPoint num="11" id="1591" />
+<TGConnectingPoint num="12" id="1592" />
+<TGConnectingPoint num="13" id="1593" />
+<TGConnectingPoint num="14" id="1594" />
+<TGConnectingPoint num="15" id="1595" />
+<TGConnectingPoint num="16" id="1596" />
+<TGConnectingPoint num="17" id="1597" />
+<TGConnectingPoint num="18" id="1598" />
+<TGConnectingPoint num="19" id="1599" />
+<TGConnectingPoint num="20" id="1600" />
+<TGConnectingPoint num="21" id="1601" />
+<TGConnectingPoint num="22" id="1602" />
+<TGConnectingPoint num="23" id="1603" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="1661" >
+<COMPONENT type="1100" id="1638" >
<cdparam x="685" y="396" />
<sizeparam width="174" height="135" 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="CPU2" value="name" />
-<TGConnectingPoint num="0" id="1637" />
-<TGConnectingPoint num="1" id="1638" />
-<TGConnectingPoint num="2" id="1639" />
-<TGConnectingPoint num="3" id="1640" />
-<TGConnectingPoint num="4" id="1641" />
-<TGConnectingPoint num="5" id="1642" />
-<TGConnectingPoint num="6" id="1643" />
-<TGConnectingPoint num="7" id="1644" />
-<TGConnectingPoint num="8" id="1645" />
-<TGConnectingPoint num="9" id="1646" />
-<TGConnectingPoint num="10" id="1647" />
-<TGConnectingPoint num="11" id="1648" />
-<TGConnectingPoint num="12" id="1649" />
-<TGConnectingPoint num="13" id="1650" />
-<TGConnectingPoint num="14" id="1651" />
-<TGConnectingPoint num="15" id="1652" />
-<TGConnectingPoint num="16" id="1653" />
-<TGConnectingPoint num="17" id="1654" />
-<TGConnectingPoint num="18" id="1655" />
-<TGConnectingPoint num="19" id="1656" />
-<TGConnectingPoint num="20" id="1657" />
-<TGConnectingPoint num="21" id="1658" />
-<TGConnectingPoint num="22" id="1659" />
-<TGConnectingPoint num="23" id="1660" />
+<TGConnectingPoint num="0" id="1614" />
+<TGConnectingPoint num="1" id="1615" />
+<TGConnectingPoint num="2" id="1616" />
+<TGConnectingPoint num="3" id="1617" />
+<TGConnectingPoint num="4" id="1618" />
+<TGConnectingPoint num="5" id="1619" />
+<TGConnectingPoint num="6" id="1620" />
+<TGConnectingPoint num="7" id="1621" />
+<TGConnectingPoint num="8" id="1622" />
+<TGConnectingPoint num="9" id="1623" />
+<TGConnectingPoint num="10" id="1624" />
+<TGConnectingPoint num="11" id="1625" />
+<TGConnectingPoint num="12" id="1626" />
+<TGConnectingPoint num="13" id="1627" />
+<TGConnectingPoint num="14" id="1628" />
+<TGConnectingPoint num="15" id="1629" />
+<TGConnectingPoint num="16" id="1630" />
+<TGConnectingPoint num="17" id="1631" />
+<TGConnectingPoint num="18" id="1632" />
+<TGConnectingPoint num="19" id="1633" />
+<TGConnectingPoint num="20" id="1634" />
+<TGConnectingPoint num="21" id="1635" />
+<TGConnectingPoint num="22" id="1636" />
+<TGConnectingPoint num="23" id="1637" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU2" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1636" >
-<father id="1661" num="0" />
+<SUBCOMPONENT type="1101" id="1613" >
+<father id="1638" num="0" />
<cdparam x="715" y="448" />
<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1628" />
-<TGConnectingPoint num="1" id="1629" />
-<TGConnectingPoint num="2" id="1630" />
-<TGConnectingPoint num="3" id="1631" />
-<TGConnectingPoint num="4" id="1632" />
-<TGConnectingPoint num="5" id="1633" />
-<TGConnectingPoint num="6" id="1634" />
-<TGConnectingPoint num="7" id="1635" />
+<TGConnectingPoint num="0" id="1605" />
+<TGConnectingPoint num="1" id="1606" />
+<TGConnectingPoint num="2" id="1607" />
+<TGConnectingPoint num="3" id="1608" />
+<TGConnectingPoint num="4" id="1609" />
+<TGConnectingPoint num="5" id="1610" />
+<TGConnectingPoint num="6" id="1611" />
+<TGConnectingPoint num="7" id="1612" />
<extraparam>
<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1695" >
+<COMPONENT type="1100" id="1672" >
<cdparam x="167" y="400" />
<sizeparam width="165" height="126" 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="CPU1" value="name" />
-<TGConnectingPoint num="0" id="1671" />
-<TGConnectingPoint num="1" id="1672" />
-<TGConnectingPoint num="2" id="1673" />
-<TGConnectingPoint num="3" id="1674" />
-<TGConnectingPoint num="4" id="1675" />
-<TGConnectingPoint num="5" id="1676" />
-<TGConnectingPoint num="6" id="1677" />
-<TGConnectingPoint num="7" id="1678" />
-<TGConnectingPoint num="8" id="1679" />
-<TGConnectingPoint num="9" id="1680" />
-<TGConnectingPoint num="10" id="1681" />
-<TGConnectingPoint num="11" id="1682" />
-<TGConnectingPoint num="12" id="1683" />
-<TGConnectingPoint num="13" id="1684" />
-<TGConnectingPoint num="14" id="1685" />
-<TGConnectingPoint num="15" id="1686" />
-<TGConnectingPoint num="16" id="1687" />
-<TGConnectingPoint num="17" id="1688" />
-<TGConnectingPoint num="18" id="1689" />
-<TGConnectingPoint num="19" id="1690" />
-<TGConnectingPoint num="20" id="1691" />
-<TGConnectingPoint num="21" id="1692" />
-<TGConnectingPoint num="22" id="1693" />
-<TGConnectingPoint num="23" id="1694" />
+<TGConnectingPoint num="0" id="1648" />
+<TGConnectingPoint num="1" id="1649" />
+<TGConnectingPoint num="2" id="1650" />
+<TGConnectingPoint num="3" id="1651" />
+<TGConnectingPoint num="4" id="1652" />
+<TGConnectingPoint num="5" id="1653" />
+<TGConnectingPoint num="6" id="1654" />
+<TGConnectingPoint num="7" id="1655" />
+<TGConnectingPoint num="8" id="1656" />
+<TGConnectingPoint num="9" id="1657" />
+<TGConnectingPoint num="10" id="1658" />
+<TGConnectingPoint num="11" id="1659" />
+<TGConnectingPoint num="12" id="1660" />
+<TGConnectingPoint num="13" id="1661" />
+<TGConnectingPoint num="14" id="1662" />
+<TGConnectingPoint num="15" id="1663" />
+<TGConnectingPoint num="16" id="1664" />
+<TGConnectingPoint num="17" id="1665" />
+<TGConnectingPoint num="18" id="1666" />
+<TGConnectingPoint num="19" id="1667" />
+<TGConnectingPoint num="20" id="1668" />
+<TGConnectingPoint num="21" id="1669" />
+<TGConnectingPoint num="22" id="1670" />
+<TGConnectingPoint num="23" id="1671" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU1" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1670" >
-<father id="1695" num="0" />
+<SUBCOMPONENT type="1101" id="1647" >
+<father id="1672" num="0" />
<cdparam x="160" y="445" />
<sizeparam width="172" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1662" />
-<TGConnectingPoint num="1" id="1663" />
-<TGConnectingPoint num="2" id="1664" />
-<TGConnectingPoint num="3" id="1665" />
-<TGConnectingPoint num="4" id="1666" />
-<TGConnectingPoint num="5" id="1667" />
-<TGConnectingPoint num="6" id="1668" />
-<TGConnectingPoint num="7" id="1669" />
+<TGConnectingPoint num="0" id="1639" />
+<TGConnectingPoint num="1" id="1640" />
+<TGConnectingPoint num="2" id="1641" />
+<TGConnectingPoint num="3" id="1642" />
+<TGConnectingPoint num="4" id="1643" />
+<TGConnectingPoint num="5" id="1644" />
+<TGConnectingPoint num="6" id="1645" />
+<TGConnectingPoint num="7" id="1646" />
<extraparam>
<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1747" >
+<COMPONENT type="1100" id="1724" >
<cdparam x="389" y="243" />
<sizeparam width="250" height="146" 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="1723" />
-<TGConnectingPoint num="1" id="1724" />
-<TGConnectingPoint num="2" id="1725" />
-<TGConnectingPoint num="3" id="1726" />
-<TGConnectingPoint num="4" id="1727" />
-<TGConnectingPoint num="5" id="1728" />
-<TGConnectingPoint num="6" id="1729" />
-<TGConnectingPoint num="7" id="1730" />
-<TGConnectingPoint num="8" id="1731" />
-<TGConnectingPoint num="9" id="1732" />
-<TGConnectingPoint num="10" id="1733" />
-<TGConnectingPoint num="11" id="1734" />
-<TGConnectingPoint num="12" id="1735" />
-<TGConnectingPoint num="13" id="1736" />
-<TGConnectingPoint num="14" id="1737" />
-<TGConnectingPoint num="15" id="1738" />
-<TGConnectingPoint num="16" id="1739" />
-<TGConnectingPoint num="17" id="1740" />
-<TGConnectingPoint num="18" id="1741" />
-<TGConnectingPoint num="19" id="1742" />
-<TGConnectingPoint num="20" id="1743" />
-<TGConnectingPoint num="21" id="1744" />
-<TGConnectingPoint num="22" id="1745" />
-<TGConnectingPoint num="23" id="1746" />
+<TGConnectingPoint num="0" id="1700" />
+<TGConnectingPoint num="1" id="1701" />
+<TGConnectingPoint num="2" id="1702" />
+<TGConnectingPoint num="3" id="1703" />
+<TGConnectingPoint num="4" id="1704" />
+<TGConnectingPoint num="5" id="1705" />
+<TGConnectingPoint num="6" id="1706" />
+<TGConnectingPoint num="7" id="1707" />
+<TGConnectingPoint num="8" id="1708" />
+<TGConnectingPoint num="9" id="1709" />
+<TGConnectingPoint num="10" id="1710" />
+<TGConnectingPoint num="11" id="1711" />
+<TGConnectingPoint num="12" id="1712" />
+<TGConnectingPoint num="13" id="1713" />
+<TGConnectingPoint num="14" id="1714" />
+<TGConnectingPoint num="15" id="1715" />
+<TGConnectingPoint num="16" id="1716" />
+<TGConnectingPoint num="17" id="1717" />
+<TGConnectingPoint num="18" id="1718" />
+<TGConnectingPoint num="19" id="1719" />
+<TGConnectingPoint num="20" id="1720" />
+<TGConnectingPoint num="21" id="1721" />
+<TGConnectingPoint num="22" id="1722" />
+<TGConnectingPoint num="23" id="1723" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU0" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1704" >
-<father id="1747" num="0" />
+<SUBCOMPONENT type="1101" id="1681" >
+<father id="1724" num="0" />
<cdparam x="396" y="258" />
<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="141" minY="0" maxY="106" />
<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1696" />
-<TGConnectingPoint num="1" id="1697" />
-<TGConnectingPoint num="2" id="1698" />
-<TGConnectingPoint num="3" id="1699" />
-<TGConnectingPoint num="4" id="1700" />
-<TGConnectingPoint num="5" id="1701" />
-<TGConnectingPoint num="6" id="1702" />
-<TGConnectingPoint num="7" id="1703" />
+<TGConnectingPoint num="0" id="1673" />
+<TGConnectingPoint num="1" id="1674" />
+<TGConnectingPoint num="2" id="1675" />
+<TGConnectingPoint num="3" id="1676" />
+<TGConnectingPoint num="4" id="1677" />
+<TGConnectingPoint num="5" id="1678" />
+<TGConnectingPoint num="6" id="1679" />
+<TGConnectingPoint num="7" id="1680" />
<extraparam>
<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1713" >
-<father id="1747" num="1" />
+<SUBCOMPONENT type="1101" id="1690" >
+<father id="1724" num="1" />
<cdparam x="415" y="349" />
<sizeparam width="144" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="106" minY="0" maxY="106" />
<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1705" />
-<TGConnectingPoint num="1" id="1706" />
-<TGConnectingPoint num="2" id="1707" />
-<TGConnectingPoint num="3" id="1708" />
-<TGConnectingPoint num="4" id="1709" />
-<TGConnectingPoint num="5" id="1710" />
-<TGConnectingPoint num="6" id="1711" />
-<TGConnectingPoint num="7" id="1712" />
+<TGConnectingPoint num="0" id="1682" />
+<TGConnectingPoint num="1" id="1683" />
+<TGConnectingPoint num="2" id="1684" />
+<TGConnectingPoint num="3" id="1685" />
+<TGConnectingPoint num="4" id="1686" />
+<TGConnectingPoint num="5" id="1687" />
+<TGConnectingPoint num="6" id="1688" />
+<TGConnectingPoint num="7" id="1689" />
<extraparam>
<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1722" >
-<father id="1747" num="2" />
+<SUBCOMPONENT type="1101" id="1699" >
+<father id="1724" num="2" />
<cdparam x="486" y="303" />
<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="109" minY="0" maxY="106" />
<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1714" />
-<TGConnectingPoint num="1" id="1715" />
-<TGConnectingPoint num="2" id="1716" />
-<TGConnectingPoint num="3" id="1717" />
-<TGConnectingPoint num="4" id="1718" />
-<TGConnectingPoint num="5" id="1719" />
-<TGConnectingPoint num="6" id="1720" />
-<TGConnectingPoint num="7" id="1721" />
+<TGConnectingPoint num="0" id="1691" />
+<TGConnectingPoint num="1" id="1692" />
+<TGConnectingPoint num="2" id="1693" />
+<TGConnectingPoint num="3" id="1694" />
+<TGConnectingPoint num="4" id="1695" />
+<TGConnectingPoint num="5" id="1696" />
+<TGConnectingPoint num="6" id="1697" />
+<TGConnectingPoint num="7" id="1698" />
<extraparam>
<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1748" >
-<cdparam x="1102" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="1102" y="237" id="1538" />
-<P2 x="934" y="189" id="1557" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1749" >
-<cdparam x="576" y="243" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="576" y="243" id="1732" />
-<P2 x="684" y="201" id="1565" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1750" >
+<CONNECTOR type="125" id="1725" >
<cdparam x="513" y="536" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="514" y="527" id="1579" />
-<P2 x="514" y="488" id="1609" />
+<P1 x="514" y="527" id="1556" />
+<P2 x="514" y="488" id="1586" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1751" >
+<CONNECTOR type="125" id="1726" >
<cdparam x="301" y="469" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1 x="332" y="463" id="1675" />
-<P2 x="389" y="463" id="1606" />
+<P1 x="332" y="463" id="1652" />
+<P2 x="389" y="463" id="1583" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1752" >
+<CONNECTOR type="125" id="1727" >
<cdparam x="773" y="479" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1 x="685" y="463" id="1640" />
-<P2 x="639" y="463" id="1607" />
+<P1 x="685" y="463" id="1617" />
+<P2 x="639" y="463" id="1584" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1753" >
+<CONNECTOR type="125" id="1728" >
<cdparam x="499" y="331" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1 x="514" y="389" id="1729" />
-<P2 x="514" y="438" id="1604" />
+<P1 x="514" y="389" id="1706" />
+<P2 x="514" y="438" id="1581" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -6833,53 +6941,53 @@ the smart card and the terminal
<Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
<DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="6003" id="1758" >
+<COMPONENT type="6003" id="1733" >
<cdparam x="60" y="417" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="1754" />
-<TGConnectingPoint num="1" id="1755" />
-<TGConnectingPoint num="2" id="1756" />
-<TGConnectingPoint num="3" id="1757" />
+<TGConnectingPoint num="0" id="1729" />
+<TGConnectingPoint num="1" id="1730" />
+<TGConnectingPoint num="2" id="1731" />
+<TGConnectingPoint num="3" id="1732" />
</COMPONENT>
-<COMPONENT type="6006" id="1763" >
+<COMPONENT type="6006" id="1738" >
<cdparam x="600" y="100" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Com. Patterns" />
-<TGConnectingPoint num="0" id="1759" />
-<TGConnectingPoint num="1" id="1760" />
-<TGConnectingPoint num="2" id="1761" />
-<TGConnectingPoint num="3" id="1762" />
+<TGConnectingPoint num="0" id="1734" />
+<TGConnectingPoint num="1" id="1735" />
+<TGConnectingPoint num="2" id="1736" />
+<TGConnectingPoint num="3" id="1737" />
</COMPONENT>
-<COMPONENT type="6002" id="1772" >
+<COMPONENT type="6002" id="1747" >
<cdparam x="518" y="306" />
<sizeparam width="318" height="136" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="1766" />
-<TGConnectingPoint num="1" id="1767" />
-<TGConnectingPoint num="2" id="1768" />
-<TGConnectingPoint num="3" id="1769" />
-<TGConnectingPoint num="4" id="1770" />
-<TGConnectingPoint num="5" id="1771" />
-</COMPONENT>
-<SUBCOMPONENT type="6005" id="1764" >
-<father id="1772" num="0" />
+<TGConnectingPoint num="0" id="1741" />
+<TGConnectingPoint num="1" id="1742" />
+<TGConnectingPoint num="2" id="1743" />
+<TGConnectingPoint num="3" id="1744" />
+<TGConnectingPoint num="4" id="1745" />
+<TGConnectingPoint num="5" id="1746" />
+</COMPONENT>
+<SUBCOMPONENT type="6005" id="1739" >
+<father id="1747" num="0" />
<cdparam x="523" y="346" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1765" >
-<father id="1772" num="1" />
+<SUBCOMPONENT type="6005" id="1740" >
+<father id="1747" num="1" />
<cdparam x="523" y="361" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6887,27 +6995,27 @@ the smart card and the terminal
<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
-<COMPONENT type="6001" id="1779" >
+<COMPONENT type="6001" id="1754" >
<cdparam x="850" y="100" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Architecture" />
-<TGConnectingPoint num="0" id="1775" />
-<TGConnectingPoint num="1" id="1776" />
-<TGConnectingPoint num="2" id="1777" />
-<TGConnectingPoint num="3" id="1778" />
+<TGConnectingPoint num="0" id="1750" />
+<TGConnectingPoint num="1" id="1751" />
+<TGConnectingPoint num="2" id="1752" />
+<TGConnectingPoint num="3" id="1753" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="1773" >
-<father id="1779" num="0" />
+<SUBCOMPONENT type="6005" id="1748" >
+<father id="1754" num="0" />
<cdparam x="855" y="140" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="855" maxX="855" minY="140" maxY="140" />
<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1774" >
-<father id="1779" num="1" />
+<SUBCOMPONENT type="6005" id="1749" >
+<father id="1754" num="1" />
<cdparam x="855" y="155" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6915,19 +7023,19 @@ the smart card and the terminal
<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
-<COMPONENT type="6000" id="1785" >
+<COMPONENT type="6000" id="1760" >
<cdparam x="233" y="101" />
<sizeparam width="334" height="161" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="1781" />
-<TGConnectingPoint num="1" id="1782" />
-<TGConnectingPoint num="2" id="1783" />
-<TGConnectingPoint num="3" id="1784" />
+<TGConnectingPoint num="0" id="1756" />
+<TGConnectingPoint num="1" id="1757" />
+<TGConnectingPoint num="2" id="1758" />
+<TGConnectingPoint num="3" id="1759" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="1780" >
-<father id="1785" num="0" />
+<SUBCOMPONENT type="6005" id="1755" >
+<father id="1760" num="0" />
<cdparam x="238" y="141" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6935,31 +7043,31 @@ the smart card and the terminal
<infoparam name="value " value="AppC" />
</SUBCOMPONENT>
-<CONNECTOR type="6004" id="1787" >
+<CONNECTOR type="6004" id="1762" >
<cdparam x="950" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="1786" />
-<P1 x="950" y="220" id="1775" />
-<P2 x="740" y="306" id="1767" />
+<TGConnectingPoint num="0" id="1761" />
+<P1 x="950" y="220" id="1750" />
+<P2 x="740" y="306" id="1742" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="1789" >
+<CONNECTOR type="6004" id="1764" >
<cdparam x="700" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="1788" />
-<P1 x="700" y="220" id="1759" />
-<P2 x="677" y="306" id="1768" />
+<TGConnectingPoint num="0" id="1763" />
+<P1 x="700" y="220" id="1734" />
+<P2 x="677" y="306" id="1743" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="1791" >
+<CONNECTOR type="6004" id="1766" >
<cdparam x="450" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="1790" />
-<P1 x="400" y="262" id="1781" />
-<P2 x="613" y="306" id="1766" />
+<TGConnectingPoint num="0" id="1765" />
+<P1 x="400" y="262" id="1756" />
+<P2 x="613" y="306" id="1741" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/src/main/java/ui/tree/JDiagramTree.java b/src/main/java/ui/tree/JDiagramTree.java
index 7947a341c5..3d964908a7 100755
--- a/src/main/java/ui/tree/JDiagramTree.java
+++ b/src/main/java/ui/tree/JDiagramTree.java
@@ -136,13 +136,19 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M
}
public void mousePressed(MouseEvent e) {
+ //TraceManager.addDev("Mouse event");
if (SwingUtilities.isRightMouseButton(e)) {
+ //TraceManager.addDev("right mouse event. popup trigger? " + e.isPopupTrigger());
if (e.isPopupTrigger()) myPopupEvent(e);
}
}
public void mouseReleased(MouseEvent e) {
- //if (e.isPopupTrigger()) myPopupEvent(e);
+ //TraceManager.addDev("Mouse event");
+ if (SwingUtilities.isRightMouseButton(e)) {
+ //TraceManager.addDev("right mouse event. popup trigger? " + e.isPopupTrigger());
+ if (e.isPopupTrigger()) myPopupEvent(e);
+ }
}
public void mouseEntered(MouseEvent e) {
@@ -160,6 +166,9 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M
private void myPopupEvent(MouseEvent e) {
+
+ //TraceManager.addDev("myPopupEvent");
+
int x = e.getX();
int y = e.getY();
JTree tree = (JTree) e.getSource();
@@ -167,8 +176,10 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M
//TraceManager.addDev("Path=" + path);
- if (path == null)
+ if (path == null) {
+ //TraceManager.addDev("Null path");
return;
+ }
tree.setSelectionPath(path);
@@ -189,6 +200,7 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M
if (obj instanceof RG) {
+ //TraceManager.addDev("RG object");
selectedRG = (RG) obj;
if (popupTree == null) {
popupTree = new JPopupMenu();
diff --git a/src/main/java/ui/window/JDialogProverifVerification.java b/src/main/java/ui/window/JDialogProverifVerification.java
index 30a9321b49..c3432f1b27 100644
--- a/src/main/java/ui/window/JDialogProverifVerification.java
+++ b/src/main/java/ui/window/JDialogProverifVerification.java
@@ -736,8 +736,7 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
LinkedList<AvatarPragma> results;
JList<AvatarPragma> jlist;
- ProVerifResultSection(String title, LinkedList<AvatarPragma> results)
- {
+ ProVerifResultSection(String title, LinkedList<AvatarPragma> results) {
this.title = title;
this.results = results;
}
diff --git a/src/main/java/ui/window/JDialogTMatrixManagement.java b/src/main/java/ui/window/JDialogTMatrixManagement.java
index 1d1ec1de87..8c7de20ec7 100755
--- a/src/main/java/ui/window/JDialogTMatrixManagement.java
+++ b/src/main/java/ui/window/JDialogTMatrixManagement.java
@@ -37,8 +37,6 @@
*/
-
-
package ui.window;
import launcher.LauncherException;
@@ -49,8 +47,8 @@ import tmatrix.RequirementModeling;
import tmatrix.Requirements;
import ui.FormatManager;
import ui.GTURTLEModeling;
-import ui.util.IconManager;
import ui.MainGUI;
+import ui.util.IconManager;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
@@ -65,16 +63,17 @@ import java.util.Vector;
* Class JDialogTMatrixManagement
* Dialog for managing remote processes call on traceability matrices
* Creation: 16/08/2006
- * @version 1.0 16/08/2006
+ *
* @author Ludovic APVRILLE
+ * @version 1.0 16/08/2006
*/
-public class JDialogTMatrixManagement extends JFrame implements ActionListener, Runnable {
-
+public class JDialogTMatrixManagement extends JFrame implements ActionListener, Runnable {
+
protected MainGUI mgui;
protected RequirementModeling rm;
protected TMatrixTableModel tm;
protected TableSorter sorter;
-
+
protected String cmdRTL;
protected String cmdDTA2DOT;
protected String cmdRGSTRAP;
@@ -87,12 +86,12 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
protected int mode;
protected RshClient rshc;
protected Thread t;
-
+
protected final static int NO_OPTIONS = 0;
protected final static int NOT_STARTED = 1;
protected final static int STARTED = 2;
protected final static int STOPPED = 3;
-
+
//components
protected JTable jtable;
protected JScrollPane jsp;
@@ -100,56 +99,58 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
protected JButton start;
protected JButton stop;
protected JButton close;
-
+
protected Vector<Requirements> toBeChecked;
-
- /** Creates new form */
+
+ /**
+ * Creates new form
+ */
public JDialogTMatrixManagement(Frame f, MainGUI _mgui, String title, RequirementModeling _rm, String _cmdRTL, String _cmdDTA2DOT, String _cmdRGSTRAP, String _cmdRG2TLSA, String _fileName, String _host, String _aldebaranHost, String _bcgioPath) {
super(title);
//super(f, title, true);
-
+
mgui = _mgui;
rm = _rm;
-
+
cmdRTL = _cmdRTL;
cmdDTA2DOT = _cmdDTA2DOT;
cmdRGSTRAP = _cmdRGSTRAP;
cmdRG2TLSA = _cmdRG2TLSA;
fileName = _fileName;
host = _host;
-
+
hostAldebaran = _aldebaranHost;
bcgioPath = _bcgioPath;
-
+
initComponents();
myInitComponents();
pack();
-
+
//getGlassPane().addMouseListener( new MouseAdapter() {});
getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
}
-
-
+
+
protected void myInitComponents() {
mode = NOT_STARTED;
setButtons();
}
-
+
protected void initComponents() {
-
+
Container c = getContentPane();
setFont(new Font("Helvetica", Font.PLAIN, 14));
c.setLayout(new BorderLayout());
//setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
+
JPanel jp1 = new JPanel();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c1 = new GridBagConstraints();
-
+
jp1.setLayout(gridbag1);
jp1.setBorder(new javax.swing.border.TitledBorder("Current matrix"));
jp1.setPreferredSize(new Dimension(400, 150));
-
+
// first line panel1
//c1.gridwidth = 3;
c1.gridheight = 1;
@@ -158,7 +159,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
c1.fill = GridBagConstraints.BOTH;
c1.gridheight = 1;
-
+
tm = new TMatrixTableModel(rm);
sorter = new TableSorter(tm);
jtable = new JTable(sorter);
@@ -172,11 +173,11 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
jsp = new JScrollPane(jtable);
jsp.setWheelScrollingEnabled(true);
jsp.getVerticalScrollBar().setUnitIncrement(10);
-
+
jp1.add(jsp, c1);
-
+
c.add(jp1, BorderLayout.NORTH);
-
+
jta = new ScrolledJTextArea();
jta.setEditable(false);
jta.setMargin(new Insets(10, 10, 10, 10));
@@ -185,37 +186,37 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
Font f = new Font("Courrier", Font.BOLD, 12);
jta.setFont(f);
JScrollPane jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-
+
JSplitPane jsplit = new JSplitPane(JSplitPane.VERTICAL_SPLIT, jp1, jsp);
c.add(jsplit, BorderLayout.CENTER);
-
+
start = new JButton("Check", IconManager.imgic53);
stop = new JButton("Stop", IconManager.imgic55);
close = new JButton("Close", IconManager.imgic27);
-
+
start.setPreferredSize(new Dimension(150, 30));
stop.setPreferredSize(new Dimension(150, 30));
close.setPreferredSize(new Dimension(150, 30));
-
+
start.addActionListener(this);
stop.addActionListener(this);
close.addActionListener(this);
-
+
JPanel jp2 = new JPanel();
jp2.add(start);
jp2.add(stop);
jp2.add(close);
-
+
c.add(jp2, BorderLayout.SOUTH);
-
+
}
-
- public void actionPerformed(ActionEvent evt) {
+
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
//System.out.println("Actions");
-
+
// Compare the action command to the known actions.
- if (command.equals("Check")) {
+ if (command.equals("Check")) {
fillCheckVector();
startProcess();
} else if (command.equals("Stop")) {
@@ -224,7 +225,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
closeDialog();
}
}
-
+
public void fillCheckVector() {
toBeChecked = new Vector<>();
if (jtable.getSelectedRowCount() == 0) {
@@ -232,50 +233,49 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
toBeChecked.addAll(rm.getMatrix());
} else {
// Checking only selected ones
- int [] tab = jtable.getSelectedRows();
- for(int i=0; i<tab.length; i++) {
+ int[] tab = jtable.getSelectedRows();
+ for (int i = 0; i < tab.length; i++) {
toBeChecked.add(rm.getRequirements(sorter.modelIndex(i)));
}
-
+
}
-
+
}
-
-
-
+
+
public void closeDialog() {
if (mode == STARTED) {
stopProcess();
}
dispose();
}
-
+
public void stopProcess() {
try {
rshc.stopCommand();
} catch (LauncherException le) {
-
+
}
rshc = null;
- mode = STOPPED;
+ mode = STOPPED;
setButtons();
}
-
+
public void startProcess() {
t = new Thread(this);
mode = STARTED;
setButtons();
t.start();
}
-
+
public JTable getJTable() {
return jtable;
}
-
+
public Requirements getRequirements(int index) {
return rm.getRequirements(sorter.modelIndex(index));
}
-
+
public void run() {
Requirements reqs;
String cmd1;
@@ -288,36 +288,36 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
//String fileTLSA = baseFileName + ".tlsa";
//String fileTLSADOT = fileTLSA + ".dot";
String data;
-
+
rshc = new RshClient(host);
Point p;
-
+
try {
jta.append("Checking requirements with observers\n");
-
- for(int i=0; i<toBeChecked.size(); i++) {
+
+ for (int i = 0; i < toBeChecked.size(); i++) {
reqs = toBeChecked.get(i);
jta.append("#" + i + ": Dealing with observer " + reqs.ro.getValue() + "\n");
-
-
+
+
if (reqs.formalSpec == null) {
jta.append("Property #" + i + "has no formal specification. Skipping.\n");
} else {
-
+
rshc.deleteFile(fileName);
rshc.deleteFile(fileDTA);
rshc.deleteFile(fileDTADOT);
-
+
rshc.sendFileData(fileName, reqs.formalSpec);
jta.append("Data sent\n");
-
+
rshc.deleteFile(fileName + ".rg0.aut");
rshc.deleteFile(fileName + ".rg0.aut.dot");
cmd1 = cmdRTL + " -ATG -AUT";
cmd1 += " -TG2 " + fileName;
//cmd3 = "cat " + fileRG;
//cmd4 = cmdDTA2DOT;
-
+
//.RG
jta.append("Making RG format AUT\n");
processCmd(cmd1);
@@ -325,13 +325,13 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
//mgui.gtm.setRGAut(data);
//mgui.saveRGAut();
jta.append("RG Done\n");
-
+
// removing useless files
rshc.deleteFile(fileName + ".tg0.aut");
rshc.deleteFile(fileName + "tg0.fc2");
rshc.deleteFile(fileName + ".rg0.fc2");
rshc.deleteFile(fileName + ".rg0.ren");
-
+
jta.append("Getting data from " + fileName + ".rg0.aut" + "\n");
// Getting data
data = rshc.getFileData(fileName + ".rg0.aut");
@@ -340,7 +340,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
jta.append("" + p.x + " state(s), " + p.y + " transition(s)\n");
//jta.append(data);
reqs.graphAut = data;
-
+
// AUT dot
jta.append("Converting to dotty format\n");
rshc = new RshClient(hostAldebaran);
@@ -350,16 +350,16 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
rshc.sendFileData(fileName + ".rg0.aut", data);
jta.append("Sending data to aldebaran host\n");
}
-
+
// Bcgio command
cmd1 = bcgioPath + " -aldebaran " + fileName + ".rg0.aut" + " -graphviz " + fileName + ".rg0.aut.dot";
data = processCmd(cmd1);
data = rshc.getFileData(fileName + ".rg0.aut.dot");
reqs.graphDot = data;
}
-
+
rshc.deleteFile(fileName);
-
+
// Satisfiability
reqs.setGraphAut(reqs.graphAut);
if (reqs.satisfied) {
@@ -371,23 +371,23 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
jtable.repaint();
}
jta.append("\nAll Done\n");
-
+
} catch (LauncherException le) {
jta.append("Error: " + le.getMessage() + "\n");
- mode = NOT_STARTED;
+ mode = NOT_STARTED;
setButtons();
return;
} catch (Exception e) {
jta.append("Error: " + e.getMessage() + "\n");
- mode = NOT_STARTED;
+ mode = NOT_STARTED;
setButtons();
return;
}
-
+
mode = NOT_STARTED;
setButtons();
}
-
+
protected String processCmd(String cmd) throws LauncherException {
rshc.setCmd(cmd);
String s = null;
@@ -402,14 +402,14 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
// s = rshc.getDataFromProcess();
// return s;
// }
-
+
protected void checkMode() {
-
+
mode = NOT_STARTED;
}
-
+
protected void setButtons() {
- switch(mode) {
+ switch (mode) {
case NOT_STARTED:
jtable.setEnabled(true);
start.setEnabled(true);
@@ -436,114 +436,116 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
break;
}
}
-
+
private int maxLengthColumn(Component c, AbstractTableModel tm, int index) {
int w = 0, wtmp;
FontMetrics fm = c.getFontMetrics(c.getFont());
if (fm == null) {
return 0;
}
-
+
String s;
-
- for(int i=0; i<tm.getRowCount(); i++) {
+
+ for (int i = 0; i < tm.getRowCount(); i++) {
s = tm.getValueAt(i, index).toString();
wtmp = fm.stringWidth(s);
w = Math.max(w, wtmp);
}
return w;
}
-
+
public void drawRequirements(Requirements reqs) {
if (reqs != null) {
mgui.gtm.generateDesign(reqs.tm);
}
}
-
+
public void viewRequirementsFormalSpecification(Requirements reqs) {
if (reqs != null) {
mgui.showFormalSpecification(reqs.ro.getValue() + "'s formal specification", reqs.formalSpec);
}
}
-
+
public void viewRG(Requirements reqs) {
if (reqs != null) {
GTURTLEModeling.runDOTTY(reqs.graphDot);
}
}
-
- public void check(Requirements reqs) {
+
+ public void check(Requirements reqs) {
if (reqs != null) {
toBeChecked = new Vector<>();
toBeChecked.add(reqs);
startProcess();
}
}
-
-
- private class PopupListener extends MouseAdapter /* popup menus onto tabs */ {
+
+
+ private class PopupListener extends MouseAdapter /* popup menus onto tabs */ {
private JDialogTMatrixManagement jdtmm;
private JPopupMenu menu;
private Requirements reqs;
-
+
private JMenuItem draw, viewfs, viewg, check;
-
+
public PopupListener(JDialogTMatrixManagement _jdtmm) {
jdtmm = _jdtmm;
createMenu();
}
-
+
public void mousePressed(MouseEvent e) {
checkForPopup(e);
}
+
public void mouseReleased(MouseEvent e) {
checkForPopup(e);
}
+
public void mouseClicked(MouseEvent e) {
checkForPopup(e);
}
-
+
private void checkForPopup(MouseEvent e) {
- if(e.isPopupTrigger()) {
+ if (e.isPopupTrigger()) {
Component c = e.getComponent();
//System.out.println("e =" + e + " Component=" + c);
updateMenu(e.getPoint());
menu.show(c, e.getX(), e.getY());
}
}
-
+
private void createMenu() {
draw = createMenuItem("Draw corresponding design");
viewfs = createMenuItem("View formal specification");
viewg = createMenuItem("View reachability graph");
check = createMenuItem("Check for satisfiability");
-
+
menu = new JPopupMenu("TMatrix management");
menu.add(draw);
menu.add(viewfs);
menu.add(viewg);
-
+
menu.addSeparator();
-
+
menu.add(check);
}
-
-
+
+
private JMenuItem createMenuItem(String s) {
JMenuItem item = new JMenuItem(s);
item.setActionCommand(s);
item.addActionListener(listener);
return item;
}
-
-
+
+
private void updateMenu(Point p) {
//System.out.println("UpdateMenu index=" + index);
jtable = jdtmm.getJTable();
// None is selected -> everything is set to pointed row
-
+
reqs = jdtmm.getRequirements(jtable.rowAtPoint(p));
-
+
if (reqs == null) {
draw.setEnabled(false);
viewfs.setEnabled(false);
@@ -551,26 +553,26 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
check.setEnabled(false);
return;
}
-
- draw.setEnabled(reqs.tm!=null);
+
+ draw.setEnabled(reqs.tm != null);
viewfs.setEnabled(reqs.formalSpec != null);
viewg.setEnabled(reqs.graphDot != null);
check.setEnabled(true);
-
+
}
-
+
private Action listener = new AbstractAction() {
-
+
public void actionPerformed(ActionEvent e) {
- JMenuItem item = (JMenuItem)e.getSource();
+ JMenuItem item = (JMenuItem) e.getSource();
String ac = item.getActionCommand();
- if(ac.equals("Draw corresponding design")) {
+ if (ac.equals("Draw corresponding design")) {
jdtmm.drawRequirements(reqs);
- } else if(ac.equals("View formal specification")) {
+ } else if (ac.equals("View formal specification")) {
jdtmm.viewRequirementsFormalSpecification(reqs);
- } else if(ac.equals("View reachability graph")) {
+ } else if (ac.equals("View reachability graph")) {
jdtmm.viewRG(reqs);
- } else if(ac.equals("Check for satisfiability")) {
+ } else if (ac.equals("Check for satisfiability")) {
jdtmm.check(reqs);
}
}
--
GitLab