diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml index 15926bfd5d0ead6dd327b2c41142c6b9b25602c1..d4088d67bd50796ce7c7ad0485aeb455974c7840 100755 --- a/modeling/DIPLODOCUS/SmartCardProtocol.xml +++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml @@ -8,16 +8,16 @@ <cdparam x="535" y="347" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="556" y="321" id="169" /> -<P2 x="534" y="395" id="216" /> +<P1 x="556" y="321" id="113" /> +<P2 x="534" y="395" id="68" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="3" > <cdparam x="820" y="398" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1025" y="471" id="63" /> -<P2 x="761" y="548" id="184" /> +<P1 x="1025" y="471" id="210" /> +<P2 x="761" y="548" id="98" /> <Point x="887" y="577" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="2" > @@ -33,128 +33,128 @@ <cdparam x="568" y="323" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="710" y="403" id="186" /> -<P2 x="693" y="321" id="147" /> +<P1 x="710" y="403" id="96" /> +<P2 x="693" y="321" id="135" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="5" > <cdparam x="522" y="390" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="534" y="369" id="211" /> -<P2 x="453" y="322" id="41" /> +<P1 x="534" y="369" id="63" /> +<P2 x="453" y="322" id="33" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="6" > <cdparam x="409" y="124" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="401" y="83" id="43" /> -<P2 x="593" y="84" id="171" /> +<P1 x="401" y="83" id="31" /> +<P2 x="593" y="84" id="111" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="7" > <cdparam x="656" y="426" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="805" y="542" id="190" /> -<P2 x="969" y="474" id="77" /> +<P1 x="805" y="542" id="92" /> +<P2 x="969" y="474" id="196" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="8" > <cdparam x="656" y="400" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="805" y="509" id="192" /> -<P2 x="931" y="466" id="75" /> +<P1 x="805" y="509" id="90" /> +<P2 x="931" y="466" id="198" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="9" > <cdparam x="602" y="327" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="751" y="406" id="200" /> -<P2 x="842" y="362" id="105" /> +<P1 x="751" y="406" id="82" /> +<P2 x="842" y="362" id="162" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="10" > <cdparam x="689" y="292" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="842" y="388" id="109" /> -<P2 x="931" y="352" id="85" /> +<P1 x="842" y="388" id="166" /> +<P2 x="931" y="352" id="188" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="11" > <cdparam x="656" y="377" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="805" y="481" id="196" /> -<P2 x="931" y="443" id="83" /> +<P1 x="805" y="481" id="86" /> +<P2 x="931" y="443" id="190" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="12" > <cdparam x="656" y="351" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="805" y="448" id="194" /> -<P2 x="931" y="416" id="81" /> +<P1 x="805" y="448" id="88" /> +<P2 x="931" y="416" id="192" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="13" > <cdparam x="741" y="296" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="931" y="387" id="79" /> -<P2 x="805" y="419" id="198" /> +<P1 x="931" y="387" id="194" /> +<P2 x="805" y="419" id="84" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="14" > <cdparam x="735" y="260" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="931" y="317" id="87" /> -<P2 x="734" y="269" id="159" /> +<P1 x="931" y="317" id="186" /> +<P2 x="734" y="269" id="123" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="15" > <cdparam x="641" y="230" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="734" y="235" id="157" /> -<P2 x="931" y="278" id="89" /> +<P1 x="734" y="235" id="125" /> +<P2 x="931" y="278" id="184" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="16" > <cdparam x="641" y="195" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="734" y="190" id="155" /> -<P2 x="931" y="235" id="91" /> +<P1 x="734" y="190" id="127" /> +<P2 x="931" y="235" id="182" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="17" > <cdparam x="740" y="353" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="842" y="362" id="104" /> -<P2 x="734" y="301" id="153" /> +<P1 x="842" y="362" id="161" /> +<P2 x="734" y="301" id="129" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="18" > <cdparam x="460" y="270" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="534" y="290" id="163" /> -<P2 x="453" y="290" id="35" /> +<P1 x="534" y="290" id="119" /> +<P2 x="453" y="290" id="39" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="19" > <cdparam x="387" y="129" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="453" y="116" id="31" /> -<P2 x="534" y="116" id="151" /> +<P1 x="453" y="116" id="43" /> +<P2 x="534" y="116" id="131" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="20" > @@ -162,63 +162,63 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="453" y="202" id="37" /> -<P2 x="534" y="202" id="165" /> +<P2 x="534" y="202" id="117" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="21" > <cdparam x="460" y="236" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="534" y="247" id="167" /> -<P2 x="453" y="247" id="39" /> +<P1 x="534" y="247" id="115" /> +<P2 x="453" y="247" id="35" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="22" > <cdparam x="389" y="163" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="453" y="156" id="33" /> -<P2 x="534" y="156" id="161" /> +<P1 x="453" y="156" id="41" /> +<P2 x="534" y="156" id="121" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="23" > <cdparam x="967" y="190" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" /> -<P1 x="931" y="185" id="93" /> -<P2 x="734" y="111" id="173" /> +<P1 x="931" y="185" id="180" /> +<P2 x="734" y="111" id="109" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="24" > <cdparam x="1028" y="535" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" /> -<P1 x="630" y="324" id="149" /> -<P2 x="669" y="406" id="188" /> +<P1 x="630" y="324" id="133" /> +<P2 x="669" y="406" id="94" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="25" > <cdparam x="1308" y="303" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" /> -<P1 x="1232" y="368" id="127" /> -<P2 x="1167" y="370" id="73" /> +<P1 x="1232" y="368" id="146" /> +<P2 x="1167" y="370" id="200" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="26" > <cdparam x="1172" y="437" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" /> -<P1 x="1167" y="405" id="71" /> -<P2 x="1232" y="403" id="125" /> +<P1 x="1167" y="405" id="202" /> +<P2 x="1232" y="403" id="148" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="29" > <cdparam x="1041" y="162" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" /> -<P1 x="1167" y="198" id="69" /> -<P2 x="1167" y="266" id="67" /> +<P1 x="1167" y="198" id="204" /> +<P2 x="1167" y="266" id="206" /> <Point x="1227" y="207" /> <Point x="1227" y="247" /> <AutomaticDrawing data="true" /> @@ -243,8 +243,8 @@ <cdparam x="877" y="343" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" /> -<P1 x="1167" y="444" id="65" /> -<P2 x="1232" y="431" id="123" /> +<P1 x="1167" y="444" id="208" /> +<P2 x="1232" y="431" id="150" /> <AutomaticDrawing data="true" /> </CONNECTOR> <COMPONENT type="1202" id="53" > @@ -272,14 +272,14 @@ </COMPONENT> <SUBCOMPONENT type="1203" id="32" > <father id="53" num="0" /> -<cdparam x="443" y="116" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="388" y="83" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" /> -<infoparam name="TGComponent" value="Request activation" /> +<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" /> +<infoparam name="TGComponent" value="Event reset, pTS, end" /> <TGConnectingPoint num="0" id="31" /> <extraparam> -<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -289,16 +289,16 @@ </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="34" > <father id="53" num="1" /> -<cdparam x="440" y="156" /> +<cdparam x="440" y="322" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" /> -<infoparam name="TGComponent" value="Event data_Ready" /> +<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" /> <TGConnectingPoint num="0" id="33" /> <extraparam> -<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> -<Type type="1" typeOther="" /> -<Type type="2" typeOther="" /> +<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Type type="0" typeOther="" /> +<Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -306,14 +306,14 @@ </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="36" > <father id="53" num="2" /> -<cdparam x="440" y="290" /> +<cdparam x="440" y="247" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" /> -<infoparam name="TGComponent" value="Event data_Ready_SC" /> +<infoparam name="TGComponent" value="Channel fromSCtoD" /> <TGConnectingPoint num="0" id="35" /> <extraparam> -<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -340,14 +340,14 @@ </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="40" > <father id="53" num="4" /> -<cdparam x="440" y="247" /> +<cdparam x="440" y="290" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" /> -<infoparam name="TGComponent" value="Channel fromSCtoD" /> +<infoparam name="TGComponent" value="Event data_Ready_SC" /> <TGConnectingPoint num="0" id="39" /> <extraparam> -<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -357,16 +357,16 @@ </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="42" > <father id="53" num="5" /> -<cdparam x="440" y="322" /> +<cdparam x="440" y="156" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" /> -<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" /> +<infoparam name="TGComponent" value="Event data_Ready" /> <TGConnectingPoint num="0" id="41" /> <extraparam> -<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> +<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Type type="1" typeOther="" /> +<Type type="2" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -374,14 +374,14 @@ </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="44" > <father id="53" num="6" /> -<cdparam x="388" y="83" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="443" y="116" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" /> -<infoparam name="TGComponent" value="Event reset, pTS, end" /> +<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" /> +<infoparam name="TGComponent" value="Request activation" /> <TGConnectingPoint num="0" id="43" /> <extraparam> -<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -428,61 +428,61 @@ <info hiddeni="false" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1200" id="146" > +<SUBCOMPONENT type="1201" id="81" > <father id="238" num="0" /> -<cdparam x="842" y="133" /> -<sizeparam width="570" height="485" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="521" y="369" /> +<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" /> -<infoparam name="TGComponent" value="TCPIP Entities" /> -<TGConnectingPoint num="0" id="138" /> -<TGConnectingPoint num="1" id="139" /> -<TGConnectingPoint num="2" id="140" /> -<TGConnectingPoint num="3" id="141" /> -<TGConnectingPoint num="4" id="142" /> -<TGConnectingPoint num="5" id="143" /> -<TGConnectingPoint num="6" id="144" /> -<TGConnectingPoint num="7" id="145" /> -<extraparam> -<info hiddeni="false" /> -</extraparam> -</SUBCOMPONENT> -<SUBCOMPONENT type="1202" id="103" > -<father id="146" num="0" /> -<cdparam x="931" y="167" /> -<sizeparam width="236" height="317" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" /> +<infoparam name="Composite port" value="" /> +<TGConnectingPoint num="0" id="63" /> +<TGConnectingPoint num="1" id="64" /> +<TGConnectingPoint num="2" id="65" /> +<TGConnectingPoint num="3" id="66" /> +<TGConnectingPoint num="4" id="67" /> +<TGConnectingPoint num="5" id="68" /> +<TGConnectingPoint num="6" id="69" /> +<TGConnectingPoint num="7" id="70" /> +<TGConnectingPoint num="8" id="71" /> +<TGConnectingPoint num="9" id="72" /> +<TGConnectingPoint num="10" id="73" /> +<TGConnectingPoint num="11" id="74" /> +<TGConnectingPoint num="12" id="75" /> +<TGConnectingPoint num="13" id="76" /> +<TGConnectingPoint num="14" id="77" /> +<TGConnectingPoint num="15" id="78" /> +<TGConnectingPoint num="16" id="79" /> +<TGConnectingPoint num="17" id="80" /> +</SUBCOMPONENT> +<SUBCOMPONENT type="1202" id="108" > +<father id="238" num="1" /> +<cdparam x="565" y="416" /> +<sizeparam width="240" height="145" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" /> -<infoparam name="TGComponent" value="TCPIP" /> -<TGConnectingPoint num="0" id="95" /> -<TGConnectingPoint num="1" id="96" /> -<TGConnectingPoint num="2" id="97" /> -<TGConnectingPoint num="3" id="98" /> -<TGConnectingPoint num="4" id="99" /> -<TGConnectingPoint num="5" id="100" /> -<TGConnectingPoint num="6" id="101" /> -<TGConnectingPoint num="7" id="102" /> +<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" /> +<infoparam name="TGComponent" value="Application" /> +<TGConnectingPoint num="0" id="100" /> +<TGConnectingPoint num="1" id="101" /> +<TGConnectingPoint num="2" id="102" /> +<TGConnectingPoint num="3" id="103" /> +<TGConnectingPoint num="4" id="104" /> +<TGConnectingPoint num="5" id="105" /> +<TGConnectingPoint num="6" id="106" /> +<TGConnectingPoint num="7" id="107" /> <extraparam> <Data isAttacker="No" Operation="" /> -<Attribute access="2" id="wind" value="64" type="0" typeOther="" /> -<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" /> -<Attribute access="2" id="i" value="" type="0" typeOther="" /> -<Attribute access="2" id="j" value="" type="0" typeOther="" /> -<Attribute access="2" id="a" value="0" type="0" typeOther="" /> -<Attribute access="2" id="b" value="0" type="0" typeOther="" /> -<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="64" > -<father id="103" num="0" /> -<cdparam x="1012" y="471" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="83" > +<father id="108" num="0" /> +<cdparam x="741" y="406" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> -<infoparam name="Primitive port" value="Event opened" /> -<TGConnectingPoint num="0" id="63" /> +<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> +<infoparam name="TGComponent" value="Request start_TCP_IP" /> +<TGConnectingPoint num="0" id="82" /> <extraparam> -<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -490,16 +490,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="66" > -<father id="103" num="1" /> -<cdparam x="1157" y="444" /> +<SUBCOMPONENT type="1203" id="85" > +<father id="108" num="1" /> +<cdparam x="795" y="419" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Event stop" /> -<TGConnectingPoint num="0" id="65" /> +<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> +<infoparam name="TGComponent" value="Channel fromTtoA" /> +<TGConnectingPoint num="0" id="84" /> <extraparam> -<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -507,16 +507,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="68" > -<father id="103" num="2" /> -<cdparam x="1157" y="266" /> +<SUBCOMPONENT type="1203" id="87" > +<father id="108" num="2" /> +<cdparam x="795" y="481" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Channel temp" /> -<TGConnectingPoint num="0" id="67" /> +<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> +<infoparam name="TGComponent" value="Event send_TCP" /> +<TGConnectingPoint num="0" id="86" /> <extraparam> -<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -524,16 +524,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="70" > -<father id="103" num="3" /> -<cdparam x="1157" y="198" /> +<SUBCOMPONENT type="1203" id="89" > +<father id="108" num="3" /> +<cdparam x="795" y="448" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Channel temp" /> -<TGConnectingPoint num="0" id="69" /> +<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> +<infoparam name="TGComponent" value="Event open, abort, close" /> +<TGConnectingPoint num="0" id="88" /> <extraparam> -<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -541,16 +541,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="72" > -<father id="103" num="4" /> -<cdparam x="1157" y="405" /> +<SUBCOMPONENT type="1203" id="91" > +<father id="108" num="4" /> +<cdparam x="795" y="509" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Request req_Timer" /> -<TGConnectingPoint num="0" id="71" /> +<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> +<infoparam name="TGComponent" value="Event receive_Application" /> +<TGConnectingPoint num="0" id="90" /> <extraparam> -<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -558,16 +558,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="74" > -<father id="103" num="5" /> -<cdparam x="1157" y="370" /> +<SUBCOMPONENT type="1203" id="93" > +<father id="108" num="5" /> +<cdparam x="795" y="542" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Event timeOut" /> -<TGConnectingPoint num="0" id="73" /> +<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> +<infoparam name="TGComponent" value="Channel fromAtoT" /> +<TGConnectingPoint num="0" id="92" /> <extraparam> -<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -575,16 +575,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="76" > -<father id="103" num="6" /> -<cdparam x="921" y="466" /> +<SUBCOMPONENT type="1203" id="95" > +<father id="108" num="6" /> +<cdparam x="659" y="406" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Event receive_Application" /> -<TGConnectingPoint num="0" id="75" /> +<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> +<infoparam name="TGComponent" value="Request start_Application" /> +<TGConnectingPoint num="0" id="94" /> <extraparam> -<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -592,16 +592,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="78" > -<father id="103" num="7" /> -<cdparam x="959" y="474" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="97" > +<father id="108" num="7" /> +<cdparam x="697" y="403" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Channel fromAtoT" /> -<TGConnectingPoint num="0" id="77" /> +<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" /> +<infoparam name="Primitive port" value="Event connectionOpened" /> +<TGConnectingPoint num="0" id="96" /> <extraparam> -<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -609,16 +609,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="80" > -<father id="103" num="8" /> -<cdparam x="921" y="387" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="99" > +<father id="108" num="8" /> +<cdparam x="748" y="548" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Channel fromTtoA" /> -<TGConnectingPoint num="0" id="79" /> +<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" /> +<infoparam name="Primitive port" value="Event opened" /> +<TGConnectingPoint num="0" id="98" /> <extraparam> -<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -626,33 +626,43 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="82" > -<father id="103" num="9" /> -<cdparam x="921" y="416" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1202" id="145" > +<father id="238" num="2" /> +<cdparam x="534" y="97" /> +<sizeparam width="200" height="237" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Event open, abort, close" /> -<TGConnectingPoint num="0" id="81" /> +<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" /> +<infoparam name="TGComponent" value="SmartCard" /> +<TGConnectingPoint num="0" id="137" /> +<TGConnectingPoint num="1" id="138" /> +<TGConnectingPoint num="2" id="139" /> +<TGConnectingPoint num="3" id="140" /> +<TGConnectingPoint num="4" id="141" /> +<TGConnectingPoint num="5" id="142" /> +<TGConnectingPoint num="6" id="143" /> +<TGConnectingPoint num="7" id="144" /> <extraparam> -<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> +<Data isAttacker="No" Operation="" /> +<Attribute access="2" id="resetType" value="0" type="0" typeOther="" /> +<Attribute access="2" id="a" value="0" type="0" typeOther="" /> +<Attribute access="2" id="b" value="" type="4" typeOther="" /> +<Attribute access="2" id="i" value="0" type="0" typeOther="" /> +<Attribute access="2" id="j" value="0" type="0" typeOther="" /> +<Attribute access="2" id="x" value="0" type="0" typeOther="" /> +<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" /> +<Attribute access="2" id="t" value="" type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="84" > -<father id="103" num="10" /> -<cdparam x="921" y="443" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="110" > +<father id="145" num="0" /> +<cdparam x="721" y="111" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Event send_TCP" /> -<TGConnectingPoint num="0" id="83" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Event send" /> +<TGConnectingPoint num="0" id="109" /> <extraparam> -<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -660,16 +670,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="86" > -<father id="103" num="11" /> -<cdparam x="921" y="352" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="112" > +<father id="145" num="1" /> +<cdparam x="580" y="84" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> -<infoparam name="TGComponent" value="Request start_TCP_IP" /> -<TGConnectingPoint num="0" id="85" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Event reset, pTS, end" /> +<TGConnectingPoint num="0" id="111" /> <extraparam> -<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -677,16 +687,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="88" > -<father id="103" num="12" /> -<cdparam x="918" y="317" /> +<SUBCOMPONENT type="1203" id="114" > +<father id="145" num="2" /> +<cdparam x="543" y="321" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> -<infoparam name="TGComponent" value="Channel fromTtoP" /> -<TGConnectingPoint num="0" id="87" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" /> +<TGConnectingPoint num="0" id="113" /> <extraparam> -<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -694,16 +704,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="90" > -<father id="103" num="13" /> -<cdparam x="918" y="278" /> +<SUBCOMPONENT type="1203" id="116" > +<father id="145" num="3" /> +<cdparam x="521" y="247" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> -<infoparam name="TGComponent" value="Channel fromPtoT" /> -<TGConnectingPoint num="0" id="89" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Channel fromSCtoD" /> +<TGConnectingPoint num="0" id="115" /> <extraparam> -<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -711,16 +721,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="92" > -<father id="103" num="14" /> -<cdparam x="918" y="235" /> +<SUBCOMPONENT type="1203" id="118" > +<father id="145" num="4" /> +<cdparam x="521" y="202" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> -<infoparam name="TGComponent" value="Event receive" /> -<TGConnectingPoint num="0" id="91" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Channel fromDtoSC" /> +<TGConnectingPoint num="0" id="117" /> <extraparam> -<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -728,16 +738,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="94" > -<father id="103" num="15" /> -<cdparam x="918" y="185" /> +<SUBCOMPONENT type="1203" id="120" > +<father id="145" num="5" /> +<cdparam x="521" y="290" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> -<infoparam name="TGComponent" value="Event send" /> -<TGConnectingPoint num="0" id="93" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Event data_Ready_SC" /> +<TGConnectingPoint num="0" id="119" /> <extraparam> -<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -745,62 +755,33 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1201" id="122" > -<father id="146" num="1" /> -<cdparam x="829" y="362" /> -<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" /> -<infoparam name="Composite port" value="" /> -<TGConnectingPoint num="0" id="104" /> -<TGConnectingPoint num="1" id="105" /> -<TGConnectingPoint num="2" id="106" /> -<TGConnectingPoint num="3" id="107" /> -<TGConnectingPoint num="4" id="108" /> -<TGConnectingPoint num="5" id="109" /> -<TGConnectingPoint num="6" id="110" /> -<TGConnectingPoint num="7" id="111" /> -<TGConnectingPoint num="8" id="112" /> -<TGConnectingPoint num="9" id="113" /> -<TGConnectingPoint num="10" id="114" /> -<TGConnectingPoint num="11" id="115" /> -<TGConnectingPoint num="12" id="116" /> -<TGConnectingPoint num="13" id="117" /> -<TGConnectingPoint num="14" id="118" /> -<TGConnectingPoint num="15" id="119" /> -<TGConnectingPoint num="16" id="120" /> -<TGConnectingPoint num="17" id="121" /> -</SUBCOMPONENT> -<SUBCOMPONENT type="1202" id="137" > -<father id="146" num="2" /> -<cdparam x="1232" y="328" /> -<sizeparam width="140" height="141" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="122" > +<father id="145" num="6" /> +<cdparam x="521" y="156" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" /> -<infoparam name="TGComponent" value="Timer" /> -<TGConnectingPoint num="0" id="129" /> -<TGConnectingPoint num="1" id="130" /> -<TGConnectingPoint num="2" id="131" /> -<TGConnectingPoint num="3" id="132" /> -<TGConnectingPoint num="4" id="133" /> -<TGConnectingPoint num="5" id="134" /> -<TGConnectingPoint num="6" id="135" /> -<TGConnectingPoint num="7" id="136" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Event data_Ready" /> +<TGConnectingPoint num="0" id="121" /> <extraparam> -<Data isAttacker="No" Operation="" /> -<Attribute access="2" id="x" value="0" type="0" typeOther="" /> +<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Type type="1" typeOther="" /> +<Type type="2" typeOther="" /> +<Type type="0" typeOther="" /> +<Type type="0" typeOther="" /> +<Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="124" > -<father id="137" num="0" /> -<cdparam x="1222" y="431" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<father id="145" num="7" /> +<cdparam x="721" y="269" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" /> -<infoparam name="TGComponent" value="Event stop" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Channel fromTtoP" /> <TGConnectingPoint num="0" id="123" /> <extraparam> -<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -809,15 +790,15 @@ </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="126" > -<father id="137" num="1" /> -<cdparam x="1222" y="403" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<father id="145" num="8" /> +<cdparam x="721" y="235" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" /> -<infoparam name="TGComponent" value="Request req_Timer" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Channel fromPtoT" /> <TGConnectingPoint num="0" id="125" /> <extraparam> -<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -826,15 +807,15 @@ </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1203" id="128" > -<father id="137" num="2" /> -<cdparam x="1222" y="368" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<father id="145" num="9" /> +<cdparam x="721" y="190" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" /> -<infoparam name="TGComponent" value="Event timeOut" /> +<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> +<infoparam name="TGComponent" value="Event receive" /> <TGConnectingPoint num="0" id="127" /> <extraparam> -<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -842,43 +823,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1202" id="183" > -<father id="238" num="1" /> -<cdparam x="534" y="97" /> -<sizeparam width="200" height="237" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" /> -<infoparam name="TGComponent" value="SmartCard" /> -<TGConnectingPoint num="0" id="175" /> -<TGConnectingPoint num="1" id="176" /> -<TGConnectingPoint num="2" id="177" /> -<TGConnectingPoint num="3" id="178" /> -<TGConnectingPoint num="4" id="179" /> -<TGConnectingPoint num="5" id="180" /> -<TGConnectingPoint num="6" id="181" /> -<TGConnectingPoint num="7" id="182" /> -<extraparam> -<Data isAttacker="No" Operation="" /> -<Attribute access="2" id="resetType" value="0" type="0" typeOther="" /> -<Attribute access="2" id="a" value="0" type="0" typeOther="" /> -<Attribute access="2" id="b" value="" type="4" typeOther="" /> -<Attribute access="2" id="i" value="0" type="0" typeOther="" /> -<Attribute access="2" id="j" value="0" type="0" typeOther="" /> -<Attribute access="2" id="x" value="0" type="0" typeOther="" /> -<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" /> -<Attribute access="2" id="t" value="" type="0" typeOther="" /> -</extraparam> -</SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="148" > -<father id="183" num="0" /> -<cdparam x="680" y="321" /> +<SUBCOMPONENT type="1203" id="130" > +<father id="145" num="10" /> +<cdparam x="721" y="301" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="Primitive port" value="Event connectionOpened" /> -<TGConnectingPoint num="0" id="147" /> +<infoparam name="TGComponent" value="Request start_TCP_IP" /> +<TGConnectingPoint num="0" id="129" /> <extraparam> -<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -886,16 +840,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="150" > -<father id="183" num="1" /> -<cdparam x="620" y="324" /> +<SUBCOMPONENT type="1203" id="132" > +<father id="145" num="11" /> +<cdparam x="524" y="116" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" /> -<infoparam name="TGComponent" value="Request start_Application" /> -<TGConnectingPoint num="0" id="149" /> +<infoparam name="TGComponent" value="Request activation" /> +<TGConnectingPoint num="0" id="131" /> <extraparam> -<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -903,16 +857,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="152" > -<father id="183" num="2" /> -<cdparam x="524" y="116" /> +<SUBCOMPONENT type="1203" id="134" > +<father id="145" num="12" /> +<cdparam x="620" y="324" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" /> -<infoparam name="TGComponent" value="Request activation" /> -<TGConnectingPoint num="0" id="151" /> +<infoparam name="TGComponent" value="Request start_Application" /> +<TGConnectingPoint num="0" id="133" /> <extraparam> -<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -920,16 +874,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="154" > -<father id="183" num="3" /> -<cdparam x="721" y="301" /> +<SUBCOMPONENT type="1203" id="136" > +<father id="145" num="13" /> +<cdparam x="680" y="321" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Request start_TCP_IP" /> -<TGConnectingPoint num="0" id="153" /> +<infoparam name="Primitive port" value="Event connectionOpened" /> +<TGConnectingPoint num="0" id="135" /> <extraparam> -<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -937,16 +891,55 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="156" > -<father id="183" num="4" /> -<cdparam x="721" y="190" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1200" id="229" > +<father id="238" num="3" /> +<cdparam x="842" y="133" /> +<sizeparam width="570" height="485" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Event receive" /> -<TGConnectingPoint num="0" id="155" /> +<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" /> +<infoparam name="TGComponent" value="TCPIP Entities" /> +<TGConnectingPoint num="0" id="221" /> +<TGConnectingPoint num="1" id="222" /> +<TGConnectingPoint num="2" id="223" /> +<TGConnectingPoint num="3" id="224" /> +<TGConnectingPoint num="4" id="225" /> +<TGConnectingPoint num="5" id="226" /> +<TGConnectingPoint num="6" id="227" /> +<TGConnectingPoint num="7" id="228" /> <extraparam> -<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<info hiddeni="false" /> +</extraparam> +</SUBCOMPONENT> +<SUBCOMPONENT type="1202" id="160" > +<father id="229" num="0" /> +<cdparam x="1232" y="328" /> +<sizeparam width="140" height="141" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" /> +<infoparam name="TGComponent" value="Timer" /> +<TGConnectingPoint num="0" id="152" /> +<TGConnectingPoint num="1" id="153" /> +<TGConnectingPoint num="2" id="154" /> +<TGConnectingPoint num="3" id="155" /> +<TGConnectingPoint num="4" id="156" /> +<TGConnectingPoint num="5" id="157" /> +<TGConnectingPoint num="6" id="158" /> +<TGConnectingPoint num="7" id="159" /> +<extraparam> +<Data isAttacker="No" Operation="" /> +<Attribute access="2" id="x" value="0" type="0" typeOther="" /> +</extraparam> +</SUBCOMPONENT> +<SUBCOMPONENT type="1203" id="147" > +<father id="160" num="0" /> +<cdparam x="1222" y="368" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" /> +<infoparam name="TGComponent" value="Event timeOut" /> +<TGConnectingPoint num="0" id="146" /> +<extraparam> +<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -954,16 +947,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="158" > -<father id="183" num="5" /> -<cdparam x="721" y="235" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="149" > +<father id="160" num="1" /> +<cdparam x="1222" y="403" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Channel fromPtoT" /> -<TGConnectingPoint num="0" id="157" /> +<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" /> +<infoparam name="TGComponent" value="Request req_Timer" /> +<TGConnectingPoint num="0" id="148" /> <extraparam> -<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -971,16 +964,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="160" > -<father id="183" num="6" /> -<cdparam x="721" y="269" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="151" > +<father id="160" num="2" /> +<cdparam x="1222" y="431" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Channel fromTtoP" /> -<TGConnectingPoint num="0" id="159" /> +<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" /> +<infoparam name="TGComponent" value="Event stop" /> +<TGConnectingPoint num="0" id="150" /> <extraparam> -<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -988,33 +981,68 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="162" > -<father id="183" num="7" /> -<cdparam x="521" y="156" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1201" id="179" > +<father id="229" num="1" /> +<cdparam x="829" y="362" /> +<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Event data_Ready" /> +<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" /> +<infoparam name="Composite port" value="" /> <TGConnectingPoint num="0" id="161" /> +<TGConnectingPoint num="1" id="162" /> +<TGConnectingPoint num="2" id="163" /> +<TGConnectingPoint num="3" id="164" /> +<TGConnectingPoint num="4" id="165" /> +<TGConnectingPoint num="5" id="166" /> +<TGConnectingPoint num="6" id="167" /> +<TGConnectingPoint num="7" id="168" /> +<TGConnectingPoint num="8" id="169" /> +<TGConnectingPoint num="9" id="170" /> +<TGConnectingPoint num="10" id="171" /> +<TGConnectingPoint num="11" id="172" /> +<TGConnectingPoint num="12" id="173" /> +<TGConnectingPoint num="13" id="174" /> +<TGConnectingPoint num="14" id="175" /> +<TGConnectingPoint num="15" id="176" /> +<TGConnectingPoint num="16" id="177" /> +<TGConnectingPoint num="17" id="178" /> +</SUBCOMPONENT> +<SUBCOMPONENT type="1202" id="220" > +<father id="229" num="2" /> +<cdparam x="931" y="167" /> +<sizeparam width="236" height="317" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" /> +<infoparam name="TGComponent" value="TCPIP" /> +<TGConnectingPoint num="0" id="212" /> +<TGConnectingPoint num="1" id="213" /> +<TGConnectingPoint num="2" id="214" /> +<TGConnectingPoint num="3" id="215" /> +<TGConnectingPoint num="4" id="216" /> +<TGConnectingPoint num="5" id="217" /> +<TGConnectingPoint num="6" id="218" /> +<TGConnectingPoint num="7" id="219" /> <extraparam> -<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> -<Type type="1" typeOther="" /> -<Type type="2" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> +<Data isAttacker="No" Operation="" /> +<Attribute access="2" id="wind" value="64" type="0" typeOther="" /> +<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" /> +<Attribute access="2" id="i" value="" type="0" typeOther="" /> +<Attribute access="2" id="j" value="" type="0" typeOther="" /> +<Attribute access="2" id="a" value="0" type="0" typeOther="" /> +<Attribute access="2" id="b" value="0" type="0" typeOther="" /> +<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="164" > -<father id="183" num="8" /> -<cdparam x="521" y="290" /> +<SUBCOMPONENT type="1203" id="181" > +<father id="220" num="0" /> +<cdparam x="918" y="185" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Event data_Ready_SC" /> -<TGConnectingPoint num="0" id="163" /> +<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> +<infoparam name="TGComponent" value="Event send" /> +<TGConnectingPoint num="0" id="180" /> <extraparam> -<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1022,16 +1050,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="166" > -<father id="183" num="9" /> -<cdparam x="521" y="202" /> +<SUBCOMPONENT type="1203" id="183" > +<father id="220" num="1" /> +<cdparam x="918" y="235" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Channel fromDtoSC" /> -<TGConnectingPoint num="0" id="165" /> +<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> +<infoparam name="TGComponent" value="Event receive" /> +<TGConnectingPoint num="0" id="182" /> <extraparam> -<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1039,16 +1067,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="168" > -<father id="183" num="10" /> -<cdparam x="521" y="247" /> +<SUBCOMPONENT type="1203" id="185" > +<father id="220" num="2" /> +<cdparam x="918" y="278" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Channel fromSCtoD" /> -<TGConnectingPoint num="0" id="167" /> +<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> +<infoparam name="TGComponent" value="Channel fromPtoT" /> +<TGConnectingPoint num="0" id="184" /> <extraparam> -<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1056,16 +1084,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="170" > -<father id="183" num="11" /> -<cdparam x="543" y="321" /> +<SUBCOMPONENT type="1203" id="187" > +<father id="220" num="3" /> +<cdparam x="918" y="317" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" /> -<TGConnectingPoint num="0" id="169" /> +<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> +<infoparam name="TGComponent" value="Channel fromTtoP" /> +<TGConnectingPoint num="0" id="186" /> <extraparam> -<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1073,16 +1101,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="172" > -<father id="183" num="12" /> -<cdparam x="580" y="84" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="189" > +<father id="220" num="4" /> +<cdparam x="921" y="352" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Event reset, pTS, end" /> -<TGConnectingPoint num="0" id="171" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Request start_TCP_IP" /> +<TGConnectingPoint num="0" id="188" /> <extraparam> -<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1090,16 +1118,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="174" > -<father id="183" num="13" /> -<cdparam x="721" y="111" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="191" > +<father id="220" num="5" /> +<cdparam x="921" y="443" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" /> -<infoparam name="TGComponent" value="Event send" /> -<TGConnectingPoint num="0" id="173" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Event send_TCP" /> +<TGConnectingPoint num="0" id="190" /> <extraparam> -<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1107,35 +1135,33 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1202" id="210" > -<father id="238" num="2" /> -<cdparam x="565" y="416" /> -<sizeparam width="240" height="145" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="193" > +<father id="220" num="6" /> +<cdparam x="921" y="416" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" /> -<infoparam name="TGComponent" value="Application" /> -<TGConnectingPoint num="0" id="202" /> -<TGConnectingPoint num="1" id="203" /> -<TGConnectingPoint num="2" id="204" /> -<TGConnectingPoint num="3" id="205" /> -<TGConnectingPoint num="4" id="206" /> -<TGConnectingPoint num="5" id="207" /> -<TGConnectingPoint num="6" id="208" /> -<TGConnectingPoint num="7" id="209" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Event open, abort, close" /> +<TGConnectingPoint num="0" id="192" /> <extraparam> -<Data isAttacker="No" Operation="" /> +<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Type type="0" typeOther="" /> +<Type type="0" typeOther="" /> +<Type type="0" typeOther="" /> +<Type type="0" typeOther="" /> +<Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="185" > -<father id="210" num="0" /> -<cdparam x="748" y="548" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="195" > +<father id="220" num="7" /> +<cdparam x="921" y="387" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" /> -<infoparam name="Primitive port" value="Event opened" /> -<TGConnectingPoint num="0" id="184" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Channel fromTtoA" /> +<TGConnectingPoint num="0" id="194" /> <extraparam> -<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1143,16 +1169,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="187" > -<father id="210" num="1" /> -<cdparam x="697" y="403" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="197" > +<father id="220" num="8" /> +<cdparam x="959" y="474" /> +<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" /> -<infoparam name="Primitive port" value="Event connectionOpened" /> -<TGConnectingPoint num="0" id="186" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Channel fromAtoT" /> +<TGConnectingPoint num="0" id="196" /> <extraparam> -<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1160,16 +1186,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="189" > -<father id="210" num="2" /> -<cdparam x="659" y="406" /> +<SUBCOMPONENT type="1203" id="199" > +<father id="220" num="9" /> +<cdparam x="921" y="466" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> -<infoparam name="TGComponent" value="Request start_Application" /> -<TGConnectingPoint num="0" id="188" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Event receive_Application" /> +<TGConnectingPoint num="0" id="198" /> <extraparam> -<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1177,16 +1203,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="191" > -<father id="210" num="3" /> -<cdparam x="795" y="542" /> +<SUBCOMPONENT type="1203" id="201" > +<father id="220" num="10" /> +<cdparam x="1157" y="370" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> -<infoparam name="TGComponent" value="Channel fromAtoT" /> -<TGConnectingPoint num="0" id="190" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Event timeOut" /> +<TGConnectingPoint num="0" id="200" /> <extraparam> -<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1194,16 +1220,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="193" > -<father id="210" num="4" /> -<cdparam x="795" y="509" /> +<SUBCOMPONENT type="1203" id="203" > +<father id="220" num="11" /> +<cdparam x="1157" y="405" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> -<infoparam name="TGComponent" value="Event receive_Application" /> -<TGConnectingPoint num="0" id="192" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Request req_Timer" /> +<TGConnectingPoint num="0" id="202" /> <extraparam> -<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1211,16 +1237,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="195" > -<father id="210" num="5" /> -<cdparam x="795" y="448" /> +<SUBCOMPONENT type="1203" id="205" > +<father id="220" num="12" /> +<cdparam x="1157" y="198" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> -<infoparam name="TGComponent" value="Event open, abort, close" /> -<TGConnectingPoint num="0" id="194" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Channel temp" /> +<TGConnectingPoint num="0" id="204" /> <extraparam> -<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1228,16 +1254,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="197" > -<father id="210" num="6" /> -<cdparam x="795" y="481" /> +<SUBCOMPONENT type="1203" id="207" > +<father id="220" num="13" /> +<cdparam x="1157" y="266" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> -<infoparam name="TGComponent" value="Event send_TCP" /> -<TGConnectingPoint num="0" id="196" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Channel temp" /> +<TGConnectingPoint num="0" id="206" /> <extraparam> -<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1245,16 +1271,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="199" > -<father id="210" num="7" /> -<cdparam x="795" y="419" /> +<SUBCOMPONENT type="1203" id="209" > +<father id="220" num="14" /> +<cdparam x="1157" y="444" /> <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> -<infoparam name="TGComponent" value="Channel fromTtoA" /> -<TGConnectingPoint num="0" id="198" /> +<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" /> +<infoparam name="TGComponent" value="Event stop" /> +<TGConnectingPoint num="0" id="208" /> <extraparam> -<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1262,16 +1288,16 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="201" > -<father id="210" num="8" /> -<cdparam x="741" y="406" /> -<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<SUBCOMPONENT type="1203" id="211" > +<father id="220" num="15" /> +<cdparam x="1012" y="471" /> +<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" /> -<infoparam name="TGComponent" value="Request start_TCP_IP" /> -<TGConnectingPoint num="0" id="200" /> +<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" /> +<infoparam name="Primitive port" value="Event opened" /> +<TGConnectingPoint num="0" id="210" /> <extraparam> -<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> +<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> <Type type="0" typeOther="" /> @@ -1279,32 +1305,6 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1201" id="229" > -<father id="238" num="3" /> -<cdparam x="521" y="369" /> -<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" /> -<infoparam name="Composite port" value="" /> -<TGConnectingPoint num="0" id="211" /> -<TGConnectingPoint num="1" id="212" /> -<TGConnectingPoint num="2" id="213" /> -<TGConnectingPoint num="3" id="214" /> -<TGConnectingPoint num="4" id="215" /> -<TGConnectingPoint num="5" id="216" /> -<TGConnectingPoint num="6" id="217" /> -<TGConnectingPoint num="7" id="218" /> -<TGConnectingPoint num="8" id="219" /> -<TGConnectingPoint num="9" id="220" /> -<TGConnectingPoint num="10" id="221" /> -<TGConnectingPoint num="11" id="222" /> -<TGConnectingPoint num="12" id="223" /> -<TGConnectingPoint num="13" id="224" /> -<TGConnectingPoint num="14" id="225" /> -<TGConnectingPoint num="15" id="226" /> -<TGConnectingPoint num="16" id="227" /> -<TGConnectingPoint num="17" id="228" /> -</SUBCOMPONENT> </TMLComponentTaskDiagramPanel> @@ -6706,11 +6706,11 @@ the smart card and the terminal </COMPONENT> <SUBCOMPONENT type="1101" id="1484" > <father id="1545" num="0" /> -<cdparam x="152" y="154" /> -<sizeparam width="163" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="286" y="304" /> +<sizeparam width="109" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" /> -<infoparam name="TGComponent" value="AppC::InterfaceDevice" /> +<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" /> +<infoparam name="TGComponent" value="AppC::Timer" /> <TGConnectingPoint num="0" id="1476" /> <TGConnectingPoint num="1" id="1477" /> <TGConnectingPoint num="2" id="1478" /> @@ -6720,16 +6720,16 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1482" /> <TGConnectingPoint num="7" id="1483" /> <extraparam> -<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> +<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1493" > <father id="1545" num="1" /> -<cdparam x="351" y="153" /> -<sizeparam width="136" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="350" y="234" /> +<sizeparam width="139" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" /> -<infoparam name="TGComponent" value="AppC::SmartCard" /> +<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" /> +<infoparam name="TGComponent" value="AppC::Application" /> <TGConnectingPoint num="0" id="1485" /> <TGConnectingPoint num="1" id="1486" /> <TGConnectingPoint num="2" id="1487" /> @@ -6739,7 +6739,7 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1491" /> <TGConnectingPoint num="7" id="1492" /> <extraparam> -<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> +<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1502" > @@ -6763,11 +6763,11 @@ the smart card and the terminal </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1511" > <father id="1545" num="3" /> -<cdparam x="350" y="234" /> -<sizeparam width="139" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="351" y="153" /> +<sizeparam width="136" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" /> -<infoparam name="TGComponent" value="AppC::Application" /> +<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" /> +<infoparam name="TGComponent" value="AppC::SmartCard" /> <TGConnectingPoint num="0" id="1503" /> <TGConnectingPoint num="1" id="1504" /> <TGConnectingPoint num="2" id="1505" /> @@ -6777,16 +6777,16 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1509" /> <TGConnectingPoint num="7" id="1510" /> <extraparam> -<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> +<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1520" > <father id="1545" num="4" /> -<cdparam x="286" y="304" /> -<sizeparam width="109" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="152" y="154" /> +<sizeparam width="163" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" /> -<infoparam name="TGComponent" value="AppC::Timer" /> +<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" /> +<infoparam name="TGComponent" value="AppC::InterfaceDevice" /> <TGConnectingPoint num="0" id="1512" /> <TGConnectingPoint num="1" id="1513" /> <TGConnectingPoint num="2" id="1514" /> @@ -6796,7 +6796,7 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1518" /> <TGConnectingPoint num="7" id="1519" /> <extraparam> -<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> +<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> @@ -6998,11 +6998,11 @@ the smart card and the terminal </COMPONENT> <SUBCOMPONENT type="1101" id="1640" > <father id="1683" num="0" /> -<cdparam x="272" y="94" /> -<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="387" y="123" /> +<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="164" minY="0" maxY="121" /> -<infoparam name="TGComponent" value="AppC::TCPIP" /> +<cdrectangleparam minX="0" maxX="136" minY="0" maxY="124" /> +<infoparam name="TGComponent" value="AppC::SmartCard" /> <TGConnectingPoint num="0" id="1632" /> <TGConnectingPoint num="1" id="1633" /> <TGConnectingPoint num="2" id="1634" /> @@ -7012,7 +7012,7 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1638" /> <TGConnectingPoint num="7" id="1639" /> <extraparam> -<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> +<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1649" > @@ -7036,11 +7036,11 @@ the smart card and the terminal </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1658" > <father id="1683" num="2" /> -<cdparam x="387" y="123" /> -<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="272" y="94" /> +<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="136" minY="0" maxY="124" /> -<infoparam name="TGComponent" value="AppC::SmartCard" /> +<cdrectangleparam minX="0" maxX="164" minY="0" maxY="121" /> +<infoparam name="TGComponent" value="AppC::TCPIP" /> <TGConnectingPoint num="0" id="1650" /> <TGConnectingPoint num="1" id="1651" /> <TGConnectingPoint num="2" id="1652" /> @@ -7050,7 +7050,7 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1656" /> <TGConnectingPoint num="7" id="1657" /> <extraparam> -<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> +<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> @@ -7386,11 +7386,11 @@ the smart card and the terminal </COMPONENT> <SUBCOMPONENT type="1101" id="1848" > <father id="1891" num="0" /> -<cdparam x="270" y="75" /> -<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="340" y="180" /> +<sizeparam width="108" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="174" minY="0" maxY="161" /> -<infoparam name="TGComponent" value="AppC::Application" /> +<cdrectangleparam minX="0" maxX="205" minY="0" maxY="161" /> +<infoparam name="TGComponent" value="AppC::TCPIP" /> <TGConnectingPoint num="0" id="1840" /> <TGConnectingPoint num="1" id="1841" /> <TGConnectingPoint num="2" id="1842" /> @@ -7400,7 +7400,7 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1846" /> <TGConnectingPoint num="7" id="1847" /> <extraparam> -<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" /> +<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1857" > @@ -7424,11 +7424,11 @@ the smart card and the terminal </SUBCOMPONENT> <SUBCOMPONENT type="1101" id="1866" > <father id="1891" num="2" /> -<cdparam x="340" y="180" /> -<sizeparam width="108" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="270" y="75" /> +<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="205" minY="0" maxY="161" /> -<infoparam name="TGComponent" value="AppC::TCPIP" /> +<cdrectangleparam minX="0" maxX="174" minY="0" maxY="161" /> +<infoparam name="TGComponent" value="AppC::Application" /> <TGConnectingPoint num="0" id="1858" /> <TGConnectingPoint num="1" id="1859" /> <TGConnectingPoint num="2" id="1860" /> @@ -7438,7 +7438,7 @@ the smart card and the terminal <TGConnectingPoint num="6" id="1864" /> <TGConnectingPoint num="7" id="1865" /> <extraparam> -<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" /> +<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> diff --git a/modeling/DIPLODOCUS/ZigBeeTutorial.xml b/modeling/DIPLODOCUS/ZigBeeTutorial.xml index 3833362df501f6dc3e7a31b7859bd87f59faf813..aa947ac67abf1028e62af993de731e7444575d48 100644 --- a/modeling/DIPLODOCUS/ZigBeeTutorial.xml +++ b/modeling/DIPLODOCUS/ZigBeeTutorial.xml @@ -171,7 +171,7 @@ <cdparam x="1409" y="343" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1397" y="380" id="685" /> +<P1 x="1410" y="393" id="685" /> <P2 x="1446" y="258" id="125" /> <Point x="1446" y="393" /> <AutomaticDrawing data="true" /> @@ -188,16 +188,16 @@ <cdparam x="1383" y="381" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1364" y="380" id="742" /> -<P2 x="1397" y="406" id="690" /> +<P1 x="1377" y="393" id="742" /> +<P2 x="1384" y="393" id="690" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="45" > <cdparam x="1507" y="228" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1494" y="263" id="596" /> -<P2 x="1535" y="237" id="648" /> +<P1 x="1507" y="250" id="596" /> +<P2 x="1522" y="250" id="648" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="46" > @@ -205,23 +205,23 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="1463" y="250" id="120" /> -<P2 x="1494" y="237" id="591" /> +<P2 x="1481" y="250" id="591" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="47" > <cdparam x="1507" y="420" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1494" y="423" id="615" /> -<P2 x="1536" y="397" id="665" /> +<P1 x="1507" y="410" id="615" /> +<P2 x="1523" y="410" id="665" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="50" > <cdparam x="1409" y="471" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1397" y="510" id="704" /> -<P2 x="1494" y="397" id="610" /> +<P1 x="1410" y="523" id="704" /> +<P2 x="1481" y="410" id="610" /> <Point x="1432" y="523" /> <Point x="1432" y="410" /> <AutomaticDrawing data="true" /> @@ -246,24 +246,24 @@ <cdparam x="1379" y="511" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1362" y="510" id="757" /> -<P2 x="1397" y="536" id="709" /> +<P1 x="1375" y="523" id="757" /> +<P2 x="1384" y="523" id="709" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="52" > <cdparam x="1507" y="344" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1494" y="367" id="634" /> -<P2 x="1536" y="341" id="661" /> +<P1 x="1507" y="354" id="634" /> +<P2 x="1523" y="354" id="661" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="55" > <cdparam x="1413" y="226" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1400" y="249" id="800" /> -<P2 x="1494" y="341" id="629" /> +<P1 x="1413" y="262" id="800" /> +<P2 x="1481" y="354" id="629" /> <Point x="1430" y="262" /> <Point x="1430" y="354" /> <AutomaticDrawing data="true" /> @@ -288,15 +288,15 @@ <cdparam x="1388" y="262" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1365" y="249" id="872" /> -<P2 x="1400" y="275" id="805" /> +<P1 x="1378" y="262" id="872" /> +<P2 x="1387" y="262" id="805" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="58" > <cdparam x="1413" y="97" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1400" y="111" id="887" /> +<P1 x="1413" y="124" id="887" /> <P2 x="1446" y="241" id="123" /> <Point x="1446" y="124" /> <AutomaticDrawing data="true" /> @@ -313,16 +313,16 @@ <cdparam x="1384" y="124" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1364" y="111" id="857" /> -<P2 x="1400" y="137" id="892" /> +<P1 x="1377" y="124" id="857" /> +<P2 x="1387" y="124" id="892" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="60" > <cdparam x="1208" y="347" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1186" y="401" id="777" /> -<P2 x="1220" y="375" id="744" /> +<P1 x="1199" y="388" id="777" /> +<P2 x="1207" y="388" id="744" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="62" > @@ -330,7 +330,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="1133" y="251" id="141" /> -<P2 x="1186" y="375" id="772" /> +<P2 x="1173" y="388" id="772" /> <Point x="1133" y="388" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="61" > @@ -346,7 +346,7 @@ <cdparam x="1105" y="254" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1046" y="230" id="563" /> +<P1 x="1059" y="243" id="563" /> <P2 x="1117" y="243" id="136" /> <AutomaticDrawing data="true" /> </CONNECTOR> @@ -354,16 +354,16 @@ <cdparam x="1068" y="239" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1010" y="230" id="495" /> -<P2 x="1046" y="256" id="568" /> +<P1 x="1023" y="243" id="495" /> +<P2 x="1033" y="243" id="568" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="67" > <cdparam x="1105" y="374" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1046" y="363" id="455" /> -<P2 x="1186" y="249" id="838" /> +<P1 x="1059" y="376" id="455" /> +<P2 x="1173" y="262" id="838" /> <Point x="1103" y="376" /> <Point x="1103" y="262" /> <AutomaticDrawing data="true" /> @@ -388,24 +388,24 @@ <cdparam x="1065" y="372" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1008" y="363" id="510" /> -<P2 x="1046" y="389" id="460" /> +<P1 x="1021" y="376" id="510" /> +<P2 x="1033" y="376" id="460" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="69" > <cdparam x="1208" y="499" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1186" y="513" id="728" /> -<P2 x="1224" y="487" id="759" /> +<P1 x="1199" y="500" id="728" /> +<P2 x="1211" y="500" id="759" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="72" > <cdparam x="1105" y="408" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1046" y="395" id="474" /> -<P2 x="1186" y="487" id="723" /> +<P1 x="1059" y="408" id="474" /> +<P2 x="1173" y="500" id="723" /> <Point x="1101" y="408" /> <Point x="1101" y="500" /> <AutomaticDrawing data="true" /> @@ -430,160 +430,160 @@ <cdparam x="1065" y="404" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1008" y="395" id="514" /> -<P2 x="1046" y="421" id="479" /> +<P1 x="1021" y="408" id="514" /> +<P2 x="1033" y="408" id="479" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="74" > <cdparam x="907" y="352" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="838" y="400" id="549" /> -<P2 x="874" y="374" id="508" /> +<P1 x="851" y="387" id="549" /> +<P2 x="861" y="387" id="508" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="75" > <cdparam x="867" y="334" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="799" y="374" id="427" /> -<P2 x="838" y="374" id="544" /> +<P1 x="812" y="387" id="427" /> +<P2 x="825" y="387" id="544" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="76" > <cdparam x="840" y="380" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="756" y="374" id="393" /> -<P2 x="799" y="400" id="432" /> +<P1 x="769" y="387" id="393" /> +<P2 x="786" y="387" id="432" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="77" > <cdparam x="915" y="228" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="838" y="274" id="530" /> -<P2 x="876" y="248" id="493" /> +<P1 x="851" y="261" id="530" /> +<P2 x="863" y="261" id="493" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="78" > <cdparam x="867" y="229" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="799" y="248" id="408" /> -<P2 x="838" y="248" id="525" /> +<P1 x="812" y="261" id="408" /> +<P2 x="825" y="261" id="525" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="79" > <cdparam x="829" y="257" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="754" y="248" id="378" /> -<P2 x="799" y="274" id="413" /> +<P1 x="767" y="261" id="378" /> +<P2 x="786" y="261" id="413" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="80" > <cdparam x="669" y="349" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="555" y="399" id="345" /> -<P2 x="597" y="373" id="395" /> +<P1 x="568" y="386" id="345" /> +<P2 x="584" y="386" id="395" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="81" > <cdparam x="586" y="350" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="516" y="373" id="225" /> -<P2 x="555" y="373" id="340" /> +<P1 x="529" y="386" id="225" /> +<P2 x="542" y="386" id="340" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="82" > <cdparam x="550" y="379" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="470" y="373" id="278" /> -<P2 x="516" y="399" id="230" /> +<P1 x="483" y="386" id="278" /> +<P2 x="503" y="386" id="230" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="83" > <cdparam x="687" y="234" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="555" y="282" id="364" /> -<P2 x="598" y="256" id="380" /> +<P1 x="568" y="269" id="364" /> +<P2 x="585" y="269" id="380" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="84" > <cdparam x="586" y="233" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="516" y="256" id="244" /> -<P2 x="555" y="256" id="359" /> +<P1 x="529" y="269" id="244" /> +<P2 x="542" y="269" id="359" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="85" > <cdparam x="549" y="263" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="473" y="256" id="263" /> -<P2 x="516" y="282" id="249" /> +<P1 x="486" y="269" id="263" /> +<P2 x="503" y="269" id="249" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="86" > <cdparam x="364" y="356" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="275" y="394" id="317" /> -<P2 x="316" y="368" id="280" /> +<P1 x="288" y="381" id="317" /> +<P2 x="303" y="381" id="280" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="87" > <cdparam x="321" y="350" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="231" y="368" id="197" /> -<P2 x="275" y="368" id="312" /> +<P1 x="244" y="381" id="197" /> +<P2 x="262" y="381" id="312" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="88" > <cdparam x="200" y="373" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="187" y="368" id="184" /> -<P2 x="231" y="394" id="202" /> +<P1 x="200" y="381" id="184" /> +<P2 x="218" y="381" id="202" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="89" > <cdparam x="356" y="223" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="275" y="271" id="298" /> -<P2 x="317" y="245" id="265" /> +<P1 x="288" y="258" id="298" /> +<P2 x="304" y="258" id="265" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="90" > <cdparam x="314" y="221" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="231" y="245" id="152" /> -<P2 x="275" y="245" id="293" /> +<P1 x="244" y="258" id="152" /> +<P2 x="262" y="258" id="293" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="91" > <cdparam x="175" y="251" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="154" y="245" id="171" /> -<P2 x="231" y="271" id="157" /> +<P1 x="167" y="258" id="171" /> +<P2 x="218" y="258" id="157" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="92" > <cdparam x="1792" y="148" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1186" y="275" id="843" /> -<P2 x="1222" y="249" id="874" /> +<P1 x="1199" y="262" id="843" /> +<P2 x="1209" y="262" id="874" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="94" > @@ -591,7 +591,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="1133" y="234" id="139" /> -<P2 x="1186" y="110" id="819" /> +<P2 x="1173" y="123" id="819" /> <Point x="1133" y="123" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="93" > @@ -607,8 +607,8 @@ <cdparam x="1792" y="8" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> -<P1 x="1186" y="136" id="824" /> -<P2 x="1220" y="110" id="859" /> +<P1 x="1199" y="123" id="824" /> +<P2 x="1207" y="123" id="859" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="96" > @@ -616,7 +616,7 @@ <sizeparam width="10" height="10" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="1657" y="318" id="663" /> -<P2 x="1562" y="278" id="650" /> +<P2 x="1562" y="304" id="650" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="97" > @@ -624,7 +624,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="1333" y="181" id="876" /> -<P2 x="1257" y="145" id="861" /> +<P2 x="1257" y="171" id="861" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="98" > @@ -632,7 +632,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="1335" y="458" id="761" /> -<P2 x="1249" y="424" id="746" /> +<P2 x="1249" y="450" id="746" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="99" > @@ -640,7 +640,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="989" y="321" id="512" /> -<P2 x="912" y="285" id="497" /> +<P2 x="912" y="311" id="497" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="100" > @@ -648,7 +648,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="729" y="327" id="397" /> -<P2 x="639" y="286" id="382" /> +<P2 x="639" y="312" id="382" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="101" > @@ -656,7 +656,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="442" y="319" id="282" /> -<P2 x="350" y="277" id="267" /> +<P2 x="350" y="303" id="267" /> <AutomaticDrawing data="true" /> </CONNECTOR> <CONNECTOR type="126" id="102" > @@ -664,12 +664,12 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="Connector between ports" /> <P1 x="108" y="320" id="186" /> -<P2 x="53" y="276" id="173" /> +<P2 x="53" y="302" id="173" /> <AutomaticDrawing data="true" /> </CONNECTOR> <COMPONENT type="301" id="119" > <cdparam x="18" y="45" /> -<sizeparam width="237" height="51" minWidth="60" minHeight="23" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="224" height="51" minWidth="60" minHeight="23" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="1702" minY="0" maxY="563" /> <infoparam name="UML Note" value="In this model THE PARAMETER SIZE @@ -3837,8 +3837,8 @@ processing tasks <TMLActivityDiagramPanel name="F_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" > <COMPONENT type="1010" id="1147" > -<cdparam x="321" y="132" /> -<sizeparam width="116" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="324" y="132" /> +<sizeparam width="110" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> @@ -3861,8 +3861,8 @@ processing tasks </COMPONENT> <COMPONENT type="1008" id="1152" > -<cdparam x="318" y="278" /> -<sizeparam width="122" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="322" y="278" /> +<sizeparam width="114" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> @@ -3876,8 +3876,8 @@ processing tasks </COMPONENT> <COMPONENT type="1007" id="1155" > -<cdparam x="331" y="204" /> -<sizeparam width="97" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="333" y="204" /> +<sizeparam width="93" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> @@ -6405,8 +6405,8 @@ POLLING <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="3000" y="920" id="2508" /> -<P2 x="3000" y="1304" id="2492" /> +<P1 x="12000" y="3680" id="2508" /> +<P2 x="12000" y="5216" id="2492" /> <AutomaticDrawing data="true" /> </CONNECTOR> @@ -7064,8 +7064,8 @@ POLLING <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="2352" y="632" id="2878" /> -<P2 x="2352" y="1016" id="2862" /> +<P1 x="9408" y="2528" id="2878" /> +<P2 x="9408" y="4064" id="2862" /> <AutomaticDrawing data="true" /> </CONNECTOR> diff --git a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java index af967cf24ad2782e261ceeced1b4e399c459cb6c..d10523ab75c19d93fec12d79efc1e5bf5ca53f10 100644 --- a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java +++ b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java @@ -406,7 +406,8 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator final String channelTypeName = namesGen.channelTypeName(channel); final String channelInstName = namesGen.channelInstanceName(channel); - declaration += channelTypeName + "* " + channelInstName + " = new " + channelTypeName + "(" + channel.getID() + ",\"" + namesGen.channelName(channel) + "\"," + channel.getSize() + ","; + declaration += channelTypeName + "* " + channelInstName + " = new " + channelTypeName + "(" + channel.getID() + ",\"" + + namesGen.channelName(channel) + "\"," + channel.getSize() + ","; final String param; diff --git a/src/main/java/ui/tmlcompd/TMLCFork.java b/src/main/java/ui/tmlcompd/TMLCFork.java index 976f0681128168a0dfe59585e2f511338fd9bbfd..14e71561ef039e115d6bddc6970e60ab0e2d5c61 100755 --- a/src/main/java/ui/tmlcompd/TMLCFork.java +++ b/src/main/java/ui/tmlcompd/TMLCFork.java @@ -44,6 +44,7 @@ package ui.tmlcompd; import myutil.GraphicLib; import ui.*; import ui.util.IconManager; +import ui.window.JDialogMultiString; import javax.swing.*; import java.awt.*; @@ -137,7 +138,44 @@ public class TMLCFork extends TMLCChannelFacility implements WithAttributes { public boolean editOndoubleClick(JFrame frame) { if (isChannel) { String oldValue = value; - String s = (String) JOptionPane.showInputDialog(frame, "Nb of samples (positive int): ", + String[] labels = new String[1]; + labels[0] = "Nb of samples (positive int): "; + String[] values = new String[1]; + values[0] = "" + value; + String[] keywords = new String[1]; + keywords[0] = "fork" ; + + + JDialogMultiString jdms = new JDialogMultiString(getTDiagramPanel().getMainGUI().getFrame(), "Fork attribute", 1, + labels, values, keywords, getTDiagramPanel().getMainGUI().getHelpManager(), getTDiagramPanel().getMainGUI()); + jdms.setSize(500, 450); + GraphicLib.centerOnParent(jdms, 500, 450); + jdms.setVisible(true); + + if (jdms.hasBeenSet()) { + String tmp = jdms.getString(0).trim(); + try { + int val = Integer.decode(tmp); + if (val > 0) { + value = tmp; + } else { + JOptionPane.showMessageDialog(frame, + "Could not change the number of samples: the number must be >0", + "Error", + JOptionPane.INFORMATION_MESSAGE); + return false; + } + } catch (Exception e) { + JOptionPane.showMessageDialog(frame, + "Could not change the number of samples: " + tmp + " is not a number", + "Error", + JOptionPane.INFORMATION_MESSAGE); + return false; + } + return true; + } + + /*String s = (String) JOptionPane.showInputDialog(frame, "Nb of samples (positive int): ", "Nb of samples per round", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101, null, getValue()); if ((s != null) && (s.length() > 0) && (!s.equals(oldValue))) { @@ -162,7 +200,7 @@ public class TMLCFork extends TMLCChannelFacility implements WithAttributes { } } - return true; + return true;*/ } else { JOptionPane.showMessageDialog(frame, "Only correctly connected fork can be configured", @@ -170,6 +208,7 @@ public class TMLCFork extends TMLCChannelFacility implements WithAttributes { JOptionPane.INFORMATION_MESSAGE); return true; } + return true; } diff --git a/src/main/java/ui/window/JDialogCPUNode.java b/src/main/java/ui/window/JDialogCPUNode.java index ed07ab649788e48498e37303cd381fcf7ec2e0ff..81cb6436213abfc1ef208eeb8c81138fcc4e1dd6 100644 --- a/src/main/java/ui/window/JDialogCPUNode.java +++ b/src/main/java/ui/window/JDialogCPUNode.java @@ -107,9 +107,9 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { private java.util.List<SimulationTransaction> transactions; //issue 183 - List<JButton> buttons; - List<HelpEntry> helpEntries; - TGComponentHelp cpuHelp; + private List<JButton> buttons; + private List<HelpEntry> helpEntries; + private TGComponentHelp cpuHelp; /* Creates new form */ public JDialogCPUNode(MainGUI _mgui, Frame _frame, String _title, TMLArchiCPUNode _node, ArchUnitMEC _MECType, diff --git a/src/main/java/ui/window/JDialogMultiString.java b/src/main/java/ui/window/JDialogMultiString.java index b1ae6b6284198921290f9757e1dc9a7cc5f4998c..81eb4a6e2db36e316504e56ba40ab7c8e768fd70 100644 --- a/src/main/java/ui/window/JDialogMultiString.java +++ b/src/main/java/ui/window/JDialogMultiString.java @@ -38,23 +38,20 @@ package ui.window; -import java.awt.Container; -import java.awt.Font; -import java.awt.Frame; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; +import help.HelpEntry; +import help.HelpManager; +import ui.MainGUI; +import ui.util.IconManager; + +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTextField; +import javax.swing.*; /** * Class JDialogMultiString @@ -69,6 +66,14 @@ public class JDialogMultiString extends JDialogBase implements ActionListener { private String[] labels; private String[] values; + // Help + private String[] helpKeywords; + private HelpManager hm; + private List<JButton> buttons; + private List<HelpEntry> helpEntries; + private TGComponentHelp cpuHelp; + private MainGUI mgui; + private int nbString; private boolean set = false; @@ -103,6 +108,26 @@ public class JDialogMultiString extends JDialogBase implements ActionListener { pack(); } + public JDialogMultiString(Frame f, String title, int _nbString, String[] _labels, String[] _values, + String[] _helpKeywords, HelpManager _hm, MainGUI _mgui) { + + super(f, title, true); + + nbString = _nbString; + labels = _labels; + values = _values; + helpKeywords = _helpKeywords; + hm = _hm; + mgui = _mgui; + + + texts = new JTextField[nbString]; + + initComponents(); + // myInitComponents(); + pack(); + } + public JDialogMultiString(Frame f, String title, int _nbString, String[] _labels, String[] _values, List<String[]> _possibleValues) { super(f, title, true); @@ -119,10 +144,32 @@ public class JDialogMultiString extends JDialogBase implements ActionListener { pack(); } + + // private void myInitComponents() { // } private void initComponents() { + + if (hm != null) { + if(!hm.loadEntries()) { + hm = null; + } else { + buttons = new ArrayList<>(); + helpEntries = new ArrayList<>(); + for(int i=0; i<helpKeywords.length; i++) { + HelpEntry he = hm.getHelpEntryWithHTMLFile(helpKeywords[i]); + helpEntries.add(he); + Icon myIcon = IconManager.imgic32; + JButton but = new JButton(myIcon); + setButton(but); + buttonClick(but, he); + buttons.add(but); + } + } + } + + inserts = new JButton[labels.length]; helps = new HashMap<>(); @@ -140,7 +187,7 @@ public class JDialogMultiString extends JDialogBase implements ActionListener { panel1 = new JPanel(); panel1.setLayout(gridbag1); - panel1.setBorder(new javax.swing.border.TitledBorder("Properties")); + panel1.setBorder(new javax.swing.border.TitledBorder("Values")); //panel1.setPreferredSize(new Dimension(600, 300)); @@ -148,7 +195,7 @@ public class JDialogMultiString extends JDialogBase implements ActionListener { c1.weighty = 1.0; c1.weightx = 1.0; c1.gridwidth = GridBagConstraints.REMAINDER; //end row - c1.fill = GridBagConstraints.BOTH; + c1.fill = GridBagConstraints.HORIZONTAL; c1.gridheight = 1; panel1.add(new JLabel(" "), c1); @@ -180,9 +227,15 @@ public class JDialogMultiString extends JDialogBase implements ActionListener { } } } - c1.gridwidth = GridBagConstraints.REMAINDER; //end row - texts[i] = new JTextField(values[i], 15); - panel1.add(texts[i], c1); + if ((helpKeywords != null) && (helpKeywords[i] != null)) { + texts[i] = new JTextField(values[i], 15); + panel1.add(texts[i], c1); + addHelpButton(i, panel1, c1); + } else { + c1.gridwidth = GridBagConstraints.REMAINDER; //end row + texts[i] = new JTextField(values[i], 15); + panel1.add(texts[i], c1); + } } @@ -202,6 +255,43 @@ public class JDialogMultiString extends JDialogBase implements ActionListener { initButtons(c0, c, this); } + private void setButton(JButton button) { + button.setOpaque(false); + button.setFocusPainted(false); + button.setContentAreaFilled(false); + button.setBorderPainted(false); + button.setPreferredSize(new Dimension(20,20)); + } + + private void buttonClick(JButton but, HelpEntry he) { + but.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if(cpuHelp == null) { + cpuHelp = new TGComponentHelp(mgui, he); + cpuHelp.setLocationHelpWindow(but); + } else { + if(!cpuHelp.isVisible()) { + cpuHelp = new TGComponentHelp(mgui, he); + cpuHelp.setLocationHelpWindow(but); + } else{ + cpuHelp.setVisible(false); + } + } + } + }); + } + + private void addHelpButton(int index, JPanel panel, GridBagConstraints c) { + //issue 183 + c.weighty = 0.5; + c.weightx = 0.5; + c.gridwidth = GridBagConstraints.REMAINDER; + if (buttons != null) + panel.add(buttons.get(index), c); + } + + @Override public void actionPerformed(ActionEvent evt) { String command = evt.getActionCommand(); diff --git a/src/main/java/ui/window/TGComponentHelp.java b/src/main/java/ui/window/TGComponentHelp.java index 5124ea9a9d15cc95da0703fbab6c8419158b5449..9bcae860af66a05c819be97f723bd56cc11b1209 100644 --- a/src/main/java/ui/window/TGComponentHelp.java +++ b/src/main/java/ui/window/TGComponentHelp.java @@ -42,8 +42,11 @@ public class TGComponentHelp extends JDialog implements ActionListener { helpPanel.setLayout(new BorderLayout()); pane = new JEditorPane("text/html;charset=UTF-8", ""); pane.setEditable(false); - pane.setText(helpEntry.getHTMLContent()); - + if ((helpEntry != null) && (helpEntry.getHTMLContent() != null)) { + pane.setText(helpEntry.getHTMLContent()); + } else { + pane.setText("No Help available"); + } JScrollPane jsp = new JScrollPane(pane); jsp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); helpPanel.add(jsp, BorderLayout.CENTER); @@ -58,6 +61,7 @@ public class TGComponentHelp extends JDialog implements ActionListener { } helpBut.addActionListener(this); + helpBut.setEnabled(helpEntry != null); JPanel jp = new JPanel(); jp.add(helpBut);