From b45e1b332160e7e1ea3a6f971189f3c6e2819732 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Thu, 13 Jul 2017 10:56:11 +0200
Subject: [PATCH] Updating graphical component public plugin
---
modeling/DIPLODOCUS/SmartCardProtocol.xml | 562 +++++++++----------
src/main/java/myutil/Plugin.java | 12 +-
src/main/java/myutil/PluginManager.java | 6 +-
src/main/java/ui/GTMLModeling.java | 14 +-
src/main/java/ui/TGComponentPlugin.java | 10 +-
src/main/java/ui/tmldd/TMLArchiArtifact.java | 18 +-
6 files changed, 311 insertions(+), 311 deletions(-)
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index 9800cc6025..29ce13aba7 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -16,16 +16,16 @@
<cdparam x="652" y="444" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="554" id="69" />
-<P2 x="971" y="502" id="132" />
+<P1 x="805" y="544" id="69" />
+<P2 x="971" y="481" id="132" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="3" >
<cdparam x="652" y="418" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="522" id="67" />
-<P2 x="922" y="482" id="134" />
+<P1 x="805" y="512" id="67" />
+<P2 x="932" y="472" id="134" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4" >
@@ -33,134 +33,134 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="752" y="408" id="59" />
-<P2 x="831" y="376" id="83" />
+<P2 x="844" y="363" id="83" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="5" >
<cdparam x="685" y="310" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="857" y="376" id="87" />
-<P2 x="922" y="368" id="124" />
+<P1 x="844" y="389" id="87" />
+<P2 x="932" y="358" id="124" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="6" >
<cdparam x="652" y="395" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="493" id="63" />
-<P2 x="922" y="459" id="126" />
+<P1 x="805" y="483" id="63" />
+<P2 x="932" y="449" id="126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="7" >
<cdparam x="652" y="369" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="461" id="65" />
-<P2 x="922" y="432" id="128" />
+<P1 x="805" y="451" id="65" />
+<P2 x="932" y="422" id="128" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="8" >
<cdparam x="737" y="314" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="922" y="403" id="130" />
-<P2 x="816" y="432" id="61" />
+<P1 x="932" y="393" id="130" />
+<P2 x="805" y="422" id="61" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="9" >
<cdparam x="735" y="260" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="919" y="336" id="122" />
-<P2 x="749" y="284" id="178" />
+<P1 x="932" y="323" id="122" />
+<P2 x="736" y="271" id="178" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="10" >
<cdparam x="641" y="230" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="749" y="248" id="180" />
-<P2 x="919" y="297" id="120" />
+<P1 x="736" y="235" id="180" />
+<P2 x="932" y="284" id="120" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="11" >
<cdparam x="641" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="749" y="204" id="182" />
-<P2 x="919" y="254" id="118" />
+<P1 x="736" y="191" id="182" />
+<P2 x="932" y="241" id="118" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="12" >
<cdparam x="740" y="353" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="831" y="376" id="82" />
-<P2 x="749" y="315" id="184" />
+<P1 x="844" y="363" id="82" />
+<P2 x="736" y="302" id="184" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="13" >
<cdparam x="460" y="270" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="522" y="304" id="174" />
-<P2 x="468" y="304" id="44" />
+<P1 x="535" y="291" id="174" />
+<P2 x="455" y="291" id="44" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="14" >
<cdparam x="387" y="129" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="466" y="127" id="48" />
-<P2 x="525" y="127" id="186" />
+<P1 x="455" y="117" id="48" />
+<P2 x="535" y="117" id="186" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="15" >
<cdparam x="389" y="200" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="468" y="216" id="42" />
-<P2 x="522" y="216" id="172" />
+<P1 x="455" y="203" id="42" />
+<P2 x="535" y="203" id="172" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="16" >
<cdparam x="460" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="522" y="261" id="170" />
-<P2 x="468" y="261" id="40" />
+<P1 x="535" y="248" id="170" />
+<P2 x="455" y="248" id="40" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="17" >
<cdparam x="460" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="536" y="349" id="168" />
-<P2 x="468" y="336" id="38" />
+<P1 x="536" y="323" id="168" />
+<P2 x="455" y="323" id="38" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="18" >
<cdparam x="389" y="163" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="468" y="170" id="46" />
-<P2 x="522" y="170" id="176" />
+<P1 x="455" y="157" id="46" />
+<P2 x="535" y="157" id="176" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="19" >
<cdparam x="967" y="190" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="919" y="204" id="116" />
-<P2 x="749" y="125" id="164" />
+<P1 x="932" y="191" id="116" />
+<P2 x="736" y="112" id="164" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="20" >
<cdparam x="1028" y="535" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="630" y="347" id="188" />
+<P1 x="630" y="326" id="188" />
<P2 x="671" y="408" id="71" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -168,24 +168,24 @@
<cdparam x="1304" y="321" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1224" y="379" id="101" />
-<P2 x="1180" y="386" id="136" />
+<P1 x="1234" y="369" id="101" />
+<P2 x="1169" y="376" id="136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="22" >
<cdparam x="1168" y="455" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1180" y="421" id="138" />
-<P2 x="1224" y="414" id="103" />
+<P1 x="1169" y="411" id="138" />
+<P2 x="1234" y="404" id="103" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="25" >
<cdparam x="1037" y="180" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1180" y="214" id="140" />
-<P2 x="1180" y="282" id="142" />
+<P1 x="1169" y="204" id="140" />
+<P2 x="1169" y="272" id="142" />
<Point x="1224" y="226" />
<Point x="1224" y="266" />
<AutomaticDrawing data="true" />
@@ -210,8 +210,8 @@
<cdparam x="873" y="361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1180" y="461" id="144" />
-<P2 x="1224" y="442" id="105" />
+<P1 x="1169" y="451" id="144" />
+<P2 x="1234" y="432" id="105" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1205" id="35" >
@@ -6257,323 +6257,323 @@ On prend b=1 comme exemple
<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="1105" id="1457" >
+<COMPONENT type="1105" id="1458" >
<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="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" />
+<TGConnectingPoint num="0" id="1434" />
+<TGConnectingPoint num="1" id="1435" />
+<TGConnectingPoint num="2" id="1436" />
+<TGConnectingPoint num="3" id="1437" />
+<TGConnectingPoint num="4" id="1438" />
+<TGConnectingPoint num="5" id="1439" />
+<TGConnectingPoint num="6" id="1440" />
+<TGConnectingPoint num="7" id="1441" />
+<TGConnectingPoint num="8" id="1442" />
+<TGConnectingPoint num="9" id="1443" />
+<TGConnectingPoint num="10" id="1444" />
+<TGConnectingPoint num="11" id="1445" />
+<TGConnectingPoint num="12" id="1446" />
+<TGConnectingPoint num="13" id="1447" />
+<TGConnectingPoint num="14" id="1448" />
+<TGConnectingPoint num="15" id="1449" />
+<TGConnectingPoint num="16" id="1450" />
+<TGConnectingPoint num="17" id="1451" />
+<TGConnectingPoint num="18" id="1452" />
+<TGConnectingPoint num="19" id="1453" />
+<TGConnectingPoint num="20" id="1454" />
+<TGConnectingPoint num="21" id="1455" />
+<TGConnectingPoint num="22" id="1456" />
+<TGConnectingPoint num="23" id="1457" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1482" >
+<COMPONENT type="1102" id="1483" >
<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="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" />
+<TGConnectingPoint num="0" id="1459" />
+<TGConnectingPoint num="1" id="1460" />
+<TGConnectingPoint num="2" id="1461" />
+<TGConnectingPoint num="3" id="1462" />
+<TGConnectingPoint num="4" id="1463" />
+<TGConnectingPoint num="5" id="1464" />
+<TGConnectingPoint num="6" id="1465" />
+<TGConnectingPoint num="7" id="1466" />
+<TGConnectingPoint num="8" id="1467" />
+<TGConnectingPoint num="9" id="1468" />
+<TGConnectingPoint num="10" id="1469" />
+<TGConnectingPoint num="11" id="1470" />
+<TGConnectingPoint num="12" id="1471" />
+<TGConnectingPoint num="13" id="1472" />
+<TGConnectingPoint num="14" id="1473" />
+<TGConnectingPoint num="15" id="1474" />
+<TGConnectingPoint num="16" id="1475" />
+<TGConnectingPoint num="17" id="1476" />
+<TGConnectingPoint num="18" id="1477" />
+<TGConnectingPoint num="19" id="1478" />
+<TGConnectingPoint num="20" id="1479" />
+<TGConnectingPoint num="21" id="1480" />
+<TGConnectingPoint num="22" id="1481" />
+<TGConnectingPoint num="23" id="1482" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="1516" >
+<COMPONENT type="1100" id="1517" >
<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="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" />
-<TGConnectingPoint num="8" id="1500" />
-<TGConnectingPoint num="9" id="1501" />
-<TGConnectingPoint num="10" id="1502" />
-<TGConnectingPoint num="11" id="1503" />
-<TGConnectingPoint num="12" id="1504" />
-<TGConnectingPoint num="13" id="1505" />
-<TGConnectingPoint num="14" id="1506" />
-<TGConnectingPoint num="15" id="1507" />
-<TGConnectingPoint num="16" id="1508" />
-<TGConnectingPoint num="17" id="1509" />
-<TGConnectingPoint num="18" id="1510" />
-<TGConnectingPoint num="19" id="1511" />
-<TGConnectingPoint num="20" id="1512" />
-<TGConnectingPoint num="21" id="1513" />
-<TGConnectingPoint num="22" id="1514" />
-<TGConnectingPoint num="23" id="1515" />
+<TGConnectingPoint num="0" id="1493" />
+<TGConnectingPoint num="1" id="1494" />
+<TGConnectingPoint num="2" id="1495" />
+<TGConnectingPoint num="3" id="1496" />
+<TGConnectingPoint num="4" id="1497" />
+<TGConnectingPoint num="5" id="1498" />
+<TGConnectingPoint num="6" id="1499" />
+<TGConnectingPoint num="7" id="1500" />
+<TGConnectingPoint num="8" id="1501" />
+<TGConnectingPoint num="9" id="1502" />
+<TGConnectingPoint num="10" id="1503" />
+<TGConnectingPoint num="11" id="1504" />
+<TGConnectingPoint num="12" id="1505" />
+<TGConnectingPoint num="13" id="1506" />
+<TGConnectingPoint num="14" id="1507" />
+<TGConnectingPoint num="15" id="1508" />
+<TGConnectingPoint num="16" id="1509" />
+<TGConnectingPoint num="17" id="1510" />
+<TGConnectingPoint num="18" id="1511" />
+<TGConnectingPoint num="19" id="1512" />
+<TGConnectingPoint num="20" id="1513" />
+<TGConnectingPoint num="21" id="1514" />
+<TGConnectingPoint num="22" id="1515" />
+<TGConnectingPoint num="23" id="1516" />
<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="1491" >
-<father id="1516" num="0" />
+<SUBCOMPONENT type="1101" id="1492" >
+<father id="1517" 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="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" />
+<TGConnectingPoint num="0" id="1484" />
+<TGConnectingPoint num="1" id="1485" />
+<TGConnectingPoint num="2" id="1486" />
+<TGConnectingPoint num="3" id="1487" />
+<TGConnectingPoint num="4" id="1488" />
+<TGConnectingPoint num="5" id="1489" />
+<TGConnectingPoint num="6" id="1490" />
+<TGConnectingPoint num="7" id="1491" />
<extraparam>
<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1550" >
+<COMPONENT type="1100" id="1551" >
<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="1526" />
-<TGConnectingPoint num="1" id="1527" />
-<TGConnectingPoint num="2" id="1528" />
-<TGConnectingPoint num="3" id="1529" />
-<TGConnectingPoint num="4" id="1530" />
-<TGConnectingPoint num="5" id="1531" />
-<TGConnectingPoint num="6" id="1532" />
-<TGConnectingPoint num="7" id="1533" />
-<TGConnectingPoint num="8" id="1534" />
-<TGConnectingPoint num="9" id="1535" />
-<TGConnectingPoint num="10" id="1536" />
-<TGConnectingPoint num="11" id="1537" />
-<TGConnectingPoint num="12" id="1538" />
-<TGConnectingPoint num="13" id="1539" />
-<TGConnectingPoint num="14" id="1540" />
-<TGConnectingPoint num="15" id="1541" />
-<TGConnectingPoint num="16" id="1542" />
-<TGConnectingPoint num="17" id="1543" />
-<TGConnectingPoint num="18" id="1544" />
-<TGConnectingPoint num="19" id="1545" />
-<TGConnectingPoint num="20" id="1546" />
-<TGConnectingPoint num="21" id="1547" />
-<TGConnectingPoint num="22" id="1548" />
-<TGConnectingPoint num="23" id="1549" />
+<TGConnectingPoint num="0" id="1527" />
+<TGConnectingPoint num="1" id="1528" />
+<TGConnectingPoint num="2" id="1529" />
+<TGConnectingPoint num="3" id="1530" />
+<TGConnectingPoint num="4" id="1531" />
+<TGConnectingPoint num="5" id="1532" />
+<TGConnectingPoint num="6" id="1533" />
+<TGConnectingPoint num="7" id="1534" />
+<TGConnectingPoint num="8" id="1535" />
+<TGConnectingPoint num="9" id="1536" />
+<TGConnectingPoint num="10" id="1537" />
+<TGConnectingPoint num="11" id="1538" />
+<TGConnectingPoint num="12" id="1539" />
+<TGConnectingPoint num="13" id="1540" />
+<TGConnectingPoint num="14" id="1541" />
+<TGConnectingPoint num="15" id="1542" />
+<TGConnectingPoint num="16" id="1543" />
+<TGConnectingPoint num="17" id="1544" />
+<TGConnectingPoint num="18" id="1545" />
+<TGConnectingPoint num="19" id="1546" />
+<TGConnectingPoint num="20" id="1547" />
+<TGConnectingPoint num="21" id="1548" />
+<TGConnectingPoint num="22" id="1549" />
+<TGConnectingPoint num="23" id="1550" />
<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="1525" >
-<father id="1550" num="0" />
+<SUBCOMPONENT type="1101" id="1526" >
+<father id="1551" 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="1517" />
-<TGConnectingPoint num="1" id="1518" />
-<TGConnectingPoint num="2" id="1519" />
-<TGConnectingPoint num="3" id="1520" />
-<TGConnectingPoint num="4" id="1521" />
-<TGConnectingPoint num="5" id="1522" />
-<TGConnectingPoint num="6" id="1523" />
-<TGConnectingPoint num="7" id="1524" />
+<TGConnectingPoint num="0" id="1518" />
+<TGConnectingPoint num="1" id="1519" />
+<TGConnectingPoint num="2" id="1520" />
+<TGConnectingPoint num="3" id="1521" />
+<TGConnectingPoint num="4" id="1522" />
+<TGConnectingPoint num="5" id="1523" />
+<TGConnectingPoint num="6" id="1524" />
+<TGConnectingPoint num="7" id="1525" />
<extraparam>
<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1602" >
+<COMPONENT type="1100" id="1603" >
<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="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="1579" />
+<TGConnectingPoint num="1" id="1580" />
+<TGConnectingPoint num="2" id="1581" />
+<TGConnectingPoint num="3" id="1582" />
+<TGConnectingPoint num="4" id="1583" />
+<TGConnectingPoint num="5" id="1584" />
+<TGConnectingPoint num="6" id="1585" />
+<TGConnectingPoint num="7" id="1586" />
+<TGConnectingPoint num="8" id="1587" />
+<TGConnectingPoint num="9" id="1588" />
+<TGConnectingPoint num="10" id="1589" />
+<TGConnectingPoint num="11" id="1590" />
+<TGConnectingPoint num="12" id="1591" />
+<TGConnectingPoint num="13" id="1592" />
+<TGConnectingPoint num="14" id="1593" />
+<TGConnectingPoint num="15" id="1594" />
+<TGConnectingPoint num="16" id="1595" />
+<TGConnectingPoint num="17" id="1596" />
+<TGConnectingPoint num="18" id="1597" />
+<TGConnectingPoint num="19" id="1598" />
+<TGConnectingPoint num="20" id="1599" />
+<TGConnectingPoint num="21" id="1600" />
+<TGConnectingPoint num="22" id="1601" />
+<TGConnectingPoint num="23" id="1602" />
<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="1559" >
-<father id="1602" num="0" />
+<SUBCOMPONENT type="1101" id="1560" >
+<father id="1603" num="0" />
<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="1551" />
-<TGConnectingPoint num="1" id="1552" />
-<TGConnectingPoint num="2" id="1553" />
-<TGConnectingPoint num="3" id="1554" />
-<TGConnectingPoint num="4" id="1555" />
-<TGConnectingPoint num="5" id="1556" />
-<TGConnectingPoint num="6" id="1557" />
-<TGConnectingPoint num="7" id="1558" />
+<TGConnectingPoint num="0" id="1552" />
+<TGConnectingPoint num="1" id="1553" />
+<TGConnectingPoint num="2" id="1554" />
+<TGConnectingPoint num="3" id="1555" />
+<TGConnectingPoint num="4" id="1556" />
+<TGConnectingPoint num="5" id="1557" />
+<TGConnectingPoint num="6" id="1558" />
+<TGConnectingPoint num="7" id="1559" />
<extraparam>
<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1568" >
-<father id="1602" num="1" />
+<SUBCOMPONENT type="1101" id="1569" >
+<father id="1603" 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="1560" />
-<TGConnectingPoint num="1" id="1561" />
-<TGConnectingPoint num="2" id="1562" />
-<TGConnectingPoint num="3" id="1563" />
-<TGConnectingPoint num="4" id="1564" />
-<TGConnectingPoint num="5" id="1565" />
-<TGConnectingPoint num="6" id="1566" />
-<TGConnectingPoint num="7" id="1567" />
+<TGConnectingPoint num="0" id="1561" />
+<TGConnectingPoint num="1" id="1562" />
+<TGConnectingPoint num="2" id="1563" />
+<TGConnectingPoint num="3" id="1564" />
+<TGConnectingPoint num="4" id="1565" />
+<TGConnectingPoint num="5" id="1566" />
+<TGConnectingPoint num="6" id="1567" />
+<TGConnectingPoint num="7" id="1568" />
<extraparam>
<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1577" >
-<father id="1602" num="2" />
+<SUBCOMPONENT type="1101" id="1578" >
+<father id="1603" num="2" />
<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="1569" />
-<TGConnectingPoint num="1" id="1570" />
-<TGConnectingPoint num="2" id="1571" />
-<TGConnectingPoint num="3" id="1572" />
-<TGConnectingPoint num="4" id="1573" />
-<TGConnectingPoint num="5" id="1574" />
-<TGConnectingPoint num="6" id="1575" />
-<TGConnectingPoint num="7" id="1576" />
+<TGConnectingPoint num="0" id="1570" />
+<TGConnectingPoint num="1" id="1571" />
+<TGConnectingPoint num="2" id="1572" />
+<TGConnectingPoint num="3" id="1573" />
+<TGConnectingPoint num="4" id="1574" />
+<TGConnectingPoint num="5" id="1575" />
+<TGConnectingPoint num="6" id="1576" />
+<TGConnectingPoint num="7" id="1577" />
<extraparam>
<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1603" >
+<CONNECTOR type="125" id="1604" >
<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="1434" />
-<P2 x="514" y="488" id="1464" />
+<P1 x="514" y="527" id="1435" />
+<P2 x="514" y="488" id="1465" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1604" >
+<CONNECTOR type="125" id="1605" >
<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="1530" />
-<P2 x="389" y="463" id="1461" />
+<P1 x="332" y="463" id="1531" />
+<P2 x="389" y="463" id="1462" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1605" >
+<CONNECTOR type="125" id="1606" >
<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="1495" />
-<P2 x="639" y="463" id="1462" />
+<P1 x="685" y="463" id="1496" />
+<P2 x="639" y="463" id="1463" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1606" >
+<CONNECTOR type="125" id="1607" >
<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="1584" />
-<P2 x="514" y="438" id="1459" />
+<P1 x="514" y="389" id="1585" />
+<P2 x="514" y="438" id="1460" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -6590,53 +6590,53 @@ On prend b=1 comme exemple
<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="1611" >
+<COMPONENT type="6003" id="1612" >
<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="1607" />
-<TGConnectingPoint num="1" id="1608" />
-<TGConnectingPoint num="2" id="1609" />
-<TGConnectingPoint num="3" id="1610" />
+<TGConnectingPoint num="0" id="1608" />
+<TGConnectingPoint num="1" id="1609" />
+<TGConnectingPoint num="2" id="1610" />
+<TGConnectingPoint num="3" id="1611" />
</COMPONENT>
-<COMPONENT type="6006" id="1616" >
+<COMPONENT type="6006" id="1617" >
<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="1612" />
-<TGConnectingPoint num="1" id="1613" />
-<TGConnectingPoint num="2" id="1614" />
-<TGConnectingPoint num="3" id="1615" />
+<TGConnectingPoint num="0" id="1613" />
+<TGConnectingPoint num="1" id="1614" />
+<TGConnectingPoint num="2" id="1615" />
+<TGConnectingPoint num="3" id="1616" />
</COMPONENT>
-<COMPONENT type="6002" id="1625" >
+<COMPONENT type="6002" id="1626" >
<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="1619" />
-<TGConnectingPoint num="1" id="1620" />
-<TGConnectingPoint num="2" id="1621" />
-<TGConnectingPoint num="3" id="1622" />
-<TGConnectingPoint num="4" id="1623" />
-<TGConnectingPoint num="5" id="1624" />
-</COMPONENT>
-<SUBCOMPONENT type="6005" id="1617" >
-<father id="1625" num="0" />
+<TGConnectingPoint num="0" id="1620" />
+<TGConnectingPoint num="1" id="1621" />
+<TGConnectingPoint num="2" id="1622" />
+<TGConnectingPoint num="3" id="1623" />
+<TGConnectingPoint num="4" id="1624" />
+<TGConnectingPoint num="5" id="1625" />
+</COMPONENT>
+<SUBCOMPONENT type="6005" id="1618" >
+<father id="1626" num="0" />
<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" />
<cdrectangleparam minX="605" maxX="605" minY="355" maxY="355" />
<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1618" >
-<father id="1625" num="1" />
+<SUBCOMPONENT type="6005" id="1619" >
+<father id="1626" num="1" />
<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" />
@@ -6644,27 +6644,27 @@ On prend b=1 comme exemple
<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
-<COMPONENT type="6001" id="1632" >
+<COMPONENT type="6001" id="1633" >
<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="1628" />
-<TGConnectingPoint num="1" id="1629" />
-<TGConnectingPoint num="2" id="1630" />
-<TGConnectingPoint num="3" id="1631" />
+<TGConnectingPoint num="0" id="1629" />
+<TGConnectingPoint num="1" id="1630" />
+<TGConnectingPoint num="2" id="1631" />
+<TGConnectingPoint num="3" id="1632" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="1626" >
-<father id="1632" num="0" />
+<SUBCOMPONENT type="6005" id="1627" >
+<father id="1633" num="0" />
<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" />
<cdrectangleparam minX="855" maxX="855" minY="155" maxY="155" />
<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1627" >
-<father id="1632" num="1" />
+<SUBCOMPONENT type="6005" id="1628" >
+<father id="1633" num="1" />
<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" />
@@ -6672,19 +6672,19 @@ On prend b=1 comme exemple
<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
-<COMPONENT type="6000" id="1638" >
+<COMPONENT type="6000" id="1639" >
<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="1634" />
-<TGConnectingPoint num="1" id="1635" />
-<TGConnectingPoint num="2" id="1636" />
-<TGConnectingPoint num="3" id="1637" />
+<TGConnectingPoint num="0" id="1635" />
+<TGConnectingPoint num="1" id="1636" />
+<TGConnectingPoint num="2" id="1637" />
+<TGConnectingPoint num="3" id="1638" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="1633" >
-<father id="1638" num="0" />
+<SUBCOMPONENT type="6005" id="1634" >
+<father id="1639" 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" />
@@ -6692,31 +6692,31 @@ On prend b=1 comme exemple
<infoparam name="value " value="AppC" />
</SUBCOMPONENT>
-<CONNECTOR type="6004" id="1640" >
+<CONNECTOR type="6004" id="1641" >
<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="1639" />
-<P1 x="950" y="220" id="1628" />
-<P2 x="740" y="306" id="1620" />
+<TGConnectingPoint num="0" id="1640" />
+<P1 x="950" y="220" id="1629" />
+<P2 x="740" y="306" id="1621" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="1642" >
+<CONNECTOR type="6004" id="1643" >
<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="1641" />
-<P1 x="700" y="220" id="1612" />
-<P2 x="677" y="306" id="1621" />
+<TGConnectingPoint num="0" id="1642" />
+<P1 x="700" y="220" id="1613" />
+<P2 x="677" y="306" id="1622" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="1644" >
+<CONNECTOR type="6004" id="1645" >
<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="1643" />
-<P1 x="400" y="262" id="1634" />
-<P2 x="613" y="306" id="1619" />
+<TGConnectingPoint num="0" id="1644" />
+<P1 x="400" y="262" id="1635" />
+<P2 x="613" y="306" id="1620" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/src/main/java/myutil/Plugin.java b/src/main/java/myutil/Plugin.java
index 87c888dafb..06905f10d1 100755
--- a/src/main/java/myutil/Plugin.java
+++ b/src/main/java/myutil/Plugin.java
@@ -119,14 +119,14 @@ public class Plugin {
}
public boolean hasGraphicalComponent(String _diagID) {
- TraceManager.addDev("Test GC with diag=" + _diagID);
+ //TraceManager.addDev("Test GC with diag=" + _diagID);
String ret = executeRetStringMethod(removeJar(name), "hasGraphicalComponent");
if (ret != null) {
classGraphicalComponent = getClass(ret);
String diagOk = executeRetStringMethod(classGraphicalComponent, "getPanelClassName");
if (diagOk != null) {
if (diagOk.compareTo(_diagID) == 0) {
- TraceManager.addDev("Found graphical component in plugin:" + name);
+ //TraceManager.addDev("Found graphical component in plugin:" + name);
return true;
}
}
@@ -171,7 +171,7 @@ public class Plugin {
}
} catch (Exception e) {
- TraceManager.addDev("Exception when using plugin " + name + " with className=" + _className);
+ //TraceManager.addDev("Exception when using plugin " + name + " with className=" + _className);
return null;
}
@@ -197,7 +197,7 @@ public class Plugin {
return c.getMethod(_methodName);
} catch (Exception e) {
- TraceManager.addDev("Exception when using plugin " + name + " with className=" + _className + " and method " + _methodName);
+ //TraceManager.addDev("Exception when using plugin " + name + " with className=" + _className + " and method " + _methodName);
return null;
}
@@ -207,7 +207,7 @@ public class Plugin {
// We have a valid plugin. We now need to get the Method
Method m = getMethod(_className, _methodName);
if (m == null) {
- TraceManager.addDev("Null method with class as a string class=" + _className + " _method=" + _methodName);
+ //TraceManager.addDev("Null method with class as a string class=" + _className + " _method=" + _methodName);
return null;
}
@@ -227,7 +227,7 @@ public class Plugin {
Method m = c.getMethod(_methodName);
if (m == null) {
- TraceManager.addDev("Null method in executeRetStringMethod with Class parameter");
+ //TraceManager.addDev("Null method in executeRetStringMethod with Class parameter");
return null;
}
return (String)(m.invoke(null));
diff --git a/src/main/java/myutil/PluginManager.java b/src/main/java/myutil/PluginManager.java
index bd2660f8e6..240ac7a2e7 100755
--- a/src/main/java/myutil/PluginManager.java
+++ b/src/main/java/myutil/PluginManager.java
@@ -73,7 +73,7 @@ public class PluginManager {
public Plugin getPluginAvatarCodeGenerator() {
for(Plugin plugin: plugins) {
if (plugin.hasAvatarCodeGenerator()) {
- TraceManager.addDev(" Found avatar code generation plugin");
+ //TraceManager.addDev(" Found avatar code generation plugin");
return plugin;
}
}
@@ -86,7 +86,7 @@ public class PluginManager {
for(Plugin plugin: plugins) {
if (plugin.hasDiplodocusCodeGenerator()) {
lplugins.add(plugin);
- TraceManager.addDev(" Found diplodocus code generator plugin");
+ //TraceManager.addDev(" Found diplodocus code generator plugin");
}
}
return lplugins;
@@ -97,7 +97,7 @@ public class PluginManager {
for(Plugin plugin: plugins) {
if (plugin.hasGraphicalComponent(diag)) {
lplugins.add(plugin);
- TraceManager.addDev(" Found graphical plugin");
+ //TraceManager.addDev(" Found graphical plugin");
}
}
return lplugins;
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index 2fe8294258..94cd22a638 100755
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -2374,17 +2374,17 @@ public class GTMLModeling {
warnings = new LinkedList<CheckingError> ();
//listE = new CorrespondanceTGElement();
- TraceManager.addDev("Making architecture");
+ //TraceManager.addDev("Making architecture");
makeArchitecture(); //fills archi
- TraceManager.addDev("Making TML modeling");
+ //TraceManager.addDev("Making TML modeling");
if (!makeTMLModeling()) {
return null;
}
- TraceManager.addDev("Making mapping");
+ //TraceManager.addDev("Making mapping");
makeMapping(); //fills map
map.listE = listE;
// map.securityPatterns.addAll(securityPatterns.keySet());
- TraceManager.addDev("Making TMLCPLib");
+ //TraceManager.addDev("Making TMLCPLib");
makeTMLCPLib();
//TraceManager.addDev("<--- TML modeling:");
@@ -3481,11 +3481,11 @@ public class GTMLModeling {
s = artifact.getReferenceTaskName();
ArchUnitMEC mec = artifact.getArchUnitMEC();
int operationType = artifact.getOperationType();
- TraceManager.addDev("1) Trying to get task named:" + s);
+ //TraceManager.addDev("1) Trying to get task named:" + s);
s = s.replaceAll("\\s", "");
- TraceManager.addDev("2) Trying to get task named:" + s);
+ //TraceManager.addDev("2) Trying to get task named:" + s);
s = s + "__" + artifact.getTaskName();
- TraceManager.addDev("3) Trying to get task named:" + s);
+ //TraceManager.addDev("3) Trying to get task named:" + s);
task = tmlm.getTMLTaskByName(s);
if (task != null) {
if( operationType != -1 ) {
diff --git a/src/main/java/ui/TGComponentPlugin.java b/src/main/java/ui/TGComponentPlugin.java
index 41563c21bf..1e7f0bc892 100755
--- a/src/main/java/ui/TGComponentPlugin.java
+++ b/src/main/java/ui/TGComponentPlugin.java
@@ -97,7 +97,7 @@ public class TGComponentPlugin extends TGComponent implements ComponentPluginInt
cArg[0] = String.class;
cArg[1] = String.class;
methodGetCustomValue = classRef.getMethod("getCustomValue", cArg);
- TraceManager.addDev("Method =" + methodGetWidth);
+ //TraceManager.addDev("Method =" + methodGetWidth);
}
String ret = (String)(methodGetCustomValue.invoke(instance, value, tdp.getName()));
@@ -117,7 +117,7 @@ public class TGComponentPlugin extends TGComponent implements ComponentPluginInt
cArg[0] = Graphics.class;
cArg[1] = String.class;
methodGetWidth = classRef.getMethod("getWidth", cArg);
- TraceManager.addDev("Method =" + methodGetWidth);
+ //TraceManager.addDev("Method =" + methodGetWidth);
}
width = (int)(methodGetWidth.invoke(instance, g, value));
@@ -128,14 +128,14 @@ public class TGComponentPlugin extends TGComponent implements ComponentPluginInt
cArg[0] = Graphics.class;
cArg[1] = String.class;
methodGetHeight = classRef.getMethod("getHeight", cArg);
- TraceManager.addDev("Method =" + methodGetHeight);
+ //TraceManager.addDev("Method =" + methodGetHeight);
}
height = (int)(methodGetHeight.invoke(instance, g, value));
if (methodInternalDrawing == null) {
createInstance();
- TraceManager.addDev("instance =" + instance);
+ //TraceManager.addDev("instance =" + instance);
Class[] cArg = new Class[7];
cArg[0] = Graphics.class;
cArg[1] = int.class;
@@ -145,7 +145,7 @@ public class TGComponentPlugin extends TGComponent implements ComponentPluginInt
cArg[5] = String.class;
cArg[6] = String.class;
methodInternalDrawing = classRef.getMethod("internalDrawing", cArg);
- TraceManager.addDev("Method =" + methodInternalDrawing);
+ //TraceManager.addDev("Method =" + methodInternalDrawing);
}
methodInternalDrawing.invoke(instance, g, x, y, width, height, value, tdp.getName());
diff --git a/src/main/java/ui/tmldd/TMLArchiArtifact.java b/src/main/java/ui/tmldd/TMLArchiArtifact.java
index b6909c149a..cf78c0574d 100755
--- a/src/main/java/ui/tmldd/TMLArchiArtifact.java
+++ b/src/main/java/ui/tmldd/TMLArchiArtifact.java
@@ -355,40 +355,40 @@ public class TMLArchiArtifact extends TGCWithoutInternalComponent implements Swa
return FepOperationMEC.CwmMEC;
}
else if( operation.equals( "CWL" ) ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwlMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwlMEC );
return FepOperationMEC.CwlMEC;
}
else if( operation.equals( "CWA" ) ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwaMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwaMEC );
return FepOperationMEC.CwaMEC;
}
else if( operation.equals( "CWP" ) ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwpMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwpMEC );
return FepOperationMEC.CwpMEC;
}
else if( operation.equals( "FFT" ) ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.FftMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.FftMEC );
return FepOperationMEC.FftMEC;
}
else if( operation.equals( "SUM" ) ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.SumMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.SumMEC );
return FepOperationMEC.SumMEC;
}
}
else if( fatherArchUnitMECType instanceof MapperMEC ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.MappOperationMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.MappOperationMEC );
return OperationMEC.MappOperationMEC;
}
else if( fatherArchUnitMECType instanceof InterleaverMEC ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.IntlOperationMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.IntlOperationMEC );
return OperationMEC.IntlOperationMEC;
}
else if( fatherArchUnitMECType instanceof AdaifMEC ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.AdaifOperationMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.AdaifOperationMEC );
return OperationMEC.AdaifOperationMEC;
}
else if( fatherArchUnitMECType instanceof CpuMEC ) {
- TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.CpuOperationMEC );
+ //TraceManager.addDev( "Operation: " + operation + " returns " + OperationMEC.CpuOperationMEC );
return OperationMEC.CpuOperationMEC;
}
return -1;
--
GitLab