From 38b8e402b19e53081be4002c84c04d8800d61564 Mon Sep 17 00:00:00 2001 From: Lee <irina.lee@etu.upmc.fr> Date: Thu, 9 Aug 2018 22:33:10 +0200 Subject: [PATCH] Revert "Revert "Issue#69: Removed unused TMLCPJunction class"" This reverts commit 71f9846808af1a773f4e20b50d91e34f7756c862. --- modeling/DIPLODOCUS/Zigbee.xml | 48 +++++----- modeling/DIPLODOCUS/ZigbeeCommunications.xml | 96 ++++++++++---------- modeling/modelsForTestingTTool/testCP.xml | 60 ++++++------ modeling/modelsForTestingTTool/testCP2.xml | 60 ++++++------ modeling/modelsForTestingTTool/testCP3.xml | 44 ++++----- 5 files changed, 154 insertions(+), 154 deletions(-) diff --git a/modeling/DIPLODOCUS/Zigbee.xml b/modeling/DIPLODOCUS/Zigbee.xml index 88fe2e2022..3077fffb99 100644 --- a/modeling/DIPLODOCUS/Zigbee.xml +++ b/modeling/DIPLODOCUS/Zigbee.xml @@ -4229,7 +4229,7 @@ <infoparam name="guard 3" value="[ else ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1323" > +<!-- COMPONENT type="1508" id="1323" > <cdparam x="346" y="190" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -4239,7 +4239,7 @@ <TGConnectingPoint num="1" id="1320" /> <TGConnectingPoint num="2" id="1321" /> <TGConnectingPoint num="3" id="1322" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1334" > <cdparam x="305" y="102" /> @@ -4312,7 +4312,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1355" > +<!-- CONNECTOR type="1501" id="1355" > <cdparam x="256" y="376" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -4345,7 +4345,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1356" > <cdparam x="361" y="325" /> @@ -4363,7 +4363,7 @@ <P2 x="361" y="97" id="1324" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1358" > +<!-- CONNECTOR type="1501" id="1358" > <cdparam x="361" y="142" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -4378,7 +4378,7 @@ <P1 x="361" y="220" id="1322" /> <P2 x="361" y="260" id="1306" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -4927,7 +4927,7 @@ CPU via interrupts (no polling messages) <TGConnectingPoint num="9" id="1718" /> </COMPONENT> -<COMPONENT type="1508" id="1724" > +<!-- COMPONENT type="1508" id="1724" > <cdparam x="278" y="185" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -4937,7 +4937,7 @@ CPU via interrupts (no polling messages) <TGConnectingPoint num="1" id="1721" /> <TGConnectingPoint num="2" id="1722" /> <TGConnectingPoint num="3" id="1723" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1735" > <cdparam x="371" y="342" /> @@ -5036,7 +5036,7 @@ CPU via interrupts (no polling messages) <P2 x="427" y="412" id="1707" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1769" > +<!-- CONNECTOR type="1501" id="1769" > <cdparam x="186" y="388" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -5069,7 +5069,7 @@ CPU via interrupts (no polling messages) <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1771" > <cdparam x="253" y="302" /> @@ -5105,7 +5105,7 @@ CPU via interrupts (no polling messages) <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1774" > +<!-- CONNECTOR type="1501" id="1774" > <cdparam x="293" y="133" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -5120,7 +5120,7 @@ CPU via interrupts (no polling messages) <P1 x="293" y="215" id="1723" /> <P2 x="293" y="277" id="1739" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1776" > <cdparam x="291" y="25" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -6148,7 +6148,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="2409" /> </COMPONENT> -<COMPONENT type="1508" id="2415" > +<!-- COMPONENT type="1508" id="2415" > <cdparam x="250" y="191" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -6158,7 +6158,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="2412" /> <TGConnectingPoint num="2" id="2413" /> <TGConnectingPoint num="3" id="2414" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="2426" > <cdparam x="337" y="348" /> @@ -6239,7 +6239,7 @@ INTERRUPTS <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="2447" > +<!-- CONNECTOR type="1501" id="2447" > <cdparam x="158" y="394" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -6272,7 +6272,7 @@ INTERRUPTS <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="2448" > <cdparam x="399" y="388" /> @@ -6282,7 +6282,7 @@ INTERRUPTS <P2 x="399" y="418" id="2398" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="2449" > +<!-- CONNECTOR type="1501" id="2449" > <cdparam x="265" y="139" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -6297,7 +6297,7 @@ INTERRUPTS <P1 x="265" y="221" id="2414" /> <P2 x="265" y="283" id="2385" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="2451" > <cdparam x="263" y="31" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -6381,7 +6381,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="2479" /> </COMPONENT> -<COMPONENT type="1508" id="2485" > +<!-- COMPONENT type="1508" id="2485" > <cdparam x="225" y="195" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -6391,7 +6391,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="2482" /> <TGConnectingPoint num="2" id="2483" /> <TGConnectingPoint num="3" id="2484" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="2496" > <cdparam x="312" y="352" /> @@ -6438,7 +6438,7 @@ INTERRUPTS <TGConnectingPoint num="0" id="2508" /> </COMPONENT> -<CONNECTOR type="1501" id="2513" > +<!-- CONNECTOR type="1501" id="2513" > <cdparam x="133" y="398" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -6471,7 +6471,7 @@ INTERRUPTS <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="2515" > <cdparam x="200" y="312" /> @@ -6515,7 +6515,7 @@ INTERRUPTS <P2 x="374" y="422" id="2468" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="2519" > +<!-- CONNECTOR type="1501" id="2519" > <cdparam x="240" y="143" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -6530,7 +6530,7 @@ INTERRUPTS <P1 x="240" y="225" id="2484" /> <P2 x="240" y="287" id="2455" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="2521" > <cdparam x="238" y="35" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> diff --git a/modeling/DIPLODOCUS/ZigbeeCommunications.xml b/modeling/DIPLODOCUS/ZigbeeCommunications.xml index 177315434b..3812a1b971 100644 --- a/modeling/DIPLODOCUS/ZigbeeCommunications.xml +++ b/modeling/DIPLODOCUS/ZigbeeCommunications.xml @@ -61,7 +61,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="21" /> </COMPONENT> -<COMPONENT type="1508" id="27" > +<!-- COMPONENT type="1508" id="27" > <cdparam x="237" y="197" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -71,7 +71,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="24" /> <TGConnectingPoint num="2" id="25" /> <TGConnectingPoint num="3" id="26" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="38" > <cdparam x="324" y="354" /> @@ -170,7 +170,7 @@ INTERRUPTS <P2 x="386" y="424" id="10" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="72" > +<!-- CONNECTOR type="1501" id="72" > <cdparam x="145" y="400" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -203,7 +203,7 @@ INTERRUPTS <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="74" > <cdparam x="212" y="314" /> @@ -247,7 +247,7 @@ INTERRUPTS <P2 x="252" y="100" id="55" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="78" > +<!-- CONNECTOR type="1501" id="78" > <cdparam x="252" y="145" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -262,7 +262,7 @@ INTERRUPTS <P1 x="252" y="227" id="26" /> <P2 x="252" y="289" id="42" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -1672,7 +1672,7 @@ POLLING <TGConnectingPoint num="0" id="947" /> </COMPONENT> -<COMPONENT type="1508" id="953" > +<!-- COMPONENT type="1508" id="953" > <cdparam x="360" y="163" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1682,7 +1682,7 @@ POLLING <TGConnectingPoint num="1" id="950" /> <TGConnectingPoint num="2" id="951" /> <TGConnectingPoint num="3" id="952" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="964" > <cdparam x="182" y="332" /> @@ -1736,7 +1736,7 @@ POLLING <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="973" > +<!-- CONNECTOR type="1501" id="973" > <cdparam x="244" y="372" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -1769,7 +1769,7 @@ POLLING <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="974" > <cdparam x="375" y="314" /> @@ -1779,7 +1779,7 @@ POLLING <P2 x="375" y="386" id="920" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="975" > +<!-- CONNECTOR type="1501" id="975" > <cdparam x="375" y="193" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -1794,7 +1794,7 @@ POLLING <P1 x="375" y="115" id="965" /> <P2 x="375" y="163" id="949" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -2340,7 +2340,7 @@ POLLING <infoparam name="guard 3" value="[ transferTerminated == true ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1323" > +<!-- COMPONENT type="1508" id="1323" > <cdparam x="279" y="127" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2350,7 +2350,7 @@ POLLING <TGConnectingPoint num="1" id="1320" /> <TGConnectingPoint num="2" id="1321" /> <TGConnectingPoint num="3" id="1322" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1334" > <cdparam x="101" y="296" /> @@ -2387,7 +2387,7 @@ POLLING <P2 x="294" y="337" id="1301" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1341" > +<!-- CONNECTOR type="1501" id="1341" > <cdparam x="163" y="336" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -2420,7 +2420,7 @@ POLLING <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1343" > <cdparam x="254" y="238" /> @@ -2439,7 +2439,7 @@ POLLING <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1344" > +<!-- CONNECTOR type="1501" id="1344" > <cdparam x="294" y="157" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -2454,7 +2454,7 @@ POLLING <P1 x="294" y="79" id="1335" /> <P2 x="294" y="127" id="1319" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -2734,7 +2734,7 @@ POLLING <Modeling type="TML CP" nameTab="Load_CPU" > <CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="1400" minY="10" maxY="900" > -<CONNECTOR type="1501" id="3903" > +<!-- CONNECTOR type="1501" id="3903" > <cdparam x="212" y="387" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -2767,7 +2767,7 @@ POLLING <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="3901" > <cdparam x="277" y="296" /> @@ -2838,7 +2838,7 @@ POLLING <infoparam name="guard 3" value="[ else ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="3877" > +<!-- COMPONENT type="1508" id="3877" > <cdparam x="302" y="201" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2848,7 +2848,7 @@ POLLING <TGConnectingPoint num="1" id="3879" /> <TGConnectingPoint num="2" id="3880" /> <TGConnectingPoint num="3" id="3881" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="3866" > <cdparam x="255" y="113" /> @@ -2936,7 +2936,7 @@ POLLING <P2 x="317" y="108" id="3867" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="3882" > +<!-- CONNECTOR type="1501" id="3882" > <cdparam x="317" y="153" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -2951,7 +2951,7 @@ POLLING <P1 x="317" y="231" id="3881" /> <P2 x="317" y="271" id="3884" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -3341,7 +3341,7 @@ POLLING <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="5618" > +<!-- CONNECTOR type="1501" id="5618" > <cdparam x="275" y="449" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -3374,7 +3374,7 @@ POLLING <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <COMPONENT type="301" id="1697" > <cdparam x="536" y="48" /> @@ -3418,7 +3418,7 @@ POLLING <TGConnectingPoint num="9" id="1709" /> </COMPONENT> -<COMPONENT type="1508" id="5592" > +<!-- COMPONENT type="1508" id="5592" > <cdparam x="365" y="263" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -3428,7 +3428,7 @@ POLLING <TGConnectingPoint num="1" id="5594" /> <TGConnectingPoint num="2" id="5595" /> <TGConnectingPoint num="3" id="5596" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="5581" > <cdparam x="318" y="175" /> @@ -3482,7 +3482,7 @@ POLLING <P2 x="380" y="170" id="5582" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="5597" > +<!-- CONNECTOR type="1501" id="5597" > <cdparam x="380" y="215" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -3497,7 +3497,7 @@ POLLING <P1 x="380" y="293" id="5596" /> <P2 x="380" y="333" id="5599" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -3847,7 +3847,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="1887" /> </COMPONENT> -<COMPONENT type="1508" id="1893" > +<!-- COMPONENT type="1508" id="1893" > <cdparam x="237" y="197" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -3857,7 +3857,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="1890" /> <TGConnectingPoint num="2" id="1891" /> <TGConnectingPoint num="3" id="1892" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1904" > <cdparam x="324" y="354" /> @@ -3956,7 +3956,7 @@ INTERRUPTS <P2 x="386" y="424" id="1876" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1938" > +<!-- CONNECTOR type="1501" id="1938" > <cdparam x="145" y="400" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -3989,7 +3989,7 @@ INTERRUPTS <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1940" > <cdparam x="212" y="314" /> @@ -4033,7 +4033,7 @@ INTERRUPTS <P2 x="252" y="100" id="1921" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1944" > +<!-- CONNECTOR type="1501" id="1944" > <cdparam x="252" y="145" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -4048,7 +4048,7 @@ INTERRUPTS <P1 x="252" y="227" id="1892" /> <P2 x="252" y="289" id="1908" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -4975,7 +4975,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="2553" /> </COMPONENT> -<COMPONENT type="1508" id="2559" > +<!-- COMPONENT type="1508" id="2559" > <cdparam x="237" y="197" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -4985,7 +4985,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="2556" /> <TGConnectingPoint num="2" id="2557" /> <TGConnectingPoint num="3" id="2558" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="2570" > <cdparam x="324" y="354" /> @@ -5084,7 +5084,7 @@ INTERRUPTS <P2 x="386" y="424" id="2542" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="2604" > +<!-- CONNECTOR type="1501" id="2604" > <cdparam x="145" y="400" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -5117,7 +5117,7 @@ INTERRUPTS <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="2606" > <cdparam x="212" y="314" /> @@ -5161,7 +5161,7 @@ INTERRUPTS <P2 x="252" y="100" id="2587" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="2610" > +<!-- CONNECTOR type="1501" id="2610" > <cdparam x="252" y="145" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -5176,7 +5176,7 @@ INTERRUPTS <P1 x="252" y="227" id="2558" /> <P2 x="252" y="289" id="2574" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -6103,7 +6103,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="3219" /> </COMPONENT> -<COMPONENT type="1508" id="3225" > +<!-- COMPONENT type="1508" id="3225" > <cdparam x="237" y="197" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -6113,7 +6113,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="3222" /> <TGConnectingPoint num="2" id="3223" /> <TGConnectingPoint num="3" id="3224" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="3236" > <cdparam x="324" y="354" /> @@ -6212,7 +6212,7 @@ INTERRUPTS <P2 x="386" y="424" id="3208" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="3270" > +<!-- CONNECTOR type="1501" id="3270" > <cdparam x="145" y="400" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -6245,7 +6245,7 @@ INTERRUPTS <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="3272" > <cdparam x="212" y="314" /> @@ -6289,7 +6289,7 @@ INTERRUPTS <P2 x="252" y="100" id="3253" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="3276" > +<!-- CONNECTOR type="1501" id="3276" > <cdparam x="252" y="145" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -6304,7 +6304,7 @@ INTERRUPTS <P1 x="252" y="227" id="3224" /> <P2 x="252" y="289" id="3240" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> diff --git a/modeling/modelsForTestingTTool/testCP.xml b/modeling/modelsForTestingTTool/testCP.xml index 6708dbc59e..0a7b71ff2f 100644 --- a/modeling/modelsForTestingTTool/testCP.xml +++ b/modeling/modelsForTestingTTool/testCP.xml @@ -1955,7 +1955,7 @@ <TGConnectingPoint num="9" id="1158" /> </COMPONENT> -<COMPONENT type="1508" id="1164" > +<!-- COMPONENT type="1508" id="1164" > <cdparam x="304" y="202" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1965,7 +1965,7 @@ <TGConnectingPoint num="1" id="1161" /> <TGConnectingPoint num="2" id="1162" /> <TGConnectingPoint num="3" id="1163" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1175" > <cdparam x="122" y="359" /> @@ -2092,7 +2092,7 @@ <TGConnectingPoint num="9" id="1225" /> </COMPONENT> -<CONNECTOR type="1501" id="1230" > +<!-- CONNECTOR type="1501" id="1230" > <cdparam x="466" y="506" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Zama to junction1" value="null" /> @@ -2125,7 +2125,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1231" > <cdparam x="178" y="475" /> @@ -2193,7 +2193,7 @@ <P2 x="319" y="91" id="1203" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1239" > +<!-- CONNECTOR type="1501" id="1239" > <cdparam x="319" y="136" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from lala to junction1" value="null" /> @@ -2208,7 +2208,7 @@ <P1 x="319" y="232" id="1163" /> <P2 x="319" y="288" id="1190" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1241" > <cdparam x="319" y="488" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -2290,7 +2290,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1266" > +<!-- COMPONENT type="1508" id="1266" > <cdparam x="755" y="345" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2300,7 +2300,7 @@ <TGConnectingPoint num="1" id="1263" /> <TGConnectingPoint num="2" id="1264" /> <TGConnectingPoint num="3" id="1265" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1277" > <cdparam x="884" y="503" /> @@ -2378,7 +2378,7 @@ <TGConnectingPoint num="13" id="1313" /> </COMPONENT> -<COMPONENT type="1508" id="1319" > +<!-- COMPONENT type="1508" id="1319" > <cdparam x="298" y="342" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2388,7 +2388,7 @@ <TGConnectingPoint num="1" id="1316" /> <TGConnectingPoint num="2" id="1317" /> <TGConnectingPoint num="3" id="1318" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1500" id="1335" > <cdparam x="298" y="429" /> @@ -2569,7 +2569,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1395" > +<!-- CONNECTOR type="1501" id="1395" > <cdparam x="946" y="543" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ExecuteTransfer2 to junction5" value="null" /> @@ -2602,7 +2602,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1397" > <cdparam x="810" y="452" /> @@ -2621,7 +2621,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1398" > +<!-- CONNECTOR type="1501" id="1398" > <cdparam x="770" y="375" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction5 to choice5" value="null" /> @@ -2670,7 +2670,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1405" > <cdparam x="273" y="444" /> @@ -2689,7 +2689,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1406" > +<!-- CONNECTOR type="1501" id="1406" > <cdparam x="313" y="372" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction2 to choice2" value="null" /> @@ -2704,7 +2704,7 @@ <P1 x="313" y="294" id="1376" /> <P2 x="313" y="342" id="1315" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1408" > <cdparam x="556" y="182" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -2830,7 +2830,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1456" > +<!-- COMPONENT type="1508" id="1456" > <cdparam x="797" y="201" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2840,7 +2840,7 @@ <TGConnectingPoint num="1" id="1453" /> <TGConnectingPoint num="2" id="1454" /> <TGConnectingPoint num="3" id="1455" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1467" > <cdparam x="756" y="89" /> @@ -2940,7 +2940,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1510" > +<!-- COMPONENT type="1508" id="1510" > <cdparam x="315" y="188" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2950,7 +2950,7 @@ <TGConnectingPoint num="1" id="1507" /> <TGConnectingPoint num="2" id="1508" /> <TGConnectingPoint num="3" id="1509" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1521" > <cdparam x="274" y="91" /> @@ -2979,7 +2979,7 @@ <TGConnectingPoint num="0" id="1522" /> </COMPONENT> -<CONNECTOR type="1501" id="1527" > +<!-- CONNECTOR type="1501" id="1527" > <cdparam x="205" y="382" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ExecuteTransfer3 to junction6" value="null" /> @@ -3012,7 +3012,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1529" > <cdparam x="290" y="291" /> @@ -3092,14 +3092,14 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1537" > +<!-- CONNECTOR type="1501" id="1537" > <cdparam x="330" y="131" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ProgramTransfer3 to junction6" value="null" /> <P1 x="330" y="131" id="1512" /> <P2 x="330" y="188" id="1506" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1538" > <cdparam x="330" y="45" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -3108,7 +3108,7 @@ <P2 x="330" y="86" id="1511" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1542" > +<!-- CONNECTOR type="1501" id="1542" > <cdparam x="979" y="404" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ExecuteTransfer4 to junction7" value="null" /> @@ -3141,7 +3141,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1544" > <cdparam x="852" y="300" /> @@ -3177,7 +3177,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1547" > +<!-- CONNECTOR type="1501" id="1547" > <cdparam x="812" y="231" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction7 to choice7" value="null" /> @@ -3192,7 +3192,7 @@ <P1 x="812" y="129" id="1458" /> <P2 x="812" y="201" id="1452" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1549" > <cdparam x="702" y="402" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -3201,14 +3201,14 @@ <P2 x="702" y="444" id="1412" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1550" > +<!-- CONNECTOR type="1501" id="1550" > <cdparam x="330" y="218" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction6 to choice6" value="null" /> <P1 x="330" y="218" id="1509" /> <P2 x="330" y="266" id="1493" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> diff --git a/modeling/modelsForTestingTTool/testCP2.xml b/modeling/modelsForTestingTTool/testCP2.xml index 6bda7a93bf..6dac72745d 100644 --- a/modeling/modelsForTestingTTool/testCP2.xml +++ b/modeling/modelsForTestingTTool/testCP2.xml @@ -1953,7 +1953,7 @@ <TGConnectingPoint num="9" id="1135" /> </COMPONENT> -<COMPONENT type="1508" id="1141" > +<!-- COMPONENT type="1508" id="1141" > <cdparam x="304" y="202" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1963,7 +1963,7 @@ <TGConnectingPoint num="1" id="1138" /> <TGConnectingPoint num="2" id="1139" /> <TGConnectingPoint num="3" id="1140" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1152" > <cdparam x="122" y="359" /> @@ -2090,7 +2090,7 @@ <TGConnectingPoint num="9" id="1202" /> </COMPONENT> -<CONNECTOR type="1501" id="1207" > +<!-- CONNECTOR type="1501" id="1207" > <cdparam x="466" y="506" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Zama to junction1" value="null" /> @@ -2123,7 +2123,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1208" > <cdparam x="178" y="475" /> @@ -2191,7 +2191,7 @@ <P2 x="319" y="91" id="1180" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1216" > +<!-- CONNECTOR type="1501" id="1216" > <cdparam x="319" y="136" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from lala to junction1" value="null" /> @@ -2206,7 +2206,7 @@ <P1 x="319" y="232" id="1140" /> <P2 x="319" y="288" id="1167" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1218" > <cdparam x="319" y="488" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -2288,7 +2288,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1243" > +<!-- COMPONENT type="1508" id="1243" > <cdparam x="755" y="345" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2298,7 +2298,7 @@ <TGConnectingPoint num="1" id="1240" /> <TGConnectingPoint num="2" id="1241" /> <TGConnectingPoint num="3" id="1242" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1254" > <cdparam x="890" y="503" /> @@ -2376,7 +2376,7 @@ <TGConnectingPoint num="13" id="1290" /> </COMPONENT> -<COMPONENT type="1508" id="1296" > +<!-- COMPONENT type="1508" id="1296" > <cdparam x="298" y="342" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2386,7 +2386,7 @@ <TGConnectingPoint num="1" id="1293" /> <TGConnectingPoint num="2" id="1294" /> <TGConnectingPoint num="3" id="1295" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1500" id="1312" > <cdparam x="298" y="429" /> @@ -2567,7 +2567,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1372" > +<!-- CONNECTOR type="1501" id="1372" > <cdparam x="946" y="543" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ExecuteTransfer2 to junction5" value="null" /> @@ -2600,7 +2600,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1374" > <cdparam x="810" y="452" /> @@ -2619,7 +2619,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1375" > +<!-- CONNECTOR type="1501" id="1375" > <cdparam x="770" y="375" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction5 to choice5" value="null" /> @@ -2668,7 +2668,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1382" > <cdparam x="273" y="444" /> @@ -2687,7 +2687,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1383" > +<!-- CONNECTOR type="1501" id="1383" > <cdparam x="313" y="372" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction2 to choice2" value="null" /> @@ -2702,7 +2702,7 @@ <P1 x="313" y="294" id="1353" /> <P2 x="313" y="342" id="1292" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1385" > <cdparam x="556" y="182" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -2828,7 +2828,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1433" > +<!-- COMPONENT type="1508" id="1433" > <cdparam x="797" y="201" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2838,7 +2838,7 @@ <TGConnectingPoint num="1" id="1430" /> <TGConnectingPoint num="2" id="1431" /> <TGConnectingPoint num="3" id="1432" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1444" > <cdparam x="756" y="89" /> @@ -2938,7 +2938,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1487" > +<!-- COMPONENT type="1508" id="1487" > <cdparam x="315" y="188" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2948,7 +2948,7 @@ <TGConnectingPoint num="1" id="1484" /> <TGConnectingPoint num="2" id="1485" /> <TGConnectingPoint num="3" id="1486" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="1498" > <cdparam x="274" y="91" /> @@ -2977,7 +2977,7 @@ <TGConnectingPoint num="0" id="1499" /> </COMPONENT> -<CONNECTOR type="1501" id="1504" > +<!-- CONNECTOR type="1501" id="1504" > <cdparam x="205" y="382" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ExecuteTransfer3 to junction6" value="null" /> @@ -3010,7 +3010,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1506" > <cdparam x="290" y="291" /> @@ -3090,14 +3090,14 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1514" > +<!-- CONNECTOR type="1501" id="1514" > <cdparam x="330" y="131" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ProgramTransfer3 to junction6" value="null" /> <P1 x="330" y="131" id="1489" /> <P2 x="330" y="188" id="1483" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1515" > <cdparam x="330" y="45" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -3106,7 +3106,7 @@ <P2 x="330" y="86" id="1488" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1519" > +<!-- CONNECTOR type="1501" id="1519" > <cdparam x="979" y="404" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ExecuteTransfer4 to junction7" value="null" /> @@ -3139,7 +3139,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1521" > <cdparam x="852" y="300" /> @@ -3175,7 +3175,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="1524" > +<!-- CONNECTOR type="1501" id="1524" > <cdparam x="812" y="231" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction7 to choice7" value="null" /> @@ -3190,7 +3190,7 @@ <P1 x="812" y="129" id="1435" /> <P2 x="812" y="201" id="1429" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1526" > <cdparam x="702" y="402" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -3199,14 +3199,14 @@ <P2 x="702" y="444" id="1389" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1527" > +<!-- CONNECTOR type="1501" id="1527" > <cdparam x="330" y="218" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction6 to choice6" value="null" /> <P1 x="330" y="218" id="1486" /> <P2 x="330" y="266" id="1470" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> diff --git a/modeling/modelsForTestingTTool/testCP3.xml b/modeling/modelsForTestingTTool/testCP3.xml index 457d7b6261..d37993f618 100644 --- a/modeling/modelsForTestingTTool/testCP3.xml +++ b/modeling/modelsForTestingTTool/testCP3.xml @@ -928,7 +928,7 @@ <TGConnectingPoint num="9" id="386" /> </COMPONENT> -<COMPONENT type="1508" id="392" > +<!-- COMPONENT type="1508" id="392" > <cdparam x="302" y="198" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -938,7 +938,7 @@ <TGConnectingPoint num="1" id="389" /> <TGConnectingPoint num="2" id="390" /> <TGConnectingPoint num="3" id="391" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="403" > <cdparam x="114" y="497" /> @@ -1065,14 +1065,14 @@ <TGConnectingPoint num="9" id="453" /> </COMPONENT> -<CONNECTOR type="1501" id="455" > +<!-- CONNECTOR type="1501" id="455" > <cdparam x="319" y="232" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> <P1 x="317" y="228" id="391" /> <P2 x="317" y="252" id="340" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="456" > <cdparam x="160" y="280" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -1081,7 +1081,7 @@ <P2 x="317" y="426" id="418" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="460" > +<!-- CONNECTOR type="1501" id="460" > <cdparam x="466" y="506" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Zama to junction1" value="null" /> @@ -1114,7 +1114,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="461" > <cdparam x="176" y="613" /> @@ -1182,14 +1182,14 @@ <P2 x="317" y="87" id="431" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="469" > +<!-- CONNECTOR type="1501" id="469" > <cdparam x="317" y="132" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from lala to junction1" value="null" /> <P1 x="317" y="132" id="432" /> <P2 x="317" y="198" id="388" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="470" > <cdparam x="317" y="626" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -1323,7 +1323,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="518" > +<!-- COMPONENT type="1508" id="518" > <cdparam x="797" y="201" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1333,7 +1333,7 @@ <TGConnectingPoint num="1" id="515" /> <TGConnectingPoint num="2" id="516" /> <TGConnectingPoint num="3" id="517" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="529" > <cdparam x="750" y="89" /> @@ -1433,7 +1433,7 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="572" > +<!-- COMPONENT type="1508" id="572" > <cdparam x="315" y="188" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1443,7 +1443,7 @@ <TGConnectingPoint num="1" id="569" /> <TGConnectingPoint num="2" id="570" /> <TGConnectingPoint num="3" id="571" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="583" > <cdparam x="268" y="91" /> @@ -1472,7 +1472,7 @@ <TGConnectingPoint num="0" id="584" /> </COMPONENT> -<CONNECTOR type="1501" id="589" > +<!-- CONNECTOR type="1501" id="589" > <cdparam x="979" y="404" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -1505,9 +1505,9 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> -<CONNECTOR type="1501" id="593" > +<!-- CONNECTOR type="1501" id="593" > <cdparam x="205" y="382" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ExecuteTransfer3 to junction6" value="null" /> @@ -1540,7 +1540,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="595" > <cdparam x="290" y="291" /> @@ -1620,14 +1620,14 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="603" > +<!-- CONNECTOR type="1501" id="603" > <cdparam x="330" y="131" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ProgramTransfer3 to junction6" value="null" /> <P1 x="330" y="131" id="574" /> <P2 x="330" y="188" id="568" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="604" > <cdparam x="330" y="45" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -1678,14 +1678,14 @@ <P2 x="812" y="275" id="501" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="610" > +<!-- CONNECTOR type="1501" id="610" > <cdparam x="812" y="129" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from ProgramTransfer4 to junction7" value="null" /> <P1 x="812" y="129" id="520" /> <P2 x="812" y="201" id="514" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="611" > <cdparam x="702" y="402" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -1694,14 +1694,14 @@ <P2 x="702" y="444" id="474" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="612" > +<!-- CONNECTOR type="1501" id="612" > <cdparam x="330" y="218" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from junction6 to choice6" value="null" /> <P1 x="330" y="218" id="571" /> <P2 x="330" y="266" id="555" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> -- GitLab