diff --git a/modeling/DIPLODOCUS/802.15.4.xml b/modeling/DIPLODOCUS/802.15.4.xml index 0038bde72fedf2e7dbfd2b14e0cd380e6784c98b..226880781b10b43cdf3bd5c6120b186aca5bdf23 100644 --- a/modeling/DIPLODOCUS/802.15.4.xml +++ b/modeling/DIPLODOCUS/802.15.4.xml @@ -19573,7 +19573,7 @@ SRC to CWM1, CWS and SINK <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="6136" > +<!-- COMPONENT type="1508" id="6136" > <cdparam x="668" y="275" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -19583,7 +19583,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="6133" /> <TGConnectingPoint num="2" id="6134" /> <TGConnectingPoint num="3" id="6135" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1507" id="6138" > <cdparam x="465" y="594" /> @@ -19616,7 +19616,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="13" id="6152" /> </COMPONENT> -<COMPONENT type="1508" id="6158" > +<!-- COMPONENT type="1508" id="6158" > <cdparam x="198" y="272" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -19626,7 +19626,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="6155" /> <TGConnectingPoint num="2" id="6156" /> <TGConnectingPoint num="3" id="6157" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1500" id="6174" > <cdparam x="198" y="362" /> @@ -19811,7 +19811,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="9" id="6256" /> </COMPONENT> -<CONNECTOR type="1501" id="6262" > +<!-- CONNECTOR type="1501" id="6262" > <cdparam x="801" y="457" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -19853,7 +19853,7 @@ SRC to CWM1, CWS and SINK <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="6264" > <cdparam x="723" y="370" /> @@ -19913,7 +19913,7 @@ SRC to CWM1, CWS and SINK <P2 x="425" y="550" id="6139" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="6274" > +<!-- CONNECTOR type="1501" id="6274" > <cdparam x="94" y="485" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -19964,7 +19964,7 @@ SRC to CWM1, CWS and SINK <P1 x="213" y="302" id="6157" /> <P2 x="213" y="352" id="6162" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="6277" > <cdparam x="173" y="377" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -20023,7 +20023,7 @@ SRC to CWM1, CWS and SINK <P2 x="456" y="117" id="6180" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="6283" > +<!-- CONNECTOR type="1501" id="6283" > <cdparam x="209" y="311" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -20038,7 +20038,7 @@ SRC to CWM1, CWS and SINK <P1 x="683" y="221" id="6237" /> <P2 x="683" y="275" id="6132" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="6285" > <cdparam x="683" y="305" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> diff --git a/modeling/DIPLODOCUS/CPlibrary/DMAPollingCycleP_AD.lib b/modeling/DIPLODOCUS/CPlibrary/DMAPollingCycleP_AD.lib index 6966203d75c84fe7618a16f74165d79d7fb9fe89..0fbe679974464fa81277e9a0a808d7cc492cd758 100644 --- a/modeling/DIPLODOCUS/CPlibrary/DMAPollingCycleP_AD.lib +++ b/modeling/DIPLODOCUS/CPlibrary/DMAPollingCycleP_AD.lib @@ -3,7 +3,7 @@ <TURTLEGSELECTEDCOMPONENTS version="0.96-beta1" copyMaxId="141314" decX="14" decY="10" > <CommunicationPatternDiagramPanelCopy name="DMAPollingCycleP_AD" xSel="14" ySel="10" widthSel="638" heightSel="382" > -<CONNECTOR type="1501" id="141311" > +<!--CONNECTOR type="1501" id="141311" > <cdparam x="174" y="274" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -36,9 +36,9 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> -<CONNECTOR type="1501" id="141310" > +<!--CONNECTOR type="1501" id="141310" > <cdparam x="418" y="121" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -56,7 +56,7 @@ <TGConnectingPoint num="1" id="141307" /> <TGConnectingPoint num="2" id="141308" /> <TGConnectingPoint num="3" id="141309" /> -</COMPONENT> +</COMPONENT--> <CONNECTOR type="1501" id="141303" > <cdparam x="271" y="184" /> @@ -163,14 +163,14 @@ <TGConnectingPoint num="0" id="141271" /> </COMPONENT> -<CONNECTOR type="1501" id="141299" > +<!--CONNECTOR type="1501" id="141299" > <cdparam x="316" y="90" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> <P1 x="311" y="40" id="141271" /> <P2 x="311" y="84" id="141306" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanelCopy> diff --git a/modeling/DIPLODOCUS/CPlibrary/DMATransferCycleP_AD.lib b/modeling/DIPLODOCUS/CPlibrary/DMATransferCycleP_AD.lib index 4493a4bc5456913dbc9243fef03ef96c43d3e3d5..fbf568870a991552dc6abb09fa3170c9043345cb 100644 --- a/modeling/DIPLODOCUS/CPlibrary/DMATransferCycleP_AD.lib +++ b/modeling/DIPLODOCUS/CPlibrary/DMATransferCycleP_AD.lib @@ -29,7 +29,7 @@ <TGConnectingPoint num="9" id="140366" /> </COMPONENT> -<CONNECTOR type="1501" id="140355" > +<!-- CONNECTOR type="1501" id="140355" > <cdparam x="382" y="90" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -70,7 +70,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="77479" > <cdparam x="342" y="324" /> @@ -133,7 +133,7 @@ <infoparam name="guard 3" value="[ else ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="77451" > +<!-- COMPONENT type="1508" id="77451" > <cdparam x="367" y="229" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -143,7 +143,7 @@ <TGConnectingPoint num="1" id="77448" /> <TGConnectingPoint num="2" id="77449" /> <TGConnectingPoint num="3" id="77450" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1507" id="77464" > <cdparam x="372" y="520" /> @@ -189,14 +189,14 @@ <P2 x="382" y="432" id="140357" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="77487" > +<!-- CONNECTOR type="1501" id="77487" > <cdparam x="382" y="259" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> <P1 x="382" y="259" id="77450" /> <P2 x="382" y="299" id="77425" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanelCopy> diff --git a/modeling/DIPLODOCUS/CPlibrary/DMATransfer_NoPolling_MainCP.lib b/modeling/DIPLODOCUS/CPlibrary/DMATransfer_NoPolling_MainCP.lib index bf31ad61b6aaf64cdc050180c1af107ab89944b5..5cfcc71faafdd6410b9a9493f9bdcbc8df55fe6d 100644 --- a/modeling/DIPLODOCUS/CPlibrary/DMATransfer_NoPolling_MainCP.lib +++ b/modeling/DIPLODOCUS/CPlibrary/DMATransfer_NoPolling_MainCP.lib @@ -46,7 +46,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="7701" > +<!-- CONNECTOR type="1501" id="7701" > <cdparam x="282" y="387" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -79,7 +79,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <COMPONENT type="1500" id="7650" > <cdparam x="374" y="286" /> @@ -152,7 +152,7 @@ <TGConnectingPoint num="9" id="7617" /> </COMPONENT> -<COMPONENT type="1508" id="7623" > +<!--COMPONENT type="1508" id="7623" > <cdparam x="374" y="184" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -162,7 +162,7 @@ <TGConnectingPoint num="1" id="7620" /> <TGConnectingPoint num="2" id="7621" /> <TGConnectingPoint num="3" id="7622" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="7634" > <cdparam x="461" y="341" /> @@ -208,7 +208,7 @@ <P2 x="523" y="411" id="7606" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="7706" > +<!-- CONNECTOR type="1501" id="7706" > <cdparam x="389" y="132" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -223,7 +223,7 @@ <P1 x="389" y="214" id="7622" /> <P2 x="389" y="276" id="7638" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="23058" > <cdparam x="398" y="55" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> diff --git a/modeling/DIPLODOCUS/CPlibrary/LoadCPU_mainCP.lib b/modeling/DIPLODOCUS/CPlibrary/LoadCPU_mainCP.lib index 7c0f4dd45a7c58854df703587f7b18edc04889ab..bc850b1a6e0ea30fbf11ed64cba7ccb163e76d68 100644 --- a/modeling/DIPLODOCUS/CPlibrary/LoadCPU_mainCP.lib +++ b/modeling/DIPLODOCUS/CPlibrary/LoadCPU_mainCP.lib @@ -64,7 +64,7 @@ <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="9922" > +<!-- CONNECTOR type="1501" id="9922" > <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" /> @@ -109,7 +109,7 @@ <TGConnectingPoint num="1" id="9898" /> <TGConnectingPoint num="2" id="9899" /> <TGConnectingPoint num="3" id="9900" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="9885" > <cdparam x="299" y="102" /> @@ -181,7 +181,7 @@ <P2 x="361" y="97" id="9886" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="9901" > +<!-- CONNECTOR type="1501" id="9901" > <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" /> @@ -196,7 +196,7 @@ <P1 x="361" y="220" id="9900" /> <P2 x="361" y="260" id="9903" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanelCopy> diff --git a/modeling/DIPLODOCUS/CPlibrary/StoreCPU_mainCP.lib b/modeling/DIPLODOCUS/CPlibrary/StoreCPU_mainCP.lib index 740681d07b249f3f03a80504a902cdfc51a94daf..9bfde1ff13b73633a7d8cd83ae3e58173795f1a2 100644 --- a/modeling/DIPLODOCUS/CPlibrary/StoreCPU_mainCP.lib +++ b/modeling/DIPLODOCUS/CPlibrary/StoreCPU_mainCP.lib @@ -3,7 +3,7 @@ <TURTLEGSELECTEDCOMPONENTS version="0.96-beta1" copyMaxId="5622" decX="91" decY="17" > <CommunicationPatternDiagramPanelCopy name="MainCP" xSel="91" ySel="17" widthSel="426" heightSel="465" > -<CONNECTOR type="1501" id="5619" > +<!-- CONNECTOR type="1501" id="5619" > <cdparam x="253" y="388" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -36,7 +36,7 @@ <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="5617" > <cdparam x="318" y="297" /> @@ -117,7 +117,7 @@ <TGConnectingPoint num="9" id="1710" /> </COMPONENT> -<COMPONENT type="1508" id="5593" > +<!-- COMPONENT type="1508" id="5593" > <cdparam x="343" y="202" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -127,7 +127,7 @@ <TGConnectingPoint num="1" id="5595" /> <TGConnectingPoint num="2" id="5596" /> <TGConnectingPoint num="3" id="5597" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="5582" > <cdparam x="296" y="114" /> @@ -181,7 +181,7 @@ <P2 x="358" y="109" id="5583" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="5598" > +<!-- CONNECTOR type="1501" id="5598" > <cdparam x="358" y="154" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -196,7 +196,7 @@ <P1 x="358" y="232" id="5597" /> <P2 x="358" y="272" id="5600" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanelCopy> diff --git a/modeling/DIPLODOCUS/MODELS_2014demo.xml b/modeling/DIPLODOCUS/MODELS_2014demo.xml index 4b23c4ce88af24e7219f74fa9a529ddcfdb89227..7df510c673072fb5e8ac71229d5f6bbc3343fb8c 100644 --- a/modeling/DIPLODOCUS/MODELS_2014demo.xml +++ b/modeling/DIPLODOCUS/MODELS_2014demo.xml @@ -20402,7 +20402,7 @@ SRC to CWM1, CWS and SINK <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="6200" > +<!-- COMPONENT type="1508" id="6200" > <cdparam x="668" y="275" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -20412,7 +20412,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="6197" /> <TGConnectingPoint num="2" id="6198" /> <TGConnectingPoint num="3" id="6199" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1507" id="6202" > <cdparam x="465" y="594" /> @@ -20445,7 +20445,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="13" id="6216" /> </COMPONENT> -<COMPONENT type="1508" id="6222" > +<!-- COMPONENT type="1508" id="6222" > <cdparam x="198" y="272" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -20455,7 +20455,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="6219" /> <TGConnectingPoint num="2" id="6220" /> <TGConnectingPoint num="3" id="6221" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1500" id="6238" > <cdparam x="198" y="362" /> @@ -20640,7 +20640,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="9" id="6320" /> </COMPONENT> -<CONNECTOR type="1501" id="6326" > +<!-- CONNECTOR type="1501" id="6326" > <cdparam x="801" y="457" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -20682,7 +20682,7 @@ SRC to CWM1, CWS and SINK <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="6328" > <cdparam x="723" y="370" /> @@ -20742,7 +20742,7 @@ SRC to CWM1, CWS and SINK <P2 x="425" y="550" id="6203" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="6338" > +<!-- CONNECTOR type="1501" id="6338" > <cdparam x="94" y="485" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -20793,7 +20793,7 @@ SRC to CWM1, CWS and SINK <P1 x="213" y="302" id="6221" /> <P2 x="213" y="352" id="6226" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="6341" > <cdparam x="173" y="377" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -20852,7 +20852,7 @@ SRC to CWM1, CWS and SINK <P2 x="456" y="117" id="6244" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="6347" > +<!-- CONNECTOR type="1501" id="6347" > <cdparam x="209" y="311" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -20875,7 +20875,7 @@ SRC to CWM1, CWS and SINK <P1 x="683" y="305" id="6199" /> <P2 x="683" y="345" id="6183" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> diff --git a/modeling/DIPLODOCUS/MODELS_2014demoFinal.xml b/modeling/DIPLODOCUS/MODELS_2014demoFinal.xml index 795ad10afb6cb91e4d06062648b1bd9b9da83f81..4f846ab5e2b1601f41715ca41ab9f5cbd3aadf03 100644 --- a/modeling/DIPLODOCUS/MODELS_2014demoFinal.xml +++ b/modeling/DIPLODOCUS/MODELS_2014demoFinal.xml @@ -14163,7 +14163,7 @@ SRC to CWM1, CWS and SINK <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="10192" > +<!-- COMPONENT type="1508" id="10192" > <cdparam x="668" y="275" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -14173,7 +14173,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="10189" /> <TGConnectingPoint num="2" id="10190" /> <TGConnectingPoint num="3" id="10191" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1507" id="10194" > <cdparam x="465" y="594" /> @@ -14206,7 +14206,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="13" id="10208" /> </COMPONENT> -<COMPONENT type="1508" id="10214" > +<!-- COMPONENT type="1508" id="10214" > <cdparam x="198" y="272" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -14216,7 +14216,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="10211" /> <TGConnectingPoint num="2" id="10212" /> <TGConnectingPoint num="3" id="10213" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1500" id="10230" > <cdparam x="198" y="362" /> @@ -14401,7 +14401,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="9" id="10312" /> </COMPONENT> -<CONNECTOR type="1501" id="10318" > +<!-- CONNECTOR type="1501" id="10318" > <cdparam x="801" y="457" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -14443,7 +14443,7 @@ SRC to CWM1, CWS and SINK <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="10320" > <cdparam x="723" y="370" /> @@ -14503,7 +14503,7 @@ SRC to CWM1, CWS and SINK <P2 x="425" y="550" id="10195" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="10330" > +<!-- CONNECTOR type="1501" id="10330" > <cdparam x="94" y="485" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -14554,7 +14554,7 @@ SRC to CWM1, CWS and SINK <P1 x="213" y="302" id="10213" /> <P2 x="213" y="352" id="10218" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="10333" > <cdparam x="173" y="377" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -14613,7 +14613,7 @@ SRC to CWM1, CWS and SINK <P2 x="456" y="117" id="10236" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="10339" > +<!-- CONNECTOR type="1501" id="10339" > <cdparam x="209" y="311" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -14636,7 +14636,7 @@ SRC to CWM1, CWS and SINK <P1 x="683" y="305" id="10191" /> <P2 x="683" y="345" id="10175" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> diff --git a/modeling/DIPLODOCUS/MODELS_2014demoTurin.xml b/modeling/DIPLODOCUS/MODELS_2014demoTurin.xml index 365870870d48d0496ae67dd4c9ec13b48586f8e3..ee1add4c3f7c6aafd962e9d2da26e869c814d6f3 100644 --- a/modeling/DIPLODOCUS/MODELS_2014demoTurin.xml +++ b/modeling/DIPLODOCUS/MODELS_2014demoTurin.xml @@ -4346,7 +4346,7 @@ SRC to CWM1, CWS and SINK <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="1266" > +<!-- COMPONENT type="1508" id="1266" > <cdparam x="668" y="275" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -4356,7 +4356,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="1263" /> <TGConnectingPoint num="2" id="1264" /> <TGConnectingPoint num="3" id="1265" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1507" id="1268" > <cdparam x="465" y="594" /> @@ -4389,7 +4389,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="13" id="1282" /> </COMPONENT> -<COMPONENT type="1508" id="1288" > +<!-- COMPONENT type="1508" id="1288" > <cdparam x="198" y="272" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -4399,7 +4399,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="1" id="1285" /> <TGConnectingPoint num="2" id="1286" /> <TGConnectingPoint num="3" id="1287" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1500" id="1304" > <cdparam x="198" y="362" /> @@ -4584,7 +4584,7 @@ SRC to CWM1, CWS and SINK <TGConnectingPoint num="9" id="1386" /> </COMPONENT> -<CONNECTOR type="1501" id="1392" > +<!-- CONNECTOR type="1501" id="1392" > <cdparam x="801" y="457" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -4626,7 +4626,7 @@ SRC to CWM1, CWS and SINK <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="1394" > <cdparam x="723" y="370" /> @@ -4686,7 +4686,7 @@ SRC to CWM1, CWS and SINK <P2 x="425" y="550" id="1269" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1404" > +<!-- CONNECTOR type="1501" id="1404" > <cdparam x="94" y="485" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -4737,7 +4737,7 @@ SRC to CWM1, CWS and SINK <P1 x="213" y="302" id="1287" /> <P2 x="213" y="352" id="1292" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="1407" > <cdparam x="173" y="377" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -4796,7 +4796,7 @@ SRC to CWM1, CWS and SINK <P2 x="456" y="117" id="1310" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="1413" > +<!-- CONNECTOR type="1501" id="1413" > <cdparam x="209" y="311" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -4819,7 +4819,7 @@ SRC to CWM1, CWS and SINK <P1 x="683" y="305" id="1265" /> <P2 x="683" y="345" id="1249" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> diff --git a/modeling/DIPLODOCUS/ZigBeeTutorial.xml b/modeling/DIPLODOCUS/ZigBeeTutorial.xml index ba2ca48c0ab2e0acce7213fb8039910f21830928..95a32d4a4902d8a4a6d0d4d3e2a76f9e463b7011 100644 --- a/modeling/DIPLODOCUS/ZigBeeTutorial.xml +++ b/modeling/DIPLODOCUS/ZigBeeTutorial.xml @@ -6235,7 +6235,7 @@ POLLING <TGConnectingPoint num="0" id="2490" /> </COMPONENT> -<COMPONENT type="1508" id="2496" > +<!-- COMPONENT type="1508" id="2496" > <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" /> @@ -6245,7 +6245,7 @@ POLLING <TGConnectingPoint num="1" id="2493" /> <TGConnectingPoint num="2" id="2494" /> <TGConnectingPoint num="3" id="2495" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="2507" > <cdparam x="182" y="332" /> @@ -6299,7 +6299,7 @@ POLLING <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="2516" > +<!-- CONNECTOR type="1501" id="2516" > <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" /> @@ -6309,7 +6309,8 @@ POLLING <Point x="136" y="425" /> <Point x="136" y="178" /> <AutomaticDrawing data="true" /> -</CONNECTOR><SUBCOMPONENT type="-1" id="2513" > +</CONNECTOR> +<SUBCOMPONENT type="-1" id="2513" > <father id="2516" num="0" /> <cdparam x="244" y="425" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -6332,7 +6333,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="2517" > <cdparam x="375" y="314" /> @@ -6342,22 +6343,22 @@ POLLING <P2 x="375" y="386" id="2463" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="2518" > +<!-- CONNECTOR type="1501" id="2518" > <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" /> <P1 x="375" y="193" id="2495" /> <P2 x="375" y="249" id="2477" /> <AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="1501" id="2519" > +</CONNECTOR--> +<!-- CONNECTOR type="1501" id="2519" > <cdparam x="375" y="115" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> <P1 x="375" y="115" id="2508" /> <P2 x="375" y="163" id="2492" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -6911,7 +6912,7 @@ POLLING <infoparam name="guard 3" value="[ transferTerminated == true ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="2866" > +<!-- COMPONENT type="1508" id="2866" > <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" /> @@ -6921,7 +6922,7 @@ POLLING <TGConnectingPoint num="1" id="2863" /> <TGConnectingPoint num="2" id="2864" /> <TGConnectingPoint num="3" id="2865" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="2877" > <cdparam x="101" y="296" /> @@ -6958,7 +6959,7 @@ POLLING <P2 x="294" y="337" id="2844" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="2884" > +<!-- CONNECTOR type="1501" id="2884" > <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" /> @@ -6968,7 +6969,8 @@ POLLING <Point x="55" y="389" /> <Point x="55" y="142" /> <AutomaticDrawing data="true" /> -</CONNECTOR><SUBCOMPONENT type="-1" id="2881" > +</CONNECTOR> +<SUBCOMPONENT type="-1" id="2881" > <father id="2884" num="0" /> <cdparam x="163" y="389" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -6991,7 +6993,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="2886" > <cdparam x="254" y="238" /> @@ -7010,22 +7012,22 @@ POLLING <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="2887" > +<!-- CONNECTOR type="1501" id="2887" > <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" /> <P1 x="294" y="157" id="2865" /> <P2 x="294" y="213" id="2849" /> <AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="1501" id="2888" > +</CONNECTOR--> +<!-- CONNECTOR type="1501" id="2888" > <cdparam x="294" y="79" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> <P1 x="294" y="79" id="2878" /> <P2 x="294" y="127" id="2862" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> diff --git a/modeling/DIPLODOCUS/Zigbee_Andrea.xml b/modeling/DIPLODOCUS/Zigbee_Andrea.xml index f7134753e75e2b83859356a80847590d66ce26db..e43a72c5a7d0bc2b15296aaea443cf12bafc5add 100644 --- a/modeling/DIPLODOCUS/Zigbee_Andrea.xml +++ b/modeling/DIPLODOCUS/Zigbee_Andrea.xml @@ -22104,7 +22104,7 @@ input components per cycle <TGConnectingPoint num="9" id="7576" /> </COMPONENT> -<COMPONENT type="1508" id="7582" > +<!-- COMPONENT type="1508" id="7582" > <cdparam x="343" y="202" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -22114,7 +22114,7 @@ input components per cycle <TGConnectingPoint num="1" id="7579" /> <TGConnectingPoint num="2" id="7580" /> <TGConnectingPoint num="3" id="7581" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="7593" > <cdparam x="296" y="114" /> @@ -22152,7 +22152,7 @@ input components per cycle <TGConnectingPoint num="0" id="7596" /> </COMPONENT> -<CONNECTOR type="1501" id="7601" > +<!-- CONNECTOR type="1501" id="7601" > <cdparam x="253" y="388" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -22185,7 +22185,7 @@ input components per cycle <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="7603" > <cdparam x="318" y="297" /> @@ -22220,7 +22220,7 @@ input components per cycle <P2 x="358" y="109" id="7583" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="7606" > +<!-- CONNECTOR type="1501" id="7606" > <cdparam x="358" y="154" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -22235,7 +22235,7 @@ input components per cycle <P1 x="358" y="232" id="7581" /> <P2 x="358" y="272" id="7554" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -22622,7 +22622,7 @@ input components per cycle </extraparam> </COMPONENT> -<COMPONENT type="1508" id="7856" > +<!-- COMPONENT type="1508" id="7856" > <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" /> @@ -22632,7 +22632,7 @@ input components per cycle <TGConnectingPoint num="1" id="7853" /> <TGConnectingPoint num="2" id="7854" /> <TGConnectingPoint num="3" id="7855" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="7867" > <cdparam x="299" y="102" /> @@ -22705,7 +22705,7 @@ input components per cycle <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="7888" > +<!-- CONNECTOR type="1501" id="7888" > <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" /> @@ -22738,7 +22738,7 @@ input components per cycle <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="7889" > <cdparam x="361" y="325" /> @@ -22756,7 +22756,7 @@ input components per cycle <P2 x="361" y="97" id="7857" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="7891" > +<!-- CONNECTOR type="1501" id="7891" > <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" /> @@ -22771,7 +22771,7 @@ input components per cycle <P1 x="361" y="220" id="7855" /> <P2 x="361" y="260" id="7822" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -23247,7 +23247,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="8167" /> </COMPONENT> -<COMPONENT type="1508" id="8173" > +<!-- COMPONENT type="1508" id="8173" > <cdparam x="281" y="543" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -23257,7 +23257,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="8170" /> <TGConnectingPoint num="2" id="8171" /> <TGConnectingPoint num="3" id="8172" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="8184" > <cdparam x="368" y="700" /> @@ -23357,7 +23357,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="8221" /> </COMPONENT> -<COMPONENT type="1508" id="8227" > +<!-- COMPONENT type="1508" id="8227" > <cdparam x="281" y="183" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -23367,7 +23367,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="8224" /> <TGConnectingPoint num="2" id="8225" /> <TGConnectingPoint num="3" id="8226" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="8238" > <cdparam x="234" y="95" /> @@ -23413,7 +23413,7 @@ INTERRUPTS <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="8246" > +<!-- CONNECTOR type="1501" id="8246" > <cdparam x="191" y="369" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -23446,7 +23446,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="8247" > <cdparam x="430" y="740" /> @@ -23456,7 +23456,7 @@ INTERRUPTS <P2 x="430" y="770" id="8156" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="8251" > +<!-- CONNECTOR type="1501" id="8251" > <cdparam x="189" y="746" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -23489,7 +23489,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="8253" > <cdparam x="256" y="660" /> @@ -23525,7 +23525,7 @@ INTERRUPTS <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="8256" > +<!-- CONNECTOR type="1501" id="8256" > <cdparam x="296" y="491" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -23540,7 +23540,7 @@ INTERRUPTS <P1 x="296" y="573" id="8172" /> <P2 x="296" y="635" id="8188" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="8258" > <cdparam x="296" y="318" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -23557,7 +23557,7 @@ INTERRUPTS <P2 x="296" y="90" id="8228" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="8260" > +<!-- CONNECTOR type="1501" id="8260" > <cdparam x="296" y="135" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -23572,7 +23572,7 @@ INTERRUPTS <P1 x="296" y="213" id="8226" /> <P2 x="296" y="253" id="8109" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -24871,7 +24871,7 @@ sequence diagram. </extraparam> </COMPONENT> -<COMPONENT type="1508" id="9105" > +<!-- COMPONENT type="1508" id="9105" > <cdparam x="340" y="217" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -24881,7 +24881,7 @@ sequence diagram. <TGConnectingPoint num="1" id="9102" /> <TGConnectingPoint num="2" id="9103" /> <TGConnectingPoint num="3" id="9104" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="9116" > <cdparam x="293" y="129" /> @@ -24937,7 +24937,7 @@ sequence diagram. <TGConnectingPoint num="0" id="9130" /> </COMPONENT> -<CONNECTOR type="1501" id="9135" > +<!-- CONNECTOR type="1501" id="9135" > <cdparam x="250" y="403" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -24970,7 +24970,7 @@ sequence diagram. <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="9137" > <cdparam x="315" y="312" /> @@ -25005,7 +25005,7 @@ sequence diagram. <P2 x="355" y="124" id="9106" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="9140" > +<!-- CONNECTOR type="1501" id="9140" > <cdparam x="355" y="169" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -25020,7 +25020,7 @@ sequence diagram. <P1 x="355" y="247" id="9104" /> <P2 x="355" y="287" id="9071" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -25540,7 +25540,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="9432" /> </COMPONENT> -<COMPONENT type="1508" id="9438" > +<!-- COMPONENT type="1508" id="9438" > <cdparam x="329" y="553" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -25550,7 +25550,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="9435" /> <TGConnectingPoint num="2" id="9436" /> <TGConnectingPoint num="3" id="9437" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="9449" > <cdparam x="416" y="710" /> @@ -25606,7 +25606,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="9470" /> </COMPONENT> -<COMPONENT type="1508" id="9476" > +<!-- COMPONENT type="1508" id="9476" > <cdparam x="329" y="193" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -25616,7 +25616,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="9473" /> <TGConnectingPoint num="2" id="9474" /> <TGConnectingPoint num="3" id="9475" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="9487" > <cdparam x="282" y="105" /> @@ -25679,7 +25679,7 @@ INTERRUPTS <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="9497" > +<!-- CONNECTOR type="1501" id="9497" > <cdparam x="237" y="756" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -25747,7 +25747,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="9503" > <cdparam x="304" y="288" /> @@ -25774,7 +25774,7 @@ INTERRUPTS <P2 x="478" y="780" id="9421" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="9505" > +<!-- CONNECTOR type="1501" id="9505" > <cdparam x="344" y="501" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -25789,7 +25789,7 @@ INTERRUPTS <P1 x="344" y="583" id="9437" /> <P2 x="344" y="645" id="9358" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="9507" > <cdparam x="344" y="328" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -25806,7 +25806,7 @@ INTERRUPTS <P2 x="344" y="100" id="9477" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="9509" > +<!-- CONNECTOR type="1501" id="9509" > <cdparam x="344" y="145" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -25821,7 +25821,7 @@ INTERRUPTS <P1 x="344" y="223" id="9475" /> <P2 x="344" y="263" id="9374" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -27120,7 +27120,7 @@ sequence diagram. </extraparam> </COMPONENT> -<COMPONENT type="1508" id="10354" > +<!-- COMPONENT type="1508" id="10354" > <cdparam x="351" y="210" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -27130,7 +27130,7 @@ sequence diagram. <TGConnectingPoint num="1" id="10351" /> <TGConnectingPoint num="2" id="10352" /> <TGConnectingPoint num="3" id="10353" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="10365" > <cdparam x="304" y="122" /> @@ -27186,7 +27186,7 @@ sequence diagram. <TGConnectingPoint num="0" id="10379" /> </COMPONENT> -<CONNECTOR type="1501" id="10384" > +<!-- CONNECTOR type="1501" id="10384" > <cdparam x="261" y="396" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -27219,7 +27219,7 @@ sequence diagram. <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="10386" > <cdparam x="326" y="305" /> @@ -27254,7 +27254,7 @@ sequence diagram. <P2 x="366" y="117" id="10355" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="10389" > +<!-- CONNECTOR type="1501" id="10389" > <cdparam x="366" y="162" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -27269,7 +27269,7 @@ sequence diagram. <P1 x="366" y="240" id="10353" /> <P2 x="366" y="280" id="10320" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -27696,7 +27696,7 @@ sequence diagram. <TGConnectingPoint num="9" id="10646" /> </COMPONENT> -<COMPONENT type="1508" id="10652" > +<!-- COMPONENT type="1508" id="10652" > <cdparam x="262" y="196" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -27706,7 +27706,7 @@ sequence diagram. <TGConnectingPoint num="1" id="10649" /> <TGConnectingPoint num="2" id="10650" /> <TGConnectingPoint num="3" id="10651" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="10663" > <cdparam x="215" y="108" /> @@ -27761,7 +27761,7 @@ sequence diagram. <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="10673" > +<!-- CONNECTOR type="1501" id="10673" > <cdparam x="172" y="382" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -27794,7 +27794,7 @@ sequence diagram. <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="10674" > <cdparam x="277" y="331" /> @@ -27812,7 +27812,7 @@ sequence diagram. <P2 x="277" y="103" id="10653" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="10676" > +<!-- CONNECTOR type="1501" id="10676" > <cdparam x="277" y="148" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -27827,7 +27827,7 @@ sequence diagram. <P1 x="277" y="226" id="10651" /> <P2 x="277" y="266" id="10607" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -28214,7 +28214,7 @@ sequence diagram. </extraparam> </COMPONENT> -<COMPONENT type="1508" id="10926" > +<!-- COMPONENT type="1508" id="10926" > <cdparam x="260" y="183" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -28224,7 +28224,7 @@ sequence diagram. <TGConnectingPoint num="1" id="10923" /> <TGConnectingPoint num="2" id="10924" /> <TGConnectingPoint num="3" id="10925" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="10937" > <cdparam x="213" y="95" /> @@ -28280,7 +28280,7 @@ sequence diagram. <TGConnectingPoint num="0" id="10951" /> </COMPONENT> -<CONNECTOR type="1501" id="10956" > +<!-- CONNECTOR type="1501" id="10956" > <cdparam x="170" y="369" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -28313,7 +28313,7 @@ sequence diagram. <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="10958" > <cdparam x="235" y="278" /> @@ -28348,7 +28348,7 @@ sequence diagram. <P2 x="275" y="90" id="10927" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="10961" > +<!-- CONNECTOR type="1501" id="10961" > <cdparam x="275" y="135" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -28363,7 +28363,7 @@ sequence diagram. <P1 x="275" y="213" id="10925" /> <P2 x="275" y="253" id="10892" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -28772,7 +28772,7 @@ sequence diagram. </extraparam> </COMPONENT> -<COMPONENT type="1508" id="11213" > +<!-- COMPONENT type="1508" id="11213" > <cdparam x="405" y="249" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -28782,7 +28782,7 @@ sequence diagram. <TGConnectingPoint num="1" id="11210" /> <TGConnectingPoint num="2" id="11211" /> <TGConnectingPoint num="3" id="11212" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="11224" > <cdparam x="358" y="161" /> @@ -28838,7 +28838,7 @@ sequence diagram. <TGConnectingPoint num="0" id="11238" /> </COMPONENT> -<CONNECTOR type="1501" id="11243" > +<!-- CONNECTOR type="1501" id="11243" > <cdparam x="315" y="435" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -28871,7 +28871,7 @@ sequence diagram. <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="11245" > <cdparam x="380" y="344" /> @@ -28906,7 +28906,7 @@ sequence diagram. <P2 x="420" y="156" id="11214" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="11248" > +<!-- CONNECTOR type="1501" id="11248" > <cdparam x="420" y="201" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -28921,7 +28921,7 @@ sequence diagram. <P1 x="420" y="279" id="11212" /> <P2 x="420" y="319" id="11179" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -29348,7 +29348,7 @@ sequence diagram. <TGConnectingPoint num="9" id="11505" /> </COMPONENT> -<COMPONENT type="1508" id="11511" > +<!-- COMPONENT type="1508" id="11511" > <cdparam x="260" y="198" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -29358,7 +29358,7 @@ sequence diagram. <TGConnectingPoint num="1" id="11508" /> <TGConnectingPoint num="2" id="11509" /> <TGConnectingPoint num="3" id="11510" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="11522" > <cdparam x="213" y="110" /> @@ -29413,7 +29413,7 @@ sequence diagram. <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="11532" > +<!-- CONNECTOR type="1501" id="11532" > <cdparam x="170" y="384" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -29446,7 +29446,7 @@ sequence diagram. <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="11533" > <cdparam x="275" y="333" /> @@ -29464,7 +29464,7 @@ sequence diagram. <P2 x="275" y="105" id="11512" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="11535" > +<!-- CONNECTOR type="1501" id="11535" > <cdparam x="275" y="150" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -29479,7 +29479,7 @@ sequence diagram. <P1 x="275" y="228" id="11510" /> <P2 x="275" y="268" id="11466" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -29884,7 +29884,7 @@ sequence diagram. <TGConnectingPoint num="9" id="11790" /> </COMPONENT> -<COMPONENT type="1508" id="11796" > +<!-- COMPONENT type="1508" id="11796" > <cdparam x="267" y="201" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -29894,7 +29894,7 @@ sequence diagram. <TGConnectingPoint num="1" id="11793" /> <TGConnectingPoint num="2" id="11794" /> <TGConnectingPoint num="3" id="11795" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="11807" > <cdparam x="220" y="113" /> @@ -29949,7 +29949,7 @@ sequence diagram. <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="11817" > +<!-- CONNECTOR type="1501" id="11817" > <cdparam x="177" y="387" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -29982,7 +29982,7 @@ sequence diagram. <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> <infoparam name="point " value="null" /> -</SUBCOMPONENT> +</SUBCOMPONENT--> <CONNECTOR type="1501" id="11818" > <cdparam x="282" y="336" /> @@ -30000,7 +30000,7 @@ sequence diagram. <P2 x="282" y="108" id="11797" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="11820" > +<!-- CONNECTOR type="1501" id="11820" > <cdparam x="282" y="153" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -30015,7 +30015,7 @@ sequence diagram. <P1 x="282" y="231" id="11795" /> <P2 x="282" y="271" id="11751" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -30515,7 +30515,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="12110" /> </COMPONENT> -<COMPONENT type="1508" id="12116" > +<!-- COMPONENT type="1508" id="12116" > <cdparam x="319" y="222" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -30525,7 +30525,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="12113" /> <TGConnectingPoint num="2" id="12114" /> <TGConnectingPoint num="3" id="12115" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="12127" > <cdparam x="406" y="379" /> @@ -30563,7 +30563,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="12137" /> </COMPONENT> -<COMPONENT type="1508" id="12143" > +<!-- COMPONENT type="1508" id="12143" > <cdparam x="453" y="543" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -30573,7 +30573,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="12140" /> <TGConnectingPoint num="2" id="12141" /> <TGConnectingPoint num="3" id="12142" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="12154" > <cdparam x="406" y="459" /> @@ -30620,7 +30620,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="12166" /> </COMPONENT> -<CONNECTOR type="1501" id="12171" > +<!-- CONNECTOR type="1501" id="12171" > <cdparam x="363" y="729" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -30653,7 +30653,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="12173" > <cdparam x="428" y="638" /> @@ -30672,7 +30672,7 @@ INTERRUPTS <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="12177" > +<!-- CONNECTOR type="1501" id="12177" > <cdparam x="227" y="425" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -30705,7 +30705,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="12179" > <cdparam x="294" y="339" /> @@ -30749,7 +30749,7 @@ INTERRUPTS <P2 x="468" y="454" id="12144" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="12183" > +<!-- CONNECTOR type="1501" id="12183" > <cdparam x="334" y="170" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -30764,7 +30764,7 @@ INTERRUPTS <P1 x="334" y="252" id="12115" /> <P2 x="334" y="314" id="12052" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="12185" > <cdparam x="343" y="93" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> @@ -30781,7 +30781,7 @@ INTERRUPTS <P2 x="468" y="771" id="12155" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="12187" > +<!-- CONNECTOR type="1501" id="12187" > <cdparam x="552" y="464" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -30796,7 +30796,7 @@ INTERRUPTS <P1 x="468" y="573" id="12142" /> <P2 x="468" y="613" id="12036" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -32277,7 +32277,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="13092" /> </COMPONENT> -<COMPONENT type="1508" id="13098" > +<!-- COMPONENT type="1508" id="13098" > <cdparam x="272" y="204" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -32287,7 +32287,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="13095" /> <TGConnectingPoint num="2" id="13096" /> <TGConnectingPoint num="3" id="13097" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="13109" > <cdparam x="225" y="116" /> @@ -32342,7 +32342,7 @@ INTERRUPTS <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="13119" > +<!-- CONNECTOR type="1501" id="13119" > <cdparam x="182" y="390" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -32375,7 +32375,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="13120" > <cdparam x="287" y="339" /> @@ -32393,7 +32393,7 @@ INTERRUPTS <P2 x="287" y="111" id="13099" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="13122" > +<!-- CONNECTOR type="1501" id="13122" > <cdparam x="287" y="156" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -32408,7 +32408,7 @@ INTERRUPTS <P1 x="287" y="234" id="13097" /> <P2 x="287" y="274" id="13070" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -32779,7 +32779,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="13360" /> </COMPONENT> -<COMPONENT type="1508" id="13366" > +<!-- COMPONENT type="1508" id="13366" > <cdparam x="268" y="197" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -32789,7 +32789,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="13363" /> <TGConnectingPoint num="2" id="13364" /> <TGConnectingPoint num="3" id="13365" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="13377" > <cdparam x="221" y="109" /> @@ -32844,7 +32844,7 @@ INTERRUPTS <infoparam name="point " value="null" /> </SUBCOMPONENT> -<CONNECTOR type="1501" id="13387" > +<!-- CONNECTOR type="1501" id="13387" > <cdparam x="178" y="383" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -32877,7 +32877,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="13388" > <cdparam x="283" y="332" /> @@ -32895,7 +32895,7 @@ INTERRUPTS <P2 x="283" y="104" id="13367" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="13390" > +<!-- CONNECTOR type="1501" id="13390" > <cdparam x="283" y="149" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -32910,7 +32910,7 @@ INTERRUPTS <P1 x="283" y="227" id="13365" /> <P2 x="283" y="267" id="13338" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -33263,7 +33263,7 @@ INTERRUPTS <infoparam name="guard 3" value="[ else ]" /> </SUBCOMPONENT> -<COMPONENT type="1508" id="13623" > +<!-- COMPONENT type="1508" id="13623" > <cdparam x="260" y="185" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -33273,7 +33273,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="13620" /> <TGConnectingPoint num="2" id="13621" /> <TGConnectingPoint num="3" id="13622" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="13634" > <cdparam x="213" y="97" /> @@ -33329,7 +33329,7 @@ INTERRUPTS <TGConnectingPoint num="0" id="13648" /> </COMPONENT> -<CONNECTOR type="1501" id="13653" > +<!-- CONNECTOR type="1501" id="13653" > <cdparam x="170" y="371" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -33362,7 +33362,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="13655" > <cdparam x="235" y="280" /> @@ -33397,7 +33397,7 @@ INTERRUPTS <P2 x="275" y="92" id="13624" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="13658" > +<!-- CONNECTOR type="1501" id="13658" > <cdparam x="275" y="137" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -33412,7 +33412,7 @@ INTERRUPTS <P1 x="275" y="215" id="13622" /> <P2 x="275" y="255" id="13606" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> </CommunicationPatternDiagramPanel> @@ -33823,7 +33823,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="13902" /> </COMPONENT> -<COMPONENT type="1508" id="13908" > +<!-- COMPONENT type="1508" id="13908" > <cdparam x="272" y="176" /> <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -33833,7 +33833,7 @@ INTERRUPTS <TGConnectingPoint num="1" id="13905" /> <TGConnectingPoint num="2" id="13906" /> <TGConnectingPoint num="3" id="13907" /> -</COMPONENT> +</COMPONENT--> <COMPONENT type="1505" id="13919" > <cdparam x="359" y="333" /> @@ -33871,7 +33871,7 @@ INTERRUPTS <TGConnectingPoint num="9" id="13929" /> </COMPONENT> -<CONNECTOR type="1501" id="13934" > +<!-- CONNECTOR type="1501" id="13934" > <cdparam x="180" y="379" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -33904,7 +33904,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="13936" > <cdparam x="247" y="293" /> @@ -33948,7 +33948,7 @@ INTERRUPTS <P2 x="421" y="403" id="13891" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="1501" id="13940" > +<!-- CONNECTOR type="1501" id="13940" > <cdparam x="287" y="124" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> @@ -33963,7 +33963,7 @@ INTERRUPTS <P1 x="287" y="206" id="13907" /> <P2 x="287" y="268" id="13876" /> <AutomaticDrawing data="true" /> -</CONNECTOR> +</CONNECTOR--> <CONNECTOR type="1501" id="13942" > <cdparam x="296" y="47" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java index 700459a36d97150cf1e3a2b3f37bbc507368a578..93287db0496229c7d0f62b6d39a72843e91f5400 100755 --- a/src/main/java/ui/ActionPerformer.java +++ b/src/main/java/ui/ActionPerformer.java @@ -367,8 +367,8 @@ public class ActionPerformer { mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARSMD_RECEIVE_SIGNAL); } else if (command.equals(mgui.actions[TGUIAction.ASMD_LIBRARY_FUNCTION_CALL].getActionCommand())) { mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARSMD_LIBRARY_FUNCTION_CALL); - } else if (command.equals(mgui.actions[TGUIAction.ASMD_PARALLEL].getActionCommand())) { - mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARSMD_PARALLEL); +// Issue #69 } else if (command.equals(mgui.actions[TGUIAction.ASMD_PARALLEL].getActionCommand())) { +// mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARSMD_PARALLEL); } else if (command.equals(mgui.actions[TGUIAction.ASMD_STATE].getActionCommand())) { mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARSMD_STATE); } else if (command.equals(mgui.actions[TGUIAction.ASMD_CHOICE].getActionCommand())) { diff --git a/src/main/java/ui/avatarsmd/AvatarSMDParallel.java b/src/main/java/ui/avatarsmd/AvatarSMDParallel.java deleted file mode 100755 index f36631d091a3d77e5a97cf692f414cb218ee8a05..0000000000000000000000000000000000000000 --- a/src/main/java/ui/avatarsmd/AvatarSMDParallel.java +++ /dev/null @@ -1,123 +0,0 @@ -/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille - * - * ludovic.apvrille AT enst.fr - * - * This software is a computer program whose purpose is to allow the - * edition of TURTLE analysis, design and deployment diagrams, to - * allow the generation of RT-LOTOS or Java code from this diagram, - * and at last to allow the analysis of formal validation traces - * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP - * from INRIA Rhone-Alpes. - * - * This software is governed by the CeCILL license under French law and - * abiding by the rules of distribution of free software. You can use, - * modify and/ or redistribute the software under the terms of the CeCILL - * license as circulated by CEA, CNRS and INRIA at the following URL - * "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, - * modify and redistribute granted by the license, users are provided only - * with a limited warranty and the software's author, the holder of the - * economic rights, and the successive licensors have only limited - * liability. - * - * In this respect, the user's attention is drawn to the risks associated - * with loading, using, modifying and/or developing or reproducing the - * software by the user in light of its specific status of free software, - * that may mean that it is complicated to manipulate, and that also - * therefore means that it is reserved for developers and experienced - * professionals having in-depth computer knowledge. Users are therefore - * encouraged to load and test the software's suitability as regards their - * requirements in conditions enabling the security of their systems and/or - * data to be ensured and, more generally, to use and operate it in the - * same conditions as regards security. - * - * The fact that you are presently reading this means that you have had - * knowledge of the CeCILL license and that you accept its terms. - */ - - - - -package ui.avatarsmd; - -import myutil.GraphicLib; -import ui.*; -import ui.util.IconManager; - -import java.awt.*; - -/** - * Class AvatarSMDParallel - * Parallel operator. - * To be used in Avatar State Machine Diagrams - * Creation: 13/04/2010 - * @version 1.0 13/04/2010 - * @author Ludovic APVRILLE - */ -public class AvatarSMDParallel extends AvatarSMDBasicComponent{ - private int lineLength = 0; - private int textX, textY; - - public AvatarSMDParallel(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) { - super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp); - - - width = 150; - height = 5; - - textX = width - 10; - textY = height - 8; - - nbConnectingPoint = 10; - connectingPoint = new TGConnectingPoint[10]; - connectingPoint[0] = new AvatarSMDConnectingPoint(this, 0, -lineLength, true, false, 0.167, 0.0); - connectingPoint[1] = new AvatarSMDConnectingPoint(this, 0, -lineLength, true, false, 0.333, 0.0); - connectingPoint[2] = new AvatarSMDConnectingPoint(this, 0, -lineLength, true, false, 0.5, 0.0); - connectingPoint[3] = new AvatarSMDConnectingPoint(this, 0, -lineLength, true, false, 0.667, 0.0); - connectingPoint[4] = new AvatarSMDConnectingPoint(this, 0, -lineLength, true, false, 0.833, 0.0); - connectingPoint[5] = new AvatarSMDConnectingPoint(this, 0, lineLength, false, true, 0.167, 1.0); - connectingPoint[6] = new AvatarSMDConnectingPoint(this, 0, lineLength, false, true, 0.333, 1.0); - connectingPoint[7] = new AvatarSMDConnectingPoint(this, 0, lineLength, false, true, 0.5, 1.0); - connectingPoint[8] = new AvatarSMDConnectingPoint(this, 0, lineLength, false, true, 0.667, 1.0); - connectingPoint[9] = new AvatarSMDConnectingPoint(this, 0, lineLength, false, true, 0.833, 1.0); - addTGConnectingPointsCommentCorner(); - - nbInternalTGComponent = 0; - - moveable = true; - editable = false; - removable = true; - - name = "parallel / synchro"; - - myImageIcon = IconManager.imgic206; - } - - public void internalDrawing(Graphics g) { - g.drawRect(x, y, width, height); - g.fillRect(x, y, width, height); - } - - public TGComponent isOnMe(int x1, int y1) { - if (GraphicLib.isInRectangle(x1, y1, x, y, width, height)) { - return this; - } - return null; - } - - public int getType() { - return TGComponentManager.AVATARSMD_PARALLEL; - } - - public int getDefaultConnector() { - return TGComponentManager.AVATARSMD_CONNECTOR; - } -} - - - - - - - diff --git a/src/main/java/ui/tmlcp/TMLCPJunction.java b/src/main/java/ui/tmlcp/TMLCPJunction.java deleted file mode 100755 index 007fc1f42614b18a4d92167da3198e77cb1bc78f..0000000000000000000000000000000000000000 --- a/src/main/java/ui/tmlcp/TMLCPJunction.java +++ /dev/null @@ -1,122 +0,0 @@ -/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille, Andrea Enrici - * - * ludovic.apvrille AT telecom-paristech.fr - * andrea.enrici AT telecom-paristech.fr - * - * This software is a computer program whose purpose is to allow the - * edition of TURTLE analysis, design and deployment diagrams, to - * allow the generation of RT-LOTOS or Java code from this diagram, - * and at last to allow the analysis of formal validation traces - * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP - * from INRIA Rhone-Alpes. - * - * This software is governed by the CeCILL license under French law and - * abiding by the rules of distribution of free software. You can use, - * modify and/ or redistribute the software under the terms of the CeCILL - * license as circulated by CEA, CNRS and INRIA at the following URL - * "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, - * modify and redistribute granted by the license, users are provided only - * with a limited warranty and the software's author, the holder of the - * economic rights, and the successive licensors have only limited - * liability. - * - * In this respect, the user's attention is drawn to the risks associated - * with loading, using, modifying and/or developing or reproducing the - * software by the user in light of its specific status of free software, - * that may mean that it is complicated to manipulate, and that also - * therefore means that it is reserved for developers and experienced - * professionals having in-depth computer knowledge. Users are therefore - * encouraged to load and test the software's suitability as regards their - * requirements in conditions enabling the security of their systems and/or - * data to be ensured and, more generally, to use and operate it in the - * same conditions as regards security. - * - * The fact that you are presently reading this means that you have had - * knowledge of the CeCILL license and that you accept its terms. - */ - - - - -package ui.tmlcp; - -import ui.*; -import ui.util.IconManager; - -import java.awt.*; -import java.awt.geom.Line2D; - - -/** - * Class TMLCPJunction - * Junction between several activities, without any synchronization. - * To be used in communication patterns diagrams - * Creation: 17/02/2014 - * @version 1.0 17/02/2014 - * @author Ludovic APVRILLE, Andrea ENRICI - */ -public class TMLCPJunction extends TGCWithoutInternalComponent { - - private static int instanceCounter = 0; - private int counter = 0; - - public TMLCPJunction(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) { - super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp); - - width = 30; - height = 30; - - nbConnectingPoint = 4; - connectingPoint = new TGConnectingPoint[nbConnectingPoint]; - connectingPoint[0] = new TGConnectingPointTMLCP(this, 0, 0, true, false, 0.5, 0.0); - connectingPoint[1] = new TGConnectingPointTMLCP(this, 0, 0, true, false, 0.0, 0.5); - connectingPoint[2] = new TGConnectingPointTMLCP(this, 0, 0, true, false, 1.0, 0.5); - connectingPoint[3] = new TGConnectingPointTMLCP(this, 0, 0, false, true, 0.5, 1); - - moveable = true; - editable = false; - removable = true; - - value = ""; - instanceCounter++; - counter = instanceCounter; - name = "junction" + Integer.toString(counter); - - myImageIcon = IconManager.imgic212; - } - - public void internalDrawing(Graphics g) { - g.drawLine(x +width/2, y, x+width/2, y + height); - g.drawLine(x, y + (height/2), x+width, y + (height/2)); - } - - public TGComponent isOnMe(int _x, int _y) { - // vertical line - if ((int)(Line2D.ptSegDistSq(x +width/2, y, x+width/2, y + height, _x, _y)) < distanceSelected) { - return this; - } - // horizontal line - if ((int)(Line2D.ptSegDistSq(x, y + (height/2), x+width, y + (height/2), _x, _y)) < distanceSelected) { - return this; - } - return null; - } - - public int getType() { - return TGComponentManager.TMLCP_JUNCTION; - } - - public int getDefaultConnector() { - return TGComponentManager.CONNECTOR_TMLCP; - } - -} - - - - - - -