diff --git a/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml b/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml
index b9aca9c07c7c93bd4b7936d3043277841163fb37..735fb8b266bc5b77b7f42a7f07a5a2357c893aa3 100644
--- a/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="4" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="2" LAST_SELECTED_SUB_TAB="0">
<Modeling type="AttackTree" nameTab="Attack Trees" >
<AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -347,22 +347,22 @@
<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="332" />
-<P2 x="534" y="395" id="379" />
+<P1 x="556" y="347" id="332" />
+<P2 x="547" y="382" id="379" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="189" >
<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="226" />
-<P2 x="761" y="548" id="347" />
+<P1 x="1025" y="497" id="226" />
+<P2 x="761" y="574" id="347" />
<Point x="887" y="577" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="188" >
<father id="189" num="0" />
<cdparam x="887" y="577" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="1744" minY="0" maxY="587" />
<infoparam name="point " value="null" />
@@ -373,15 +373,15 @@
<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="349" />
-<P2 x="693" y="321" id="310" />
+<P2 x="693" y="347" id="310" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="191" >
<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="374" />
-<P2 x="453" y="322" id="412" />
+<P1 x="521" y="382" id="374" />
+<P2 x="466" y="335" id="412" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="192" >
@@ -396,16 +396,16 @@
<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="353" />
-<P2 x="969" y="474" id="240" />
+<P1 x="816" y="552" id="353" />
+<P2 x="969" y="495" id="240" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="194" >
<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="355" />
-<P2 x="931" y="466" id="238" />
+<P1 x="816" y="519" id="355" />
+<P2 x="921" y="476" id="238" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="195" >
@@ -413,126 +413,126 @@
<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="750" y="406" id="363" />
-<P2 x="841" y="362" id="268" />
+<P2 x="828" y="375" id="268" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="196" >
<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="841" y="388" id="272" />
-<P2 x="931" y="352" id="248" />
+<P1 x="854" y="375" id="272" />
+<P2 x="921" y="362" id="248" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="197" >
<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="359" />
-<P2 x="931" y="443" id="246" />
+<P1 x="816" y="491" id="359" />
+<P2 x="921" y="453" id="246" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="198" >
<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="357" />
-<P2 x="931" y="416" id="244" />
+<P1 x="816" y="458" id="357" />
+<P2 x="921" y="426" id="244" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="199" >
<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="242" />
-<P2 x="805" y="419" id="361" />
+<P1 x="921" y="397" id="242" />
+<P2 x="816" y="429" id="361" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="200" >
<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="250" />
-<P2 x="734" y="269" id="322" />
+<P1 x="918" y="330" id="250" />
+<P2 x="747" y="282" id="322" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="201" >
<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="320" />
-<P2 x="931" y="278" id="252" />
+<P1 x="747" y="248" id="320" />
+<P2 x="918" y="291" id="252" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="202" >
<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="318" />
-<P2 x="931" y="235" id="254" />
+<P1 x="747" y="203" id="318" />
+<P2 x="918" y="248" id="254" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="203" >
<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="841" y="362" id="267" />
-<P2 x="734" y="301" id="316" />
+<P1 x="828" y="375" id="267" />
+<P2 x="747" y="314" id="316" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="204" >
<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="326" />
-<P2 x="453" y="290" id="406" />
+<P1 x="521" y="303" id="326" />
+<P2 x="466" y="303" id="406" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="205" >
<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="402" />
-<P2 x="534" y="116" id="314" />
+<P1 x="464" y="126" id="402" />
+<P2 x="524" y="126" id="314" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="206" >
<cdparam x="389" y="200" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="453" y="202" id="408" />
-<P2 x="534" y="202" id="328" />
+<P1 x="466" y="215" id="408" />
+<P2 x="521" y="215" id="328" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="207" >
<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="330" />
-<P2 x="453" y="247" id="410" />
+<P1 x="521" y="260" id="330" />
+<P2 x="466" y="260" id="410" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="208" >
<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="404" />
-<P2 x="534" y="156" id="324" />
+<P1 x="466" y="169" id="404" />
+<P2 x="521" y="169" id="324" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="209" >
<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="256" />
-<P2 x="734" y="111" id="336" />
+<P1 x="918" y="198" id="256" />
+<P2 x="747" y="124" id="336" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="210" >
<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="312" />
+<P1 x="630" y="345" id="312" />
<P2 x="669" y="406" id="351" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -540,31 +540,31 @@
<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="290" />
-<P2 x="1167" y="370" id="236" />
+<P1 x="1222" y="378" id="290" />
+<P2 x="1178" y="380" id="236" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="212" >
<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="234" />
-<P2 x="1232" y="403" id="288" />
+<P1 x="1178" y="415" id="234" />
+<P2 x="1222" y="413" id="288" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="215" >
<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="232" />
-<P2 x="1167" y="266" id="230" />
+<P1 x="1178" y="208" id="232" />
+<P2 x="1178" y="276" id="230" />
<Point x="1227" y="207" />
<Point x="1227" y="247" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="213" >
<father id="215" num="0" />
<cdparam x="1227" y="207" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
@@ -572,7 +572,7 @@
<SUBCOMPONENT type="-1" id="214" >
<father id="215" num="1" />
<cdparam x="1227" y="247" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
@@ -582,8 +582,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="228" />
-<P2 x="1232" y="431" id="286" />
+<P1 x="1178" y="454" id="228" />
+<P2 x="1222" y="441" id="286" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1205" id="225" >
@@ -659,7 +659,7 @@
<TGConnectingPoint num="6" id="264" />
<TGConnectingPoint num="7" id="265" />
<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" 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="" />
@@ -983,7 +983,7 @@
<TGConnectingPoint num="6" id="298" />
<TGConnectingPoint num="7" id="299" />
<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
<Attribute access="2" id="x" value="0" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
@@ -1054,7 +1054,7 @@
<TGConnectingPoint num="6" id="344" />
<TGConnectingPoint num="7" id="345" />
<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" 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="" />
@@ -1322,7 +1322,7 @@
<TGConnectingPoint num="6" id="371" />
<TGConnectingPoint num="7" id="372" />
<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="348" >
@@ -1520,7 +1520,7 @@
<TGConnectingPoint num="6" id="422" />
<TGConnectingPoint num="7" id="423" />
<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
<Attribute access="2" id="x" value="0" type="0" typeOther="" />
<Attribute access="2" id="i" value="0" type="0" typeOther="" />
@@ -1654,7 +1654,7 @@
</TMLComponentTaskDiagramPanel>
-<TMLActivityDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<COMPONENT type="1008" id="427" >
<cdparam x="320" y="433" />
<sizeparam width="40" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -2007,7 +2007,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<P1 x="561" y="301" id="500" />
-<P2 x="561" y="366" id="431" />
+<P2 x="561" y="371" id="431" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="513" >
@@ -2024,7 +2024,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="509" >
<father id="513" num="0" />
<cdparam x="228" y="382" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -2032,7 +2032,7 @@
<SUBCOMPONENT type="-1" id="510" >
<father id="513" num="1" />
<cdparam x="228" y="382" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -2040,7 +2040,7 @@
<SUBCOMPONENT type="-1" id="511" >
<father id="513" num="2" />
<cdparam x="286" y="376" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -2048,7 +2048,7 @@
<SUBCOMPONENT type="-1" id="512" >
<father id="513" num="3" />
<cdparam x="285" y="127" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -2058,7 +2058,7 @@
<cdparam x="228" y="57" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to send request" value="null" />
-<P1 x="229" y="73" id="444" />
+<P1 x="229" y="78" id="444" />
<P2 x="228" y="132" id="446" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -2123,7 +2123,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from notified event to choice" value="null" />
<P1 x="659" y="472" id="487" />
-<P2 x="659" y="507" id="439" />
+<P2 x="659" y="512" id="439" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="523" >
@@ -2161,7 +2161,7 @@
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" >
+<TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" zoom="1.0" >
<COMPONENT type="1008" id="529" >
<cdparam x="156" y="424" />
<sizeparam width="68" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4822,7 +4822,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<P1 x="190" y="449" id="528" />
-<P2 x="188" y="476" id="689" />
+<P2 x="188" y="481" id="689" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1278" >
@@ -4830,7 +4830,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="1048" y="795" id="667" />
-<P2 x="1728" y="865" id="589" />
+<P2 x="1728" y="870" id="589" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1279" >
@@ -4838,7 +4838,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="1089" y="954" id="639" />
-<P2 x="1208" y="1010" id="609" />
+<P2 x="1208" y="1015" id="609" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1280" >
@@ -4862,7 +4862,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="504" y="597" id="707" />
-<P2 x="572" y="702" id="621" />
+<P2 x="572" y="707" id="621" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1283" >
@@ -4925,7 +4925,7 @@ On prend b=1 comme exemple
<cdparam x="234" y="47" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for loop" value="null" />
-<P1 x="234" y="42" id="718" />
+<P1 x="234" y="47" id="718" />
<P2 x="235" y="80" id="745" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -4934,7 +4934,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from notified event to choice" value="null" />
<P1 x="374" y="158" id="755" />
-<P2 x="374" y="182" id="697" />
+<P2 x="374" y="187" id="697" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1292" >
@@ -4990,7 +4990,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
<P1 x="289" y="493" id="770" />
-<P2 x="289" y="554" id="713" />
+<P2 x="289" y="559" id="713" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1299" >
@@ -5046,7 +5046,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
<P1 x="464" y="517" id="767" />
-<P2 x="464" y="572" id="705" />
+<P2 x="464" y="577" id="705" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1306" >
@@ -5070,7 +5070,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to select" value="null" />
<P1 x="414" y="207" id="699" />
-<P2 x="464" y="257" id="775" />
+<P2 x="464" y="262" id="775" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1309" >
@@ -5086,7 +5086,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="968" y="795" id="666" />
-<P2 x="843" y="859" id="649" />
+<P2 x="843" y="864" id="649" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1311" >
@@ -5494,7 +5494,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to choice" value="null" />
<P1 x="1008" y="736" id="672" />
-<P2 x="1008" y="770" id="665" />
+<P2 x="1008" y="775" id="665" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1362" >
@@ -5502,7 +5502,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="1008" y="835" id="668" />
-<P2 x="1049" y="929" id="637" />
+<P2 x="1049" y="934" id="637" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1363" >
@@ -5758,7 +5758,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="1688" y="890" id="590" />
-<P2 x="1607" y="996" id="581" />
+<P2 x="1607" y="1001" id="581" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1395" >
@@ -5766,7 +5766,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="1768" y="890" id="591" />
-<P2 x="2277" y="941" id="541" />
+<P2 x="2277" y="946" id="541" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1396" >
@@ -5854,7 +5854,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="2036" y="1361" id="551" />
-<P2 x="2101" y="1368" id="533" />
+<P2 x="2101" y="1373" id="533" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1407" >
@@ -5862,7 +5862,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="1866" y="1284" id="559" />
-<P2 x="1996" y="1336" id="549" />
+<P2 x="1996" y="1341" id="549" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1408" >
@@ -5926,7 +5926,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
<P1 x="1768" y="1156" id="567" />
-<P2 x="1826" y="1259" id="557" />
+<P2 x="1826" y="1264" id="557" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1416" >
@@ -5934,13 +5934,13 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to choice" value="null" />
<P1 x="1728" y="1111" id="1275" />
-<P2 x="1728" y="1131" id="565" />
+<P2 x="1728" y="1136" id="565" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<COMPONENT type="1012" id="1424" >
<cdparam x="509" y="222" />
<sizeparam width="30" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -6052,7 +6052,7 @@ On prend b=1 comme exemple
<cdparam x="496" y="46" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="496" y="41" id="1425" />
+<P1 x="496" y="46" id="1425" />
<P2 x="526" y="152" id="1437" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6085,7 +6085,7 @@ On prend b=1 comme exemple
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from notified event to choice" value="null" />
<P1 x="526" y="182" id="1438" />
-<P2 x="524" y="212" id="1420" />
+<P2 x="524" y="217" id="1420" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1445" >
@@ -6099,7 +6099,7 @@ On prend b=1 comme exemple
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<COMPONENT type="1001" id="1447" >
<cdparam x="430" y="408" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -6460,7 +6460,7 @@ the smart card and the terminal
</CONNECTOR><SUBCOMPONENT type="-1" id="1537" >
<father id="1541" num="0" />
<cdparam x="166" y="353" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -6468,7 +6468,7 @@ the smart card and the terminal
<SUBCOMPONENT type="-1" id="1538" >
<father id="1541" num="1" />
<cdparam x="225" y="353" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -6476,7 +6476,7 @@ the smart card and the terminal
<SUBCOMPONENT type="-1" id="1539" >
<father id="1541" num="2" />
<cdparam x="225" y="72" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -6484,7 +6484,7 @@ the smart card and the terminal
<SUBCOMPONENT type="-1" id="1540" >
<father id="1541" num="3" />
<cdparam x="278" y="72" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
@@ -6494,7 +6494,7 @@ the smart card and the terminal
<cdparam x="166" y="64" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to wait event" value="null" />
-<P1 x="166" y="81" id="1454" />
+<P1 x="166" y="86" id="1454" />
<P2 x="166" y="124" id="1456" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6615,7 +6615,7 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to select" value="null" />
<P1 x="360" y="275" id="1520" />
-<P2 x="439" y="275" id="1525" />
+<P2 x="439" y="280" id="1525" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1558" >
@@ -6653,7 +6653,7 @@ the smart card and the terminal
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<COMPONENT type="1013" id="1565" >
<cdparam x="505" y="259" />
<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -6848,7 +6848,7 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<P1 x="508" y="424" id="1589" />
-<P2 x="510" y="504" id="1575" />
+<P2 x="510" y="509" id="1575" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1603" >
@@ -6871,7 +6871,7 @@ the smart card and the terminal
<cdparam x="506" y="36" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to send event" value="null" />
-<P1 x="505" y="48" id="1580" />
+<P1 x="505" y="53" id="1580" />
<P2 x="505" y="66" id="1582" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6932,7 +6932,7 @@ the smart card and the terminal
<Modeling type="TML Architecture" nameTab="Mapping1" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" zoom="1.0" >
<COMPONENT type="1102" id="1636" >
<cdparam x="612" y="450" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7169,7 +7169,7 @@ the smart card and the terminal
<Modeling type="TML Architecture" nameTab="Mapping2" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" zoom="1.0" >
<COMPONENT type="1105" id="1758" >
<cdparam x="309" y="358" />
<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7334,10 +7334,10 @@ the smart card and the terminal
</COMPONENT>
<SUBCOMPONENT type="1101" id="1826" >
<father id="1851" num="0" />
-<cdparam x="49" y="276" />
-<sizeparam width="172" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="56" y="276" />
+<sizeparam width="163" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
+<cdrectangleparam minX="0" maxX="2" minY="0" maxY="86" />
<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
<TGConnectingPoint num="0" id="1818" />
<TGConnectingPoint num="1" id="1819" />
@@ -7390,9 +7390,9 @@ the smart card and the terminal
<SUBCOMPONENT type="1101" id="1860" >
<father id="1903" num="0" />
<cdparam x="277" y="90" />
-<sizeparam width="109" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="163" minY="0" maxY="127" />
+<cdrectangleparam minX="0" maxX="164" minY="0" maxY="127" />
<infoparam name="TGComponent" value="AppC::TCPIP" />
<TGConnectingPoint num="0" id="1852" />
<TGConnectingPoint num="1" id="1853" />
@@ -7409,9 +7409,9 @@ the smart card and the terminal
<SUBCOMPONENT type="1101" id="1869" >
<father id="1903" num="1" />
<cdparam x="293" y="165" />
-<sizeparam width="144" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="128" minY="0" maxY="127" />
+<cdrectangleparam minX="0" maxX="133" minY="0" maxY="127" />
<infoparam name="TGComponent" value="AppC::Application" />
<TGConnectingPoint num="0" id="1861" />
<TGConnectingPoint num="1" id="1862" />
@@ -7428,9 +7428,9 @@ the smart card and the terminal
<SUBCOMPONENT type="1101" id="1878" >
<father id="1903" num="2" />
<cdparam x="392" y="119" />
-<sizeparam width="141" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="131" minY="0" maxY="130" />
+<cdrectangleparam minX="0" maxX="136" minY="0" maxY="130" />
<infoparam name="TGComponent" value="AppC::SmartCard" />
<TGConnectingPoint num="0" id="1870" />
<TGConnectingPoint num="1" id="1871" />
@@ -7502,7 +7502,7 @@ the smart card and the terminal
<Modeling type="TML Architecture" nameTab="Mapping2_Sec" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" zoom="1.0" >
<COMPONENT type="1102" id="1932" >
<cdparam x="17" y="403" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7739,10 +7739,10 @@ the smart card and the terminal
</COMPONENT>
<SUBCOMPONENT type="1101" id="2050" >
<father id="2075" num="0" />
-<cdparam x="49" y="276" />
-<sizeparam width="172" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="56" y="276" />
+<sizeparam width="163" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
+<cdrectangleparam minX="0" maxX="2" minY="0" maxY="86" />
<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
<TGConnectingPoint num="0" id="2042" />
<TGConnectingPoint num="1" id="2043" />
@@ -7795,9 +7795,9 @@ the smart card and the terminal
<SUBCOMPONENT type="1101" id="2084" >
<father id="2127" num="0" />
<cdparam x="392" y="119" />
-<sizeparam width="141" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="131" minY="0" maxY="130" />
+<cdrectangleparam minX="0" maxX="136" minY="0" maxY="130" />
<infoparam name="TGComponent" value="AppC::SmartCard" />
<TGConnectingPoint num="0" id="2076" />
<TGConnectingPoint num="1" id="2077" />
@@ -7814,9 +7814,9 @@ the smart card and the terminal
<SUBCOMPONENT type="1101" id="2093" >
<father id="2127" num="1" />
<cdparam x="293" y="165" />
-<sizeparam width="144" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="128" minY="0" maxY="127" />
+<cdrectangleparam minX="0" maxX="133" minY="0" maxY="127" />
<infoparam name="TGComponent" value="AppC::Application" />
<TGConnectingPoint num="0" id="2085" />
<TGConnectingPoint num="1" id="2086" />
@@ -7833,9 +7833,9 @@ the smart card and the terminal
<SUBCOMPONENT type="1101" id="2102" >
<father id="2127" num="2" />
<cdparam x="277" y="90" />
-<sizeparam width="109" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="163" minY="0" maxY="127" />
+<cdrectangleparam minX="0" maxX="164" minY="0" maxY="127" />
<infoparam name="TGComponent" value="AppC::TCPIP" />
<TGConnectingPoint num="0" id="2094" />
<TGConnectingPoint num="1" id="2095" />
@@ -8031,6 +8031,7 @@ the smart card and the terminal
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
+<considerTimingOperators value="true" />
<Validated value="" />
<Ignored value="" />
@@ -8049,12 +8050,12 @@ the smart card and the terminal
<extraparam>
<iso value="in chin(Message msg)" />
<osd value="out chout(Message msg)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" ams="false" />
</extraparam>
</CONNECTOR><SUBCOMPONENT type="-1" id="2186" >
<father id="2191" num="0" />
<cdparam x="490" y="199" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
@@ -8062,7 +8063,7 @@ the smart card and the terminal
<SUBCOMPONENT type="-1" id="2187" >
<father id="2191" num="1" />
<cdparam x="490" y="254" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
@@ -8117,7 +8118,6 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="2215" />
<TGConnectingPoint num="7" id="2216" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
@@ -8136,7 +8136,6 @@ the smart card and the terminal
<TGConnectingPoint num="6" id="2224" />
<TGConnectingPoint num="7" id="2225" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
@@ -8325,7 +8324,7 @@ the smart card and the terminal
<infoparam name="connector from state0 to state0" value="null" />
<TGConnectingPoint num="0" id="2309" />
<P1 x="416" y="379" id="2345" />
-<P2 x="420" y="424" id="2381" />
+<P2 x="420" y="424" id="2413" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2308" >
<father id="2310" num="0" />
@@ -8343,6 +8342,9 @@ the smart card and the terminal
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -8355,7 +8357,7 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
<TGConnectingPoint num="0" id="2316" />
-<P1 x="407" y="273" id="2427" />
+<P1 x="407" y="273" id="2491" />
<P2 x="416" y="339" id="2340" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2315" >
@@ -8374,6 +8376,9 @@ the smart card and the terminal
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -8386,8 +8391,8 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
<TGConnectingPoint num="0" id="2323" />
-<P1 x="406" y="201" id="2463" />
-<P2 x="407" y="233" id="2422" />
+<P1 x="406" y="201" id="2559" />
+<P2 x="407" y="233" id="2486" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2322" >
<father id="2324" num="0" />
@@ -8405,6 +8410,9 @@ the smart card and the terminal
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -8416,8 +8424,8 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="2330" />
-<P1 x="406" y="141" id="2479" />
-<P2 x="406" y="171" id="2462" />
+<P1 x="406" y="141" id="2575" />
+<P2 x="406" y="171" id="2558" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2329" >
<father id="2331" num="0" />
@@ -8435,6 +8443,9 @@ the smart card and the terminal
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -8446,8 +8457,8 @@ the smart card and the terminal
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
<TGConnectingPoint num="0" id="2337" />
-<P1 x="407" y="70" id="2514" />
-<P2 x="406" y="101" id="2474" />
+<P1 x="407" y="70" id="2642" />
+<P2 x="406" y="101" id="2570" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2336" >
<father id="2338" num="0" />
@@ -8465,13 +8476,16 @@ the smart card and the terminal
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="2379" >
+<COMPONENT type="5106" id="2411" >
<cdparam x="327" y="339" />
<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -8518,309 +8532,449 @@ the smart card and the terminal
<TGConnectingPoint num="37" id="2376" />
<TGConnectingPoint num="38" id="2377" />
<TGConnectingPoint num="39" id="2378" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2420" >
+<TGConnectingPoint num="40" id="2379" />
+<TGConnectingPoint num="41" id="2380" />
+<TGConnectingPoint num="42" id="2381" />
+<TGConnectingPoint num="43" id="2382" />
+<TGConnectingPoint num="44" id="2383" />
+<TGConnectingPoint num="45" id="2384" />
+<TGConnectingPoint num="46" id="2385" />
+<TGConnectingPoint num="47" id="2386" />
+<TGConnectingPoint num="48" id="2387" />
+<TGConnectingPoint num="49" id="2388" />
+<TGConnectingPoint num="50" id="2389" />
+<TGConnectingPoint num="51" id="2390" />
+<TGConnectingPoint num="52" id="2391" />
+<TGConnectingPoint num="53" id="2392" />
+<TGConnectingPoint num="54" id="2393" />
+<TGConnectingPoint num="55" id="2394" />
+<TGConnectingPoint num="56" id="2395" />
+<TGConnectingPoint num="57" id="2396" />
+<TGConnectingPoint num="58" id="2397" />
+<TGConnectingPoint num="59" id="2398" />
+<TGConnectingPoint num="60" id="2399" />
+<TGConnectingPoint num="61" id="2400" />
+<TGConnectingPoint num="62" id="2401" />
+<TGConnectingPoint num="63" id="2402" />
+<TGConnectingPoint num="64" id="2403" />
+<TGConnectingPoint num="65" id="2404" />
+<TGConnectingPoint num="66" id="2405" />
+<TGConnectingPoint num="67" id="2406" />
+<TGConnectingPoint num="68" id="2407" />
+<TGConnectingPoint num="69" id="2408" />
+<TGConnectingPoint num="70" id="2409" />
+<TGConnectingPoint num="71" id="2410" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2484" >
<cdparam x="350" y="424" />
<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="2380" />
-<TGConnectingPoint num="1" id="2381" />
-<TGConnectingPoint num="2" id="2382" />
-<TGConnectingPoint num="3" id="2383" />
-<TGConnectingPoint num="4" id="2384" />
-<TGConnectingPoint num="5" id="2385" />
-<TGConnectingPoint num="6" id="2386" />
-<TGConnectingPoint num="7" id="2387" />
-<TGConnectingPoint num="8" id="2388" />
-<TGConnectingPoint num="9" id="2389" />
-<TGConnectingPoint num="10" id="2390" />
-<TGConnectingPoint num="11" id="2391" />
-<TGConnectingPoint num="12" id="2392" />
-<TGConnectingPoint num="13" id="2393" />
-<TGConnectingPoint num="14" id="2394" />
-<TGConnectingPoint num="15" id="2395" />
-<TGConnectingPoint num="16" id="2396" />
-<TGConnectingPoint num="17" id="2397" />
-<TGConnectingPoint num="18" id="2398" />
-<TGConnectingPoint num="19" id="2399" />
-<TGConnectingPoint num="20" id="2400" />
-<TGConnectingPoint num="21" id="2401" />
-<TGConnectingPoint num="22" id="2402" />
-<TGConnectingPoint num="23" id="2403" />
-<TGConnectingPoint num="24" id="2404" />
-<TGConnectingPoint num="25" id="2405" />
-<TGConnectingPoint num="26" id="2406" />
-<TGConnectingPoint num="27" id="2407" />
-<TGConnectingPoint num="28" id="2408" />
-<TGConnectingPoint num="29" id="2409" />
-<TGConnectingPoint num="30" id="2410" />
-<TGConnectingPoint num="31" id="2411" />
-<TGConnectingPoint num="32" id="2412" />
-<TGConnectingPoint num="33" id="2413" />
-<TGConnectingPoint num="34" id="2414" />
-<TGConnectingPoint num="35" id="2415" />
-<TGConnectingPoint num="36" id="2416" />
-<TGConnectingPoint num="37" id="2417" />
-<TGConnectingPoint num="38" id="2418" />
-<TGConnectingPoint num="39" id="2419" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2461" >
+<TGConnectingPoint num="0" id="2412" />
+<TGConnectingPoint num="1" id="2413" />
+<TGConnectingPoint num="2" id="2414" />
+<TGConnectingPoint num="3" id="2415" />
+<TGConnectingPoint num="4" id="2416" />
+<TGConnectingPoint num="5" id="2417" />
+<TGConnectingPoint num="6" id="2418" />
+<TGConnectingPoint num="7" id="2419" />
+<TGConnectingPoint num="8" id="2420" />
+<TGConnectingPoint num="9" id="2421" />
+<TGConnectingPoint num="10" id="2422" />
+<TGConnectingPoint num="11" id="2423" />
+<TGConnectingPoint num="12" id="2424" />
+<TGConnectingPoint num="13" id="2425" />
+<TGConnectingPoint num="14" id="2426" />
+<TGConnectingPoint num="15" id="2427" />
+<TGConnectingPoint num="16" id="2428" />
+<TGConnectingPoint num="17" id="2429" />
+<TGConnectingPoint num="18" id="2430" />
+<TGConnectingPoint num="19" id="2431" />
+<TGConnectingPoint num="20" id="2432" />
+<TGConnectingPoint num="21" id="2433" />
+<TGConnectingPoint num="22" id="2434" />
+<TGConnectingPoint num="23" id="2435" />
+<TGConnectingPoint num="24" id="2436" />
+<TGConnectingPoint num="25" id="2437" />
+<TGConnectingPoint num="26" id="2438" />
+<TGConnectingPoint num="27" id="2439" />
+<TGConnectingPoint num="28" id="2440" />
+<TGConnectingPoint num="29" id="2441" />
+<TGConnectingPoint num="30" id="2442" />
+<TGConnectingPoint num="31" id="2443" />
+<TGConnectingPoint num="32" id="2444" />
+<TGConnectingPoint num="33" id="2445" />
+<TGConnectingPoint num="34" id="2446" />
+<TGConnectingPoint num="35" id="2447" />
+<TGConnectingPoint num="36" id="2448" />
+<TGConnectingPoint num="37" id="2449" />
+<TGConnectingPoint num="38" id="2450" />
+<TGConnectingPoint num="39" id="2451" />
+<TGConnectingPoint num="40" id="2452" />
+<TGConnectingPoint num="41" id="2453" />
+<TGConnectingPoint num="42" id="2454" />
+<TGConnectingPoint num="43" id="2455" />
+<TGConnectingPoint num="44" id="2456" />
+<TGConnectingPoint num="45" id="2457" />
+<TGConnectingPoint num="46" id="2458" />
+<TGConnectingPoint num="47" id="2459" />
+<TGConnectingPoint num="48" id="2460" />
+<TGConnectingPoint num="49" id="2461" />
+<TGConnectingPoint num="50" id="2462" />
+<TGConnectingPoint num="51" id="2463" />
+<TGConnectingPoint num="52" id="2464" />
+<TGConnectingPoint num="53" id="2465" />
+<TGConnectingPoint num="54" id="2466" />
+<TGConnectingPoint num="55" id="2467" />
+<TGConnectingPoint num="56" id="2468" />
+<TGConnectingPoint num="57" id="2469" />
+<TGConnectingPoint num="58" id="2470" />
+<TGConnectingPoint num="59" id="2471" />
+<TGConnectingPoint num="60" id="2472" />
+<TGConnectingPoint num="61" id="2473" />
+<TGConnectingPoint num="62" id="2474" />
+<TGConnectingPoint num="63" id="2475" />
+<TGConnectingPoint num="64" id="2476" />
+<TGConnectingPoint num="65" id="2477" />
+<TGConnectingPoint num="66" id="2478" />
+<TGConnectingPoint num="67" id="2479" />
+<TGConnectingPoint num="68" id="2480" />
+<TGConnectingPoint num="69" id="2481" />
+<TGConnectingPoint num="70" id="2482" />
+<TGConnectingPoint num="71" id="2483" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2557" >
<cdparam x="336" y="233" />
<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="2421" />
-<TGConnectingPoint num="1" id="2422" />
-<TGConnectingPoint num="2" id="2423" />
-<TGConnectingPoint num="3" id="2424" />
-<TGConnectingPoint num="4" id="2425" />
-<TGConnectingPoint num="5" id="2426" />
-<TGConnectingPoint num="6" id="2427" />
-<TGConnectingPoint num="7" id="2428" />
-<TGConnectingPoint num="8" id="2429" />
-<TGConnectingPoint num="9" id="2430" />
-<TGConnectingPoint num="10" id="2431" />
-<TGConnectingPoint num="11" id="2432" />
-<TGConnectingPoint num="12" id="2433" />
-<TGConnectingPoint num="13" id="2434" />
-<TGConnectingPoint num="14" id="2435" />
-<TGConnectingPoint num="15" id="2436" />
-<TGConnectingPoint num="16" id="2437" />
-<TGConnectingPoint num="17" id="2438" />
-<TGConnectingPoint num="18" id="2439" />
-<TGConnectingPoint num="19" id="2440" />
-<TGConnectingPoint num="20" id="2441" />
-<TGConnectingPoint num="21" id="2442" />
-<TGConnectingPoint num="22" id="2443" />
-<TGConnectingPoint num="23" id="2444" />
-<TGConnectingPoint num="24" id="2445" />
-<TGConnectingPoint num="25" id="2446" />
-<TGConnectingPoint num="26" id="2447" />
-<TGConnectingPoint num="27" id="2448" />
-<TGConnectingPoint num="28" id="2449" />
-<TGConnectingPoint num="29" id="2450" />
-<TGConnectingPoint num="30" id="2451" />
-<TGConnectingPoint num="31" id="2452" />
-<TGConnectingPoint num="32" id="2453" />
-<TGConnectingPoint num="33" id="2454" />
-<TGConnectingPoint num="34" id="2455" />
-<TGConnectingPoint num="35" id="2456" />
-<TGConnectingPoint num="36" id="2457" />
-<TGConnectingPoint num="37" id="2458" />
-<TGConnectingPoint num="38" id="2459" />
-<TGConnectingPoint num="39" id="2460" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="2472" >
+<TGConnectingPoint num="0" id="2485" />
+<TGConnectingPoint num="1" id="2486" />
+<TGConnectingPoint num="2" id="2487" />
+<TGConnectingPoint num="3" id="2488" />
+<TGConnectingPoint num="4" id="2489" />
+<TGConnectingPoint num="5" id="2490" />
+<TGConnectingPoint num="6" id="2491" />
+<TGConnectingPoint num="7" id="2492" />
+<TGConnectingPoint num="8" id="2493" />
+<TGConnectingPoint num="9" id="2494" />
+<TGConnectingPoint num="10" id="2495" />
+<TGConnectingPoint num="11" id="2496" />
+<TGConnectingPoint num="12" id="2497" />
+<TGConnectingPoint num="13" id="2498" />
+<TGConnectingPoint num="14" id="2499" />
+<TGConnectingPoint num="15" id="2500" />
+<TGConnectingPoint num="16" id="2501" />
+<TGConnectingPoint num="17" id="2502" />
+<TGConnectingPoint num="18" id="2503" />
+<TGConnectingPoint num="19" id="2504" />
+<TGConnectingPoint num="20" id="2505" />
+<TGConnectingPoint num="21" id="2506" />
+<TGConnectingPoint num="22" id="2507" />
+<TGConnectingPoint num="23" id="2508" />
+<TGConnectingPoint num="24" id="2509" />
+<TGConnectingPoint num="25" id="2510" />
+<TGConnectingPoint num="26" id="2511" />
+<TGConnectingPoint num="27" id="2512" />
+<TGConnectingPoint num="28" id="2513" />
+<TGConnectingPoint num="29" id="2514" />
+<TGConnectingPoint num="30" id="2515" />
+<TGConnectingPoint num="31" id="2516" />
+<TGConnectingPoint num="32" id="2517" />
+<TGConnectingPoint num="33" id="2518" />
+<TGConnectingPoint num="34" id="2519" />
+<TGConnectingPoint num="35" id="2520" />
+<TGConnectingPoint num="36" id="2521" />
+<TGConnectingPoint num="37" id="2522" />
+<TGConnectingPoint num="38" id="2523" />
+<TGConnectingPoint num="39" id="2524" />
+<TGConnectingPoint num="40" id="2525" />
+<TGConnectingPoint num="41" id="2526" />
+<TGConnectingPoint num="42" id="2527" />
+<TGConnectingPoint num="43" id="2528" />
+<TGConnectingPoint num="44" id="2529" />
+<TGConnectingPoint num="45" id="2530" />
+<TGConnectingPoint num="46" id="2531" />
+<TGConnectingPoint num="47" id="2532" />
+<TGConnectingPoint num="48" id="2533" />
+<TGConnectingPoint num="49" id="2534" />
+<TGConnectingPoint num="50" id="2535" />
+<TGConnectingPoint num="51" id="2536" />
+<TGConnectingPoint num="52" id="2537" />
+<TGConnectingPoint num="53" id="2538" />
+<TGConnectingPoint num="54" id="2539" />
+<TGConnectingPoint num="55" id="2540" />
+<TGConnectingPoint num="56" id="2541" />
+<TGConnectingPoint num="57" id="2542" />
+<TGConnectingPoint num="58" id="2543" />
+<TGConnectingPoint num="59" id="2544" />
+<TGConnectingPoint num="60" id="2545" />
+<TGConnectingPoint num="61" id="2546" />
+<TGConnectingPoint num="62" id="2547" />
+<TGConnectingPoint num="63" id="2548" />
+<TGConnectingPoint num="64" id="2549" />
+<TGConnectingPoint num="65" id="2550" />
+<TGConnectingPoint num="66" id="2551" />
+<TGConnectingPoint num="67" id="2552" />
+<TGConnectingPoint num="68" id="2553" />
+<TGConnectingPoint num="69" id="2554" />
+<TGConnectingPoint num="70" id="2555" />
+<TGConnectingPoint num="71" id="2556" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="2568" >
<cdparam x="372" y="176" />
<sizeparam width="68" 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" />
<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="2462" />
-<TGConnectingPoint num="1" id="2463" />
-<TGConnectingPoint num="2" id="2464" />
-<TGConnectingPoint num="3" id="2465" />
-<TGConnectingPoint num="4" id="2466" />
-<TGConnectingPoint num="5" id="2467" />
-<TGConnectingPoint num="6" id="2468" />
-<TGConnectingPoint num="7" id="2469" />
-<TGConnectingPoint num="8" id="2470" />
-<TGConnectingPoint num="9" id="2471" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2513" >
+<TGConnectingPoint num="0" id="2558" />
+<TGConnectingPoint num="1" id="2559" />
+<TGConnectingPoint num="2" id="2560" />
+<TGConnectingPoint num="3" id="2561" />
+<TGConnectingPoint num="4" id="2562" />
+<TGConnectingPoint num="5" id="2563" />
+<TGConnectingPoint num="6" id="2564" />
+<TGConnectingPoint num="7" id="2565" />
+<TGConnectingPoint num="8" id="2566" />
+<TGConnectingPoint num="9" id="2567" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2641" >
<cdparam x="340" y="101" />
<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="2473" />
-<TGConnectingPoint num="1" id="2474" />
-<TGConnectingPoint num="2" id="2475" />
-<TGConnectingPoint num="3" id="2476" />
-<TGConnectingPoint num="4" id="2477" />
-<TGConnectingPoint num="5" id="2478" />
-<TGConnectingPoint num="6" id="2479" />
-<TGConnectingPoint num="7" id="2480" />
-<TGConnectingPoint num="8" id="2481" />
-<TGConnectingPoint num="9" id="2482" />
-<TGConnectingPoint num="10" id="2483" />
-<TGConnectingPoint num="11" id="2484" />
-<TGConnectingPoint num="12" id="2485" />
-<TGConnectingPoint num="13" id="2486" />
-<TGConnectingPoint num="14" id="2487" />
-<TGConnectingPoint num="15" id="2488" />
-<TGConnectingPoint num="16" id="2489" />
-<TGConnectingPoint num="17" id="2490" />
-<TGConnectingPoint num="18" id="2491" />
-<TGConnectingPoint num="19" id="2492" />
-<TGConnectingPoint num="20" id="2493" />
-<TGConnectingPoint num="21" id="2494" />
-<TGConnectingPoint num="22" id="2495" />
-<TGConnectingPoint num="23" id="2496" />
-<TGConnectingPoint num="24" id="2497" />
-<TGConnectingPoint num="25" id="2498" />
-<TGConnectingPoint num="26" id="2499" />
-<TGConnectingPoint num="27" id="2500" />
-<TGConnectingPoint num="28" id="2501" />
-<TGConnectingPoint num="29" id="2502" />
-<TGConnectingPoint num="30" id="2503" />
-<TGConnectingPoint num="31" id="2504" />
-<TGConnectingPoint num="32" id="2505" />
-<TGConnectingPoint num="33" id="2506" />
-<TGConnectingPoint num="34" id="2507" />
-<TGConnectingPoint num="35" id="2508" />
-<TGConnectingPoint num="36" id="2509" />
-<TGConnectingPoint num="37" id="2510" />
-<TGConnectingPoint num="38" id="2511" />
-<TGConnectingPoint num="39" id="2512" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2515" >
+<TGConnectingPoint num="0" id="2569" />
+<TGConnectingPoint num="1" id="2570" />
+<TGConnectingPoint num="2" id="2571" />
+<TGConnectingPoint num="3" id="2572" />
+<TGConnectingPoint num="4" id="2573" />
+<TGConnectingPoint num="5" id="2574" />
+<TGConnectingPoint num="6" id="2575" />
+<TGConnectingPoint num="7" id="2576" />
+<TGConnectingPoint num="8" id="2577" />
+<TGConnectingPoint num="9" id="2578" />
+<TGConnectingPoint num="10" id="2579" />
+<TGConnectingPoint num="11" id="2580" />
+<TGConnectingPoint num="12" id="2581" />
+<TGConnectingPoint num="13" id="2582" />
+<TGConnectingPoint num="14" id="2583" />
+<TGConnectingPoint num="15" id="2584" />
+<TGConnectingPoint num="16" id="2585" />
+<TGConnectingPoint num="17" id="2586" />
+<TGConnectingPoint num="18" id="2587" />
+<TGConnectingPoint num="19" id="2588" />
+<TGConnectingPoint num="20" id="2589" />
+<TGConnectingPoint num="21" id="2590" />
+<TGConnectingPoint num="22" id="2591" />
+<TGConnectingPoint num="23" id="2592" />
+<TGConnectingPoint num="24" id="2593" />
+<TGConnectingPoint num="25" id="2594" />
+<TGConnectingPoint num="26" id="2595" />
+<TGConnectingPoint num="27" id="2596" />
+<TGConnectingPoint num="28" id="2597" />
+<TGConnectingPoint num="29" id="2598" />
+<TGConnectingPoint num="30" id="2599" />
+<TGConnectingPoint num="31" id="2600" />
+<TGConnectingPoint num="32" id="2601" />
+<TGConnectingPoint num="33" id="2602" />
+<TGConnectingPoint num="34" id="2603" />
+<TGConnectingPoint num="35" id="2604" />
+<TGConnectingPoint num="36" id="2605" />
+<TGConnectingPoint num="37" id="2606" />
+<TGConnectingPoint num="38" id="2607" />
+<TGConnectingPoint num="39" id="2608" />
+<TGConnectingPoint num="40" id="2609" />
+<TGConnectingPoint num="41" id="2610" />
+<TGConnectingPoint num="42" id="2611" />
+<TGConnectingPoint num="43" id="2612" />
+<TGConnectingPoint num="44" id="2613" />
+<TGConnectingPoint num="45" id="2614" />
+<TGConnectingPoint num="46" id="2615" />
+<TGConnectingPoint num="47" id="2616" />
+<TGConnectingPoint num="48" id="2617" />
+<TGConnectingPoint num="49" id="2618" />
+<TGConnectingPoint num="50" id="2619" />
+<TGConnectingPoint num="51" id="2620" />
+<TGConnectingPoint num="52" id="2621" />
+<TGConnectingPoint num="53" id="2622" />
+<TGConnectingPoint num="54" id="2623" />
+<TGConnectingPoint num="55" id="2624" />
+<TGConnectingPoint num="56" id="2625" />
+<TGConnectingPoint num="57" id="2626" />
+<TGConnectingPoint num="58" id="2627" />
+<TGConnectingPoint num="59" id="2628" />
+<TGConnectingPoint num="60" id="2629" />
+<TGConnectingPoint num="61" id="2630" />
+<TGConnectingPoint num="62" id="2631" />
+<TGConnectingPoint num="63" id="2632" />
+<TGConnectingPoint num="64" id="2633" />
+<TGConnectingPoint num="65" id="2634" />
+<TGConnectingPoint num="66" id="2635" />
+<TGConnectingPoint num="67" id="2636" />
+<TGConnectingPoint num="68" id="2637" />
+<TGConnectingPoint num="69" id="2638" />
+<TGConnectingPoint num="70" id="2639" />
+<TGConnectingPoint num="71" id="2640" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="2643" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2514" />
+<TGConnectingPoint num="0" id="2642" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2522" >
+<CONNECTOR type="5102" id="2650" >
<cdparam x="407" y="310" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2521" />
-<P1 x="407" y="310" id="2593" />
-<P2 x="416" y="356" id="2552" />
+<TGConnectingPoint num="0" id="2649" />
+<P1 x="407" y="310" id="2753" />
+<P2 x="416" y="356" id="2680" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2520" >
-<father id="2522" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2648" >
+<father id="2650" num="0" />
<cdparam x="449" y="353" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2516" />
-<TGConnectingPoint num="1" id="2517" />
-<TGConnectingPoint num="2" id="2518" />
-<TGConnectingPoint num="3" id="2519" />
+<TGConnectingPoint num="0" id="2644" />
+<TGConnectingPoint num="1" id="2645" />
+<TGConnectingPoint num="2" id="2646" />
+<TGConnectingPoint num="3" id="2647" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2529" >
+<CONNECTOR type="5102" id="2657" >
<cdparam x="492" y="446" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2528" />
-<P1 x="416" y="406" id="2557" />
-<P2 x="434" y="446" id="2603" />
+<TGConnectingPoint num="0" id="2656" />
+<P1 x="416" y="406" id="2685" />
+<P2 x="434" y="446" id="2763" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2527" >
-<father id="2529" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2655" >
+<father id="2657" num="0" />
<cdparam x="449" y="440" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2523" />
-<TGConnectingPoint num="1" id="2524" />
-<TGConnectingPoint num="2" id="2525" />
-<TGConnectingPoint num="3" id="2526" />
+<TGConnectingPoint num="0" id="2651" />
+<TGConnectingPoint num="1" id="2652" />
+<TGConnectingPoint num="2" id="2653" />
+<TGConnectingPoint num="3" id="2654" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2536" >
+<CONNECTOR type="5102" id="2664" >
<cdparam x="407" y="251" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="2535" />
-<P1 x="407" y="251" id="2611" />
-<P2 x="407" y="280" id="2592" />
+<TGConnectingPoint num="0" id="2663" />
+<P1 x="407" y="251" id="2771" />
+<P2 x="407" y="280" id="2752" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2534" >
-<father id="2536" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2662" >
+<father id="2664" num="0" />
<cdparam x="407" y="291" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2530" />
-<TGConnectingPoint num="1" id="2531" />
-<TGConnectingPoint num="2" id="2532" />
-<TGConnectingPoint num="3" id="2533" />
+<TGConnectingPoint num="0" id="2658" />
+<TGConnectingPoint num="1" id="2659" />
+<TGConnectingPoint num="2" id="2660" />
+<TGConnectingPoint num="3" id="2661" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2543" >
+<CONNECTOR type="5102" id="2671" >
<cdparam x="407" y="132" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2542" />
-<P1 x="407" y="132" id="2652" />
-<P2 x="407" y="211" id="2606" />
+<TGConnectingPoint num="0" id="2670" />
+<P1 x="407" y="132" id="2844" />
+<P2 x="407" y="211" id="2766" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2541" >
-<father id="2543" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2669" >
+<father id="2671" num="0" />
<cdparam x="414" y="162" />
<sizeparam width="126" height="30" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2537" />
-<TGConnectingPoint num="1" id="2538" />
-<TGConnectingPoint num="2" id="2539" />
-<TGConnectingPoint num="3" id="2540" />
+<TGConnectingPoint num="0" id="2665" />
+<TGConnectingPoint num="1" id="2666" />
+<TGConnectingPoint num="2" id="2667" />
+<TGConnectingPoint num="3" id="2668" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -8829,224 +8983,323 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2550" >
+<CONNECTOR type="5102" id="2678" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2549" />
-<P1 x="407" y="70" id="2687" />
-<P2 x="407" y="92" id="2647" />
+<TGConnectingPoint num="0" id="2677" />
+<P1 x="407" y="70" id="2911" />
+<P2 x="407" y="92" id="2839" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2548" >
-<father id="2550" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2676" >
+<father id="2678" num="0" />
<cdparam x="407" y="110" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2544" />
-<TGConnectingPoint num="1" id="2545" />
-<TGConnectingPoint num="2" id="2546" />
-<TGConnectingPoint num="3" id="2547" />
+<TGConnectingPoint num="0" id="2672" />
+<TGConnectingPoint num="1" id="2673" />
+<TGConnectingPoint num="2" id="2674" />
+<TGConnectingPoint num="3" id="2675" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="2591" >
+<COMPONENT type="5106" id="2751" >
<cdparam x="366" y="356" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="beforeFinish" />
-<TGConnectingPoint num="0" id="2551" />
-<TGConnectingPoint num="1" id="2552" />
-<TGConnectingPoint num="2" id="2553" />
-<TGConnectingPoint num="3" id="2554" />
-<TGConnectingPoint num="4" id="2555" />
-<TGConnectingPoint num="5" id="2556" />
-<TGConnectingPoint num="6" id="2557" />
-<TGConnectingPoint num="7" id="2558" />
-<TGConnectingPoint num="8" id="2559" />
-<TGConnectingPoint num="9" id="2560" />
-<TGConnectingPoint num="10" id="2561" />
-<TGConnectingPoint num="11" id="2562" />
-<TGConnectingPoint num="12" id="2563" />
-<TGConnectingPoint num="13" id="2564" />
-<TGConnectingPoint num="14" id="2565" />
-<TGConnectingPoint num="15" id="2566" />
-<TGConnectingPoint num="16" id="2567" />
-<TGConnectingPoint num="17" id="2568" />
-<TGConnectingPoint num="18" id="2569" />
-<TGConnectingPoint num="19" id="2570" />
-<TGConnectingPoint num="20" id="2571" />
-<TGConnectingPoint num="21" id="2572" />
-<TGConnectingPoint num="22" id="2573" />
-<TGConnectingPoint num="23" id="2574" />
-<TGConnectingPoint num="24" id="2575" />
-<TGConnectingPoint num="25" id="2576" />
-<TGConnectingPoint num="26" id="2577" />
-<TGConnectingPoint num="27" id="2578" />
-<TGConnectingPoint num="28" id="2579" />
-<TGConnectingPoint num="29" id="2580" />
-<TGConnectingPoint num="30" id="2581" />
-<TGConnectingPoint num="31" id="2582" />
-<TGConnectingPoint num="32" id="2583" />
-<TGConnectingPoint num="33" id="2584" />
-<TGConnectingPoint num="34" id="2585" />
-<TGConnectingPoint num="35" id="2586" />
-<TGConnectingPoint num="36" id="2587" />
-<TGConnectingPoint num="37" id="2588" />
-<TGConnectingPoint num="38" id="2589" />
-<TGConnectingPoint num="39" id="2590" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="2602" >
+<TGConnectingPoint num="0" id="2679" />
+<TGConnectingPoint num="1" id="2680" />
+<TGConnectingPoint num="2" id="2681" />
+<TGConnectingPoint num="3" id="2682" />
+<TGConnectingPoint num="4" id="2683" />
+<TGConnectingPoint num="5" id="2684" />
+<TGConnectingPoint num="6" id="2685" />
+<TGConnectingPoint num="7" id="2686" />
+<TGConnectingPoint num="8" id="2687" />
+<TGConnectingPoint num="9" id="2688" />
+<TGConnectingPoint num="10" id="2689" />
+<TGConnectingPoint num="11" id="2690" />
+<TGConnectingPoint num="12" id="2691" />
+<TGConnectingPoint num="13" id="2692" />
+<TGConnectingPoint num="14" id="2693" />
+<TGConnectingPoint num="15" id="2694" />
+<TGConnectingPoint num="16" id="2695" />
+<TGConnectingPoint num="17" id="2696" />
+<TGConnectingPoint num="18" id="2697" />
+<TGConnectingPoint num="19" id="2698" />
+<TGConnectingPoint num="20" id="2699" />
+<TGConnectingPoint num="21" id="2700" />
+<TGConnectingPoint num="22" id="2701" />
+<TGConnectingPoint num="23" id="2702" />
+<TGConnectingPoint num="24" id="2703" />
+<TGConnectingPoint num="25" id="2704" />
+<TGConnectingPoint num="26" id="2705" />
+<TGConnectingPoint num="27" id="2706" />
+<TGConnectingPoint num="28" id="2707" />
+<TGConnectingPoint num="29" id="2708" />
+<TGConnectingPoint num="30" id="2709" />
+<TGConnectingPoint num="31" id="2710" />
+<TGConnectingPoint num="32" id="2711" />
+<TGConnectingPoint num="33" id="2712" />
+<TGConnectingPoint num="34" id="2713" />
+<TGConnectingPoint num="35" id="2714" />
+<TGConnectingPoint num="36" id="2715" />
+<TGConnectingPoint num="37" id="2716" />
+<TGConnectingPoint num="38" id="2717" />
+<TGConnectingPoint num="39" id="2718" />
+<TGConnectingPoint num="40" id="2719" />
+<TGConnectingPoint num="41" id="2720" />
+<TGConnectingPoint num="42" id="2721" />
+<TGConnectingPoint num="43" id="2722" />
+<TGConnectingPoint num="44" id="2723" />
+<TGConnectingPoint num="45" id="2724" />
+<TGConnectingPoint num="46" id="2725" />
+<TGConnectingPoint num="47" id="2726" />
+<TGConnectingPoint num="48" id="2727" />
+<TGConnectingPoint num="49" id="2728" />
+<TGConnectingPoint num="50" id="2729" />
+<TGConnectingPoint num="51" id="2730" />
+<TGConnectingPoint num="52" id="2731" />
+<TGConnectingPoint num="53" id="2732" />
+<TGConnectingPoint num="54" id="2733" />
+<TGConnectingPoint num="55" id="2734" />
+<TGConnectingPoint num="56" id="2735" />
+<TGConnectingPoint num="57" id="2736" />
+<TGConnectingPoint num="58" id="2737" />
+<TGConnectingPoint num="59" id="2738" />
+<TGConnectingPoint num="60" id="2739" />
+<TGConnectingPoint num="61" id="2740" />
+<TGConnectingPoint num="62" id="2741" />
+<TGConnectingPoint num="63" id="2742" />
+<TGConnectingPoint num="64" id="2743" />
+<TGConnectingPoint num="65" id="2744" />
+<TGConnectingPoint num="66" id="2745" />
+<TGConnectingPoint num="67" id="2746" />
+<TGConnectingPoint num="68" id="2747" />
+<TGConnectingPoint num="69" id="2748" />
+<TGConnectingPoint num="70" id="2749" />
+<TGConnectingPoint num="71" id="2750" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="2762" >
<cdparam x="373" y="285" />
<sizeparam width="68" 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" />
<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="2592" />
-<TGConnectingPoint num="1" id="2593" />
-<TGConnectingPoint num="2" id="2594" />
-<TGConnectingPoint num="3" id="2595" />
-<TGConnectingPoint num="4" id="2596" />
-<TGConnectingPoint num="5" id="2597" />
-<TGConnectingPoint num="6" id="2598" />
-<TGConnectingPoint num="7" id="2599" />
-<TGConnectingPoint num="8" id="2600" />
-<TGConnectingPoint num="9" id="2601" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="2604" >
+<TGConnectingPoint num="0" id="2752" />
+<TGConnectingPoint num="1" id="2753" />
+<TGConnectingPoint num="2" id="2754" />
+<TGConnectingPoint num="3" id="2755" />
+<TGConnectingPoint num="4" id="2756" />
+<TGConnectingPoint num="5" id="2757" />
+<TGConnectingPoint num="6" id="2758" />
+<TGConnectingPoint num="7" id="2759" />
+<TGConnectingPoint num="8" id="2760" />
+<TGConnectingPoint num="9" id="2761" />
+</COMPONENT>
+
+<COMPONENT type="5101" id="2764" >
<cdparam x="424" y="451" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2603" />
+<TGConnectingPoint num="0" id="2763" />
</COMPONENT>
-<COMPONENT type="5106" id="2645" >
+<COMPONENT type="5106" id="2837" >
<cdparam x="336" y="211" />
<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="2605" />
-<TGConnectingPoint num="1" id="2606" />
-<TGConnectingPoint num="2" id="2607" />
-<TGConnectingPoint num="3" id="2608" />
-<TGConnectingPoint num="4" id="2609" />
-<TGConnectingPoint num="5" id="2610" />
-<TGConnectingPoint num="6" id="2611" />
-<TGConnectingPoint num="7" id="2612" />
-<TGConnectingPoint num="8" id="2613" />
-<TGConnectingPoint num="9" id="2614" />
-<TGConnectingPoint num="10" id="2615" />
-<TGConnectingPoint num="11" id="2616" />
-<TGConnectingPoint num="12" id="2617" />
-<TGConnectingPoint num="13" id="2618" />
-<TGConnectingPoint num="14" id="2619" />
-<TGConnectingPoint num="15" id="2620" />
-<TGConnectingPoint num="16" id="2621" />
-<TGConnectingPoint num="17" id="2622" />
-<TGConnectingPoint num="18" id="2623" />
-<TGConnectingPoint num="19" id="2624" />
-<TGConnectingPoint num="20" id="2625" />
-<TGConnectingPoint num="21" id="2626" />
-<TGConnectingPoint num="22" id="2627" />
-<TGConnectingPoint num="23" id="2628" />
-<TGConnectingPoint num="24" id="2629" />
-<TGConnectingPoint num="25" id="2630" />
-<TGConnectingPoint num="26" id="2631" />
-<TGConnectingPoint num="27" id="2632" />
-<TGConnectingPoint num="28" id="2633" />
-<TGConnectingPoint num="29" id="2634" />
-<TGConnectingPoint num="30" id="2635" />
-<TGConnectingPoint num="31" id="2636" />
-<TGConnectingPoint num="32" id="2637" />
-<TGConnectingPoint num="33" id="2638" />
-<TGConnectingPoint num="34" id="2639" />
-<TGConnectingPoint num="35" id="2640" />
-<TGConnectingPoint num="36" id="2641" />
-<TGConnectingPoint num="37" id="2642" />
-<TGConnectingPoint num="38" id="2643" />
-<TGConnectingPoint num="39" id="2644" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2686" >
+<TGConnectingPoint num="0" id="2765" />
+<TGConnectingPoint num="1" id="2766" />
+<TGConnectingPoint num="2" id="2767" />
+<TGConnectingPoint num="3" id="2768" />
+<TGConnectingPoint num="4" id="2769" />
+<TGConnectingPoint num="5" id="2770" />
+<TGConnectingPoint num="6" id="2771" />
+<TGConnectingPoint num="7" id="2772" />
+<TGConnectingPoint num="8" id="2773" />
+<TGConnectingPoint num="9" id="2774" />
+<TGConnectingPoint num="10" id="2775" />
+<TGConnectingPoint num="11" id="2776" />
+<TGConnectingPoint num="12" id="2777" />
+<TGConnectingPoint num="13" id="2778" />
+<TGConnectingPoint num="14" id="2779" />
+<TGConnectingPoint num="15" id="2780" />
+<TGConnectingPoint num="16" id="2781" />
+<TGConnectingPoint num="17" id="2782" />
+<TGConnectingPoint num="18" id="2783" />
+<TGConnectingPoint num="19" id="2784" />
+<TGConnectingPoint num="20" id="2785" />
+<TGConnectingPoint num="21" id="2786" />
+<TGConnectingPoint num="22" id="2787" />
+<TGConnectingPoint num="23" id="2788" />
+<TGConnectingPoint num="24" id="2789" />
+<TGConnectingPoint num="25" id="2790" />
+<TGConnectingPoint num="26" id="2791" />
+<TGConnectingPoint num="27" id="2792" />
+<TGConnectingPoint num="28" id="2793" />
+<TGConnectingPoint num="29" id="2794" />
+<TGConnectingPoint num="30" id="2795" />
+<TGConnectingPoint num="31" id="2796" />
+<TGConnectingPoint num="32" id="2797" />
+<TGConnectingPoint num="33" id="2798" />
+<TGConnectingPoint num="34" id="2799" />
+<TGConnectingPoint num="35" id="2800" />
+<TGConnectingPoint num="36" id="2801" />
+<TGConnectingPoint num="37" id="2802" />
+<TGConnectingPoint num="38" id="2803" />
+<TGConnectingPoint num="39" id="2804" />
+<TGConnectingPoint num="40" id="2805" />
+<TGConnectingPoint num="41" id="2806" />
+<TGConnectingPoint num="42" id="2807" />
+<TGConnectingPoint num="43" id="2808" />
+<TGConnectingPoint num="44" id="2809" />
+<TGConnectingPoint num="45" id="2810" />
+<TGConnectingPoint num="46" id="2811" />
+<TGConnectingPoint num="47" id="2812" />
+<TGConnectingPoint num="48" id="2813" />
+<TGConnectingPoint num="49" id="2814" />
+<TGConnectingPoint num="50" id="2815" />
+<TGConnectingPoint num="51" id="2816" />
+<TGConnectingPoint num="52" id="2817" />
+<TGConnectingPoint num="53" id="2818" />
+<TGConnectingPoint num="54" id="2819" />
+<TGConnectingPoint num="55" id="2820" />
+<TGConnectingPoint num="56" id="2821" />
+<TGConnectingPoint num="57" id="2822" />
+<TGConnectingPoint num="58" id="2823" />
+<TGConnectingPoint num="59" id="2824" />
+<TGConnectingPoint num="60" id="2825" />
+<TGConnectingPoint num="61" id="2826" />
+<TGConnectingPoint num="62" id="2827" />
+<TGConnectingPoint num="63" id="2828" />
+<TGConnectingPoint num="64" id="2829" />
+<TGConnectingPoint num="65" id="2830" />
+<TGConnectingPoint num="66" id="2831" />
+<TGConnectingPoint num="67" id="2832" />
+<TGConnectingPoint num="68" id="2833" />
+<TGConnectingPoint num="69" id="2834" />
+<TGConnectingPoint num="70" id="2835" />
+<TGConnectingPoint num="71" id="2836" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2910" >
<cdparam x="340" y="92" />
<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="2646" />
-<TGConnectingPoint num="1" id="2647" />
-<TGConnectingPoint num="2" id="2648" />
-<TGConnectingPoint num="3" id="2649" />
-<TGConnectingPoint num="4" id="2650" />
-<TGConnectingPoint num="5" id="2651" />
-<TGConnectingPoint num="6" id="2652" />
-<TGConnectingPoint num="7" id="2653" />
-<TGConnectingPoint num="8" id="2654" />
-<TGConnectingPoint num="9" id="2655" />
-<TGConnectingPoint num="10" id="2656" />
-<TGConnectingPoint num="11" id="2657" />
-<TGConnectingPoint num="12" id="2658" />
-<TGConnectingPoint num="13" id="2659" />
-<TGConnectingPoint num="14" id="2660" />
-<TGConnectingPoint num="15" id="2661" />
-<TGConnectingPoint num="16" id="2662" />
-<TGConnectingPoint num="17" id="2663" />
-<TGConnectingPoint num="18" id="2664" />
-<TGConnectingPoint num="19" id="2665" />
-<TGConnectingPoint num="20" id="2666" />
-<TGConnectingPoint num="21" id="2667" />
-<TGConnectingPoint num="22" id="2668" />
-<TGConnectingPoint num="23" id="2669" />
-<TGConnectingPoint num="24" id="2670" />
-<TGConnectingPoint num="25" id="2671" />
-<TGConnectingPoint num="26" id="2672" />
-<TGConnectingPoint num="27" id="2673" />
-<TGConnectingPoint num="28" id="2674" />
-<TGConnectingPoint num="29" id="2675" />
-<TGConnectingPoint num="30" id="2676" />
-<TGConnectingPoint num="31" id="2677" />
-<TGConnectingPoint num="32" id="2678" />
-<TGConnectingPoint num="33" id="2679" />
-<TGConnectingPoint num="34" id="2680" />
-<TGConnectingPoint num="35" id="2681" />
-<TGConnectingPoint num="36" id="2682" />
-<TGConnectingPoint num="37" id="2683" />
-<TGConnectingPoint num="38" id="2684" />
-<TGConnectingPoint num="39" id="2685" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2688" >
+<TGConnectingPoint num="0" id="2838" />
+<TGConnectingPoint num="1" id="2839" />
+<TGConnectingPoint num="2" id="2840" />
+<TGConnectingPoint num="3" id="2841" />
+<TGConnectingPoint num="4" id="2842" />
+<TGConnectingPoint num="5" id="2843" />
+<TGConnectingPoint num="6" id="2844" />
+<TGConnectingPoint num="7" id="2845" />
+<TGConnectingPoint num="8" id="2846" />
+<TGConnectingPoint num="9" id="2847" />
+<TGConnectingPoint num="10" id="2848" />
+<TGConnectingPoint num="11" id="2849" />
+<TGConnectingPoint num="12" id="2850" />
+<TGConnectingPoint num="13" id="2851" />
+<TGConnectingPoint num="14" id="2852" />
+<TGConnectingPoint num="15" id="2853" />
+<TGConnectingPoint num="16" id="2854" />
+<TGConnectingPoint num="17" id="2855" />
+<TGConnectingPoint num="18" id="2856" />
+<TGConnectingPoint num="19" id="2857" />
+<TGConnectingPoint num="20" id="2858" />
+<TGConnectingPoint num="21" id="2859" />
+<TGConnectingPoint num="22" id="2860" />
+<TGConnectingPoint num="23" id="2861" />
+<TGConnectingPoint num="24" id="2862" />
+<TGConnectingPoint num="25" id="2863" />
+<TGConnectingPoint num="26" id="2864" />
+<TGConnectingPoint num="27" id="2865" />
+<TGConnectingPoint num="28" id="2866" />
+<TGConnectingPoint num="29" id="2867" />
+<TGConnectingPoint num="30" id="2868" />
+<TGConnectingPoint num="31" id="2869" />
+<TGConnectingPoint num="32" id="2870" />
+<TGConnectingPoint num="33" id="2871" />
+<TGConnectingPoint num="34" id="2872" />
+<TGConnectingPoint num="35" id="2873" />
+<TGConnectingPoint num="36" id="2874" />
+<TGConnectingPoint num="37" id="2875" />
+<TGConnectingPoint num="38" id="2876" />
+<TGConnectingPoint num="39" id="2877" />
+<TGConnectingPoint num="40" id="2878" />
+<TGConnectingPoint num="41" id="2879" />
+<TGConnectingPoint num="42" id="2880" />
+<TGConnectingPoint num="43" id="2881" />
+<TGConnectingPoint num="44" id="2882" />
+<TGConnectingPoint num="45" id="2883" />
+<TGConnectingPoint num="46" id="2884" />
+<TGConnectingPoint num="47" id="2885" />
+<TGConnectingPoint num="48" id="2886" />
+<TGConnectingPoint num="49" id="2887" />
+<TGConnectingPoint num="50" id="2888" />
+<TGConnectingPoint num="51" id="2889" />
+<TGConnectingPoint num="52" id="2890" />
+<TGConnectingPoint num="53" id="2891" />
+<TGConnectingPoint num="54" id="2892" />
+<TGConnectingPoint num="55" id="2893" />
+<TGConnectingPoint num="56" id="2894" />
+<TGConnectingPoint num="57" id="2895" />
+<TGConnectingPoint num="58" id="2896" />
+<TGConnectingPoint num="59" id="2897" />
+<TGConnectingPoint num="60" id="2898" />
+<TGConnectingPoint num="61" id="2899" />
+<TGConnectingPoint num="62" id="2900" />
+<TGConnectingPoint num="63" id="2901" />
+<TGConnectingPoint num="64" id="2902" />
+<TGConnectingPoint num="65" id="2903" />
+<TGConnectingPoint num="66" id="2904" />
+<TGConnectingPoint num="67" id="2905" />
+<TGConnectingPoint num="68" id="2906" />
+<TGConnectingPoint num="69" id="2907" />
+<TGConnectingPoint num="70" id="2908" />
+<TGConnectingPoint num="71" id="2909" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="2912" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2687" />
+<TGConnectingPoint num="0" id="2911" />
</COMPONENT>
@@ -9062,44 +9315,45 @@ the smart card and the terminal
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
+<considerTimingOperators value="true" />
<Validated value="" />
<Ignored value="" />
-<CONNECTOR type="5002" id="2694" >
+<CONNECTOR type="5002" id="2918" >
<cdparam x="568" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2691" />
-<TGConnectingPoint num="1" id="2692" />
-<TGConnectingPoint num="2" id="2693" />
-<P1 x="459" y="199" id="2791" />
-<P2 x="459" y="254" id="2784" />
+<TGConnectingPoint num="0" id="2915" />
+<TGConnectingPoint num="1" id="2916" />
+<TGConnectingPoint num="2" id="2917" />
+<P1 x="459" y="199" id="3015" />
+<P2 x="459" y="254" id="3008" />
<Point x="490" y="199" />
<Point x="490" y="254" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in chin(Message msg)" />
<osd value="out chout(Message msg)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" ams="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2689" >
-<father id="2694" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2913" >
+<father id="2918" num="0" />
<cdparam x="490" y="199" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2690" >
-<father id="2694" num="1" />
+<SUBCOMPONENT type="-1" id="2914" >
+<father id="2918" num="1" />
<cdparam x="490" y="254" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<COMPONENT type="302" id="2711" >
+<COMPONENT type="302" id="2935" >
<cdparam x="517" y="154" />
<sizeparam width="565" height="110" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9110,22 +9364,22 @@ the smart card and the terminal
#Confidentiality InterfaceDevice.secretData
#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m
" />
-<TGConnectingPoint num="0" id="2695" />
-<TGConnectingPoint num="1" id="2696" />
-<TGConnectingPoint num="2" id="2697" />
-<TGConnectingPoint num="3" id="2698" />
-<TGConnectingPoint num="4" id="2699" />
-<TGConnectingPoint num="5" id="2700" />
-<TGConnectingPoint num="6" id="2701" />
-<TGConnectingPoint num="7" id="2702" />
-<TGConnectingPoint num="8" id="2703" />
-<TGConnectingPoint num="9" id="2704" />
-<TGConnectingPoint num="10" id="2705" />
-<TGConnectingPoint num="11" id="2706" />
-<TGConnectingPoint num="12" id="2707" />
-<TGConnectingPoint num="13" id="2708" />
-<TGConnectingPoint num="14" id="2709" />
-<TGConnectingPoint num="15" id="2710" />
+<TGConnectingPoint num="0" id="2919" />
+<TGConnectingPoint num="1" id="2920" />
+<TGConnectingPoint num="2" id="2921" />
+<TGConnectingPoint num="3" id="2922" />
+<TGConnectingPoint num="4" id="2923" />
+<TGConnectingPoint num="5" id="2924" />
+<TGConnectingPoint num="6" id="2925" />
+<TGConnectingPoint num="7" id="2926" />
+<TGConnectingPoint num="8" id="2927" />
+<TGConnectingPoint num="9" id="2928" />
+<TGConnectingPoint num="10" id="2929" />
+<TGConnectingPoint num="11" id="2930" />
+<TGConnectingPoint num="12" id="2931" />
+<TGConnectingPoint num="13" id="2932" />
+<TGConnectingPoint num="14" id="2933" />
+<TGConnectingPoint num="15" id="2934" />
<extraparam>
<Line value="#PrivatePublicKeys InterfaceDevice privK pubK" />
<Line value="#PrivatePublicKeys SmartCard privK pubK" />
@@ -9135,74 +9389,72 @@ the smart card and the terminal
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="2720" >
+<COMPONENT type="5003" id="2944" >
<cdparam x="260" y="373" />
<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="2712" />
-<TGConnectingPoint num="1" id="2713" />
-<TGConnectingPoint num="2" id="2714" />
-<TGConnectingPoint num="3" id="2715" />
-<TGConnectingPoint num="4" id="2716" />
-<TGConnectingPoint num="5" id="2717" />
-<TGConnectingPoint num="6" id="2718" />
-<TGConnectingPoint num="7" id="2719" />
+<TGConnectingPoint num="0" id="2936" />
+<TGConnectingPoint num="1" id="2937" />
+<TGConnectingPoint num="2" id="2938" />
+<TGConnectingPoint num="3" id="2939" />
+<TGConnectingPoint num="4" id="2940" />
+<TGConnectingPoint num="5" id="2941" />
+<TGConnectingPoint num="6" id="2942" />
+<TGConnectingPoint num="7" id="2943" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="2729" >
+<COMPONENT type="5003" id="2953" >
<cdparam x="68" y="372" />
<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="2721" />
-<TGConnectingPoint num="1" id="2722" />
-<TGConnectingPoint num="2" id="2723" />
-<TGConnectingPoint num="3" id="2724" />
-<TGConnectingPoint num="4" id="2725" />
-<TGConnectingPoint num="5" id="2726" />
-<TGConnectingPoint num="6" id="2727" />
-<TGConnectingPoint num="7" id="2728" />
+<TGConnectingPoint num="0" id="2945" />
+<TGConnectingPoint num="1" id="2946" />
+<TGConnectingPoint num="2" id="2947" />
+<TGConnectingPoint num="3" id="2948" />
+<TGConnectingPoint num="4" id="2949" />
+<TGConnectingPoint num="5" id="2950" />
+<TGConnectingPoint num="6" id="2951" />
+<TGConnectingPoint num="7" id="2952" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="2804" >
+<COMPONENT type="5000" id="3028" >
<cdparam x="21" y="145" />
<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block0" value="System" />
-<TGConnectingPoint num="0" id="2780" />
-<TGConnectingPoint num="1" id="2781" />
-<TGConnectingPoint num="2" id="2782" />
-<TGConnectingPoint num="3" id="2783" />
-<TGConnectingPoint num="4" id="2784" />
-<TGConnectingPoint num="5" id="2785" />
-<TGConnectingPoint num="6" id="2786" />
-<TGConnectingPoint num="7" id="2787" />
-<TGConnectingPoint num="8" id="2788" />
-<TGConnectingPoint num="9" id="2789" />
-<TGConnectingPoint num="10" id="2790" />
-<TGConnectingPoint num="11" id="2791" />
-<TGConnectingPoint num="12" id="2792" />
-<TGConnectingPoint num="13" id="2793" />
-<TGConnectingPoint num="14" id="2794" />
-<TGConnectingPoint num="15" id="2795" />
-<TGConnectingPoint num="16" id="2796" />
-<TGConnectingPoint num="17" id="2797" />
-<TGConnectingPoint num="18" id="2798" />
-<TGConnectingPoint num="19" id="2799" />
-<TGConnectingPoint num="20" id="2800" />
-<TGConnectingPoint num="21" id="2801" />
-<TGConnectingPoint num="22" id="2802" />
-<TGConnectingPoint num="23" id="2803" />
+<TGConnectingPoint num="0" id="3004" />
+<TGConnectingPoint num="1" id="3005" />
+<TGConnectingPoint num="2" id="3006" />
+<TGConnectingPoint num="3" id="3007" />
+<TGConnectingPoint num="4" id="3008" />
+<TGConnectingPoint num="5" id="3009" />
+<TGConnectingPoint num="6" id="3010" />
+<TGConnectingPoint num="7" id="3011" />
+<TGConnectingPoint num="8" id="3012" />
+<TGConnectingPoint num="9" id="3013" />
+<TGConnectingPoint num="10" id="3014" />
+<TGConnectingPoint num="11" id="3015" />
+<TGConnectingPoint num="12" id="3016" />
+<TGConnectingPoint num="13" id="3017" />
+<TGConnectingPoint num="14" id="3018" />
+<TGConnectingPoint num="15" id="3019" />
+<TGConnectingPoint num="16" id="3020" />
+<TGConnectingPoint num="17" id="3021" />
+<TGConnectingPoint num="18" id="3022" />
+<TGConnectingPoint num="19" id="3023" />
+<TGConnectingPoint num="20" id="3024" />
+<TGConnectingPoint num="21" id="3025" />
+<TGConnectingPoint num="22" id="3026" />
+<TGConnectingPoint num="23" id="3027" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -9210,37 +9462,37 @@ the smart card and the terminal
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="2754" >
-<father id="2804" num="0" />
+<SUBCOMPONENT type="5000" id="2978" >
+<father id="3028" num="0" />
<cdparam x="36" y="233" />
<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
<infoparam name="Block0" value="InterfaceDevice" />
-<TGConnectingPoint num="0" id="2730" />
-<TGConnectingPoint num="1" id="2731" />
-<TGConnectingPoint num="2" id="2732" />
-<TGConnectingPoint num="3" id="2733" />
-<TGConnectingPoint num="4" id="2734" />
-<TGConnectingPoint num="5" id="2735" />
-<TGConnectingPoint num="6" id="2736" />
-<TGConnectingPoint num="7" id="2737" />
-<TGConnectingPoint num="8" id="2738" />
-<TGConnectingPoint num="9" id="2739" />
-<TGConnectingPoint num="10" id="2740" />
-<TGConnectingPoint num="11" id="2741" />
-<TGConnectingPoint num="12" id="2742" />
-<TGConnectingPoint num="13" id="2743" />
-<TGConnectingPoint num="14" id="2744" />
-<TGConnectingPoint num="15" id="2745" />
-<TGConnectingPoint num="16" id="2746" />
-<TGConnectingPoint num="17" id="2747" />
-<TGConnectingPoint num="18" id="2748" />
-<TGConnectingPoint num="19" id="2749" />
-<TGConnectingPoint num="20" id="2750" />
-<TGConnectingPoint num="21" id="2751" />
-<TGConnectingPoint num="22" id="2752" />
-<TGConnectingPoint num="23" id="2753" />
+<TGConnectingPoint num="0" id="2954" />
+<TGConnectingPoint num="1" id="2955" />
+<TGConnectingPoint num="2" id="2956" />
+<TGConnectingPoint num="3" id="2957" />
+<TGConnectingPoint num="4" id="2958" />
+<TGConnectingPoint num="5" id="2959" />
+<TGConnectingPoint num="6" id="2960" />
+<TGConnectingPoint num="7" id="2961" />
+<TGConnectingPoint num="8" id="2962" />
+<TGConnectingPoint num="9" id="2963" />
+<TGConnectingPoint num="10" id="2964" />
+<TGConnectingPoint num="11" id="2965" />
+<TGConnectingPoint num="12" id="2966" />
+<TGConnectingPoint num="13" id="2967" />
+<TGConnectingPoint num="14" id="2968" />
+<TGConnectingPoint num="15" id="2969" />
+<TGConnectingPoint num="16" id="2970" />
+<TGConnectingPoint num="17" id="2971" />
+<TGConnectingPoint num="18" id="2972" />
+<TGConnectingPoint num="19" id="2973" />
+<TGConnectingPoint num="20" id="2974" />
+<TGConnectingPoint num="21" id="2975" />
+<TGConnectingPoint num="22" id="2976" />
+<TGConnectingPoint num="23" id="2977" />
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
@@ -9275,37 +9527,37 @@ the smart card and the terminal
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2779" >
-<father id="2804" num="1" />
+<SUBCOMPONENT type="5000" id="3003" >
+<father id="3028" num="1" />
<cdparam x="263" y="233" />
<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
<infoparam name="Block0" value="SmartCard" />
-<TGConnectingPoint num="0" id="2755" />
-<TGConnectingPoint num="1" id="2756" />
-<TGConnectingPoint num="2" id="2757" />
-<TGConnectingPoint num="3" id="2758" />
-<TGConnectingPoint num="4" id="2759" />
-<TGConnectingPoint num="5" id="2760" />
-<TGConnectingPoint num="6" id="2761" />
-<TGConnectingPoint num="7" id="2762" />
-<TGConnectingPoint num="8" id="2763" />
-<TGConnectingPoint num="9" id="2764" />
-<TGConnectingPoint num="10" id="2765" />
-<TGConnectingPoint num="11" id="2766" />
-<TGConnectingPoint num="12" id="2767" />
-<TGConnectingPoint num="13" id="2768" />
-<TGConnectingPoint num="14" id="2769" />
-<TGConnectingPoint num="15" id="2770" />
-<TGConnectingPoint num="16" id="2771" />
-<TGConnectingPoint num="17" id="2772" />
-<TGConnectingPoint num="18" id="2773" />
-<TGConnectingPoint num="19" id="2774" />
-<TGConnectingPoint num="20" id="2775" />
-<TGConnectingPoint num="21" id="2776" />
-<TGConnectingPoint num="22" id="2777" />
-<TGConnectingPoint num="23" id="2778" />
+<TGConnectingPoint num="0" id="2979" />
+<TGConnectingPoint num="1" id="2980" />
+<TGConnectingPoint num="2" id="2981" />
+<TGConnectingPoint num="3" id="2982" />
+<TGConnectingPoint num="4" id="2983" />
+<TGConnectingPoint num="5" id="2984" />
+<TGConnectingPoint num="6" id="2985" />
+<TGConnectingPoint num="7" id="2986" />
+<TGConnectingPoint num="8" id="2987" />
+<TGConnectingPoint num="9" id="2988" />
+<TGConnectingPoint num="10" id="2989" />
+<TGConnectingPoint num="11" id="2990" />
+<TGConnectingPoint num="12" id="2991" />
+<TGConnectingPoint num="13" id="2992" />
+<TGConnectingPoint num="14" id="2993" />
+<TGConnectingPoint num="15" id="2994" />
+<TGConnectingPoint num="16" id="2995" />
+<TGConnectingPoint num="17" id="2996" />
+<TGConnectingPoint num="18" id="2997" />
+<TGConnectingPoint num="19" id="2998" />
+<TGConnectingPoint num="20" id="2999" />
+<TGConnectingPoint num="21" id="3000" />
+<TGConnectingPoint num="22" id="3001" />
+<TGConnectingPoint num="23" id="3002" />
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
@@ -9345,133 +9597,145 @@ the smart card and the terminal
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="2806" >
+<COMPONENT type="5100" id="3030" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2805" />
+<TGConnectingPoint num="0" id="3029" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2813" >
+<CONNECTOR type="5102" id="3037" >
<cdparam x="411" y="567" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2812" />
-<P1 x="411" y="567" id="3016" />
-<P2 x="420" y="613" id="2975" />
+<TGConnectingPoint num="0" id="3036" />
+<P1 x="411" y="567" id="3336" />
+<P2 x="420" y="613" id="3263" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2811" >
-<father id="2813" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3035" >
+<father id="3037" num="0" />
<cdparam x="453" y="610" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2807" />
-<TGConnectingPoint num="1" id="2808" />
-<TGConnectingPoint num="2" id="2809" />
-<TGConnectingPoint num="3" id="2810" />
+<TGConnectingPoint num="0" id="3031" />
+<TGConnectingPoint num="1" id="3032" />
+<TGConnectingPoint num="2" id="3033" />
+<TGConnectingPoint num="3" id="3034" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2820" >
+<CONNECTOR type="5102" id="3044" >
<cdparam x="496" y="703" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2819" />
-<P1 x="420" y="663" id="2980" />
-<P2 x="438" y="703" id="3026" />
+<TGConnectingPoint num="0" id="3043" />
+<P1 x="420" y="663" id="3268" />
+<P2 x="438" y="703" id="3346" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2818" >
-<father id="2820" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3042" >
+<father id="3044" num="0" />
<cdparam x="453" y="697" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2814" />
-<TGConnectingPoint num="1" id="2815" />
-<TGConnectingPoint num="2" id="2816" />
-<TGConnectingPoint num="3" id="2817" />
+<TGConnectingPoint num="0" id="3038" />
+<TGConnectingPoint num="1" id="3039" />
+<TGConnectingPoint num="2" id="3040" />
+<TGConnectingPoint num="3" id="3041" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2827" >
+<CONNECTOR type="5102" id="3051" >
<cdparam x="411" y="508" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="2826" />
-<P1 x="411" y="508" id="3034" />
-<P2 x="411" y="537" id="3015" />
+<TGConnectingPoint num="0" id="3050" />
+<P1 x="411" y="508" id="3354" />
+<P2 x="411" y="537" id="3335" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2825" >
-<father id="2827" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3049" >
+<father id="3051" num="0" />
<cdparam x="411" y="548" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2821" />
-<TGConnectingPoint num="1" id="2822" />
-<TGConnectingPoint num="2" id="2823" />
-<TGConnectingPoint num="3" id="2824" />
+<TGConnectingPoint num="0" id="3045" />
+<TGConnectingPoint num="1" id="3046" />
+<TGConnectingPoint num="2" id="3047" />
+<TGConnectingPoint num="3" id="3048" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2834" >
+<CONNECTOR type="5102" id="3058" >
<cdparam x="411" y="389" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2833" />
-<P1 x="411" y="389" id="3075" />
-<P2 x="411" y="468" id="3029" />
+<TGConnectingPoint num="0" id="3057" />
+<P1 x="411" y="389" id="3427" />
+<P2 x="411" y="468" id="3349" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2832" >
-<father id="2834" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3056" >
+<father id="3058" num="0" />
<cdparam x="439" y="414" />
<sizeparam width="148" height="45" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2828" />
-<TGConnectingPoint num="1" id="2829" />
-<TGConnectingPoint num="2" id="2830" />
-<TGConnectingPoint num="3" id="2831" />
+<TGConnectingPoint num="0" id="3052" />
+<TGConnectingPoint num="1" id="3053" />
+<TGConnectingPoint num="2" id="3054" />
+<TGConnectingPoint num="3" id="3055" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -9481,60 +9745,66 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2841" >
+<CONNECTOR type="5102" id="3065" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2840" />
-<P1 x="407" y="70" id="3110" />
-<P2 x="405" y="91" id="2934" />
+<TGConnectingPoint num="0" id="3064" />
+<P1 x="407" y="70" id="3494" />
+<P2 x="405" y="91" id="3190" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2839" >
-<father id="2841" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3063" >
+<father id="3065" num="0" />
<cdparam x="407" y="110" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2835" />
-<TGConnectingPoint num="1" id="2836" />
-<TGConnectingPoint num="2" id="2837" />
-<TGConnectingPoint num="3" id="2838" />
+<TGConnectingPoint num="0" id="3059" />
+<TGConnectingPoint num="1" id="3060" />
+<TGConnectingPoint num="2" id="3061" />
+<TGConnectingPoint num="3" id="3062" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2848" >
+<CONNECTOR type="5102" id="3072" >
<cdparam x="392" y="122" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2847" />
-<P1 x="392" y="122" id="2962" />
-<P2 x="392" y="150" id="2922" />
+<TGConnectingPoint num="0" id="3071" />
+<P1 x="392" y="122" id="3218" />
+<P2 x="392" y="150" id="3178" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2846" >
-<father id="2848" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3070" >
+<father id="3072" num="0" />
<cdparam x="411" y="142" />
<sizeparam width="120" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2842" />
-<TGConnectingPoint num="1" id="2843" />
-<TGConnectingPoint num="2" id="2844" />
-<TGConnectingPoint num="3" id="2845" />
+<TGConnectingPoint num="0" id="3066" />
+<TGConnectingPoint num="1" id="3067" />
+<TGConnectingPoint num="2" id="3068" />
+<TGConnectingPoint num="3" id="3069" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -9542,90 +9812,99 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2855" >
+<CONNECTOR type="5102" id="3079" >
<cdparam x="391" y="166" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2854" />
-<P1 x="392" y="180" id="2923" />
-<P2 x="380" y="224" id="2898" />
+<TGConnectingPoint num="0" id="3078" />
+<P1 x="392" y="180" id="3179" />
+<P2 x="380" y="224" id="3122" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2853" >
-<father id="2855" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3077" >
+<father id="3079" num="0" />
<cdparam x="390" y="188" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2849" />
-<TGConnectingPoint num="1" id="2850" />
-<TGConnectingPoint num="2" id="2851" />
-<TGConnectingPoint num="3" id="2852" />
+<TGConnectingPoint num="0" id="3073" />
+<TGConnectingPoint num="1" id="3074" />
+<TGConnectingPoint num="2" id="3075" />
+<TGConnectingPoint num="3" id="3076" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2862" >
+<CONNECTOR type="5102" id="3086" >
<cdparam x="380" y="258" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2861" />
-<P1 x="380" y="258" id="2910" />
-<P2 x="386" y="287" id="2870" />
+<TGConnectingPoint num="0" id="3085" />
+<P1 x="380" y="258" id="3134" />
+<P2 x="386" y="287" id="3094" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2860" >
-<father id="2862" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3084" >
+<father id="3086" num="0" />
<cdparam x="377" y="267" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2856" />
-<TGConnectingPoint num="1" id="2857" />
-<TGConnectingPoint num="2" id="2858" />
-<TGConnectingPoint num="3" id="2859" />
+<TGConnectingPoint num="0" id="3080" />
+<TGConnectingPoint num="1" id="3081" />
+<TGConnectingPoint num="2" id="3082" />
+<TGConnectingPoint num="3" id="3083" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2869" >
+<CONNECTOR type="5102" id="3093" >
<cdparam x="375" y="306" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2868" />
-<P1 x="386" y="317" id="2871" />
-<P2 x="377" y="349" id="3077" />
+<TGConnectingPoint num="0" id="3092" />
+<P1 x="386" y="317" id="3095" />
+<P2 x="377" y="349" id="3429" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2867" >
-<father id="2869" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3091" >
+<father id="3093" num="0" />
<cdparam x="396" y="336" />
<sizeparam width="142" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2863" />
-<TGConnectingPoint num="1" id="2864" />
-<TGConnectingPoint num="2" id="2865" />
-<TGConnectingPoint num="3" id="2866" />
+<TGConnectingPoint num="0" id="3087" />
+<TGConnectingPoint num="1" id="3088" />
+<TGConnectingPoint num="2" id="3089" />
+<TGConnectingPoint num="3" id="3090" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -9633,364 +9912,527 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5104" id="2880" >
+<COMPONENT type="5104" id="3104" >
<cdparam x="356" y="292" />
<sizeparam width="60" 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" />
<infoparam name="Receive signal" value="chin(m)" />
-<TGConnectingPoint num="0" id="2870" />
-<TGConnectingPoint num="1" id="2871" />
-<TGConnectingPoint num="2" id="2872" />
-<TGConnectingPoint num="3" id="2873" />
-<TGConnectingPoint num="4" id="2874" />
-<TGConnectingPoint num="5" id="2875" />
-<TGConnectingPoint num="6" id="2876" />
-<TGConnectingPoint num="7" id="2877" />
-<TGConnectingPoint num="8" id="2878" />
-<TGConnectingPoint num="9" id="2879" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2921" >
+<TGConnectingPoint num="0" id="3094" />
+<TGConnectingPoint num="1" id="3095" />
+<TGConnectingPoint num="2" id="3096" />
+<TGConnectingPoint num="3" id="3097" />
+<TGConnectingPoint num="4" id="3098" />
+<TGConnectingPoint num="5" id="3099" />
+<TGConnectingPoint num="6" id="3100" />
+<TGConnectingPoint num="7" id="3101" />
+<TGConnectingPoint num="8" id="3102" />
+<TGConnectingPoint num="9" id="3103" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3177" >
<cdparam x="338" y="224" />
<sizeparam width="114" height="34" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="receivingPubK" />
-<TGConnectingPoint num="0" id="2881" />
-<TGConnectingPoint num="1" id="2882" />
-<TGConnectingPoint num="2" id="2883" />
-<TGConnectingPoint num="3" id="2884" />
-<TGConnectingPoint num="4" id="2885" />
-<TGConnectingPoint num="5" id="2886" />
-<TGConnectingPoint num="6" id="2887" />
-<TGConnectingPoint num="7" id="2888" />
-<TGConnectingPoint num="8" id="2889" />
-<TGConnectingPoint num="9" id="2890" />
-<TGConnectingPoint num="10" id="2891" />
-<TGConnectingPoint num="11" id="2892" />
-<TGConnectingPoint num="12" id="2893" />
-<TGConnectingPoint num="13" id="2894" />
-<TGConnectingPoint num="14" id="2895" />
-<TGConnectingPoint num="15" id="2896" />
-<TGConnectingPoint num="16" id="2897" />
-<TGConnectingPoint num="17" id="2898" />
-<TGConnectingPoint num="18" id="2899" />
-<TGConnectingPoint num="19" id="2900" />
-<TGConnectingPoint num="20" id="2901" />
-<TGConnectingPoint num="21" id="2902" />
-<TGConnectingPoint num="22" id="2903" />
-<TGConnectingPoint num="23" id="2904" />
-<TGConnectingPoint num="24" id="2905" />
-<TGConnectingPoint num="25" id="2906" />
-<TGConnectingPoint num="26" id="2907" />
-<TGConnectingPoint num="27" id="2908" />
-<TGConnectingPoint num="28" id="2909" />
-<TGConnectingPoint num="29" id="2910" />
-<TGConnectingPoint num="30" id="2911" />
-<TGConnectingPoint num="31" id="2912" />
-<TGConnectingPoint num="32" id="2913" />
-<TGConnectingPoint num="33" id="2914" />
-<TGConnectingPoint num="34" id="2915" />
-<TGConnectingPoint num="35" id="2916" />
-<TGConnectingPoint num="36" id="2917" />
-<TGConnectingPoint num="37" id="2918" />
-<TGConnectingPoint num="38" id="2919" />
-<TGConnectingPoint num="39" id="2920" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="2932" >
+<TGConnectingPoint num="0" id="3105" />
+<TGConnectingPoint num="1" id="3106" />
+<TGConnectingPoint num="2" id="3107" />
+<TGConnectingPoint num="3" id="3108" />
+<TGConnectingPoint num="4" id="3109" />
+<TGConnectingPoint num="5" id="3110" />
+<TGConnectingPoint num="6" id="3111" />
+<TGConnectingPoint num="7" id="3112" />
+<TGConnectingPoint num="8" id="3113" />
+<TGConnectingPoint num="9" id="3114" />
+<TGConnectingPoint num="10" id="3115" />
+<TGConnectingPoint num="11" id="3116" />
+<TGConnectingPoint num="12" id="3117" />
+<TGConnectingPoint num="13" id="3118" />
+<TGConnectingPoint num="14" id="3119" />
+<TGConnectingPoint num="15" id="3120" />
+<TGConnectingPoint num="16" id="3121" />
+<TGConnectingPoint num="17" id="3122" />
+<TGConnectingPoint num="18" id="3123" />
+<TGConnectingPoint num="19" id="3124" />
+<TGConnectingPoint num="20" id="3125" />
+<TGConnectingPoint num="21" id="3126" />
+<TGConnectingPoint num="22" id="3127" />
+<TGConnectingPoint num="23" id="3128" />
+<TGConnectingPoint num="24" id="3129" />
+<TGConnectingPoint num="25" id="3130" />
+<TGConnectingPoint num="26" id="3131" />
+<TGConnectingPoint num="27" id="3132" />
+<TGConnectingPoint num="28" id="3133" />
+<TGConnectingPoint num="29" id="3134" />
+<TGConnectingPoint num="30" id="3135" />
+<TGConnectingPoint num="31" id="3136" />
+<TGConnectingPoint num="32" id="3137" />
+<TGConnectingPoint num="33" id="3138" />
+<TGConnectingPoint num="34" id="3139" />
+<TGConnectingPoint num="35" id="3140" />
+<TGConnectingPoint num="36" id="3141" />
+<TGConnectingPoint num="37" id="3142" />
+<TGConnectingPoint num="38" id="3143" />
+<TGConnectingPoint num="39" id="3144" />
+<TGConnectingPoint num="40" id="3145" />
+<TGConnectingPoint num="41" id="3146" />
+<TGConnectingPoint num="42" id="3147" />
+<TGConnectingPoint num="43" id="3148" />
+<TGConnectingPoint num="44" id="3149" />
+<TGConnectingPoint num="45" id="3150" />
+<TGConnectingPoint num="46" id="3151" />
+<TGConnectingPoint num="47" id="3152" />
+<TGConnectingPoint num="48" id="3153" />
+<TGConnectingPoint num="49" id="3154" />
+<TGConnectingPoint num="50" id="3155" />
+<TGConnectingPoint num="51" id="3156" />
+<TGConnectingPoint num="52" id="3157" />
+<TGConnectingPoint num="53" id="3158" />
+<TGConnectingPoint num="54" id="3159" />
+<TGConnectingPoint num="55" id="3160" />
+<TGConnectingPoint num="56" id="3161" />
+<TGConnectingPoint num="57" id="3162" />
+<TGConnectingPoint num="58" id="3163" />
+<TGConnectingPoint num="59" id="3164" />
+<TGConnectingPoint num="60" id="3165" />
+<TGConnectingPoint num="61" id="3166" />
+<TGConnectingPoint num="62" id="3167" />
+<TGConnectingPoint num="63" id="3168" />
+<TGConnectingPoint num="64" id="3169" />
+<TGConnectingPoint num="65" id="3170" />
+<TGConnectingPoint num="66" id="3171" />
+<TGConnectingPoint num="67" id="3172" />
+<TGConnectingPoint num="68" id="3173" />
+<TGConnectingPoint num="69" id="3174" />
+<TGConnectingPoint num="70" id="3175" />
+<TGConnectingPoint num="71" id="3176" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3188" >
<cdparam x="362" y="155" />
<sizeparam width="60" 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" />
<infoparam name="Send signal" value="chout(m)" />
-<TGConnectingPoint num="0" id="2922" />
-<TGConnectingPoint num="1" id="2923" />
-<TGConnectingPoint num="2" id="2924" />
-<TGConnectingPoint num="3" id="2925" />
-<TGConnectingPoint num="4" id="2926" />
-<TGConnectingPoint num="5" id="2927" />
-<TGConnectingPoint num="6" id="2928" />
-<TGConnectingPoint num="7" id="2929" />
-<TGConnectingPoint num="8" id="2930" />
-<TGConnectingPoint num="9" id="2931" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2973" >
+<TGConnectingPoint num="0" id="3178" />
+<TGConnectingPoint num="1" id="3179" />
+<TGConnectingPoint num="2" id="3180" />
+<TGConnectingPoint num="3" id="3181" />
+<TGConnectingPoint num="4" id="3182" />
+<TGConnectingPoint num="5" id="3183" />
+<TGConnectingPoint num="6" id="3184" />
+<TGConnectingPoint num="7" id="3185" />
+<TGConnectingPoint num="8" id="3186" />
+<TGConnectingPoint num="9" id="3187" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3261" >
<cdparam x="355" y="91" />
<sizeparam width="100" height="31" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="sendingPubK" />
-<TGConnectingPoint num="0" id="2933" />
-<TGConnectingPoint num="1" id="2934" />
-<TGConnectingPoint num="2" id="2935" />
-<TGConnectingPoint num="3" id="2936" />
-<TGConnectingPoint num="4" id="2937" />
-<TGConnectingPoint num="5" id="2938" />
-<TGConnectingPoint num="6" id="2939" />
-<TGConnectingPoint num="7" id="2940" />
-<TGConnectingPoint num="8" id="2941" />
-<TGConnectingPoint num="9" id="2942" />
-<TGConnectingPoint num="10" id="2943" />
-<TGConnectingPoint num="11" id="2944" />
-<TGConnectingPoint num="12" id="2945" />
-<TGConnectingPoint num="13" id="2946" />
-<TGConnectingPoint num="14" id="2947" />
-<TGConnectingPoint num="15" id="2948" />
-<TGConnectingPoint num="16" id="2949" />
-<TGConnectingPoint num="17" id="2950" />
-<TGConnectingPoint num="18" id="2951" />
-<TGConnectingPoint num="19" id="2952" />
-<TGConnectingPoint num="20" id="2953" />
-<TGConnectingPoint num="21" id="2954" />
-<TGConnectingPoint num="22" id="2955" />
-<TGConnectingPoint num="23" id="2956" />
-<TGConnectingPoint num="24" id="2957" />
-<TGConnectingPoint num="25" id="2958" />
-<TGConnectingPoint num="26" id="2959" />
-<TGConnectingPoint num="27" id="2960" />
-<TGConnectingPoint num="28" id="2961" />
-<TGConnectingPoint num="29" id="2962" />
-<TGConnectingPoint num="30" id="2963" />
-<TGConnectingPoint num="31" id="2964" />
-<TGConnectingPoint num="32" id="2965" />
-<TGConnectingPoint num="33" id="2966" />
-<TGConnectingPoint num="34" id="2967" />
-<TGConnectingPoint num="35" id="2968" />
-<TGConnectingPoint num="36" id="2969" />
-<TGConnectingPoint num="37" id="2970" />
-<TGConnectingPoint num="38" id="2971" />
-<TGConnectingPoint num="39" id="2972" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3014" >
+<TGConnectingPoint num="0" id="3189" />
+<TGConnectingPoint num="1" id="3190" />
+<TGConnectingPoint num="2" id="3191" />
+<TGConnectingPoint num="3" id="3192" />
+<TGConnectingPoint num="4" id="3193" />
+<TGConnectingPoint num="5" id="3194" />
+<TGConnectingPoint num="6" id="3195" />
+<TGConnectingPoint num="7" id="3196" />
+<TGConnectingPoint num="8" id="3197" />
+<TGConnectingPoint num="9" id="3198" />
+<TGConnectingPoint num="10" id="3199" />
+<TGConnectingPoint num="11" id="3200" />
+<TGConnectingPoint num="12" id="3201" />
+<TGConnectingPoint num="13" id="3202" />
+<TGConnectingPoint num="14" id="3203" />
+<TGConnectingPoint num="15" id="3204" />
+<TGConnectingPoint num="16" id="3205" />
+<TGConnectingPoint num="17" id="3206" />
+<TGConnectingPoint num="18" id="3207" />
+<TGConnectingPoint num="19" id="3208" />
+<TGConnectingPoint num="20" id="3209" />
+<TGConnectingPoint num="21" id="3210" />
+<TGConnectingPoint num="22" id="3211" />
+<TGConnectingPoint num="23" id="3212" />
+<TGConnectingPoint num="24" id="3213" />
+<TGConnectingPoint num="25" id="3214" />
+<TGConnectingPoint num="26" id="3215" />
+<TGConnectingPoint num="27" id="3216" />
+<TGConnectingPoint num="28" id="3217" />
+<TGConnectingPoint num="29" id="3218" />
+<TGConnectingPoint num="30" id="3219" />
+<TGConnectingPoint num="31" id="3220" />
+<TGConnectingPoint num="32" id="3221" />
+<TGConnectingPoint num="33" id="3222" />
+<TGConnectingPoint num="34" id="3223" />
+<TGConnectingPoint num="35" id="3224" />
+<TGConnectingPoint num="36" id="3225" />
+<TGConnectingPoint num="37" id="3226" />
+<TGConnectingPoint num="38" id="3227" />
+<TGConnectingPoint num="39" id="3228" />
+<TGConnectingPoint num="40" id="3229" />
+<TGConnectingPoint num="41" id="3230" />
+<TGConnectingPoint num="42" id="3231" />
+<TGConnectingPoint num="43" id="3232" />
+<TGConnectingPoint num="44" id="3233" />
+<TGConnectingPoint num="45" id="3234" />
+<TGConnectingPoint num="46" id="3235" />
+<TGConnectingPoint num="47" id="3236" />
+<TGConnectingPoint num="48" id="3237" />
+<TGConnectingPoint num="49" id="3238" />
+<TGConnectingPoint num="50" id="3239" />
+<TGConnectingPoint num="51" id="3240" />
+<TGConnectingPoint num="52" id="3241" />
+<TGConnectingPoint num="53" id="3242" />
+<TGConnectingPoint num="54" id="3243" />
+<TGConnectingPoint num="55" id="3244" />
+<TGConnectingPoint num="56" id="3245" />
+<TGConnectingPoint num="57" id="3246" />
+<TGConnectingPoint num="58" id="3247" />
+<TGConnectingPoint num="59" id="3248" />
+<TGConnectingPoint num="60" id="3249" />
+<TGConnectingPoint num="61" id="3250" />
+<TGConnectingPoint num="62" id="3251" />
+<TGConnectingPoint num="63" id="3252" />
+<TGConnectingPoint num="64" id="3253" />
+<TGConnectingPoint num="65" id="3254" />
+<TGConnectingPoint num="66" id="3255" />
+<TGConnectingPoint num="67" id="3256" />
+<TGConnectingPoint num="68" id="3257" />
+<TGConnectingPoint num="69" id="3258" />
+<TGConnectingPoint num="70" id="3259" />
+<TGConnectingPoint num="71" id="3260" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3334" >
<cdparam x="370" y="613" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="beforeFinish" />
-<TGConnectingPoint num="0" id="2974" />
-<TGConnectingPoint num="1" id="2975" />
-<TGConnectingPoint num="2" id="2976" />
-<TGConnectingPoint num="3" id="2977" />
-<TGConnectingPoint num="4" id="2978" />
-<TGConnectingPoint num="5" id="2979" />
-<TGConnectingPoint num="6" id="2980" />
-<TGConnectingPoint num="7" id="2981" />
-<TGConnectingPoint num="8" id="2982" />
-<TGConnectingPoint num="9" id="2983" />
-<TGConnectingPoint num="10" id="2984" />
-<TGConnectingPoint num="11" id="2985" />
-<TGConnectingPoint num="12" id="2986" />
-<TGConnectingPoint num="13" id="2987" />
-<TGConnectingPoint num="14" id="2988" />
-<TGConnectingPoint num="15" id="2989" />
-<TGConnectingPoint num="16" id="2990" />
-<TGConnectingPoint num="17" id="2991" />
-<TGConnectingPoint num="18" id="2992" />
-<TGConnectingPoint num="19" id="2993" />
-<TGConnectingPoint num="20" id="2994" />
-<TGConnectingPoint num="21" id="2995" />
-<TGConnectingPoint num="22" id="2996" />
-<TGConnectingPoint num="23" id="2997" />
-<TGConnectingPoint num="24" id="2998" />
-<TGConnectingPoint num="25" id="2999" />
-<TGConnectingPoint num="26" id="3000" />
-<TGConnectingPoint num="27" id="3001" />
-<TGConnectingPoint num="28" id="3002" />
-<TGConnectingPoint num="29" id="3003" />
-<TGConnectingPoint num="30" id="3004" />
-<TGConnectingPoint num="31" id="3005" />
-<TGConnectingPoint num="32" id="3006" />
-<TGConnectingPoint num="33" id="3007" />
-<TGConnectingPoint num="34" id="3008" />
-<TGConnectingPoint num="35" id="3009" />
-<TGConnectingPoint num="36" id="3010" />
-<TGConnectingPoint num="37" id="3011" />
-<TGConnectingPoint num="38" id="3012" />
-<TGConnectingPoint num="39" id="3013" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3025" >
+<TGConnectingPoint num="0" id="3262" />
+<TGConnectingPoint num="1" id="3263" />
+<TGConnectingPoint num="2" id="3264" />
+<TGConnectingPoint num="3" id="3265" />
+<TGConnectingPoint num="4" id="3266" />
+<TGConnectingPoint num="5" id="3267" />
+<TGConnectingPoint num="6" id="3268" />
+<TGConnectingPoint num="7" id="3269" />
+<TGConnectingPoint num="8" id="3270" />
+<TGConnectingPoint num="9" id="3271" />
+<TGConnectingPoint num="10" id="3272" />
+<TGConnectingPoint num="11" id="3273" />
+<TGConnectingPoint num="12" id="3274" />
+<TGConnectingPoint num="13" id="3275" />
+<TGConnectingPoint num="14" id="3276" />
+<TGConnectingPoint num="15" id="3277" />
+<TGConnectingPoint num="16" id="3278" />
+<TGConnectingPoint num="17" id="3279" />
+<TGConnectingPoint num="18" id="3280" />
+<TGConnectingPoint num="19" id="3281" />
+<TGConnectingPoint num="20" id="3282" />
+<TGConnectingPoint num="21" id="3283" />
+<TGConnectingPoint num="22" id="3284" />
+<TGConnectingPoint num="23" id="3285" />
+<TGConnectingPoint num="24" id="3286" />
+<TGConnectingPoint num="25" id="3287" />
+<TGConnectingPoint num="26" id="3288" />
+<TGConnectingPoint num="27" id="3289" />
+<TGConnectingPoint num="28" id="3290" />
+<TGConnectingPoint num="29" id="3291" />
+<TGConnectingPoint num="30" id="3292" />
+<TGConnectingPoint num="31" id="3293" />
+<TGConnectingPoint num="32" id="3294" />
+<TGConnectingPoint num="33" id="3295" />
+<TGConnectingPoint num="34" id="3296" />
+<TGConnectingPoint num="35" id="3297" />
+<TGConnectingPoint num="36" id="3298" />
+<TGConnectingPoint num="37" id="3299" />
+<TGConnectingPoint num="38" id="3300" />
+<TGConnectingPoint num="39" id="3301" />
+<TGConnectingPoint num="40" id="3302" />
+<TGConnectingPoint num="41" id="3303" />
+<TGConnectingPoint num="42" id="3304" />
+<TGConnectingPoint num="43" id="3305" />
+<TGConnectingPoint num="44" id="3306" />
+<TGConnectingPoint num="45" id="3307" />
+<TGConnectingPoint num="46" id="3308" />
+<TGConnectingPoint num="47" id="3309" />
+<TGConnectingPoint num="48" id="3310" />
+<TGConnectingPoint num="49" id="3311" />
+<TGConnectingPoint num="50" id="3312" />
+<TGConnectingPoint num="51" id="3313" />
+<TGConnectingPoint num="52" id="3314" />
+<TGConnectingPoint num="53" id="3315" />
+<TGConnectingPoint num="54" id="3316" />
+<TGConnectingPoint num="55" id="3317" />
+<TGConnectingPoint num="56" id="3318" />
+<TGConnectingPoint num="57" id="3319" />
+<TGConnectingPoint num="58" id="3320" />
+<TGConnectingPoint num="59" id="3321" />
+<TGConnectingPoint num="60" id="3322" />
+<TGConnectingPoint num="61" id="3323" />
+<TGConnectingPoint num="62" id="3324" />
+<TGConnectingPoint num="63" id="3325" />
+<TGConnectingPoint num="64" id="3326" />
+<TGConnectingPoint num="65" id="3327" />
+<TGConnectingPoint num="66" id="3328" />
+<TGConnectingPoint num="67" id="3329" />
+<TGConnectingPoint num="68" id="3330" />
+<TGConnectingPoint num="69" id="3331" />
+<TGConnectingPoint num="70" id="3332" />
+<TGConnectingPoint num="71" id="3333" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3345" >
<cdparam x="377" y="542" />
<sizeparam width="68" 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" />
<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="3015" />
-<TGConnectingPoint num="1" id="3016" />
-<TGConnectingPoint num="2" id="3017" />
-<TGConnectingPoint num="3" id="3018" />
-<TGConnectingPoint num="4" id="3019" />
-<TGConnectingPoint num="5" id="3020" />
-<TGConnectingPoint num="6" id="3021" />
-<TGConnectingPoint num="7" id="3022" />
-<TGConnectingPoint num="8" id="3023" />
-<TGConnectingPoint num="9" id="3024" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="3027" >
+<TGConnectingPoint num="0" id="3335" />
+<TGConnectingPoint num="1" id="3336" />
+<TGConnectingPoint num="2" id="3337" />
+<TGConnectingPoint num="3" id="3338" />
+<TGConnectingPoint num="4" id="3339" />
+<TGConnectingPoint num="5" id="3340" />
+<TGConnectingPoint num="6" id="3341" />
+<TGConnectingPoint num="7" id="3342" />
+<TGConnectingPoint num="8" id="3343" />
+<TGConnectingPoint num="9" id="3344" />
+</COMPONENT>
+
+<COMPONENT type="5101" id="3347" >
<cdparam x="428" y="708" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="3026" />
+<TGConnectingPoint num="0" id="3346" />
</COMPONENT>
-<COMPONENT type="5106" id="3068" >
+<COMPONENT type="5106" id="3420" >
<cdparam x="340" y="468" />
<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="3028" />
-<TGConnectingPoint num="1" id="3029" />
-<TGConnectingPoint num="2" id="3030" />
-<TGConnectingPoint num="3" id="3031" />
-<TGConnectingPoint num="4" id="3032" />
-<TGConnectingPoint num="5" id="3033" />
-<TGConnectingPoint num="6" id="3034" />
-<TGConnectingPoint num="7" id="3035" />
-<TGConnectingPoint num="8" id="3036" />
-<TGConnectingPoint num="9" id="3037" />
-<TGConnectingPoint num="10" id="3038" />
-<TGConnectingPoint num="11" id="3039" />
-<TGConnectingPoint num="12" id="3040" />
-<TGConnectingPoint num="13" id="3041" />
-<TGConnectingPoint num="14" id="3042" />
-<TGConnectingPoint num="15" id="3043" />
-<TGConnectingPoint num="16" id="3044" />
-<TGConnectingPoint num="17" id="3045" />
-<TGConnectingPoint num="18" id="3046" />
-<TGConnectingPoint num="19" id="3047" />
-<TGConnectingPoint num="20" id="3048" />
-<TGConnectingPoint num="21" id="3049" />
-<TGConnectingPoint num="22" id="3050" />
-<TGConnectingPoint num="23" id="3051" />
-<TGConnectingPoint num="24" id="3052" />
-<TGConnectingPoint num="25" id="3053" />
-<TGConnectingPoint num="26" id="3054" />
-<TGConnectingPoint num="27" id="3055" />
-<TGConnectingPoint num="28" id="3056" />
-<TGConnectingPoint num="29" id="3057" />
-<TGConnectingPoint num="30" id="3058" />
-<TGConnectingPoint num="31" id="3059" />
-<TGConnectingPoint num="32" id="3060" />
-<TGConnectingPoint num="33" id="3061" />
-<TGConnectingPoint num="34" id="3062" />
-<TGConnectingPoint num="35" id="3063" />
-<TGConnectingPoint num="36" id="3064" />
-<TGConnectingPoint num="37" id="3065" />
-<TGConnectingPoint num="38" id="3066" />
-<TGConnectingPoint num="39" id="3067" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3109" >
+<TGConnectingPoint num="0" id="3348" />
+<TGConnectingPoint num="1" id="3349" />
+<TGConnectingPoint num="2" id="3350" />
+<TGConnectingPoint num="3" id="3351" />
+<TGConnectingPoint num="4" id="3352" />
+<TGConnectingPoint num="5" id="3353" />
+<TGConnectingPoint num="6" id="3354" />
+<TGConnectingPoint num="7" id="3355" />
+<TGConnectingPoint num="8" id="3356" />
+<TGConnectingPoint num="9" id="3357" />
+<TGConnectingPoint num="10" id="3358" />
+<TGConnectingPoint num="11" id="3359" />
+<TGConnectingPoint num="12" id="3360" />
+<TGConnectingPoint num="13" id="3361" />
+<TGConnectingPoint num="14" id="3362" />
+<TGConnectingPoint num="15" id="3363" />
+<TGConnectingPoint num="16" id="3364" />
+<TGConnectingPoint num="17" id="3365" />
+<TGConnectingPoint num="18" id="3366" />
+<TGConnectingPoint num="19" id="3367" />
+<TGConnectingPoint num="20" id="3368" />
+<TGConnectingPoint num="21" id="3369" />
+<TGConnectingPoint num="22" id="3370" />
+<TGConnectingPoint num="23" id="3371" />
+<TGConnectingPoint num="24" id="3372" />
+<TGConnectingPoint num="25" id="3373" />
+<TGConnectingPoint num="26" id="3374" />
+<TGConnectingPoint num="27" id="3375" />
+<TGConnectingPoint num="28" id="3376" />
+<TGConnectingPoint num="29" id="3377" />
+<TGConnectingPoint num="30" id="3378" />
+<TGConnectingPoint num="31" id="3379" />
+<TGConnectingPoint num="32" id="3380" />
+<TGConnectingPoint num="33" id="3381" />
+<TGConnectingPoint num="34" id="3382" />
+<TGConnectingPoint num="35" id="3383" />
+<TGConnectingPoint num="36" id="3384" />
+<TGConnectingPoint num="37" id="3385" />
+<TGConnectingPoint num="38" id="3386" />
+<TGConnectingPoint num="39" id="3387" />
+<TGConnectingPoint num="40" id="3388" />
+<TGConnectingPoint num="41" id="3389" />
+<TGConnectingPoint num="42" id="3390" />
+<TGConnectingPoint num="43" id="3391" />
+<TGConnectingPoint num="44" id="3392" />
+<TGConnectingPoint num="45" id="3393" />
+<TGConnectingPoint num="46" id="3394" />
+<TGConnectingPoint num="47" id="3395" />
+<TGConnectingPoint num="48" id="3396" />
+<TGConnectingPoint num="49" id="3397" />
+<TGConnectingPoint num="50" id="3398" />
+<TGConnectingPoint num="51" id="3399" />
+<TGConnectingPoint num="52" id="3400" />
+<TGConnectingPoint num="53" id="3401" />
+<TGConnectingPoint num="54" id="3402" />
+<TGConnectingPoint num="55" id="3403" />
+<TGConnectingPoint num="56" id="3404" />
+<TGConnectingPoint num="57" id="3405" />
+<TGConnectingPoint num="58" id="3406" />
+<TGConnectingPoint num="59" id="3407" />
+<TGConnectingPoint num="60" id="3408" />
+<TGConnectingPoint num="61" id="3409" />
+<TGConnectingPoint num="62" id="3410" />
+<TGConnectingPoint num="63" id="3411" />
+<TGConnectingPoint num="64" id="3412" />
+<TGConnectingPoint num="65" id="3413" />
+<TGConnectingPoint num="66" id="3414" />
+<TGConnectingPoint num="67" id="3415" />
+<TGConnectingPoint num="68" id="3416" />
+<TGConnectingPoint num="69" id="3417" />
+<TGConnectingPoint num="70" id="3418" />
+<TGConnectingPoint num="71" id="3419" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3493" >
<cdparam x="344" y="349" />
<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="3069" />
-<TGConnectingPoint num="1" id="3070" />
-<TGConnectingPoint num="2" id="3071" />
-<TGConnectingPoint num="3" id="3072" />
-<TGConnectingPoint num="4" id="3073" />
-<TGConnectingPoint num="5" id="3074" />
-<TGConnectingPoint num="6" id="3075" />
-<TGConnectingPoint num="7" id="3076" />
-<TGConnectingPoint num="8" id="3077" />
-<TGConnectingPoint num="9" id="3078" />
-<TGConnectingPoint num="10" id="3079" />
-<TGConnectingPoint num="11" id="3080" />
-<TGConnectingPoint num="12" id="3081" />
-<TGConnectingPoint num="13" id="3082" />
-<TGConnectingPoint num="14" id="3083" />
-<TGConnectingPoint num="15" id="3084" />
-<TGConnectingPoint num="16" id="3085" />
-<TGConnectingPoint num="17" id="3086" />
-<TGConnectingPoint num="18" id="3087" />
-<TGConnectingPoint num="19" id="3088" />
-<TGConnectingPoint num="20" id="3089" />
-<TGConnectingPoint num="21" id="3090" />
-<TGConnectingPoint num="22" id="3091" />
-<TGConnectingPoint num="23" id="3092" />
-<TGConnectingPoint num="24" id="3093" />
-<TGConnectingPoint num="25" id="3094" />
-<TGConnectingPoint num="26" id="3095" />
-<TGConnectingPoint num="27" id="3096" />
-<TGConnectingPoint num="28" id="3097" />
-<TGConnectingPoint num="29" id="3098" />
-<TGConnectingPoint num="30" id="3099" />
-<TGConnectingPoint num="31" id="3100" />
-<TGConnectingPoint num="32" id="3101" />
-<TGConnectingPoint num="33" id="3102" />
-<TGConnectingPoint num="34" id="3103" />
-<TGConnectingPoint num="35" id="3104" />
-<TGConnectingPoint num="36" id="3105" />
-<TGConnectingPoint num="37" id="3106" />
-<TGConnectingPoint num="38" id="3107" />
-<TGConnectingPoint num="39" id="3108" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3111" >
+<TGConnectingPoint num="0" id="3421" />
+<TGConnectingPoint num="1" id="3422" />
+<TGConnectingPoint num="2" id="3423" />
+<TGConnectingPoint num="3" id="3424" />
+<TGConnectingPoint num="4" id="3425" />
+<TGConnectingPoint num="5" id="3426" />
+<TGConnectingPoint num="6" id="3427" />
+<TGConnectingPoint num="7" id="3428" />
+<TGConnectingPoint num="8" id="3429" />
+<TGConnectingPoint num="9" id="3430" />
+<TGConnectingPoint num="10" id="3431" />
+<TGConnectingPoint num="11" id="3432" />
+<TGConnectingPoint num="12" id="3433" />
+<TGConnectingPoint num="13" id="3434" />
+<TGConnectingPoint num="14" id="3435" />
+<TGConnectingPoint num="15" id="3436" />
+<TGConnectingPoint num="16" id="3437" />
+<TGConnectingPoint num="17" id="3438" />
+<TGConnectingPoint num="18" id="3439" />
+<TGConnectingPoint num="19" id="3440" />
+<TGConnectingPoint num="20" id="3441" />
+<TGConnectingPoint num="21" id="3442" />
+<TGConnectingPoint num="22" id="3443" />
+<TGConnectingPoint num="23" id="3444" />
+<TGConnectingPoint num="24" id="3445" />
+<TGConnectingPoint num="25" id="3446" />
+<TGConnectingPoint num="26" id="3447" />
+<TGConnectingPoint num="27" id="3448" />
+<TGConnectingPoint num="28" id="3449" />
+<TGConnectingPoint num="29" id="3450" />
+<TGConnectingPoint num="30" id="3451" />
+<TGConnectingPoint num="31" id="3452" />
+<TGConnectingPoint num="32" id="3453" />
+<TGConnectingPoint num="33" id="3454" />
+<TGConnectingPoint num="34" id="3455" />
+<TGConnectingPoint num="35" id="3456" />
+<TGConnectingPoint num="36" id="3457" />
+<TGConnectingPoint num="37" id="3458" />
+<TGConnectingPoint num="38" id="3459" />
+<TGConnectingPoint num="39" id="3460" />
+<TGConnectingPoint num="40" id="3461" />
+<TGConnectingPoint num="41" id="3462" />
+<TGConnectingPoint num="42" id="3463" />
+<TGConnectingPoint num="43" id="3464" />
+<TGConnectingPoint num="44" id="3465" />
+<TGConnectingPoint num="45" id="3466" />
+<TGConnectingPoint num="46" id="3467" />
+<TGConnectingPoint num="47" id="3468" />
+<TGConnectingPoint num="48" id="3469" />
+<TGConnectingPoint num="49" id="3470" />
+<TGConnectingPoint num="50" id="3471" />
+<TGConnectingPoint num="51" id="3472" />
+<TGConnectingPoint num="52" id="3473" />
+<TGConnectingPoint num="53" id="3474" />
+<TGConnectingPoint num="54" id="3475" />
+<TGConnectingPoint num="55" id="3476" />
+<TGConnectingPoint num="56" id="3477" />
+<TGConnectingPoint num="57" id="3478" />
+<TGConnectingPoint num="58" id="3479" />
+<TGConnectingPoint num="59" id="3480" />
+<TGConnectingPoint num="60" id="3481" />
+<TGConnectingPoint num="61" id="3482" />
+<TGConnectingPoint num="62" id="3483" />
+<TGConnectingPoint num="63" id="3484" />
+<TGConnectingPoint num="64" id="3485" />
+<TGConnectingPoint num="65" id="3486" />
+<TGConnectingPoint num="66" id="3487" />
+<TGConnectingPoint num="67" id="3488" />
+<TGConnectingPoint num="68" id="3489" />
+<TGConnectingPoint num="69" id="3490" />
+<TGConnectingPoint num="70" id="3491" />
+<TGConnectingPoint num="71" id="3492" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3495" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3110" />
+<TGConnectingPoint num="0" id="3494" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3118" >
+<CONNECTOR type="5102" id="3502" >
<cdparam x="418" y="632" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3117" />
-<P1 x="418" y="632" id="3285" />
-<P2 x="422" y="677" id="3321" />
+<TGConnectingPoint num="0" id="3501" />
+<P1 x="418" y="632" id="3733" />
+<P2 x="422" y="677" id="3801" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3116" >
-<father id="3118" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3500" >
+<father id="3502" num="0" />
<cdparam x="433" y="656" />
<sizeparam width="135" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3112" />
-<TGConnectingPoint num="1" id="3113" />
-<TGConnectingPoint num="2" id="3114" />
-<TGConnectingPoint num="3" id="3115" />
+<TGConnectingPoint num="0" id="3496" />
+<TGConnectingPoint num="1" id="3497" />
+<TGConnectingPoint num="2" id="3498" />
+<TGConnectingPoint num="3" id="3499" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -9998,30 +10440,33 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3125" >
+<CONNECTOR type="5102" id="3509" >
<cdparam x="409" y="526" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3124" />
-<P1 x="409" y="526" id="3367" />
-<P2 x="418" y="592" id="3280" />
+<TGConnectingPoint num="0" id="3508" />
+<P1 x="409" y="526" id="3879" />
+<P2 x="418" y="592" id="3728" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3123" >
-<father id="3125" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3507" >
+<father id="3509" num="0" />
<cdparam x="431" y="551" />
<sizeparam width="151" height="30" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3119" />
-<TGConnectingPoint num="1" id="3120" />
-<TGConnectingPoint num="2" id="3121" />
-<TGConnectingPoint num="3" id="3122" />
+<TGConnectingPoint num="0" id="3503" />
+<TGConnectingPoint num="1" id="3504" />
+<TGConnectingPoint num="2" id="3505" />
+<TGConnectingPoint num="3" id="3506" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -10030,120 +10475,132 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3132" >
+<CONNECTOR type="5102" id="3516" >
<cdparam x="408" y="454" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3131" />
-<P1 x="408" y="454" id="3403" />
-<P2 x="409" y="486" id="3362" />
+<TGConnectingPoint num="0" id="3515" />
+<P1 x="408" y="454" id="3947" />
+<P2 x="409" y="486" id="3874" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3130" >
-<father id="3132" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3514" >
+<father id="3516" num="0" />
<cdparam x="408" y="494" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3126" />
-<TGConnectingPoint num="1" id="3127" />
-<TGConnectingPoint num="2" id="3128" />
-<TGConnectingPoint num="3" id="3129" />
+<TGConnectingPoint num="0" id="3510" />
+<TGConnectingPoint num="1" id="3511" />
+<TGConnectingPoint num="2" id="3512" />
+<TGConnectingPoint num="3" id="3513" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3139" >
+<CONNECTOR type="5102" id="3523" >
<cdparam x="408" y="394" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3138" />
-<P1 x="408" y="394" id="3419" />
-<P2 x="408" y="424" id="3402" />
+<TGConnectingPoint num="0" id="3522" />
+<P1 x="408" y="394" id="3963" />
+<P2 x="408" y="424" id="3946" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3137" >
-<father id="3139" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3521" >
+<father id="3523" num="0" />
<cdparam x="408" y="434" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3133" />
-<TGConnectingPoint num="1" id="3134" />
-<TGConnectingPoint num="2" id="3135" />
-<TGConnectingPoint num="3" id="3136" />
+<TGConnectingPoint num="0" id="3517" />
+<TGConnectingPoint num="1" id="3518" />
+<TGConnectingPoint num="2" id="3519" />
+<TGConnectingPoint num="3" id="3520" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3146" >
+<CONNECTOR type="5102" id="3530" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3145" />
-<P1 x="407" y="70" id="3454" />
-<P2 x="407" y="95" id="3239" />
+<TGConnectingPoint num="0" id="3529" />
+<P1 x="407" y="70" id="4030" />
+<P2 x="407" y="95" id="3655" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3144" >
-<father id="3146" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3528" >
+<father id="3530" num="0" />
<cdparam x="407" y="110" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3140" />
-<TGConnectingPoint num="1" id="3141" />
-<TGConnectingPoint num="2" id="3142" />
-<TGConnectingPoint num="3" id="3143" />
+<TGConnectingPoint num="0" id="3524" />
+<TGConnectingPoint num="1" id="3525" />
+<TGConnectingPoint num="2" id="3526" />
+<TGConnectingPoint num="3" id="3527" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3153" >
+<CONNECTOR type="5102" id="3537" >
<cdparam x="407" y="127" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3152" />
-<P1 x="407" y="127" id="3244" />
-<P2 x="407" y="153" id="3227" />
+<TGConnectingPoint num="0" id="3536" />
+<P1 x="407" y="127" id="3660" />
+<P2 x="407" y="153" id="3643" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3151" >
-<father id="3153" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3535" >
+<father id="3537" num="0" />
<cdparam x="428" y="145" />
<sizeparam width="120" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3147" />
-<TGConnectingPoint num="1" id="3148" />
-<TGConnectingPoint num="2" id="3149" />
-<TGConnectingPoint num="3" id="3150" />
+<TGConnectingPoint num="0" id="3531" />
+<TGConnectingPoint num="1" id="3532" />
+<TGConnectingPoint num="2" id="3533" />
+<TGConnectingPoint num="3" id="3534" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -10151,90 +10608,99 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3160" >
+<CONNECTOR type="5102" id="3544" >
<cdparam x="407" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3159" />
-<P1 x="407" y="183" id="3228" />
-<P2 x="408" y="213" id="3187" />
+<TGConnectingPoint num="0" id="3543" />
+<P1 x="407" y="183" id="3644" />
+<P2 x="408" y="213" id="3571" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3158" >
-<father id="3160" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3542" >
+<father id="3544" num="0" />
<cdparam x="408" y="199" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3154" />
-<TGConnectingPoint num="1" id="3155" />
-<TGConnectingPoint num="2" id="3156" />
-<TGConnectingPoint num="3" id="3157" />
+<TGConnectingPoint num="0" id="3538" />
+<TGConnectingPoint num="1" id="3539" />
+<TGConnectingPoint num="2" id="3540" />
+<TGConnectingPoint num="3" id="3541" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3167" >
+<CONNECTOR type="5102" id="3551" >
<cdparam x="409" y="265" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3166" />
-<P1 x="408" y="251" id="3192" />
-<P2 x="406" y="285" id="3175" />
+<TGConnectingPoint num="0" id="3550" />
+<P1 x="408" y="251" id="3576" />
+<P2 x="406" y="285" id="3559" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3165" >
-<father id="3167" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3549" >
+<father id="3551" num="0" />
<cdparam x="409" y="281" />
<sizeparam width="10" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3161" />
-<TGConnectingPoint num="1" id="3162" />
-<TGConnectingPoint num="2" id="3163" />
-<TGConnectingPoint num="3" id="3164" />
+<TGConnectingPoint num="0" id="3545" />
+<TGConnectingPoint num="1" id="3546" />
+<TGConnectingPoint num="2" id="3547" />
+<TGConnectingPoint num="3" id="3548" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3174" >
+<CONNECTOR type="5102" id="3558" >
<cdparam x="410" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3173" />
-<P1 x="406" y="315" id="3176" />
-<P2 x="408" y="354" id="3414" />
+<TGConnectingPoint num="0" id="3557" />
+<P1 x="406" y="315" id="3560" />
+<P2 x="408" y="354" id="3958" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3172" >
-<father id="3174" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3556" >
+<father id="3558" num="0" />
<cdparam x="426" y="337" />
<sizeparam width="145" height="15" minWidth="1" 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" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3168" />
-<TGConnectingPoint num="1" id="3169" />
-<TGConnectingPoint num="2" id="3170" />
-<TGConnectingPoint num="3" id="3171" />
+<TGConnectingPoint num="0" id="3552" />
+<TGConnectingPoint num="1" id="3553" />
+<TGConnectingPoint num="2" id="3554" />
+<TGConnectingPoint num="3" id="3555" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
@@ -10242,376 +10708,568 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5104" id="3185" >
+<COMPONENT type="5104" id="3569" >
<cdparam x="376" y="290" />
<sizeparam width="60" 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" />
<infoparam name="Receive signal" value="chin(m)" />
-<TGConnectingPoint num="0" id="3175" />
-<TGConnectingPoint num="1" id="3176" />
-<TGConnectingPoint num="2" id="3177" />
-<TGConnectingPoint num="3" id="3178" />
-<TGConnectingPoint num="4" id="3179" />
-<TGConnectingPoint num="5" id="3180" />
-<TGConnectingPoint num="6" id="3181" />
-<TGConnectingPoint num="7" id="3182" />
-<TGConnectingPoint num="8" id="3183" />
-<TGConnectingPoint num="9" id="3184" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3226" >
+<TGConnectingPoint num="0" id="3559" />
+<TGConnectingPoint num="1" id="3560" />
+<TGConnectingPoint num="2" id="3561" />
+<TGConnectingPoint num="3" id="3562" />
+<TGConnectingPoint num="4" id="3563" />
+<TGConnectingPoint num="5" id="3564" />
+<TGConnectingPoint num="6" id="3565" />
+<TGConnectingPoint num="7" id="3566" />
+<TGConnectingPoint num="8" id="3567" />
+<TGConnectingPoint num="9" id="3568" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3642" >
<cdparam x="347" y="213" />
<sizeparam width="123" height="38" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="receivingPubK" />
-<TGConnectingPoint num="0" id="3186" />
-<TGConnectingPoint num="1" id="3187" />
-<TGConnectingPoint num="2" id="3188" />
-<TGConnectingPoint num="3" id="3189" />
-<TGConnectingPoint num="4" id="3190" />
-<TGConnectingPoint num="5" id="3191" />
-<TGConnectingPoint num="6" id="3192" />
-<TGConnectingPoint num="7" id="3193" />
-<TGConnectingPoint num="8" id="3194" />
-<TGConnectingPoint num="9" id="3195" />
-<TGConnectingPoint num="10" id="3196" />
-<TGConnectingPoint num="11" id="3197" />
-<TGConnectingPoint num="12" id="3198" />
-<TGConnectingPoint num="13" id="3199" />
-<TGConnectingPoint num="14" id="3200" />
-<TGConnectingPoint num="15" id="3201" />
-<TGConnectingPoint num="16" id="3202" />
-<TGConnectingPoint num="17" id="3203" />
-<TGConnectingPoint num="18" id="3204" />
-<TGConnectingPoint num="19" id="3205" />
-<TGConnectingPoint num="20" id="3206" />
-<TGConnectingPoint num="21" id="3207" />
-<TGConnectingPoint num="22" id="3208" />
-<TGConnectingPoint num="23" id="3209" />
-<TGConnectingPoint num="24" id="3210" />
-<TGConnectingPoint num="25" id="3211" />
-<TGConnectingPoint num="26" id="3212" />
-<TGConnectingPoint num="27" id="3213" />
-<TGConnectingPoint num="28" id="3214" />
-<TGConnectingPoint num="29" id="3215" />
-<TGConnectingPoint num="30" id="3216" />
-<TGConnectingPoint num="31" id="3217" />
-<TGConnectingPoint num="32" id="3218" />
-<TGConnectingPoint num="33" id="3219" />
-<TGConnectingPoint num="34" id="3220" />
-<TGConnectingPoint num="35" id="3221" />
-<TGConnectingPoint num="36" id="3222" />
-<TGConnectingPoint num="37" id="3223" />
-<TGConnectingPoint num="38" id="3224" />
-<TGConnectingPoint num="39" id="3225" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3237" >
+<TGConnectingPoint num="0" id="3570" />
+<TGConnectingPoint num="1" id="3571" />
+<TGConnectingPoint num="2" id="3572" />
+<TGConnectingPoint num="3" id="3573" />
+<TGConnectingPoint num="4" id="3574" />
+<TGConnectingPoint num="5" id="3575" />
+<TGConnectingPoint num="6" id="3576" />
+<TGConnectingPoint num="7" id="3577" />
+<TGConnectingPoint num="8" id="3578" />
+<TGConnectingPoint num="9" id="3579" />
+<TGConnectingPoint num="10" id="3580" />
+<TGConnectingPoint num="11" id="3581" />
+<TGConnectingPoint num="12" id="3582" />
+<TGConnectingPoint num="13" id="3583" />
+<TGConnectingPoint num="14" id="3584" />
+<TGConnectingPoint num="15" id="3585" />
+<TGConnectingPoint num="16" id="3586" />
+<TGConnectingPoint num="17" id="3587" />
+<TGConnectingPoint num="18" id="3588" />
+<TGConnectingPoint num="19" id="3589" />
+<TGConnectingPoint num="20" id="3590" />
+<TGConnectingPoint num="21" id="3591" />
+<TGConnectingPoint num="22" id="3592" />
+<TGConnectingPoint num="23" id="3593" />
+<TGConnectingPoint num="24" id="3594" />
+<TGConnectingPoint num="25" id="3595" />
+<TGConnectingPoint num="26" id="3596" />
+<TGConnectingPoint num="27" id="3597" />
+<TGConnectingPoint num="28" id="3598" />
+<TGConnectingPoint num="29" id="3599" />
+<TGConnectingPoint num="30" id="3600" />
+<TGConnectingPoint num="31" id="3601" />
+<TGConnectingPoint num="32" id="3602" />
+<TGConnectingPoint num="33" id="3603" />
+<TGConnectingPoint num="34" id="3604" />
+<TGConnectingPoint num="35" id="3605" />
+<TGConnectingPoint num="36" id="3606" />
+<TGConnectingPoint num="37" id="3607" />
+<TGConnectingPoint num="38" id="3608" />
+<TGConnectingPoint num="39" id="3609" />
+<TGConnectingPoint num="40" id="3610" />
+<TGConnectingPoint num="41" id="3611" />
+<TGConnectingPoint num="42" id="3612" />
+<TGConnectingPoint num="43" id="3613" />
+<TGConnectingPoint num="44" id="3614" />
+<TGConnectingPoint num="45" id="3615" />
+<TGConnectingPoint num="46" id="3616" />
+<TGConnectingPoint num="47" id="3617" />
+<TGConnectingPoint num="48" id="3618" />
+<TGConnectingPoint num="49" id="3619" />
+<TGConnectingPoint num="50" id="3620" />
+<TGConnectingPoint num="51" id="3621" />
+<TGConnectingPoint num="52" id="3622" />
+<TGConnectingPoint num="53" id="3623" />
+<TGConnectingPoint num="54" id="3624" />
+<TGConnectingPoint num="55" id="3625" />
+<TGConnectingPoint num="56" id="3626" />
+<TGConnectingPoint num="57" id="3627" />
+<TGConnectingPoint num="58" id="3628" />
+<TGConnectingPoint num="59" id="3629" />
+<TGConnectingPoint num="60" id="3630" />
+<TGConnectingPoint num="61" id="3631" />
+<TGConnectingPoint num="62" id="3632" />
+<TGConnectingPoint num="63" id="3633" />
+<TGConnectingPoint num="64" id="3634" />
+<TGConnectingPoint num="65" id="3635" />
+<TGConnectingPoint num="66" id="3636" />
+<TGConnectingPoint num="67" id="3637" />
+<TGConnectingPoint num="68" id="3638" />
+<TGConnectingPoint num="69" id="3639" />
+<TGConnectingPoint num="70" id="3640" />
+<TGConnectingPoint num="71" id="3641" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3653" >
<cdparam x="377" y="158" />
<sizeparam width="60" 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" />
<infoparam name="Send signal" value="chout(m)" />
-<TGConnectingPoint num="0" id="3227" />
-<TGConnectingPoint num="1" id="3228" />
-<TGConnectingPoint num="2" id="3229" />
-<TGConnectingPoint num="3" id="3230" />
-<TGConnectingPoint num="4" id="3231" />
-<TGConnectingPoint num="5" id="3232" />
-<TGConnectingPoint num="6" id="3233" />
-<TGConnectingPoint num="7" id="3234" />
-<TGConnectingPoint num="8" id="3235" />
-<TGConnectingPoint num="9" id="3236" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3278" >
+<TGConnectingPoint num="0" id="3643" />
+<TGConnectingPoint num="1" id="3644" />
+<TGConnectingPoint num="2" id="3645" />
+<TGConnectingPoint num="3" id="3646" />
+<TGConnectingPoint num="4" id="3647" />
+<TGConnectingPoint num="5" id="3648" />
+<TGConnectingPoint num="6" id="3649" />
+<TGConnectingPoint num="7" id="3650" />
+<TGConnectingPoint num="8" id="3651" />
+<TGConnectingPoint num="9" id="3652" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3726" >
<cdparam x="351" y="95" />
<sizeparam width="113" height="32" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="sendingPubK" />
-<TGConnectingPoint num="0" id="3238" />
-<TGConnectingPoint num="1" id="3239" />
-<TGConnectingPoint num="2" id="3240" />
-<TGConnectingPoint num="3" id="3241" />
-<TGConnectingPoint num="4" id="3242" />
-<TGConnectingPoint num="5" id="3243" />
-<TGConnectingPoint num="6" id="3244" />
-<TGConnectingPoint num="7" id="3245" />
-<TGConnectingPoint num="8" id="3246" />
-<TGConnectingPoint num="9" id="3247" />
-<TGConnectingPoint num="10" id="3248" />
-<TGConnectingPoint num="11" id="3249" />
-<TGConnectingPoint num="12" id="3250" />
-<TGConnectingPoint num="13" id="3251" />
-<TGConnectingPoint num="14" id="3252" />
-<TGConnectingPoint num="15" id="3253" />
-<TGConnectingPoint num="16" id="3254" />
-<TGConnectingPoint num="17" id="3255" />
-<TGConnectingPoint num="18" id="3256" />
-<TGConnectingPoint num="19" id="3257" />
-<TGConnectingPoint num="20" id="3258" />
-<TGConnectingPoint num="21" id="3259" />
-<TGConnectingPoint num="22" id="3260" />
-<TGConnectingPoint num="23" id="3261" />
-<TGConnectingPoint num="24" id="3262" />
-<TGConnectingPoint num="25" id="3263" />
-<TGConnectingPoint num="26" id="3264" />
-<TGConnectingPoint num="27" id="3265" />
-<TGConnectingPoint num="28" id="3266" />
-<TGConnectingPoint num="29" id="3267" />
-<TGConnectingPoint num="30" id="3268" />
-<TGConnectingPoint num="31" id="3269" />
-<TGConnectingPoint num="32" id="3270" />
-<TGConnectingPoint num="33" id="3271" />
-<TGConnectingPoint num="34" id="3272" />
-<TGConnectingPoint num="35" id="3273" />
-<TGConnectingPoint num="36" id="3274" />
-<TGConnectingPoint num="37" id="3275" />
-<TGConnectingPoint num="38" id="3276" />
-<TGConnectingPoint num="39" id="3277" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3319" >
+<TGConnectingPoint num="0" id="3654" />
+<TGConnectingPoint num="1" id="3655" />
+<TGConnectingPoint num="2" id="3656" />
+<TGConnectingPoint num="3" id="3657" />
+<TGConnectingPoint num="4" id="3658" />
+<TGConnectingPoint num="5" id="3659" />
+<TGConnectingPoint num="6" id="3660" />
+<TGConnectingPoint num="7" id="3661" />
+<TGConnectingPoint num="8" id="3662" />
+<TGConnectingPoint num="9" id="3663" />
+<TGConnectingPoint num="10" id="3664" />
+<TGConnectingPoint num="11" id="3665" />
+<TGConnectingPoint num="12" id="3666" />
+<TGConnectingPoint num="13" id="3667" />
+<TGConnectingPoint num="14" id="3668" />
+<TGConnectingPoint num="15" id="3669" />
+<TGConnectingPoint num="16" id="3670" />
+<TGConnectingPoint num="17" id="3671" />
+<TGConnectingPoint num="18" id="3672" />
+<TGConnectingPoint num="19" id="3673" />
+<TGConnectingPoint num="20" id="3674" />
+<TGConnectingPoint num="21" id="3675" />
+<TGConnectingPoint num="22" id="3676" />
+<TGConnectingPoint num="23" id="3677" />
+<TGConnectingPoint num="24" id="3678" />
+<TGConnectingPoint num="25" id="3679" />
+<TGConnectingPoint num="26" id="3680" />
+<TGConnectingPoint num="27" id="3681" />
+<TGConnectingPoint num="28" id="3682" />
+<TGConnectingPoint num="29" id="3683" />
+<TGConnectingPoint num="30" id="3684" />
+<TGConnectingPoint num="31" id="3685" />
+<TGConnectingPoint num="32" id="3686" />
+<TGConnectingPoint num="33" id="3687" />
+<TGConnectingPoint num="34" id="3688" />
+<TGConnectingPoint num="35" id="3689" />
+<TGConnectingPoint num="36" id="3690" />
+<TGConnectingPoint num="37" id="3691" />
+<TGConnectingPoint num="38" id="3692" />
+<TGConnectingPoint num="39" id="3693" />
+<TGConnectingPoint num="40" id="3694" />
+<TGConnectingPoint num="41" id="3695" />
+<TGConnectingPoint num="42" id="3696" />
+<TGConnectingPoint num="43" id="3697" />
+<TGConnectingPoint num="44" id="3698" />
+<TGConnectingPoint num="45" id="3699" />
+<TGConnectingPoint num="46" id="3700" />
+<TGConnectingPoint num="47" id="3701" />
+<TGConnectingPoint num="48" id="3702" />
+<TGConnectingPoint num="49" id="3703" />
+<TGConnectingPoint num="50" id="3704" />
+<TGConnectingPoint num="51" id="3705" />
+<TGConnectingPoint num="52" id="3706" />
+<TGConnectingPoint num="53" id="3707" />
+<TGConnectingPoint num="54" id="3708" />
+<TGConnectingPoint num="55" id="3709" />
+<TGConnectingPoint num="56" id="3710" />
+<TGConnectingPoint num="57" id="3711" />
+<TGConnectingPoint num="58" id="3712" />
+<TGConnectingPoint num="59" id="3713" />
+<TGConnectingPoint num="60" id="3714" />
+<TGConnectingPoint num="61" id="3715" />
+<TGConnectingPoint num="62" id="3716" />
+<TGConnectingPoint num="63" id="3717" />
+<TGConnectingPoint num="64" id="3718" />
+<TGConnectingPoint num="65" id="3719" />
+<TGConnectingPoint num="66" id="3720" />
+<TGConnectingPoint num="67" id="3721" />
+<TGConnectingPoint num="68" id="3722" />
+<TGConnectingPoint num="69" id="3723" />
+<TGConnectingPoint num="70" id="3724" />
+<TGConnectingPoint num="71" id="3725" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3799" >
<cdparam x="329" y="592" />
<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="3279" />
-<TGConnectingPoint num="1" id="3280" />
-<TGConnectingPoint num="2" id="3281" />
-<TGConnectingPoint num="3" id="3282" />
-<TGConnectingPoint num="4" id="3283" />
-<TGConnectingPoint num="5" id="3284" />
-<TGConnectingPoint num="6" id="3285" />
-<TGConnectingPoint num="7" id="3286" />
-<TGConnectingPoint num="8" id="3287" />
-<TGConnectingPoint num="9" id="3288" />
-<TGConnectingPoint num="10" id="3289" />
-<TGConnectingPoint num="11" id="3290" />
-<TGConnectingPoint num="12" id="3291" />
-<TGConnectingPoint num="13" id="3292" />
-<TGConnectingPoint num="14" id="3293" />
-<TGConnectingPoint num="15" id="3294" />
-<TGConnectingPoint num="16" id="3295" />
-<TGConnectingPoint num="17" id="3296" />
-<TGConnectingPoint num="18" id="3297" />
-<TGConnectingPoint num="19" id="3298" />
-<TGConnectingPoint num="20" id="3299" />
-<TGConnectingPoint num="21" id="3300" />
-<TGConnectingPoint num="22" id="3301" />
-<TGConnectingPoint num="23" id="3302" />
-<TGConnectingPoint num="24" id="3303" />
-<TGConnectingPoint num="25" id="3304" />
-<TGConnectingPoint num="26" id="3305" />
-<TGConnectingPoint num="27" id="3306" />
-<TGConnectingPoint num="28" id="3307" />
-<TGConnectingPoint num="29" id="3308" />
-<TGConnectingPoint num="30" id="3309" />
-<TGConnectingPoint num="31" id="3310" />
-<TGConnectingPoint num="32" id="3311" />
-<TGConnectingPoint num="33" id="3312" />
-<TGConnectingPoint num="34" id="3313" />
-<TGConnectingPoint num="35" id="3314" />
-<TGConnectingPoint num="36" id="3315" />
-<TGConnectingPoint num="37" id="3316" />
-<TGConnectingPoint num="38" id="3317" />
-<TGConnectingPoint num="39" id="3318" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3360" >
+<TGConnectingPoint num="0" id="3727" />
+<TGConnectingPoint num="1" id="3728" />
+<TGConnectingPoint num="2" id="3729" />
+<TGConnectingPoint num="3" id="3730" />
+<TGConnectingPoint num="4" id="3731" />
+<TGConnectingPoint num="5" id="3732" />
+<TGConnectingPoint num="6" id="3733" />
+<TGConnectingPoint num="7" id="3734" />
+<TGConnectingPoint num="8" id="3735" />
+<TGConnectingPoint num="9" id="3736" />
+<TGConnectingPoint num="10" id="3737" />
+<TGConnectingPoint num="11" id="3738" />
+<TGConnectingPoint num="12" id="3739" />
+<TGConnectingPoint num="13" id="3740" />
+<TGConnectingPoint num="14" id="3741" />
+<TGConnectingPoint num="15" id="3742" />
+<TGConnectingPoint num="16" id="3743" />
+<TGConnectingPoint num="17" id="3744" />
+<TGConnectingPoint num="18" id="3745" />
+<TGConnectingPoint num="19" id="3746" />
+<TGConnectingPoint num="20" id="3747" />
+<TGConnectingPoint num="21" id="3748" />
+<TGConnectingPoint num="22" id="3749" />
+<TGConnectingPoint num="23" id="3750" />
+<TGConnectingPoint num="24" id="3751" />
+<TGConnectingPoint num="25" id="3752" />
+<TGConnectingPoint num="26" id="3753" />
+<TGConnectingPoint num="27" id="3754" />
+<TGConnectingPoint num="28" id="3755" />
+<TGConnectingPoint num="29" id="3756" />
+<TGConnectingPoint num="30" id="3757" />
+<TGConnectingPoint num="31" id="3758" />
+<TGConnectingPoint num="32" id="3759" />
+<TGConnectingPoint num="33" id="3760" />
+<TGConnectingPoint num="34" id="3761" />
+<TGConnectingPoint num="35" id="3762" />
+<TGConnectingPoint num="36" id="3763" />
+<TGConnectingPoint num="37" id="3764" />
+<TGConnectingPoint num="38" id="3765" />
+<TGConnectingPoint num="39" id="3766" />
+<TGConnectingPoint num="40" id="3767" />
+<TGConnectingPoint num="41" id="3768" />
+<TGConnectingPoint num="42" id="3769" />
+<TGConnectingPoint num="43" id="3770" />
+<TGConnectingPoint num="44" id="3771" />
+<TGConnectingPoint num="45" id="3772" />
+<TGConnectingPoint num="46" id="3773" />
+<TGConnectingPoint num="47" id="3774" />
+<TGConnectingPoint num="48" id="3775" />
+<TGConnectingPoint num="49" id="3776" />
+<TGConnectingPoint num="50" id="3777" />
+<TGConnectingPoint num="51" id="3778" />
+<TGConnectingPoint num="52" id="3779" />
+<TGConnectingPoint num="53" id="3780" />
+<TGConnectingPoint num="54" id="3781" />
+<TGConnectingPoint num="55" id="3782" />
+<TGConnectingPoint num="56" id="3783" />
+<TGConnectingPoint num="57" id="3784" />
+<TGConnectingPoint num="58" id="3785" />
+<TGConnectingPoint num="59" id="3786" />
+<TGConnectingPoint num="60" id="3787" />
+<TGConnectingPoint num="61" id="3788" />
+<TGConnectingPoint num="62" id="3789" />
+<TGConnectingPoint num="63" id="3790" />
+<TGConnectingPoint num="64" id="3791" />
+<TGConnectingPoint num="65" id="3792" />
+<TGConnectingPoint num="66" id="3793" />
+<TGConnectingPoint num="67" id="3794" />
+<TGConnectingPoint num="68" id="3795" />
+<TGConnectingPoint num="69" id="3796" />
+<TGConnectingPoint num="70" id="3797" />
+<TGConnectingPoint num="71" id="3798" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3872" >
<cdparam x="352" y="677" />
<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="3320" />
-<TGConnectingPoint num="1" id="3321" />
-<TGConnectingPoint num="2" id="3322" />
-<TGConnectingPoint num="3" id="3323" />
-<TGConnectingPoint num="4" id="3324" />
-<TGConnectingPoint num="5" id="3325" />
-<TGConnectingPoint num="6" id="3326" />
-<TGConnectingPoint num="7" id="3327" />
-<TGConnectingPoint num="8" id="3328" />
-<TGConnectingPoint num="9" id="3329" />
-<TGConnectingPoint num="10" id="3330" />
-<TGConnectingPoint num="11" id="3331" />
-<TGConnectingPoint num="12" id="3332" />
-<TGConnectingPoint num="13" id="3333" />
-<TGConnectingPoint num="14" id="3334" />
-<TGConnectingPoint num="15" id="3335" />
-<TGConnectingPoint num="16" id="3336" />
-<TGConnectingPoint num="17" id="3337" />
-<TGConnectingPoint num="18" id="3338" />
-<TGConnectingPoint num="19" id="3339" />
-<TGConnectingPoint num="20" id="3340" />
-<TGConnectingPoint num="21" id="3341" />
-<TGConnectingPoint num="22" id="3342" />
-<TGConnectingPoint num="23" id="3343" />
-<TGConnectingPoint num="24" id="3344" />
-<TGConnectingPoint num="25" id="3345" />
-<TGConnectingPoint num="26" id="3346" />
-<TGConnectingPoint num="27" id="3347" />
-<TGConnectingPoint num="28" id="3348" />
-<TGConnectingPoint num="29" id="3349" />
-<TGConnectingPoint num="30" id="3350" />
-<TGConnectingPoint num="31" id="3351" />
-<TGConnectingPoint num="32" id="3352" />
-<TGConnectingPoint num="33" id="3353" />
-<TGConnectingPoint num="34" id="3354" />
-<TGConnectingPoint num="35" id="3355" />
-<TGConnectingPoint num="36" id="3356" />
-<TGConnectingPoint num="37" id="3357" />
-<TGConnectingPoint num="38" id="3358" />
-<TGConnectingPoint num="39" id="3359" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3401" >
+<TGConnectingPoint num="0" id="3800" />
+<TGConnectingPoint num="1" id="3801" />
+<TGConnectingPoint num="2" id="3802" />
+<TGConnectingPoint num="3" id="3803" />
+<TGConnectingPoint num="4" id="3804" />
+<TGConnectingPoint num="5" id="3805" />
+<TGConnectingPoint num="6" id="3806" />
+<TGConnectingPoint num="7" id="3807" />
+<TGConnectingPoint num="8" id="3808" />
+<TGConnectingPoint num="9" id="3809" />
+<TGConnectingPoint num="10" id="3810" />
+<TGConnectingPoint num="11" id="3811" />
+<TGConnectingPoint num="12" id="3812" />
+<TGConnectingPoint num="13" id="3813" />
+<TGConnectingPoint num="14" id="3814" />
+<TGConnectingPoint num="15" id="3815" />
+<TGConnectingPoint num="16" id="3816" />
+<TGConnectingPoint num="17" id="3817" />
+<TGConnectingPoint num="18" id="3818" />
+<TGConnectingPoint num="19" id="3819" />
+<TGConnectingPoint num="20" id="3820" />
+<TGConnectingPoint num="21" id="3821" />
+<TGConnectingPoint num="22" id="3822" />
+<TGConnectingPoint num="23" id="3823" />
+<TGConnectingPoint num="24" id="3824" />
+<TGConnectingPoint num="25" id="3825" />
+<TGConnectingPoint num="26" id="3826" />
+<TGConnectingPoint num="27" id="3827" />
+<TGConnectingPoint num="28" id="3828" />
+<TGConnectingPoint num="29" id="3829" />
+<TGConnectingPoint num="30" id="3830" />
+<TGConnectingPoint num="31" id="3831" />
+<TGConnectingPoint num="32" id="3832" />
+<TGConnectingPoint num="33" id="3833" />
+<TGConnectingPoint num="34" id="3834" />
+<TGConnectingPoint num="35" id="3835" />
+<TGConnectingPoint num="36" id="3836" />
+<TGConnectingPoint num="37" id="3837" />
+<TGConnectingPoint num="38" id="3838" />
+<TGConnectingPoint num="39" id="3839" />
+<TGConnectingPoint num="40" id="3840" />
+<TGConnectingPoint num="41" id="3841" />
+<TGConnectingPoint num="42" id="3842" />
+<TGConnectingPoint num="43" id="3843" />
+<TGConnectingPoint num="44" id="3844" />
+<TGConnectingPoint num="45" id="3845" />
+<TGConnectingPoint num="46" id="3846" />
+<TGConnectingPoint num="47" id="3847" />
+<TGConnectingPoint num="48" id="3848" />
+<TGConnectingPoint num="49" id="3849" />
+<TGConnectingPoint num="50" id="3850" />
+<TGConnectingPoint num="51" id="3851" />
+<TGConnectingPoint num="52" id="3852" />
+<TGConnectingPoint num="53" id="3853" />
+<TGConnectingPoint num="54" id="3854" />
+<TGConnectingPoint num="55" id="3855" />
+<TGConnectingPoint num="56" id="3856" />
+<TGConnectingPoint num="57" id="3857" />
+<TGConnectingPoint num="58" id="3858" />
+<TGConnectingPoint num="59" id="3859" />
+<TGConnectingPoint num="60" id="3860" />
+<TGConnectingPoint num="61" id="3861" />
+<TGConnectingPoint num="62" id="3862" />
+<TGConnectingPoint num="63" id="3863" />
+<TGConnectingPoint num="64" id="3864" />
+<TGConnectingPoint num="65" id="3865" />
+<TGConnectingPoint num="66" id="3866" />
+<TGConnectingPoint num="67" id="3867" />
+<TGConnectingPoint num="68" id="3868" />
+<TGConnectingPoint num="69" id="3869" />
+<TGConnectingPoint num="70" id="3870" />
+<TGConnectingPoint num="71" id="3871" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3945" >
<cdparam x="338" y="486" />
<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="3361" />
-<TGConnectingPoint num="1" id="3362" />
-<TGConnectingPoint num="2" id="3363" />
-<TGConnectingPoint num="3" id="3364" />
-<TGConnectingPoint num="4" id="3365" />
-<TGConnectingPoint num="5" id="3366" />
-<TGConnectingPoint num="6" id="3367" />
-<TGConnectingPoint num="7" id="3368" />
-<TGConnectingPoint num="8" id="3369" />
-<TGConnectingPoint num="9" id="3370" />
-<TGConnectingPoint num="10" id="3371" />
-<TGConnectingPoint num="11" id="3372" />
-<TGConnectingPoint num="12" id="3373" />
-<TGConnectingPoint num="13" id="3374" />
-<TGConnectingPoint num="14" id="3375" />
-<TGConnectingPoint num="15" id="3376" />
-<TGConnectingPoint num="16" id="3377" />
-<TGConnectingPoint num="17" id="3378" />
-<TGConnectingPoint num="18" id="3379" />
-<TGConnectingPoint num="19" id="3380" />
-<TGConnectingPoint num="20" id="3381" />
-<TGConnectingPoint num="21" id="3382" />
-<TGConnectingPoint num="22" id="3383" />
-<TGConnectingPoint num="23" id="3384" />
-<TGConnectingPoint num="24" id="3385" />
-<TGConnectingPoint num="25" id="3386" />
-<TGConnectingPoint num="26" id="3387" />
-<TGConnectingPoint num="27" id="3388" />
-<TGConnectingPoint num="28" id="3389" />
-<TGConnectingPoint num="29" id="3390" />
-<TGConnectingPoint num="30" id="3391" />
-<TGConnectingPoint num="31" id="3392" />
-<TGConnectingPoint num="32" id="3393" />
-<TGConnectingPoint num="33" id="3394" />
-<TGConnectingPoint num="34" id="3395" />
-<TGConnectingPoint num="35" id="3396" />
-<TGConnectingPoint num="36" id="3397" />
-<TGConnectingPoint num="37" id="3398" />
-<TGConnectingPoint num="38" id="3399" />
-<TGConnectingPoint num="39" id="3400" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="3412" >
+<TGConnectingPoint num="0" id="3873" />
+<TGConnectingPoint num="1" id="3874" />
+<TGConnectingPoint num="2" id="3875" />
+<TGConnectingPoint num="3" id="3876" />
+<TGConnectingPoint num="4" id="3877" />
+<TGConnectingPoint num="5" id="3878" />
+<TGConnectingPoint num="6" id="3879" />
+<TGConnectingPoint num="7" id="3880" />
+<TGConnectingPoint num="8" id="3881" />
+<TGConnectingPoint num="9" id="3882" />
+<TGConnectingPoint num="10" id="3883" />
+<TGConnectingPoint num="11" id="3884" />
+<TGConnectingPoint num="12" id="3885" />
+<TGConnectingPoint num="13" id="3886" />
+<TGConnectingPoint num="14" id="3887" />
+<TGConnectingPoint num="15" id="3888" />
+<TGConnectingPoint num="16" id="3889" />
+<TGConnectingPoint num="17" id="3890" />
+<TGConnectingPoint num="18" id="3891" />
+<TGConnectingPoint num="19" id="3892" />
+<TGConnectingPoint num="20" id="3893" />
+<TGConnectingPoint num="21" id="3894" />
+<TGConnectingPoint num="22" id="3895" />
+<TGConnectingPoint num="23" id="3896" />
+<TGConnectingPoint num="24" id="3897" />
+<TGConnectingPoint num="25" id="3898" />
+<TGConnectingPoint num="26" id="3899" />
+<TGConnectingPoint num="27" id="3900" />
+<TGConnectingPoint num="28" id="3901" />
+<TGConnectingPoint num="29" id="3902" />
+<TGConnectingPoint num="30" id="3903" />
+<TGConnectingPoint num="31" id="3904" />
+<TGConnectingPoint num="32" id="3905" />
+<TGConnectingPoint num="33" id="3906" />
+<TGConnectingPoint num="34" id="3907" />
+<TGConnectingPoint num="35" id="3908" />
+<TGConnectingPoint num="36" id="3909" />
+<TGConnectingPoint num="37" id="3910" />
+<TGConnectingPoint num="38" id="3911" />
+<TGConnectingPoint num="39" id="3912" />
+<TGConnectingPoint num="40" id="3913" />
+<TGConnectingPoint num="41" id="3914" />
+<TGConnectingPoint num="42" id="3915" />
+<TGConnectingPoint num="43" id="3916" />
+<TGConnectingPoint num="44" id="3917" />
+<TGConnectingPoint num="45" id="3918" />
+<TGConnectingPoint num="46" id="3919" />
+<TGConnectingPoint num="47" id="3920" />
+<TGConnectingPoint num="48" id="3921" />
+<TGConnectingPoint num="49" id="3922" />
+<TGConnectingPoint num="50" id="3923" />
+<TGConnectingPoint num="51" id="3924" />
+<TGConnectingPoint num="52" id="3925" />
+<TGConnectingPoint num="53" id="3926" />
+<TGConnectingPoint num="54" id="3927" />
+<TGConnectingPoint num="55" id="3928" />
+<TGConnectingPoint num="56" id="3929" />
+<TGConnectingPoint num="57" id="3930" />
+<TGConnectingPoint num="58" id="3931" />
+<TGConnectingPoint num="59" id="3932" />
+<TGConnectingPoint num="60" id="3933" />
+<TGConnectingPoint num="61" id="3934" />
+<TGConnectingPoint num="62" id="3935" />
+<TGConnectingPoint num="63" id="3936" />
+<TGConnectingPoint num="64" id="3937" />
+<TGConnectingPoint num="65" id="3938" />
+<TGConnectingPoint num="66" id="3939" />
+<TGConnectingPoint num="67" id="3940" />
+<TGConnectingPoint num="68" id="3941" />
+<TGConnectingPoint num="69" id="3942" />
+<TGConnectingPoint num="70" id="3943" />
+<TGConnectingPoint num="71" id="3944" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="3956" >
<cdparam x="374" y="429" />
<sizeparam width="68" 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" />
<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="3402" />
-<TGConnectingPoint num="1" id="3403" />
-<TGConnectingPoint num="2" id="3404" />
-<TGConnectingPoint num="3" id="3405" />
-<TGConnectingPoint num="4" id="3406" />
-<TGConnectingPoint num="5" id="3407" />
-<TGConnectingPoint num="6" id="3408" />
-<TGConnectingPoint num="7" id="3409" />
-<TGConnectingPoint num="8" id="3410" />
-<TGConnectingPoint num="9" id="3411" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3453" >
+<TGConnectingPoint num="0" id="3946" />
+<TGConnectingPoint num="1" id="3947" />
+<TGConnectingPoint num="2" id="3948" />
+<TGConnectingPoint num="3" id="3949" />
+<TGConnectingPoint num="4" id="3950" />
+<TGConnectingPoint num="5" id="3951" />
+<TGConnectingPoint num="6" id="3952" />
+<TGConnectingPoint num="7" id="3953" />
+<TGConnectingPoint num="8" id="3954" />
+<TGConnectingPoint num="9" id="3955" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4029" >
<cdparam x="342" y="354" />
<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="3413" />
-<TGConnectingPoint num="1" id="3414" />
-<TGConnectingPoint num="2" id="3415" />
-<TGConnectingPoint num="3" id="3416" />
-<TGConnectingPoint num="4" id="3417" />
-<TGConnectingPoint num="5" id="3418" />
-<TGConnectingPoint num="6" id="3419" />
-<TGConnectingPoint num="7" id="3420" />
-<TGConnectingPoint num="8" id="3421" />
-<TGConnectingPoint num="9" id="3422" />
-<TGConnectingPoint num="10" id="3423" />
-<TGConnectingPoint num="11" id="3424" />
-<TGConnectingPoint num="12" id="3425" />
-<TGConnectingPoint num="13" id="3426" />
-<TGConnectingPoint num="14" id="3427" />
-<TGConnectingPoint num="15" id="3428" />
-<TGConnectingPoint num="16" id="3429" />
-<TGConnectingPoint num="17" id="3430" />
-<TGConnectingPoint num="18" id="3431" />
-<TGConnectingPoint num="19" id="3432" />
-<TGConnectingPoint num="20" id="3433" />
-<TGConnectingPoint num="21" id="3434" />
-<TGConnectingPoint num="22" id="3435" />
-<TGConnectingPoint num="23" id="3436" />
-<TGConnectingPoint num="24" id="3437" />
-<TGConnectingPoint num="25" id="3438" />
-<TGConnectingPoint num="26" id="3439" />
-<TGConnectingPoint num="27" id="3440" />
-<TGConnectingPoint num="28" id="3441" />
-<TGConnectingPoint num="29" id="3442" />
-<TGConnectingPoint num="30" id="3443" />
-<TGConnectingPoint num="31" id="3444" />
-<TGConnectingPoint num="32" id="3445" />
-<TGConnectingPoint num="33" id="3446" />
-<TGConnectingPoint num="34" id="3447" />
-<TGConnectingPoint num="35" id="3448" />
-<TGConnectingPoint num="36" id="3449" />
-<TGConnectingPoint num="37" id="3450" />
-<TGConnectingPoint num="38" id="3451" />
-<TGConnectingPoint num="39" id="3452" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3455" >
+<TGConnectingPoint num="0" id="3957" />
+<TGConnectingPoint num="1" id="3958" />
+<TGConnectingPoint num="2" id="3959" />
+<TGConnectingPoint num="3" id="3960" />
+<TGConnectingPoint num="4" id="3961" />
+<TGConnectingPoint num="5" id="3962" />
+<TGConnectingPoint num="6" id="3963" />
+<TGConnectingPoint num="7" id="3964" />
+<TGConnectingPoint num="8" id="3965" />
+<TGConnectingPoint num="9" id="3966" />
+<TGConnectingPoint num="10" id="3967" />
+<TGConnectingPoint num="11" id="3968" />
+<TGConnectingPoint num="12" id="3969" />
+<TGConnectingPoint num="13" id="3970" />
+<TGConnectingPoint num="14" id="3971" />
+<TGConnectingPoint num="15" id="3972" />
+<TGConnectingPoint num="16" id="3973" />
+<TGConnectingPoint num="17" id="3974" />
+<TGConnectingPoint num="18" id="3975" />
+<TGConnectingPoint num="19" id="3976" />
+<TGConnectingPoint num="20" id="3977" />
+<TGConnectingPoint num="21" id="3978" />
+<TGConnectingPoint num="22" id="3979" />
+<TGConnectingPoint num="23" id="3980" />
+<TGConnectingPoint num="24" id="3981" />
+<TGConnectingPoint num="25" id="3982" />
+<TGConnectingPoint num="26" id="3983" />
+<TGConnectingPoint num="27" id="3984" />
+<TGConnectingPoint num="28" id="3985" />
+<TGConnectingPoint num="29" id="3986" />
+<TGConnectingPoint num="30" id="3987" />
+<TGConnectingPoint num="31" id="3988" />
+<TGConnectingPoint num="32" id="3989" />
+<TGConnectingPoint num="33" id="3990" />
+<TGConnectingPoint num="34" id="3991" />
+<TGConnectingPoint num="35" id="3992" />
+<TGConnectingPoint num="36" id="3993" />
+<TGConnectingPoint num="37" id="3994" />
+<TGConnectingPoint num="38" id="3995" />
+<TGConnectingPoint num="39" id="3996" />
+<TGConnectingPoint num="40" id="3997" />
+<TGConnectingPoint num="41" id="3998" />
+<TGConnectingPoint num="42" id="3999" />
+<TGConnectingPoint num="43" id="4000" />
+<TGConnectingPoint num="44" id="4001" />
+<TGConnectingPoint num="45" id="4002" />
+<TGConnectingPoint num="46" id="4003" />
+<TGConnectingPoint num="47" id="4004" />
+<TGConnectingPoint num="48" id="4005" />
+<TGConnectingPoint num="49" id="4006" />
+<TGConnectingPoint num="50" id="4007" />
+<TGConnectingPoint num="51" id="4008" />
+<TGConnectingPoint num="52" id="4009" />
+<TGConnectingPoint num="53" id="4010" />
+<TGConnectingPoint num="54" id="4011" />
+<TGConnectingPoint num="55" id="4012" />
+<TGConnectingPoint num="56" id="4013" />
+<TGConnectingPoint num="57" id="4014" />
+<TGConnectingPoint num="58" id="4015" />
+<TGConnectingPoint num="59" id="4016" />
+<TGConnectingPoint num="60" id="4017" />
+<TGConnectingPoint num="61" id="4018" />
+<TGConnectingPoint num="62" id="4019" />
+<TGConnectingPoint num="63" id="4020" />
+<TGConnectingPoint num="64" id="4021" />
+<TGConnectingPoint num="65" id="4022" />
+<TGConnectingPoint num="66" id="4023" />
+<TGConnectingPoint num="67" id="4024" />
+<TGConnectingPoint num="68" id="4025" />
+<TGConnectingPoint num="69" id="4026" />
+<TGConnectingPoint num="70" id="4027" />
+<TGConnectingPoint num="71" id="4028" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="4031" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3454" />
+<TGConnectingPoint num="0" id="4030" />
</COMPONENT>
@@ -10627,82 +11285,83 @@ the smart card and the terminal
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
+<considerTimingOperators value="true" />
<Validated value="" />
<Ignored value="" />
-<CONNECTOR type="5002" id="3461" >
+<CONNECTOR type="5002" id="4037" >
<cdparam x="568" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="3458" />
-<TGConnectingPoint num="1" id="3459" />
-<TGConnectingPoint num="2" id="3460" />
-<P1 x="459" y="106" id="3601" />
-<P2 x="459" y="192" id="3594" />
+<TGConnectingPoint num="0" id="4034" />
+<TGConnectingPoint num="1" id="4035" />
+<TGConnectingPoint num="2" id="4036" />
+<P1 x="459" y="106" id="4177" />
+<P2 x="459" y="192" id="4170" />
<Point x="492" y="119" />
<Point x="492" y="174" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in chin(Message msg)" />
<osd value="out chout(Message msg)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" ams="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="3456" >
-<father id="3461" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4032" >
+<father id="4037" num="0" />
<cdparam x="492" y="119" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3457" >
-<father id="3461" num="1" />
+<SUBCOMPONENT type="-1" id="4033" >
+<father id="4037" num="1" />
<cdparam x="492" y="174" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<COMPONENT type="5003" id="3470" >
+<COMPONENT type="5003" id="4046" >
<cdparam x="450" y="340" />
<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="3462" />
-<TGConnectingPoint num="1" id="3463" />
-<TGConnectingPoint num="2" id="3464" />
-<TGConnectingPoint num="3" id="3465" />
-<TGConnectingPoint num="4" id="3466" />
-<TGConnectingPoint num="5" id="3467" />
-<TGConnectingPoint num="6" id="3468" />
-<TGConnectingPoint num="7" id="3469" />
+<TGConnectingPoint num="0" id="4038" />
+<TGConnectingPoint num="1" id="4039" />
+<TGConnectingPoint num="2" id="4040" />
+<TGConnectingPoint num="3" id="4041" />
+<TGConnectingPoint num="4" id="4042" />
+<TGConnectingPoint num="5" id="4043" />
+<TGConnectingPoint num="6" id="4044" />
+<TGConnectingPoint num="7" id="4045" />
<extraparam>
<Attribute access="2" id="data" value="0" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="3479" >
+<COMPONENT type="5003" id="4055" >
<cdparam x="50" y="340" />
<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="3471" />
-<TGConnectingPoint num="1" id="3472" />
-<TGConnectingPoint num="2" id="3473" />
-<TGConnectingPoint num="3" id="3474" />
-<TGConnectingPoint num="4" id="3475" />
-<TGConnectingPoint num="5" id="3476" />
-<TGConnectingPoint num="6" id="3477" />
-<TGConnectingPoint num="7" id="3478" />
+<TGConnectingPoint num="0" id="4047" />
+<TGConnectingPoint num="1" id="4048" />
+<TGConnectingPoint num="2" id="4049" />
+<TGConnectingPoint num="3" id="4050" />
+<TGConnectingPoint num="4" id="4051" />
+<TGConnectingPoint num="5" id="4052" />
+<TGConnectingPoint num="6" id="4053" />
+<TGConnectingPoint num="7" id="4054" />
<extraparam>
<Attribute access="2" id="data" value="0" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="302" id="3496" >
+<COMPONENT type="302" id="4072" >
<cdparam x="566" y="97" />
<sizeparam width="520" height="188" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -10719,22 +11378,22 @@ the smart card and the terminal
#Confidentiality InterfaceDevice.secretData
#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m
" />
-<TGConnectingPoint num="0" id="3480" />
-<TGConnectingPoint num="1" id="3481" />
-<TGConnectingPoint num="2" id="3482" />
-<TGConnectingPoint num="3" id="3483" />
-<TGConnectingPoint num="4" id="3484" />
-<TGConnectingPoint num="5" id="3485" />
-<TGConnectingPoint num="6" id="3486" />
-<TGConnectingPoint num="7" id="3487" />
-<TGConnectingPoint num="8" id="3488" />
-<TGConnectingPoint num="9" id="3489" />
-<TGConnectingPoint num="10" id="3490" />
-<TGConnectingPoint num="11" id="3491" />
-<TGConnectingPoint num="12" id="3492" />
-<TGConnectingPoint num="13" id="3493" />
-<TGConnectingPoint num="14" id="3494" />
-<TGConnectingPoint num="15" id="3495" />
+<TGConnectingPoint num="0" id="4056" />
+<TGConnectingPoint num="1" id="4057" />
+<TGConnectingPoint num="2" id="4058" />
+<TGConnectingPoint num="3" id="4059" />
+<TGConnectingPoint num="4" id="4060" />
+<TGConnectingPoint num="5" id="4061" />
+<TGConnectingPoint num="6" id="4062" />
+<TGConnectingPoint num="7" id="4063" />
+<TGConnectingPoint num="8" id="4064" />
+<TGConnectingPoint num="9" id="4065" />
+<TGConnectingPoint num="10" id="4066" />
+<TGConnectingPoint num="11" id="4067" />
+<TGConnectingPoint num="12" id="4068" />
+<TGConnectingPoint num="13" id="4069" />
+<TGConnectingPoint num="14" id="4070" />
+<TGConnectingPoint num="15" id="4071" />
<extraparam>
<Line value="#PrivatePublicKeys InterfaceDevice privK pubK" />
<Line value="#PrivatePublicKeys SmartCard privK pubK" />
@@ -10750,74 +11409,72 @@ the smart card and the terminal
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="3505" >
+<COMPONENT type="5003" id="4081" >
<cdparam x="260" y="373" />
<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="3497" />
-<TGConnectingPoint num="1" id="3498" />
-<TGConnectingPoint num="2" id="3499" />
-<TGConnectingPoint num="3" id="3500" />
-<TGConnectingPoint num="4" id="3501" />
-<TGConnectingPoint num="5" id="3502" />
-<TGConnectingPoint num="6" id="3503" />
-<TGConnectingPoint num="7" id="3504" />
+<TGConnectingPoint num="0" id="4073" />
+<TGConnectingPoint num="1" id="4074" />
+<TGConnectingPoint num="2" id="4075" />
+<TGConnectingPoint num="3" id="4076" />
+<TGConnectingPoint num="4" id="4077" />
+<TGConnectingPoint num="5" id="4078" />
+<TGConnectingPoint num="6" id="4079" />
+<TGConnectingPoint num="7" id="4080" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="3514" >
+<COMPONENT type="5003" id="4090" >
<cdparam x="68" y="372" />
<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="3506" />
-<TGConnectingPoint num="1" id="3507" />
-<TGConnectingPoint num="2" id="3508" />
-<TGConnectingPoint num="3" id="3509" />
-<TGConnectingPoint num="4" id="3510" />
-<TGConnectingPoint num="5" id="3511" />
-<TGConnectingPoint num="6" id="3512" />
-<TGConnectingPoint num="7" id="3513" />
+<TGConnectingPoint num="0" id="4082" />
+<TGConnectingPoint num="1" id="4083" />
+<TGConnectingPoint num="2" id="4084" />
+<TGConnectingPoint num="3" id="4085" />
+<TGConnectingPoint num="4" id="4086" />
+<TGConnectingPoint num="5" id="4087" />
+<TGConnectingPoint num="6" id="4088" />
+<TGConnectingPoint num="7" id="4089" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="3614" >
+<COMPONENT type="5000" id="4190" >
<cdparam x="21" y="20" />
<sizeparam width="438" height="344" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block0" value="System" />
-<TGConnectingPoint num="0" id="3590" />
-<TGConnectingPoint num="1" id="3591" />
-<TGConnectingPoint num="2" id="3592" />
-<TGConnectingPoint num="3" id="3593" />
-<TGConnectingPoint num="4" id="3594" />
-<TGConnectingPoint num="5" id="3595" />
-<TGConnectingPoint num="6" id="3596" />
-<TGConnectingPoint num="7" id="3597" />
-<TGConnectingPoint num="8" id="3598" />
-<TGConnectingPoint num="9" id="3599" />
-<TGConnectingPoint num="10" id="3600" />
-<TGConnectingPoint num="11" id="3601" />
-<TGConnectingPoint num="12" id="3602" />
-<TGConnectingPoint num="13" id="3603" />
-<TGConnectingPoint num="14" id="3604" />
-<TGConnectingPoint num="15" id="3605" />
-<TGConnectingPoint num="16" id="3606" />
-<TGConnectingPoint num="17" id="3607" />
-<TGConnectingPoint num="18" id="3608" />
-<TGConnectingPoint num="19" id="3609" />
-<TGConnectingPoint num="20" id="3610" />
-<TGConnectingPoint num="21" id="3611" />
-<TGConnectingPoint num="22" id="3612" />
-<TGConnectingPoint num="23" id="3613" />
+<TGConnectingPoint num="0" id="4166" />
+<TGConnectingPoint num="1" id="4167" />
+<TGConnectingPoint num="2" id="4168" />
+<TGConnectingPoint num="3" id="4169" />
+<TGConnectingPoint num="4" id="4170" />
+<TGConnectingPoint num="5" id="4171" />
+<TGConnectingPoint num="6" id="4172" />
+<TGConnectingPoint num="7" id="4173" />
+<TGConnectingPoint num="8" id="4174" />
+<TGConnectingPoint num="9" id="4175" />
+<TGConnectingPoint num="10" id="4176" />
+<TGConnectingPoint num="11" id="4177" />
+<TGConnectingPoint num="12" id="4178" />
+<TGConnectingPoint num="13" id="4179" />
+<TGConnectingPoint num="14" id="4180" />
+<TGConnectingPoint num="15" id="4181" />
+<TGConnectingPoint num="16" id="4182" />
+<TGConnectingPoint num="17" id="4183" />
+<TGConnectingPoint num="18" id="4184" />
+<TGConnectingPoint num="19" id="4185" />
+<TGConnectingPoint num="20" id="4186" />
+<TGConnectingPoint num="21" id="4187" />
+<TGConnectingPoint num="22" id="4188" />
+<TGConnectingPoint num="23" id="4189" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -10825,37 +11482,37 @@ the smart card and the terminal
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="3539" >
-<father id="3614" num="0" />
+<SUBCOMPONENT type="5000" id="4115" >
+<father id="4190" num="0" />
<cdparam x="263" y="108" />
<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
<infoparam name="Block0" value="SmartCard" />
-<TGConnectingPoint num="0" id="3515" />
-<TGConnectingPoint num="1" id="3516" />
-<TGConnectingPoint num="2" id="3517" />
-<TGConnectingPoint num="3" id="3518" />
-<TGConnectingPoint num="4" id="3519" />
-<TGConnectingPoint num="5" id="3520" />
-<TGConnectingPoint num="6" id="3521" />
-<TGConnectingPoint num="7" id="3522" />
-<TGConnectingPoint num="8" id="3523" />
-<TGConnectingPoint num="9" id="3524" />
-<TGConnectingPoint num="10" id="3525" />
-<TGConnectingPoint num="11" id="3526" />
-<TGConnectingPoint num="12" id="3527" />
-<TGConnectingPoint num="13" id="3528" />
-<TGConnectingPoint num="14" id="3529" />
-<TGConnectingPoint num="15" id="3530" />
-<TGConnectingPoint num="16" id="3531" />
-<TGConnectingPoint num="17" id="3532" />
-<TGConnectingPoint num="18" id="3533" />
-<TGConnectingPoint num="19" id="3534" />
-<TGConnectingPoint num="20" id="3535" />
-<TGConnectingPoint num="21" id="3536" />
-<TGConnectingPoint num="22" id="3537" />
-<TGConnectingPoint num="23" id="3538" />
+<TGConnectingPoint num="0" id="4091" />
+<TGConnectingPoint num="1" id="4092" />
+<TGConnectingPoint num="2" id="4093" />
+<TGConnectingPoint num="3" id="4094" />
+<TGConnectingPoint num="4" id="4095" />
+<TGConnectingPoint num="5" id="4096" />
+<TGConnectingPoint num="6" id="4097" />
+<TGConnectingPoint num="7" id="4098" />
+<TGConnectingPoint num="8" id="4099" />
+<TGConnectingPoint num="9" id="4100" />
+<TGConnectingPoint num="10" id="4101" />
+<TGConnectingPoint num="11" id="4102" />
+<TGConnectingPoint num="12" id="4103" />
+<TGConnectingPoint num="13" id="4104" />
+<TGConnectingPoint num="14" id="4105" />
+<TGConnectingPoint num="15" id="4106" />
+<TGConnectingPoint num="16" id="4107" />
+<TGConnectingPoint num="17" id="4108" />
+<TGConnectingPoint num="18" id="4109" />
+<TGConnectingPoint num="19" id="4110" />
+<TGConnectingPoint num="20" id="4111" />
+<TGConnectingPoint num="21" id="4112" />
+<TGConnectingPoint num="22" id="4113" />
+<TGConnectingPoint num="23" id="4114" />
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
@@ -10896,37 +11553,37 @@ the smart card and the terminal
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="3564" >
-<father id="3614" num="1" />
+<SUBCOMPONENT type="5000" id="4140" >
+<father id="4190" num="1" />
<cdparam x="36" y="108" />
<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="223" minY="0" maxY="218" />
<infoparam name="Block0" value="InterfaceDevice" />
-<TGConnectingPoint num="0" id="3540" />
-<TGConnectingPoint num="1" id="3541" />
-<TGConnectingPoint num="2" id="3542" />
-<TGConnectingPoint num="3" id="3543" />
-<TGConnectingPoint num="4" id="3544" />
-<TGConnectingPoint num="5" id="3545" />
-<TGConnectingPoint num="6" id="3546" />
-<TGConnectingPoint num="7" id="3547" />
-<TGConnectingPoint num="8" id="3548" />
-<TGConnectingPoint num="9" id="3549" />
-<TGConnectingPoint num="10" id="3550" />
-<TGConnectingPoint num="11" id="3551" />
-<TGConnectingPoint num="12" id="3552" />
-<TGConnectingPoint num="13" id="3553" />
-<TGConnectingPoint num="14" id="3554" />
-<TGConnectingPoint num="15" id="3555" />
-<TGConnectingPoint num="16" id="3556" />
-<TGConnectingPoint num="17" id="3557" />
-<TGConnectingPoint num="18" id="3558" />
-<TGConnectingPoint num="19" id="3559" />
-<TGConnectingPoint num="20" id="3560" />
-<TGConnectingPoint num="21" id="3561" />
-<TGConnectingPoint num="22" id="3562" />
-<TGConnectingPoint num="23" id="3563" />
+<TGConnectingPoint num="0" id="4116" />
+<TGConnectingPoint num="1" id="4117" />
+<TGConnectingPoint num="2" id="4118" />
+<TGConnectingPoint num="3" id="4119" />
+<TGConnectingPoint num="4" id="4120" />
+<TGConnectingPoint num="5" id="4121" />
+<TGConnectingPoint num="6" id="4122" />
+<TGConnectingPoint num="7" id="4123" />
+<TGConnectingPoint num="8" id="4124" />
+<TGConnectingPoint num="9" id="4125" />
+<TGConnectingPoint num="10" id="4126" />
+<TGConnectingPoint num="11" id="4127" />
+<TGConnectingPoint num="12" id="4128" />
+<TGConnectingPoint num="13" id="4129" />
+<TGConnectingPoint num="14" id="4130" />
+<TGConnectingPoint num="15" id="4131" />
+<TGConnectingPoint num="16" id="4132" />
+<TGConnectingPoint num="17" id="4133" />
+<TGConnectingPoint num="18" id="4134" />
+<TGConnectingPoint num="19" id="4135" />
+<TGConnectingPoint num="20" id="4136" />
+<TGConnectingPoint num="21" id="4137" />
+<TGConnectingPoint num="22" id="4138" />
+<TGConnectingPoint num="23" id="4139" />
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
@@ -10966,37 +11623,37 @@ the smart card and the terminal
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="3589" >
-<father id="3614" num="2" />
+<SUBCOMPONENT type="5000" id="4165" >
+<father id="4190" num="2" />
<cdparam x="115" y="249" />
<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
<infoparam name="Block0" value="CA" />
-<TGConnectingPoint num="0" id="3565" />
-<TGConnectingPoint num="1" id="3566" />
-<TGConnectingPoint num="2" id="3567" />
-<TGConnectingPoint num="3" id="3568" />
-<TGConnectingPoint num="4" id="3569" />
-<TGConnectingPoint num="5" id="3570" />
-<TGConnectingPoint num="6" id="3571" />
-<TGConnectingPoint num="7" id="3572" />
-<TGConnectingPoint num="8" id="3573" />
-<TGConnectingPoint num="9" id="3574" />
-<TGConnectingPoint num="10" id="3575" />
-<TGConnectingPoint num="11" id="3576" />
-<TGConnectingPoint num="12" id="3577" />
-<TGConnectingPoint num="13" id="3578" />
-<TGConnectingPoint num="14" id="3579" />
-<TGConnectingPoint num="15" id="3580" />
-<TGConnectingPoint num="16" id="3581" />
-<TGConnectingPoint num="17" id="3582" />
-<TGConnectingPoint num="18" id="3583" />
-<TGConnectingPoint num="19" id="3584" />
-<TGConnectingPoint num="20" id="3585" />
-<TGConnectingPoint num="21" id="3586" />
-<TGConnectingPoint num="22" id="3587" />
-<TGConnectingPoint num="23" id="3588" />
+<TGConnectingPoint num="0" id="4141" />
+<TGConnectingPoint num="1" id="4142" />
+<TGConnectingPoint num="2" id="4143" />
+<TGConnectingPoint num="3" id="4144" />
+<TGConnectingPoint num="4" id="4145" />
+<TGConnectingPoint num="5" id="4146" />
+<TGConnectingPoint num="6" id="4147" />
+<TGConnectingPoint num="7" id="4148" />
+<TGConnectingPoint num="8" id="4149" />
+<TGConnectingPoint num="9" id="4150" />
+<TGConnectingPoint num="10" id="4151" />
+<TGConnectingPoint num="11" id="4152" />
+<TGConnectingPoint num="12" id="4153" />
+<TGConnectingPoint num="13" id="4154" />
+<TGConnectingPoint num="14" id="4155" />
+<TGConnectingPoint num="15" id="4156" />
+<TGConnectingPoint num="16" id="4157" />
+<TGConnectingPoint num="17" id="4158" />
+<TGConnectingPoint num="18" id="4159" />
+<TGConnectingPoint num="19" id="4160" />
+<TGConnectingPoint num="20" id="4161" />
+<TGConnectingPoint num="21" id="4162" />
+<TGConnectingPoint num="22" id="4163" />
+<TGConnectingPoint num="23" id="4164" />
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
@@ -11039,52 +11696,52 @@ the smart card and the terminal
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3616" >
+<COMPONENT type="5100" id="4192" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3615" />
+<TGConnectingPoint num="0" id="4191" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3618" >
+<COMPONENT type="5100" id="4194" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3617" />
+<TGConnectingPoint num="0" id="4193" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3620" >
+<COMPONENT type="5100" id="4196" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3619" />
+<TGConnectingPoint num="0" id="4195" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="CA" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3622" >
+<COMPONENT type="5100" id="4198" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3621" />
+<TGConnectingPoint num="0" id="4197" />
</COMPONENT>
@@ -11097,60 +11754,60 @@ the smart card and the terminal
<Modeling type="Sysmlsec Methodology" nameTab="SysMLSec_Methodology" >
<SysmlsecMethodologyDiagramPanel name="SysMLSec_Methodology" minX="10" maxX="2000" minY="10" maxY="1200" zoom="0.8000000000000002" >
-<COMPONENT type="5705" id="3627" >
+<COMPONENT type="5705" id="4203" >
<cdparam x="520" y="400" />
<sizeparam width="144" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Properties" />
-<TGConnectingPoint num="0" id="3623" />
-<TGConnectingPoint num="1" id="3624" />
-<TGConnectingPoint num="2" id="3625" />
-<TGConnectingPoint num="3" id="3626" />
+<TGConnectingPoint num="0" id="4199" />
+<TGConnectingPoint num="1" id="4200" />
+<TGConnectingPoint num="2" id="4201" />
+<TGConnectingPoint num="3" id="4202" />
</COMPONENT>
-<COMPONENT type="5706" id="3632" >
+<COMPONENT type="5706" id="4208" >
<cdparam x="880" y="480" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Prototyping" />
-<TGConnectingPoint num="0" id="3628" />
-<TGConnectingPoint num="1" id="3629" />
-<TGConnectingPoint num="2" id="3630" />
-<TGConnectingPoint num="3" id="3631" />
+<TGConnectingPoint num="0" id="4204" />
+<TGConnectingPoint num="1" id="4205" />
+<TGConnectingPoint num="2" id="4206" />
+<TGConnectingPoint num="3" id="4207" />
</COMPONENT>
-<COMPONENT type="5704" id="3641" >
+<COMPONENT type="5704" id="4217" >
<cdparam x="800" y="400" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Design" />
-<TGConnectingPoint num="0" id="3636" />
-<TGConnectingPoint num="1" id="3637" />
-<TGConnectingPoint num="2" id="3638" />
-<TGConnectingPoint num="3" id="3639" />
-<TGConnectingPoint num="4" id="3640" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3633" >
-<father id="3641" num="0" />
+<TGConnectingPoint num="0" id="4212" />
+<TGConnectingPoint num="1" id="4213" />
+<TGConnectingPoint num="2" id="4214" />
+<TGConnectingPoint num="3" id="4215" />
+<TGConnectingPoint num="4" id="4216" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="4209" >
+<father id="4217" num="0" />
<cdparam x="804" y="456" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="1005" maxX="1005" minY="570" maxY="570" />
<infoparam name="value " value="DHWithCertificateSecurityProtocol" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3634" >
-<father id="3641" num="1" />
+<SUBCOMPONENT type="5707" id="4210" >
+<father id="4217" num="1" />
<cdparam x="804" y="444" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="1005" maxX="1005" minY="555" maxY="555" />
<infoparam name="value " value="DHSecurityProtocol" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3635" >
-<father id="3641" num="2" />
+<SUBCOMPONENT type="5707" id="4211" >
+<father id="4217" num="2" />
<cdparam x="804" y="432" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11158,74 +11815,74 @@ the smart card and the terminal
<infoparam name="value " value="BasicSecurityProtocol" />
</SUBCOMPONENT>
-<COMPONENT type="5703" id="3647" >
+<COMPONENT type="5703" id="4223" >
<cdparam x="720" y="320" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Analysis" />
-<TGConnectingPoint num="0" id="3642" />
-<TGConnectingPoint num="1" id="3643" />
-<TGConnectingPoint num="2" id="3644" />
-<TGConnectingPoint num="3" id="3645" />
-<TGConnectingPoint num="4" id="3646" />
+<TGConnectingPoint num="0" id="4218" />
+<TGConnectingPoint num="1" id="4219" />
+<TGConnectingPoint num="2" id="4220" />
+<TGConnectingPoint num="3" id="4221" />
+<TGConnectingPoint num="4" id="4222" />
</COMPONENT>
-<COMPONENT type="5711" id="3652" >
+<COMPONENT type="5711" id="4228" >
<cdparam x="709" y="80" />
<sizeparam width="181" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Communication pattern" />
-<TGConnectingPoint num="0" id="3648" />
-<TGConnectingPoint num="1" id="3649" />
-<TGConnectingPoint num="2" id="3650" />
-<TGConnectingPoint num="3" id="3651" />
+<TGConnectingPoint num="0" id="4224" />
+<TGConnectingPoint num="1" id="4225" />
+<TGConnectingPoint num="2" id="4226" />
+<TGConnectingPoint num="3" id="4227" />
</COMPONENT>
-<COMPONENT type="5710" id="3659" >
+<COMPONENT type="5710" id="4235" >
<cdparam x="720" y="180" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="3653" />
-<TGConnectingPoint num="1" id="3654" />
-<TGConnectingPoint num="2" id="3655" />
-<TGConnectingPoint num="3" id="3656" />
-<TGConnectingPoint num="4" id="3657" />
-<TGConnectingPoint num="5" id="3658" />
+<TGConnectingPoint num="0" id="4229" />
+<TGConnectingPoint num="1" id="4230" />
+<TGConnectingPoint num="2" id="4231" />
+<TGConnectingPoint num="3" id="4232" />
+<TGConnectingPoint num="4" id="4233" />
+<TGConnectingPoint num="5" id="4234" />
</COMPONENT>
-<COMPONENT type="5709" id="3667" >
+<COMPONENT type="5709" id="4243" >
<cdparam x="920" y="80" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Architecture view" />
-<TGConnectingPoint num="0" id="3663" />
-<TGConnectingPoint num="1" id="3664" />
-<TGConnectingPoint num="2" id="3665" />
-<TGConnectingPoint num="3" id="3666" />
+<TGConnectingPoint num="0" id="4239" />
+<TGConnectingPoint num="1" id="4240" />
+<TGConnectingPoint num="2" id="4241" />
+<TGConnectingPoint num="3" id="4242" />
</COMPONENT>
-<SUBCOMPONENT type="5707" id="3660" >
-<father id="3667" num="0" />
+<SUBCOMPONENT type="5707" id="4236" >
+<father id="4243" num="0" />
<cdparam x="924" y="136" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="1155" maxX="1155" minY="170" maxY="170" />
<infoparam name="value " value="Mapping2_Sec" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3661" >
-<father id="3667" num="1" />
+<SUBCOMPONENT type="5707" id="4237" >
+<father id="4243" num="1" />
<cdparam x="924" y="124" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="1155" maxX="1155" minY="155" maxY="155" />
<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3662" >
-<father id="3667" num="2" />
+<SUBCOMPONENT type="5707" id="4238" >
+<father id="4243" num="2" />
<cdparam x="924" y="112" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11233,19 +11890,19 @@ the smart card and the terminal
<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
-<COMPONENT type="5713" id="3673" >
+<COMPONENT type="5713" id="4249" >
<cdparam x="520" y="80" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Functional view" />
-<TGConnectingPoint num="0" id="3669" />
-<TGConnectingPoint num="1" id="3670" />
-<TGConnectingPoint num="2" id="3671" />
-<TGConnectingPoint num="3" id="3672" />
+<TGConnectingPoint num="0" id="4245" />
+<TGConnectingPoint num="1" id="4246" />
+<TGConnectingPoint num="2" id="4247" />
+<TGConnectingPoint num="3" id="4248" />
</COMPONENT>
-<SUBCOMPONENT type="5707" id="3668" >
-<father id="3673" num="0" />
+<SUBCOMPONENT type="5707" id="4244" >
+<father id="4249" num="0" />
<cdparam x="524" y="112" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11253,33 +11910,33 @@ the smart card and the terminal
<infoparam name="value " value="AppC" />
</SUBCOMPONENT>
-<COMPONENT type="5719" id="3679" >
+<COMPONENT type="5719" id="4255" >
<cdparam x="280" y="120" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Faults" />
-<TGConnectingPoint num="0" id="3674" />
-<TGConnectingPoint num="1" id="3675" />
-<TGConnectingPoint num="2" id="3676" />
-<TGConnectingPoint num="3" id="3677" />
-<TGConnectingPoint num="4" id="3678" />
+<TGConnectingPoint num="0" id="4250" />
+<TGConnectingPoint num="1" id="4251" />
+<TGConnectingPoint num="2" id="4252" />
+<TGConnectingPoint num="3" id="4253" />
+<TGConnectingPoint num="4" id="4254" />
</COMPONENT>
-<COMPONENT type="5712" id="3686" >
+<COMPONENT type="5712" id="4262" >
<cdparam x="280" y="440" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Attacks" />
-<TGConnectingPoint num="0" id="3681" />
-<TGConnectingPoint num="1" id="3682" />
-<TGConnectingPoint num="2" id="3683" />
-<TGConnectingPoint num="3" id="3684" />
-<TGConnectingPoint num="4" id="3685" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3680" >
-<father id="3686" num="0" />
+<TGConnectingPoint num="0" id="4257" />
+<TGConnectingPoint num="1" id="4258" />
+<TGConnectingPoint num="2" id="4259" />
+<TGConnectingPoint num="3" id="4260" />
+<TGConnectingPoint num="4" id="4261" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="4256" >
+<father id="4262" num="0" />
<cdparam x="284" y="472" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11287,23 +11944,23 @@ the smart card and the terminal
<infoparam name="value " value="Attack Trees" />
</SUBCOMPONENT>
-<COMPONENT type="5702" id="3696" >
+<COMPONENT type="5702" id="4272" >
<cdparam x="280" y="280" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="3688" />
-<TGConnectingPoint num="1" id="3689" />
-<TGConnectingPoint num="2" id="3690" />
-<TGConnectingPoint num="3" id="3691" />
-<TGConnectingPoint num="4" id="3692" />
-<TGConnectingPoint num="5" id="3693" />
-<TGConnectingPoint num="6" id="3694" />
-<TGConnectingPoint num="7" id="3695" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3687" >
-<father id="3696" num="0" />
+<TGConnectingPoint num="0" id="4264" />
+<TGConnectingPoint num="1" id="4265" />
+<TGConnectingPoint num="2" id="4266" />
+<TGConnectingPoint num="3" id="4267" />
+<TGConnectingPoint num="4" id="4268" />
+<TGConnectingPoint num="5" id="4269" />
+<TGConnectingPoint num="6" id="4270" />
+<TGConnectingPoint num="7" id="4271" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="4263" >
+<father id="4272" num="0" />
<cdparam x="284" y="312" />
<sizeparam width="8" height="8" minWidth="8" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11311,230 +11968,230 @@ the smart card and the terminal
<infoparam name="value " value="Requirements" />
</SUBCOMPONENT>
-<COMPONENT type="5701" id="3701" >
+<COMPONENT type="5701" id="4277" >
<cdparam x="40" y="280" />
<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2499" minY="12" maxY="1499" />
<infoparam name="TGComponent" value="Assumptions" />
-<TGConnectingPoint num="0" id="3697" />
-<TGConnectingPoint num="1" id="3698" />
-<TGConnectingPoint num="2" id="3699" />
-<TGConnectingPoint num="3" id="3700" />
+<TGConnectingPoint num="0" id="4273" />
+<TGConnectingPoint num="1" id="4274" />
+<TGConnectingPoint num="2" id="4275" />
+<TGConnectingPoint num="3" id="4276" />
</COMPONENT>
-<COMPONENT type="304" id="3718" >
+<COMPONENT type="304" id="4294" >
<cdparam x="504" y="52" />
<sizeparam width="600" height="200" minWidth="16" minHeight="16" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2000" minY="10" maxY="1200" />
<infoparam name="Info" value="SW/HW Partitioning" />
-<TGConnectingPoint num="0" id="3702" />
-<TGConnectingPoint num="1" id="3703" />
-<TGConnectingPoint num="2" id="3704" />
-<TGConnectingPoint num="3" id="3705" />
-<TGConnectingPoint num="4" id="3706" />
-<TGConnectingPoint num="5" id="3707" />
-<TGConnectingPoint num="6" id="3708" />
-<TGConnectingPoint num="7" id="3709" />
-<TGConnectingPoint num="8" id="3710" />
-<TGConnectingPoint num="9" id="3711" />
-<TGConnectingPoint num="10" id="3712" />
-<TGConnectingPoint num="11" id="3713" />
-<TGConnectingPoint num="12" id="3714" />
-<TGConnectingPoint num="13" id="3715" />
-<TGConnectingPoint num="14" id="3716" />
-<TGConnectingPoint num="15" id="3717" />
+<TGConnectingPoint num="0" id="4278" />
+<TGConnectingPoint num="1" id="4279" />
+<TGConnectingPoint num="2" id="4280" />
+<TGConnectingPoint num="3" id="4281" />
+<TGConnectingPoint num="4" id="4282" />
+<TGConnectingPoint num="5" id="4283" />
+<TGConnectingPoint num="6" id="4284" />
+<TGConnectingPoint num="7" id="4285" />
+<TGConnectingPoint num="8" id="4286" />
+<TGConnectingPoint num="9" id="4287" />
+<TGConnectingPoint num="10" id="4288" />
+<TGConnectingPoint num="11" id="4289" />
+<TGConnectingPoint num="12" id="4290" />
+<TGConnectingPoint num="13" id="4291" />
+<TGConnectingPoint num="14" id="4292" />
+<TGConnectingPoint num="15" id="4293" />
<extraparam>
<TextColor value="-1" />
<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="304" id="3735" >
+<COMPONENT type="304" id="4311" >
<cdparam x="504" y="300" />
<sizeparam width="600" height="260" minWidth="16" minHeight="16" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2000" minY="10" maxY="1200" />
<infoparam name="Info" value="SW Design" />
-<TGConnectingPoint num="0" id="3719" />
-<TGConnectingPoint num="1" id="3720" />
-<TGConnectingPoint num="2" id="3721" />
-<TGConnectingPoint num="3" id="3722" />
-<TGConnectingPoint num="4" id="3723" />
-<TGConnectingPoint num="5" id="3724" />
-<TGConnectingPoint num="6" id="3725" />
-<TGConnectingPoint num="7" id="3726" />
-<TGConnectingPoint num="8" id="3727" />
-<TGConnectingPoint num="9" id="3728" />
-<TGConnectingPoint num="10" id="3729" />
-<TGConnectingPoint num="11" id="3730" />
-<TGConnectingPoint num="12" id="3731" />
-<TGConnectingPoint num="13" id="3732" />
-<TGConnectingPoint num="14" id="3733" />
-<TGConnectingPoint num="15" id="3734" />
+<TGConnectingPoint num="0" id="4295" />
+<TGConnectingPoint num="1" id="4296" />
+<TGConnectingPoint num="2" id="4297" />
+<TGConnectingPoint num="3" id="4298" />
+<TGConnectingPoint num="4" id="4299" />
+<TGConnectingPoint num="5" id="4300" />
+<TGConnectingPoint num="6" id="4301" />
+<TGConnectingPoint num="7" id="4302" />
+<TGConnectingPoint num="8" id="4303" />
+<TGConnectingPoint num="9" id="4304" />
+<TGConnectingPoint num="10" id="4305" />
+<TGConnectingPoint num="11" id="4306" />
+<TGConnectingPoint num="12" id="4307" />
+<TGConnectingPoint num="13" id="4308" />
+<TGConnectingPoint num="14" id="4309" />
+<TGConnectingPoint num="15" id="4310" />
<extraparam>
<TextColor value="-1" />
<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="304" id="3752" >
+<COMPONENT type="304" id="4328" >
<cdparam x="264" y="80" />
<sizeparam width="192" height="440" minWidth="16" minHeight="16" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2000" minY="10" maxY="1200" />
<infoparam name="Info" value="Req / faults / attacks" />
-<TGConnectingPoint num="0" id="3736" />
-<TGConnectingPoint num="1" id="3737" />
-<TGConnectingPoint num="2" id="3738" />
-<TGConnectingPoint num="3" id="3739" />
-<TGConnectingPoint num="4" id="3740" />
-<TGConnectingPoint num="5" id="3741" />
-<TGConnectingPoint num="6" id="3742" />
-<TGConnectingPoint num="7" id="3743" />
-<TGConnectingPoint num="8" id="3744" />
-<TGConnectingPoint num="9" id="3745" />
-<TGConnectingPoint num="10" id="3746" />
-<TGConnectingPoint num="11" id="3747" />
-<TGConnectingPoint num="12" id="3748" />
-<TGConnectingPoint num="13" id="3749" />
-<TGConnectingPoint num="14" id="3750" />
-<TGConnectingPoint num="15" id="3751" />
+<TGConnectingPoint num="0" id="4312" />
+<TGConnectingPoint num="1" id="4313" />
+<TGConnectingPoint num="2" id="4314" />
+<TGConnectingPoint num="3" id="4315" />
+<TGConnectingPoint num="4" id="4316" />
+<TGConnectingPoint num="5" id="4317" />
+<TGConnectingPoint num="6" id="4318" />
+<TGConnectingPoint num="7" id="4319" />
+<TGConnectingPoint num="8" id="4320" />
+<TGConnectingPoint num="9" id="4321" />
+<TGConnectingPoint num="10" id="4322" />
+<TGConnectingPoint num="11" id="4323" />
+<TGConnectingPoint num="12" id="4324" />
+<TGConnectingPoint num="13" id="4325" />
+<TGConnectingPoint num="14" id="4326" />
+<TGConnectingPoint num="15" id="4327" />
<extraparam>
<TextColor value="-1" />
<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="6004" id="3754" >
+<CONNECTOR type="6004" id="4330" >
<cdparam x="1000" y="136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3753" />
-<P1 x="1000" y="136" id="3663" />
-<P2 x="832" y="180" id="3654" />
+<TGConnectingPoint num="0" id="4329" />
+<P1 x="1000" y="136" id="4239" />
+<P2 x="832" y="180" id="4230" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="3756" >
+<CONNECTOR type="6004" id="4332" >
<cdparam x="800" y="136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3755" />
-<P1 x="799" y="136" id="3648" />
-<P2 x="800" y="180" id="3655" />
+<TGConnectingPoint num="0" id="4331" />
+<P1 x="799" y="136" id="4224" />
+<P2 x="800" y="180" id="4231" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="3758" >
+<CONNECTOR type="6004" id="4334" >
<cdparam x="600" y="136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3757" />
-<P1 x="600" y="136" id="3669" />
-<P2 x="768" y="180" id="3653" />
+<TGConnectingPoint num="0" id="4333" />
+<P1 x="600" y="136" id="4245" />
+<P2 x="768" y="180" id="4229" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5718" id="3764" >
+<CONNECTOR type="5718" id="4340" >
<cdparam x="440" y="308" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3761" />
-<TGConnectingPoint num="1" id="3762" />
-<TGConnectingPoint num="2" id="3763" />
-<P1 x="440" y="308" id="3688" />
-<P2 x="592" y="400" id="3623" />
+<TGConnectingPoint num="0" id="4337" />
+<TGConnectingPoint num="1" id="4338" />
+<TGConnectingPoint num="2" id="4339" />
+<P1 x="440" y="308" id="4264" />
+<P2 x="592" y="400" id="4199" />
<Point x="476" y="308" />
<Point x="476" y="360" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3759" >
-<father id="3764" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4335" >
+<father id="4340" num="0" />
<cdparam x="476" y="308" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="6" height="6" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3760" >
-<father id="3764" num="1" />
+<SUBCOMPONENT type="-1" id="4336" >
+<father id="4340" num="1" />
<cdparam x="476" y="360" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="6" height="6" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="3768" >
+<CONNECTOR type="5718" id="4344" >
<cdparam x="832" y="456" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3766" />
-<TGConnectingPoint num="1" id="3767" />
-<P1 x="832" y="456" id="3637" />
-<P2 x="880" y="508" id="3628" />
+<TGConnectingPoint num="0" id="4342" />
+<TGConnectingPoint num="1" id="4343" />
+<P1 x="832" y="456" id="4213" />
+<P2 x="880" y="508" id="4204" />
<Point x="848" y="500" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3765" >
-<father id="3768" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4341" >
+<father id="4344" num="0" />
<cdparam x="848" y="500" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="6" height="6" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="3772" >
+<CONNECTOR type="5718" id="4348" >
<cdparam x="768" y="376" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3770" />
-<TGConnectingPoint num="1" id="3771" />
-<P1 x="768" y="376" id="3643" />
-<P2 x="800" y="428" id="3636" />
+<TGConnectingPoint num="0" id="4346" />
+<TGConnectingPoint num="1" id="4347" />
+<P1 x="768" y="376" id="4219" />
+<P2 x="800" y="428" id="4212" />
<Point x="768" y="420" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3769" >
-<father id="3772" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4345" >
+<father id="4348" num="0" />
<cdparam x="768" y="420" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="6" height="6" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="3774" >
+<CONNECTOR type="5718" id="4350" >
<cdparam x="376" y="440" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3773" />
-<P1 x="376" y="440" id="3682" />
-<P2 x="376" y="336" id="3690" />
+<TGConnectingPoint num="0" id="4349" />
+<P1 x="376" y="440" id="4258" />
+<P2 x="376" y="336" id="4266" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5718" id="3776" >
+<CONNECTOR type="5718" id="4352" >
<cdparam x="376" y="176" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3775" />
-<P1 x="376" y="176" id="3675" />
-<P2 x="376" y="280" id="3691" />
+<TGConnectingPoint num="0" id="4351" />
+<P1 x="376" y="176" id="4251" />
+<P2 x="376" y="280" id="4267" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5718" id="3778" >
+<CONNECTOR type="5718" id="4354" >
<cdparam x="328" y="280" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3777" />
-<P1 x="328" y="280" id="3692" />
-<P2 x="328" y="176" id="3674" />
+<TGConnectingPoint num="0" id="4353" />
+<P1 x="328" y="280" id="4268" />
+<P2 x="328" y="176" id="4250" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5718" id="3780" >
+<CONNECTOR type="5718" id="4356" >
<cdparam x="328" y="336" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3779" />
-<P1 x="328" y="336" id="3689" />
-<P2 x="328" y="440" id="3681" />
+<TGConnectingPoint num="0" id="4355" />
+<P1 x="328" y="336" id="4265" />
+<P2 x="328" y="440" id="4257" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/modeling/SysMLSec/at_chuli.xml b/modeling/SysMLSec/at_chuli.xml
index d3019272ee6e38e74bc9cd398bf050b72a497522..fac554597b6bb15464f9276b22f9418e1f2639c4 100644
--- a/modeling/SysMLSec/at_chuli.xml
+++ b/modeling/SysMLSec/at_chuli.xml
@@ -11,15 +11,15 @@
<TGConnectingPoint num="0" id="3" />
<TGConnectingPoint num="1" id="4" />
<TGConnectingPoint num="2" id="5" />
-<P1 x="523" y="634" id="775" />
-<P2 x="847" y="712" id="608" />
+<P1 x="509" y="634" id="336" />
+<P2 x="835" y="712" id="495" />
<Point x="594" y="664" />
<Point x="812" y="664" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1" >
<father id="6" num="0" />
<cdparam x="594" y="664" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -27,7 +27,7 @@
<SUBCOMPONENT type="-1" id="2" >
<father id="6" num="1" />
<cdparam x="812" y="664" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -38,8 +38,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="7" />
-<P1 x="446" y="860" id="291" />
-<P2 x="482" y="861" id="692" />
+<P1 x="446" y="860" id="818" />
+<P2 x="482" y="861" id="403" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="10" >
@@ -47,8 +47,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="9" />
-<P1 x="431" y="644" id="769" />
-<P2 x="371" y="836" id="289" />
+<P1 x="424" y="644" id="330" />
+<P2 x="371" y="836" id="816" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="12" >
@@ -56,8 +56,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="11" />
-<P1 x="374" y="919" id="302" />
-<P2 x="371" y="885" id="292" />
+<P1 x="369" y="919" id="791" />
+<P2 x="371" y="885" id="819" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="14" >
@@ -65,8 +65,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="13" />
-<P1 x="477" y="644" id="777" />
-<P2 x="469" y="718" id="720" />
+<P1 x="466" y="644" id="338" />
+<P2 x="467" y="718" id="381" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="22" >
@@ -77,8 +77,8 @@
<TGConnectingPoint num="1" id="19" />
<TGConnectingPoint num="2" id="20" />
<TGConnectingPoint num="3" id="21" />
-<P1 x="385" y="644" id="776" />
-<P2 x="547" y="1308" id="543" />
+<P1 x="382" y="644" id="337" />
+<P2 x="537" y="1308" id="556" />
<Point x="172" y="1020" />
<Point x="173" y="1323" />
<Point x="516" y="1323" />
@@ -86,7 +86,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="15" >
<father id="22" num="0" />
<cdparam x="172" y="1020" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -94,7 +94,7 @@
<SUBCOMPONENT type="-1" id="16" >
<father id="22" num="1" />
<cdparam x="173" y="1323" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -102,7 +102,7 @@
<SUBCOMPONENT type="-1" id="17" >
<father id="22" num="2" />
<cdparam x="516" y="1323" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -115,15 +115,15 @@
<TGConnectingPoint num="0" id="25" />
<TGConnectingPoint num="1" id="26" />
<TGConnectingPoint num="2" id="27" />
-<P1 x="428" y="1278" id="546" />
-<P2 x="267" y="1138" id="380" />
+<P1 x="428" y="1278" id="559" />
+<P2 x="261" y="1138" id="719" />
<Point x="386" y="1197" />
<Point x="255" y="1197" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="23" >
<father id="28" num="0" />
<cdparam x="386" y="1197" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -131,7 +131,7 @@
<SUBCOMPONENT type="-1" id="24" >
<father id="28" num="1" />
<cdparam x="255" y="1197" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -142,8 +142,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="29" />
-<P1 x="428" y="1288" id="541" />
-<P2 x="316" y="1248" id="355" />
+<P1 x="428" y="1288" id="554" />
+<P2 x="306" y="1248" id="744" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="34" >
@@ -152,14 +152,14 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="32" />
<TGConnectingPoint num="1" id="33" />
-<P1 x="428" y="1298" id="548" />
-<P2 x="188" y="1062" id="510" />
+<P1 x="428" y="1298" id="561" />
+<P2 x="188" y="1062" id="599" />
<Point x="188" y="1303" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="31" >
<father id="34" num="0" />
<cdparam x="188" y="1303" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -171,14 +171,14 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="36" />
<TGConnectingPoint num="1" id="37" />
-<P1 x="785" y="1220" id="332" />
-<P2 x="589" y="1022" id="536" />
+<P1 x="770" y="1220" id="771" />
+<P2 x="589" y="1022" id="587" />
<Point x="740" y="1112" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="35" >
<father id="38" num="0" />
<cdparam x="740" y="1112" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -190,14 +190,14 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="40" />
<TGConnectingPoint num="1" id="41" />
-<P1 x="667" y="1298" id="549" />
-<P2 x="905" y="1172" id="413" />
+<P1 x="646" y="1298" id="562" />
+<P2 x="893" y="1172" id="702" />
<Point x="851" y="1303" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="39" >
<father id="42" num="0" />
<cdparam x="851" y="1303" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -208,8 +208,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="43" />
-<P1 x="607" y="1268" id="545" />
-<P2 x="639" y="1170" id="437" />
+<P1 x="591" y="1268" id="558" />
+<P2 x="635" y="1170" id="676" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="46" >
@@ -217,8 +217,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="45" />
-<P1 x="487" y="1268" id="544" />
-<P2 x="446" y="1168" id="488" />
+<P1 x="482" y="1268" id="557" />
+<P2 x="438" y="1168" id="627" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="48" >
@@ -226,8 +226,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="47" />
-<P1 x="547" y="1268" id="540" />
-<P2 x="534" y="1169" id="455" />
+<P1 x="537" y="1268" id="553" />
+<P2 x="529" y="1169" id="644" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="50" >
@@ -235,8 +235,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="49" />
-<P1 x="514" y="986" id="527" />
-<P2 x="540" y="968" id="807" />
+<P1 x="514" y="986" id="578" />
+<P2 x="532" y="968" id="292" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="54" >
@@ -245,14 +245,14 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="52" />
<TGConnectingPoint num="1" id="53" />
-<P1 x="316" y="1208" id="352" />
-<P2 x="440" y="1022" id="535" />
+<P1 x="306" y="1208" id="741" />
+<P2 x="440" y="1022" id="586" />
<Point x="332" y="1118" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="51" >
<father id="54" num="0" />
<cdparam x="332" y="1118" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
@@ -263,8 +263,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="55" />
-<P1 x="331" y="1108" id="384" />
-<P2 x="440" y="1010" id="528" />
+<P1 x="320" y="1108" id="723" />
+<P2 x="440" y="1010" id="579" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="58" >
@@ -272,8 +272,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="57" />
-<P1 x="854" y="1132" id="402" />
-<P2 x="589" y="998" id="534" />
+<P1 x="846" y="1132" id="691" />
+<P2 x="589" y="998" id="585" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="60" >
@@ -281,8 +281,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="59" />
-<P1 x="683" y="1130" id="427" />
-<P2 x="551" y="1035" id="538" />
+<P1 x="676" y="1130" id="666" />
+<P2 x="551" y="1035" id="589" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="62" >
@@ -290,8 +290,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="61" />
-<P1 x="534" y="1129" id="452" />
-<P2 x="514" y="1035" id="530" />
+<P1 x="529" y="1129" id="641" />
+<P2 x="514" y="1035" id="581" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="64" >
@@ -299,8 +299,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="63" />
-<P1 x="410" y="1128" id="477" />
-<P2 x="477" y="1035" id="537" />
+<P1 x="405" y="1128" id="616" />
+<P2 x="477" y="1035" id="588" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="66" >
@@ -308,8 +308,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="65" />
-<P1 x="267" y="1032" id="502" />
-<P2 x="440" y="998" id="533" />
+<P1 x="262" y="1032" id="591" />
+<P2 x="440" y="998" id="584" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="68" >
@@ -317,8 +317,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="67" />
-<P1 x="690" y="634" id="565" />
-<P2 x="720" y="617" id="581" />
+<P1 x="690" y="634" id="540" />
+<P2 x="713" y="617" id="518" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="70" >
@@ -326,8 +326,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="69" />
-<P1 x="804" y="712" id="603" />
-<P2 x="727" y="683" id="576" />
+<P1 x="796" y="712" id="490" />
+<P2 x="727" y="683" id="551" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="72" >
@@ -335,8 +335,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="71" />
-<P1 x="624" y="708" id="628" />
-<P2 x="653" y="683" id="575" />
+<P1 x="619" y="708" id="465" />
+<P2 x="653" y="683" id="550" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="74" >
@@ -344,7 +344,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="73" />
-<P1 x="720" y="577" id="578" />
+<P1 x="713" y="577" id="515" />
<P2 x="703" y="551" id="865" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -353,8 +353,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="75" />
-<P1 x="620" y="775" id="653" />
-<P2 x="624" y="748" id="631" />
+<P1 x="620" y="775" id="452" />
+<P2 x="619" y="748" id="468" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="78" >
@@ -362,8 +362,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="77" />
-<P1 x="746" y="842" id="666" />
-<P2 x="657" y="824" id="664" />
+<P1 x="740" y="842" id="427" />
+<P2 x="657" y="824" id="463" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="80" >
@@ -371,8 +371,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="79" />
-<P1 x="532" y="841" id="691" />
-<P2 x="583" y="824" id="663" />
+<P1 x="529" y="841" id="402" />
+<P2 x="583" y="824" id="462" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="82" >
@@ -381,7 +381,7 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="81" />
<P1 x="629" y="502" id="858" />
-<P2 x="606" y="416" id="129" />
+<P2 x="599" y="416" id="192" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="84" >
@@ -389,8 +389,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="83" />
-<P1 x="431" y="606" id="766" />
-<P2 x="458" y="330" id="154" />
+<P1 x="424" y="606" id="327" />
+<P2 x="458" y="330" id="179" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="86" >
@@ -398,8 +398,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="85" />
-<P1 x="304" y="625" id="793" />
-<P2 x="340" y="625" id="767" />
+<P1 x="304" y="625" id="316" />
+<P2 x="340" y="625" id="328" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="88" >
@@ -407,8 +407,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="87" />
-<P1 x="273" y="676" id="741" />
-<P2 x="242" y="644" id="794" />
+<P1 x="263" y="676" id="352" />
+<P2 x="242" y="644" id="317" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="90" >
@@ -416,8 +416,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="89" />
-<P1 x="382" y="437" id="192" />
-<P2 x="211" y="606" id="795" />
+<P1 x="372" y="437" id="129" />
+<P2 x="211" y="606" id="318" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="92" >
@@ -425,8 +425,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="91" />
-<P1 x="372" y="379" id="217" />
-<P2 x="382" y="397" id="189" />
+<P1 x="367" y="379" id="104" />
+<P2 x="372" y="397" id="126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="94" >
@@ -434,8 +434,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="93" />
-<P1 x="390" y="311" id="166" />
-<P2 x="396" y="311" id="152" />
+<P1 x="379" y="311" id="153" />
+<P2 x="396" y="311" id="177" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="96" >
@@ -443,8 +443,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="3" />
<TGConnectingPoint num="0" id="95" />
-<P1 x="606" y="378" id="126" />
-<P2 x="489" y="330" id="162" />
+<P1 x="599" y="378" id="189" />
+<P2 x="489" y="330" id="187" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="98" >
@@ -452,8 +452,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="97" />
-<P1 x="458" y="292" id="151" />
-<P2 x="481" y="278" id="104" />
+<P1 x="458" y="292" id="176" />
+<P2 x="472" y="278" id="217" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="100" >
@@ -461,7 +461,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="99" />
-<P1 x="537" y="718" id="721" />
+<P1 x="529" y="718" id="382" />
<P2 x="629" y="551" id="864" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -498,12 +498,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="125" >
<father id="263" num="0" />
-<cdparam x="366" y="240" />
-<sizeparam width="231" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="305" y="341" />
+<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="203" minY="0" maxY="198" />
-<infoparam name="TGComponent" value="GatherInformationOnMobilePhone" />
+<cdrectangleparam minX="0" maxX="310" minY="0" maxY="198" />
+<infoparam name="TGComponent" value="InfectMobilePhone" />
<TGConnectingPoint num="0" id="101" />
<TGConnectingPoint num="1" id="102" />
<TGConnectingPoint num="2" id="103" />
@@ -528,19 +528,18 @@
<TGConnectingPoint num="21" id="122" />
<TGConnectingPoint num="22" id="123" />
<TGConnectingPoint num="23" id="124" />
-<accessibility />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="150" >
<father id="263" num="1" />
-<cdparam x="513" y="378" />
-<sizeparam width="187" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="270" y="397" />
+<sizeparam width="204" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="false" />
-<cdrectangleparam minX="0" maxX="247" minY="0" maxY="198" />
-<infoparam name="TGComponent" value="ReceiveRemoteInformation" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="230" minY="0" maxY="196" />
+<infoparam name="TGComponent" value="SendSpamWithMaliciousPackage" />
<TGConnectingPoint num="0" id="126" />
<TGConnectingPoint num="1" id="127" />
<TGConnectingPoint num="2" id="128" />
@@ -569,13 +568,14 @@
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="163" >
+<SUBCOMPONENT type="1401" id="175" >
<father id="263" num="2" />
-<cdparam x="396" y="292" />
-<sizeparam width="124" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="272" y="291" />
+<sizeparam width="107" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="310" minY="0" maxY="198" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="327" minY="0" maxY="196" />
+<infoparam name="TGComponent" value="StartWebServer" />
<TGConnectingPoint num="0" id="151" />
<TGConnectingPoint num="1" id="152" />
<TGConnectingPoint num="2" id="153" />
@@ -588,54 +588,53 @@
<TGConnectingPoint num="9" id="160" />
<TGConnectingPoint num="10" id="161" />
<TGConnectingPoint num="11" id="162" />
+<TGConnectingPoint num="12" id="163" />
+<TGConnectingPoint num="13" id="164" />
+<TGConnectingPoint num="14" id="165" />
+<TGConnectingPoint num="15" id="166" />
+<TGConnectingPoint num="16" id="167" />
+<TGConnectingPoint num="17" id="168" />
+<TGConnectingPoint num="18" id="169" />
+<TGConnectingPoint num="19" id="170" />
+<TGConnectingPoint num="20" id="171" />
+<TGConnectingPoint num="21" id="172" />
+<TGConnectingPoint num="22" id="173" />
+<TGConnectingPoint num="23" id="174" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="188" >
+<SUBCOMPONENT type="1402" id="188" >
<father id="263" num="3" />
-<cdparam x="272" y="291" />
-<sizeparam width="118" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="396" y="292" />
+<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="316" minY="0" maxY="196" />
-<infoparam name="TGComponent" value="StartWebServer" />
-<TGConnectingPoint num="0" id="164" />
-<TGConnectingPoint num="1" id="165" />
-<TGConnectingPoint num="2" id="166" />
-<TGConnectingPoint num="3" id="167" />
-<TGConnectingPoint num="4" id="168" />
-<TGConnectingPoint num="5" id="169" />
-<TGConnectingPoint num="6" id="170" />
-<TGConnectingPoint num="7" id="171" />
-<TGConnectingPoint num="8" id="172" />
-<TGConnectingPoint num="9" id="173" />
-<TGConnectingPoint num="10" id="174" />
-<TGConnectingPoint num="11" id="175" />
-<TGConnectingPoint num="12" id="176" />
-<TGConnectingPoint num="13" id="177" />
-<TGConnectingPoint num="14" id="178" />
-<TGConnectingPoint num="15" id="179" />
-<TGConnectingPoint num="16" id="180" />
-<TGConnectingPoint num="17" id="181" />
-<TGConnectingPoint num="18" id="182" />
-<TGConnectingPoint num="19" id="183" />
-<TGConnectingPoint num="20" id="184" />
-<TGConnectingPoint num="21" id="185" />
-<TGConnectingPoint num="22" id="186" />
-<TGConnectingPoint num="23" id="187" />
+<cdrectangleparam minX="0" maxX="310" minY="0" maxY="198" />
+<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<TGConnectingPoint num="0" id="176" />
+<TGConnectingPoint num="1" id="177" />
+<TGConnectingPoint num="2" id="178" />
+<TGConnectingPoint num="3" id="179" />
+<TGConnectingPoint num="4" id="180" />
+<TGConnectingPoint num="5" id="181" />
+<TGConnectingPoint num="6" id="182" />
+<TGConnectingPoint num="7" id="183" />
+<TGConnectingPoint num="8" id="184" />
+<TGConnectingPoint num="9" id="185" />
+<TGConnectingPoint num="10" id="186" />
+<TGConnectingPoint num="11" id="187" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="213" >
<father id="263" num="4" />
-<cdparam x="270" y="397" />
-<sizeparam width="225" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="513" y="378" />
+<sizeparam width="173" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="209" minY="0" maxY="196" />
-<infoparam name="TGComponent" value="SendSpamWithMaliciousPackage" />
+<enabled value="false" />
+<cdrectangleparam minX="0" maxX="261" minY="0" maxY="198" />
+<infoparam name="TGComponent" value="ReceiveRemoteInformation" />
<TGConnectingPoint num="0" id="189" />
<TGConnectingPoint num="1" id="190" />
<TGConnectingPoint num="2" id="191" />
@@ -666,12 +665,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="238" >
<father id="263" num="5" />
-<cdparam x="305" y="341" />
-<sizeparam width="135" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="366" y="240" />
+<sizeparam width="213" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="198" />
-<infoparam name="TGComponent" value="InfectMobilePhone" />
+<cdrectangleparam minX="0" maxX="221" minY="0" maxY="198" />
+<infoparam name="TGComponent" value="GatherInformationOnMobilePhone" />
<TGConnectingPoint num="0" id="214" />
<TGConnectingPoint num="1" id="215" />
<TGConnectingPoint num="2" id="216" />
@@ -696,8 +695,9 @@
<TGConnectingPoint num="21" id="235" />
<TGConnectingPoint num="22" id="236" />
<TGConnectingPoint num="23" id="237" />
+<accessibility />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="true" />
</extraparam>
</SUBCOMPONENT>
@@ -764,13 +764,14 @@
<TGConnectingPoint num="22" id="851" />
<TGConnectingPoint num="23" id="852" />
</COMPONENT>
-<SUBCOMPONENT type="1402" id="301" >
+<SUBCOMPONENT type="1401" id="313" >
<father id="853" num="0" />
-<cdparam x="297" y="836" />
-<sizeparam width="149" height="49" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="444" y="928" />
+<sizeparam width="177" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="628" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="RestartMaliciousApplication" />
<TGConnectingPoint num="0" id="289" />
<TGConnectingPoint num="1" id="290" />
<TGConnectingPoint num="2" id="291" />
@@ -783,54 +784,53 @@
<TGConnectingPoint num="9" id="298" />
<TGConnectingPoint num="10" id="299" />
<TGConnectingPoint num="11" id="300" />
+<TGConnectingPoint num="12" id="301" />
+<TGConnectingPoint num="13" id="302" />
+<TGConnectingPoint num="14" id="303" />
+<TGConnectingPoint num="15" id="304" />
+<TGConnectingPoint num="16" id="305" />
+<TGConnectingPoint num="17" id="306" />
+<TGConnectingPoint num="18" id="307" />
+<TGConnectingPoint num="19" id="308" />
+<TGConnectingPoint num="20" id="309" />
+<TGConnectingPoint num="21" id="310" />
+<TGConnectingPoint num="22" id="311" />
+<TGConnectingPoint num="23" id="312" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="326" >
+<SUBCOMPONENT type="1402" id="326" >
<father id="853" num="1" />
-<cdparam x="322" y="919" />
-<sizeparam width="104" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="180" y="606" />
+<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="701" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorIntent" />
-<TGConnectingPoint num="0" id="302" />
-<TGConnectingPoint num="1" id="303" />
-<TGConnectingPoint num="2" id="304" />
-<TGConnectingPoint num="3" id="305" />
-<TGConnectingPoint num="4" id="306" />
-<TGConnectingPoint num="5" id="307" />
-<TGConnectingPoint num="6" id="308" />
-<TGConnectingPoint num="7" id="309" />
-<TGConnectingPoint num="8" id="310" />
-<TGConnectingPoint num="9" id="311" />
-<TGConnectingPoint num="10" id="312" />
-<TGConnectingPoint num="11" id="313" />
-<TGConnectingPoint num="12" id="314" />
-<TGConnectingPoint num="13" id="315" />
-<TGConnectingPoint num="14" id="316" />
-<TGConnectingPoint num="15" id="317" />
-<TGConnectingPoint num="16" id="318" />
-<TGConnectingPoint num="17" id="319" />
-<TGConnectingPoint num="18" id="320" />
-<TGConnectingPoint num="19" id="321" />
-<TGConnectingPoint num="20" id="322" />
-<TGConnectingPoint num="21" id="323" />
-<TGConnectingPoint num="22" id="324" />
-<TGConnectingPoint num="23" id="325" />
+<cdrectangleparam minX="0" maxX="681" minY="0" maxY="753" />
+<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<TGConnectingPoint num="0" id="314" />
+<TGConnectingPoint num="1" id="315" />
+<TGConnectingPoint num="2" id="316" />
+<TGConnectingPoint num="3" id="317" />
+<TGConnectingPoint num="4" id="318" />
+<TGConnectingPoint num="5" id="319" />
+<TGConnectingPoint num="6" id="320" />
+<TGConnectingPoint num="7" id="321" />
+<TGConnectingPoint num="8" id="322" />
+<TGConnectingPoint num="9" id="323" />
+<TGConnectingPoint num="10" id="324" />
+<TGConnectingPoint num="11" id="325" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="351" >
<father id="853" num="2" />
-<cdparam x="620" y="1220" />
-<sizeparam width="221" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="340" y="606" />
+<sizeparam width="169" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="584" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorFailureInDataConnection" />
+<cdrectangleparam minX="0" maxX="636" minY="0" maxY="753" />
+<infoparam name="TGComponent" value="InstallMaliciousApplication" />
<TGConnectingPoint num="0" id="327" />
<TGConnectingPoint num="1" id="328" />
<TGConnectingPoint num="2" id="329" />
@@ -861,12 +861,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="376" >
<father id="853" num="3" />
-<cdparam x="198" y="1208" />
-<sizeparam width="237" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="160" y="676" />
+<sizeparam width="207" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="568" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorNetworkConnectionChange" />
+<cdrectangleparam minX="0" maxX="598" minY="0" maxY="753" />
+<infoparam name="TGComponent" value="OpenSpamWithMaliciousPackage" />
<TGConnectingPoint num="0" id="352" />
<TGConnectingPoint num="1" id="353" />
<TGConnectingPoint num="2" id="354" />
@@ -897,12 +897,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="401" >
<father id="853" num="4" />
-<cdparam x="203" y="1098" />
-<sizeparam width="128" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="436" y="718" />
+<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="677" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorScreenOn" />
+<cdrectangleparam minX="0" maxX="681" minY="0" maxY="753" />
+<infoparam name="TGComponent" value="RegisterThePhone" />
<TGConnectingPoint num="0" id="377" />
<TGConnectingPoint num="1" id="378" />
<TGConnectingPoint num="2" id="379" />
@@ -933,12 +933,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="426" >
<father id="853" num="5" />
-<cdparam x="752" y="1132" />
-<sizeparam width="205" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="482" y="841" />
+<sizeparam width="95" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="600" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorApplicationInstallation" />
+<cdrectangleparam minX="0" maxX="710" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="GatherIntent" />
<TGConnectingPoint num="0" id="402" />
<TGConnectingPoint num="1" id="403" />
<TGConnectingPoint num="2" id="404" />
@@ -969,12 +969,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="451" >
<father id="853" num="6" />
-<cdparam x="595" y="1130" />
-<sizeparam width="177" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="686" y="842" />
+<sizeparam width="109" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="628" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorWallPaperChange" />
+<cdrectangleparam minX="0" maxX="696" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="BroadcastIntent" />
<TGConnectingPoint num="0" id="427" />
<TGConnectingPoint num="1" id="428" />
<TGConnectingPoint num="2" id="429" />
@@ -1003,14 +1003,13 @@
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="476" >
+<SUBCOMPONENT type="1402" id="464" >
<father id="853" num="7" />
-<cdparam x="462" y="1129" />
-<sizeparam width="144" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="546" y="775" />
+<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="661" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorTimeChange" />
+<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
+<infoparam name="TGComponent" value="<<AFTER>>" />
<TGConnectingPoint num="0" id="452" />
<TGConnectingPoint num="1" id="453" />
<TGConnectingPoint num="2" id="454" />
@@ -1023,125 +1022,125 @@
<TGConnectingPoint num="9" id="461" />
<TGConnectingPoint num="10" id="462" />
<TGConnectingPoint num="11" id="463" />
-<TGConnectingPoint num="12" id="464" />
-<TGConnectingPoint num="13" id="465" />
-<TGConnectingPoint num="14" id="466" />
-<TGConnectingPoint num="15" id="467" />
-<TGConnectingPoint num="16" id="468" />
-<TGConnectingPoint num="17" id="469" />
-<TGConnectingPoint num="18" id="470" />
-<TGConnectingPoint num="19" id="471" />
-<TGConnectingPoint num="20" id="472" />
-<TGConnectingPoint num="21" id="473" />
-<TGConnectingPoint num="22" id="474" />
-<TGConnectingPoint num="23" id="475" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="1" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="501" >
+<SUBCOMPONENT type="1401" id="489" >
<father id="853" num="8" />
-<cdparam x="339" y="1128" />
-<sizeparam width="143" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="571" y="708" />
+<sizeparam width="97" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="662" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorBatteryLevel" />
-<TGConnectingPoint num="0" id="477" />
-<TGConnectingPoint num="1" id="478" />
-<TGConnectingPoint num="2" id="479" />
-<TGConnectingPoint num="3" id="480" />
-<TGConnectingPoint num="4" id="481" />
-<TGConnectingPoint num="5" id="482" />
-<TGConnectingPoint num="6" id="483" />
-<TGConnectingPoint num="7" id="484" />
-<TGConnectingPoint num="8" id="485" />
-<TGConnectingPoint num="9" id="486" />
-<TGConnectingPoint num="10" id="487" />
-<TGConnectingPoint num="11" id="488" />
-<TGConnectingPoint num="12" id="489" />
-<TGConnectingPoint num="13" id="490" />
-<TGConnectingPoint num="14" id="491" />
-<TGConnectingPoint num="15" id="492" />
-<TGConnectingPoint num="16" id="493" />
-<TGConnectingPoint num="17" id="494" />
-<TGConnectingPoint num="18" id="495" />
-<TGConnectingPoint num="19" id="496" />
-<TGConnectingPoint num="20" id="497" />
-<TGConnectingPoint num="21" id="498" />
-<TGConnectingPoint num="22" id="499" />
-<TGConnectingPoint num="23" id="500" />
+<cdrectangleparam minX="0" maxX="708" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="ManageIntent" />
+<TGConnectingPoint num="0" id="465" />
+<TGConnectingPoint num="1" id="466" />
+<TGConnectingPoint num="2" id="467" />
+<TGConnectingPoint num="3" id="468" />
+<TGConnectingPoint num="4" id="469" />
+<TGConnectingPoint num="5" id="470" />
+<TGConnectingPoint num="6" id="471" />
+<TGConnectingPoint num="7" id="472" />
+<TGConnectingPoint num="8" id="473" />
+<TGConnectingPoint num="9" id="474" />
+<TGConnectingPoint num="10" id="475" />
+<TGConnectingPoint num="11" id="476" />
+<TGConnectingPoint num="12" id="477" />
+<TGConnectingPoint num="13" id="478" />
+<TGConnectingPoint num="14" id="479" />
+<TGConnectingPoint num="15" id="480" />
+<TGConnectingPoint num="16" id="481" />
+<TGConnectingPoint num="17" id="482" />
+<TGConnectingPoint num="18" id="483" />
+<TGConnectingPoint num="19" id="484" />
+<TGConnectingPoint num="20" id="485" />
+<TGConnectingPoint num="21" id="486" />
+<TGConnectingPoint num="22" id="487" />
+<TGConnectingPoint num="23" id="488" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="526" >
+<SUBCOMPONENT type="1401" id="514" >
<father id="853" num="9" />
-<cdparam x="188" y="1032" />
-<sizeparam width="159" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="718" y="712" />
+<sizeparam width="157" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="646" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorDeviceWakeUp" />
-<TGConnectingPoint num="0" id="502" />
-<TGConnectingPoint num="1" id="503" />
-<TGConnectingPoint num="2" id="504" />
-<TGConnectingPoint num="3" id="505" />
-<TGConnectingPoint num="4" id="506" />
-<TGConnectingPoint num="5" id="507" />
-<TGConnectingPoint num="6" id="508" />
-<TGConnectingPoint num="7" id="509" />
-<TGConnectingPoint num="8" id="510" />
-<TGConnectingPoint num="9" id="511" />
-<TGConnectingPoint num="10" id="512" />
-<TGConnectingPoint num="11" id="513" />
-<TGConnectingPoint num="12" id="514" />
-<TGConnectingPoint num="13" id="515" />
-<TGConnectingPoint num="14" id="516" />
-<TGConnectingPoint num="15" id="517" />
-<TGConnectingPoint num="16" id="518" />
-<TGConnectingPoint num="17" id="519" />
-<TGConnectingPoint num="18" id="520" />
-<TGConnectingPoint num="19" id="521" />
-<TGConnectingPoint num="20" id="522" />
-<TGConnectingPoint num="21" id="523" />
-<TGConnectingPoint num="22" id="524" />
-<TGConnectingPoint num="23" id="525" />
+<cdrectangleparam minX="0" maxX="648" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="SpiesIncomingMessages" />
+<TGConnectingPoint num="0" id="490" />
+<TGConnectingPoint num="1" id="491" />
+<TGConnectingPoint num="2" id="492" />
+<TGConnectingPoint num="3" id="493" />
+<TGConnectingPoint num="4" id="494" />
+<TGConnectingPoint num="5" id="495" />
+<TGConnectingPoint num="6" id="496" />
+<TGConnectingPoint num="7" id="497" />
+<TGConnectingPoint num="8" id="498" />
+<TGConnectingPoint num="9" id="499" />
+<TGConnectingPoint num="10" id="500" />
+<TGConnectingPoint num="11" id="501" />
+<TGConnectingPoint num="12" id="502" />
+<TGConnectingPoint num="13" id="503" />
+<TGConnectingPoint num="14" id="504" />
+<TGConnectingPoint num="15" id="505" />
+<TGConnectingPoint num="16" id="506" />
+<TGConnectingPoint num="17" id="507" />
+<TGConnectingPoint num="18" id="508" />
+<TGConnectingPoint num="19" id="509" />
+<TGConnectingPoint num="20" id="510" />
+<TGConnectingPoint num="21" id="511" />
+<TGConnectingPoint num="22" id="512" />
+<TGConnectingPoint num="23" id="513" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="539" >
+<SUBCOMPONENT type="1401" id="539" >
<father id="853" num="10" />
-<cdparam x="440" y="986" />
-<sizeparam width="149" height="49" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="637" y="577" />
+<sizeparam width="152" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
-<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="527" />
-<TGConnectingPoint num="1" id="528" />
-<TGConnectingPoint num="2" id="529" />
-<TGConnectingPoint num="3" id="530" />
-<TGConnectingPoint num="4" id="531" />
-<TGConnectingPoint num="5" id="532" />
-<TGConnectingPoint num="6" id="533" />
-<TGConnectingPoint num="7" id="534" />
-<TGConnectingPoint num="8" id="535" />
-<TGConnectingPoint num="9" id="536" />
-<TGConnectingPoint num="10" id="537" />
-<TGConnectingPoint num="11" id="538" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="653" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="SendPrivateInformation" />
+<TGConnectingPoint num="0" id="515" />
+<TGConnectingPoint num="1" id="516" />
+<TGConnectingPoint num="2" id="517" />
+<TGConnectingPoint num="3" id="518" />
+<TGConnectingPoint num="4" id="519" />
+<TGConnectingPoint num="5" id="520" />
+<TGConnectingPoint num="6" id="521" />
+<TGConnectingPoint num="7" id="522" />
+<TGConnectingPoint num="8" id="523" />
+<TGConnectingPoint num="9" id="524" />
+<TGConnectingPoint num="10" id="525" />
+<TGConnectingPoint num="11" id="526" />
+<TGConnectingPoint num="12" id="527" />
+<TGConnectingPoint num="13" id="528" />
+<TGConnectingPoint num="14" id="529" />
+<TGConnectingPoint num="15" id="530" />
+<TGConnectingPoint num="16" id="531" />
+<TGConnectingPoint num="17" id="532" />
+<TGConnectingPoint num="18" id="533" />
+<TGConnectingPoint num="19" id="534" />
+<TGConnectingPoint num="20" id="535" />
+<TGConnectingPoint num="21" id="536" />
+<TGConnectingPoint num="22" id="537" />
+<TGConnectingPoint num="23" id="538" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="564" >
+<SUBCOMPONENT type="1402" id="552" >
<father id="853" num="11" />
-<cdparam x="428" y="1268" />
-<sizeparam width="239" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="616" y="634" />
+<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="566" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="MonitorMaliciousPackageIsRunning" />
+<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
+<infoparam name="TGComponent" value="<<OR>>" />
<TGConnectingPoint num="0" id="540" />
<TGConnectingPoint num="1" id="541" />
<TGConnectingPoint num="2" id="542" />
@@ -1154,53 +1153,53 @@
<TGConnectingPoint num="9" id="549" />
<TGConnectingPoint num="10" id="550" />
<TGConnectingPoint num="11" id="551" />
-<TGConnectingPoint num="12" id="552" />
-<TGConnectingPoint num="13" id="553" />
-<TGConnectingPoint num="14" id="554" />
-<TGConnectingPoint num="15" id="555" />
-<TGConnectingPoint num="16" id="556" />
-<TGConnectingPoint num="17" id="557" />
-<TGConnectingPoint num="18" id="558" />
-<TGConnectingPoint num="19" id="559" />
-<TGConnectingPoint num="20" id="560" />
-<TGConnectingPoint num="21" id="561" />
-<TGConnectingPoint num="22" id="562" />
-<TGConnectingPoint num="23" id="563" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="577" >
+<SUBCOMPONENT type="1401" id="577" >
<father id="853" num="12" />
-<cdparam x="616" y="634" />
-<sizeparam width="149" height="49" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="428" y="1268" />
+<sizeparam width="218" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
-<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="565" />
-<TGConnectingPoint num="1" id="566" />
-<TGConnectingPoint num="2" id="567" />
-<TGConnectingPoint num="3" id="568" />
-<TGConnectingPoint num="4" id="569" />
-<TGConnectingPoint num="5" id="570" />
-<TGConnectingPoint num="6" id="571" />
-<TGConnectingPoint num="7" id="572" />
-<TGConnectingPoint num="8" id="573" />
-<TGConnectingPoint num="9" id="574" />
-<TGConnectingPoint num="10" id="575" />
-<TGConnectingPoint num="11" id="576" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="587" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorMaliciousPackageIsRunning" />
+<TGConnectingPoint num="0" id="553" />
+<TGConnectingPoint num="1" id="554" />
+<TGConnectingPoint num="2" id="555" />
+<TGConnectingPoint num="3" id="556" />
+<TGConnectingPoint num="4" id="557" />
+<TGConnectingPoint num="5" id="558" />
+<TGConnectingPoint num="6" id="559" />
+<TGConnectingPoint num="7" id="560" />
+<TGConnectingPoint num="8" id="561" />
+<TGConnectingPoint num="9" id="562" />
+<TGConnectingPoint num="10" id="563" />
+<TGConnectingPoint num="11" id="564" />
+<TGConnectingPoint num="12" id="565" />
+<TGConnectingPoint num="13" id="566" />
+<TGConnectingPoint num="14" id="567" />
+<TGConnectingPoint num="15" id="568" />
+<TGConnectingPoint num="16" id="569" />
+<TGConnectingPoint num="17" id="570" />
+<TGConnectingPoint num="18" id="571" />
+<TGConnectingPoint num="19" id="572" />
+<TGConnectingPoint num="20" id="573" />
+<TGConnectingPoint num="21" id="574" />
+<TGConnectingPoint num="22" id="575" />
+<TGConnectingPoint num="23" id="576" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="602" >
+<SUBCOMPONENT type="1402" id="590" >
<father id="853" num="13" />
-<cdparam x="637" y="577" />
-<sizeparam width="166" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="440" y="986" />
+<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="639" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="SendPrivateInformation" />
+<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
+<infoparam name="TGComponent" value="<<OR>>" />
<TGConnectingPoint num="0" id="578" />
<TGConnectingPoint num="1" id="579" />
<TGConnectingPoint num="2" id="580" />
@@ -1213,125 +1212,126 @@
<TGConnectingPoint num="9" id="587" />
<TGConnectingPoint num="10" id="588" />
<TGConnectingPoint num="11" id="589" />
-<TGConnectingPoint num="12" id="590" />
-<TGConnectingPoint num="13" id="591" />
-<TGConnectingPoint num="14" id="592" />
-<TGConnectingPoint num="15" id="593" />
-<TGConnectingPoint num="16" id="594" />
-<TGConnectingPoint num="17" id="595" />
-<TGConnectingPoint num="18" id="596" />
-<TGConnectingPoint num="19" id="597" />
-<TGConnectingPoint num="20" id="598" />
-<TGConnectingPoint num="21" id="599" />
-<TGConnectingPoint num="22" id="600" />
-<TGConnectingPoint num="23" id="601" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="627" >
+<SUBCOMPONENT type="1401" id="615" >
<father id="853" num="14" />
-<cdparam x="718" y="712" />
-<sizeparam width="173" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="188" y="1032" />
+<sizeparam width="148" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="632" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="SpiesIncomingMessages" />
-<TGConnectingPoint num="0" id="603" />
-<TGConnectingPoint num="1" id="604" />
-<TGConnectingPoint num="2" id="605" />
-<TGConnectingPoint num="3" id="606" />
-<TGConnectingPoint num="4" id="607" />
-<TGConnectingPoint num="5" id="608" />
-<TGConnectingPoint num="6" id="609" />
-<TGConnectingPoint num="7" id="610" />
-<TGConnectingPoint num="8" id="611" />
-<TGConnectingPoint num="9" id="612" />
-<TGConnectingPoint num="10" id="613" />
-<TGConnectingPoint num="11" id="614" />
-<TGConnectingPoint num="12" id="615" />
-<TGConnectingPoint num="13" id="616" />
-<TGConnectingPoint num="14" id="617" />
-<TGConnectingPoint num="15" id="618" />
-<TGConnectingPoint num="16" id="619" />
-<TGConnectingPoint num="17" id="620" />
-<TGConnectingPoint num="18" id="621" />
-<TGConnectingPoint num="19" id="622" />
-<TGConnectingPoint num="20" id="623" />
-<TGConnectingPoint num="21" id="624" />
-<TGConnectingPoint num="22" id="625" />
-<TGConnectingPoint num="23" id="626" />
+<cdrectangleparam minX="0" maxX="657" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorDeviceWakeUp" />
+<TGConnectingPoint num="0" id="591" />
+<TGConnectingPoint num="1" id="592" />
+<TGConnectingPoint num="2" id="593" />
+<TGConnectingPoint num="3" id="594" />
+<TGConnectingPoint num="4" id="595" />
+<TGConnectingPoint num="5" id="596" />
+<TGConnectingPoint num="6" id="597" />
+<TGConnectingPoint num="7" id="598" />
+<TGConnectingPoint num="8" id="599" />
+<TGConnectingPoint num="9" id="600" />
+<TGConnectingPoint num="10" id="601" />
+<TGConnectingPoint num="11" id="602" />
+<TGConnectingPoint num="12" id="603" />
+<TGConnectingPoint num="13" id="604" />
+<TGConnectingPoint num="14" id="605" />
+<TGConnectingPoint num="15" id="606" />
+<TGConnectingPoint num="16" id="607" />
+<TGConnectingPoint num="17" id="608" />
+<TGConnectingPoint num="18" id="609" />
+<TGConnectingPoint num="19" id="610" />
+<TGConnectingPoint num="20" id="611" />
+<TGConnectingPoint num="21" id="612" />
+<TGConnectingPoint num="22" id="613" />
+<TGConnectingPoint num="23" id="614" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="652" >
+<SUBCOMPONENT type="1401" id="640" >
<father id="853" num="15" />
-<cdparam x="571" y="708" />
-<sizeparam width="107" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="339" y="1128" />
+<sizeparam width="132" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="698" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="ManageIntent" />
-<TGConnectingPoint num="0" id="628" />
-<TGConnectingPoint num="1" id="629" />
-<TGConnectingPoint num="2" id="630" />
-<TGConnectingPoint num="3" id="631" />
-<TGConnectingPoint num="4" id="632" />
-<TGConnectingPoint num="5" id="633" />
-<TGConnectingPoint num="6" id="634" />
-<TGConnectingPoint num="7" id="635" />
-<TGConnectingPoint num="8" id="636" />
-<TGConnectingPoint num="9" id="637" />
-<TGConnectingPoint num="10" id="638" />
-<TGConnectingPoint num="11" id="639" />
-<TGConnectingPoint num="12" id="640" />
-<TGConnectingPoint num="13" id="641" />
-<TGConnectingPoint num="14" id="642" />
-<TGConnectingPoint num="15" id="643" />
-<TGConnectingPoint num="16" id="644" />
-<TGConnectingPoint num="17" id="645" />
-<TGConnectingPoint num="18" id="646" />
-<TGConnectingPoint num="19" id="647" />
-<TGConnectingPoint num="20" id="648" />
-<TGConnectingPoint num="21" id="649" />
-<TGConnectingPoint num="22" id="650" />
-<TGConnectingPoint num="23" id="651" />
+<cdrectangleparam minX="0" maxX="673" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorBatteryLevel" />
+<TGConnectingPoint num="0" id="616" />
+<TGConnectingPoint num="1" id="617" />
+<TGConnectingPoint num="2" id="618" />
+<TGConnectingPoint num="3" id="619" />
+<TGConnectingPoint num="4" id="620" />
+<TGConnectingPoint num="5" id="621" />
+<TGConnectingPoint num="6" id="622" />
+<TGConnectingPoint num="7" id="623" />
+<TGConnectingPoint num="8" id="624" />
+<TGConnectingPoint num="9" id="625" />
+<TGConnectingPoint num="10" id="626" />
+<TGConnectingPoint num="11" id="627" />
+<TGConnectingPoint num="12" id="628" />
+<TGConnectingPoint num="13" id="629" />
+<TGConnectingPoint num="14" id="630" />
+<TGConnectingPoint num="15" id="631" />
+<TGConnectingPoint num="16" id="632" />
+<TGConnectingPoint num="17" id="633" />
+<TGConnectingPoint num="18" id="634" />
+<TGConnectingPoint num="19" id="635" />
+<TGConnectingPoint num="20" id="636" />
+<TGConnectingPoint num="21" id="637" />
+<TGConnectingPoint num="22" id="638" />
+<TGConnectingPoint num="23" id="639" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="665" >
+<SUBCOMPONENT type="1401" id="665" >
<father id="853" num="16" />
-<cdparam x="546" y="775" />
-<sizeparam width="149" height="49" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="462" y="1129" />
+<sizeparam width="135" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
-<infoparam name="TGComponent" value="<<AFTER>>" />
-<TGConnectingPoint num="0" id="653" />
-<TGConnectingPoint num="1" id="654" />
-<TGConnectingPoint num="2" id="655" />
-<TGConnectingPoint num="3" id="656" />
-<TGConnectingPoint num="4" id="657" />
-<TGConnectingPoint num="5" id="658" />
-<TGConnectingPoint num="6" id="659" />
-<TGConnectingPoint num="7" id="660" />
-<TGConnectingPoint num="8" id="661" />
-<TGConnectingPoint num="9" id="662" />
-<TGConnectingPoint num="10" id="663" />
-<TGConnectingPoint num="11" id="664" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="670" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorTimeChange" />
+<TGConnectingPoint num="0" id="641" />
+<TGConnectingPoint num="1" id="642" />
+<TGConnectingPoint num="2" id="643" />
+<TGConnectingPoint num="3" id="644" />
+<TGConnectingPoint num="4" id="645" />
+<TGConnectingPoint num="5" id="646" />
+<TGConnectingPoint num="6" id="647" />
+<TGConnectingPoint num="7" id="648" />
+<TGConnectingPoint num="8" id="649" />
+<TGConnectingPoint num="9" id="650" />
+<TGConnectingPoint num="10" id="651" />
+<TGConnectingPoint num="11" id="652" />
+<TGConnectingPoint num="12" id="653" />
+<TGConnectingPoint num="13" id="654" />
+<TGConnectingPoint num="14" id="655" />
+<TGConnectingPoint num="15" id="656" />
+<TGConnectingPoint num="16" id="657" />
+<TGConnectingPoint num="17" id="658" />
+<TGConnectingPoint num="18" id="659" />
+<TGConnectingPoint num="19" id="660" />
+<TGConnectingPoint num="20" id="661" />
+<TGConnectingPoint num="21" id="662" />
+<TGConnectingPoint num="22" id="663" />
+<TGConnectingPoint num="23" id="664" />
<extraparam>
-<info equation="1" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="690" >
<father id="853" num="17" />
-<cdparam x="686" y="842" />
-<sizeparam width="121" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="595" y="1130" />
+<sizeparam width="163" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="684" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="BroadcastIntent" />
+<cdrectangleparam minX="0" maxX="642" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorWallPaperChange" />
<TGConnectingPoint num="0" id="666" />
<TGConnectingPoint num="1" id="667" />
<TGConnectingPoint num="2" id="668" />
@@ -1362,12 +1362,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="715" >
<father id="853" num="18" />
-<cdparam x="482" y="841" />
-<sizeparam width="100" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="752" y="1132" />
+<sizeparam width="188" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="705" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="GatherIntent" />
+<cdrectangleparam minX="0" maxX="617" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorApplicationInstallation" />
<TGConnectingPoint num="0" id="691" />
<TGConnectingPoint num="1" id="692" />
<TGConnectingPoint num="2" id="693" />
@@ -1398,12 +1398,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="740" >
<father id="853" num="19" />
-<cdparam x="436" y="718" />
-<sizeparam width="135" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="203" y="1098" />
+<sizeparam width="117" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="670" minY="0" maxY="753" />
-<infoparam name="TGComponent" value="RegisterThePhone" />
+<cdrectangleparam minX="0" maxX="688" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorScreenOn" />
<TGConnectingPoint num="0" id="716" />
<TGConnectingPoint num="1" id="717" />
<TGConnectingPoint num="2" id="718" />
@@ -1434,12 +1434,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="765" >
<father id="853" num="20" />
-<cdparam x="160" y="676" />
-<sizeparam width="226" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="198" y="1208" />
+<sizeparam width="217" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="579" minY="0" maxY="753" />
-<infoparam name="TGComponent" value="OpenSpamWithMaliciousPackage" />
+<cdrectangleparam minX="0" maxX="588" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorNetworkConnectionChange" />
<TGConnectingPoint num="0" id="741" />
<TGConnectingPoint num="1" id="742" />
<TGConnectingPoint num="2" id="743" />
@@ -1470,12 +1470,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="790" >
<father id="853" num="21" />
-<cdparam x="340" y="606" />
-<sizeparam width="183" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="620" y="1220" />
+<sizeparam width="201" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="622" minY="0" maxY="753" />
-<infoparam name="TGComponent" value="InstallMaliciousApplication" />
+<cdrectangleparam minX="0" maxX="604" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorFailureInDataConnection" />
<TGConnectingPoint num="0" id="766" />
<TGConnectingPoint num="1" id="767" />
<TGConnectingPoint num="2" id="768" />
@@ -1504,13 +1504,14 @@
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="803" >
+<SUBCOMPONENT type="1401" id="815" >
<father id="853" num="22" />
-<cdparam x="180" y="606" />
-<sizeparam width="124" height="38" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="322" y="919" />
+<sizeparam width="95" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="681" minY="0" maxY="753" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="710" minY="0" maxY="751" />
+<infoparam name="TGComponent" value="MonitorIntent" />
<TGConnectingPoint num="0" id="791" />
<TGConnectingPoint num="1" id="792" />
<TGConnectingPoint num="2" id="793" />
@@ -1523,44 +1524,43 @@
<TGConnectingPoint num="9" id="800" />
<TGConnectingPoint num="10" id="801" />
<TGConnectingPoint num="11" id="802" />
+<TGConnectingPoint num="12" id="803" />
+<TGConnectingPoint num="13" id="804" />
+<TGConnectingPoint num="14" id="805" />
+<TGConnectingPoint num="15" id="806" />
+<TGConnectingPoint num="16" id="807" />
+<TGConnectingPoint num="17" id="808" />
+<TGConnectingPoint num="18" id="809" />
+<TGConnectingPoint num="19" id="810" />
+<TGConnectingPoint num="20" id="811" />
+<TGConnectingPoint num="21" id="812" />
+<TGConnectingPoint num="22" id="813" />
+<TGConnectingPoint num="23" id="814" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="828" >
+<SUBCOMPONENT type="1402" id="828" >
<father id="853" num="23" />
-<cdparam x="444" y="928" />
-<sizeparam width="192" height="40" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="297" y="836" />
+<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="613" minY="0" maxY="751" />
-<infoparam name="TGComponent" value="RestartMaliciousApplication" />
-<TGConnectingPoint num="0" id="804" />
-<TGConnectingPoint num="1" id="805" />
-<TGConnectingPoint num="2" id="806" />
-<TGConnectingPoint num="3" id="807" />
-<TGConnectingPoint num="4" id="808" />
-<TGConnectingPoint num="5" id="809" />
-<TGConnectingPoint num="6" id="810" />
-<TGConnectingPoint num="7" id="811" />
-<TGConnectingPoint num="8" id="812" />
-<TGConnectingPoint num="9" id="813" />
-<TGConnectingPoint num="10" id="814" />
-<TGConnectingPoint num="11" id="815" />
-<TGConnectingPoint num="12" id="816" />
-<TGConnectingPoint num="13" id="817" />
-<TGConnectingPoint num="14" id="818" />
-<TGConnectingPoint num="15" id="819" />
-<TGConnectingPoint num="16" id="820" />
-<TGConnectingPoint num="17" id="821" />
-<TGConnectingPoint num="18" id="822" />
-<TGConnectingPoint num="19" id="823" />
-<TGConnectingPoint num="20" id="824" />
-<TGConnectingPoint num="21" id="825" />
-<TGConnectingPoint num="22" id="826" />
-<TGConnectingPoint num="23" id="827" />
+<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
+<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<TGConnectingPoint num="0" id="816" />
+<TGConnectingPoint num="1" id="817" />
+<TGConnectingPoint num="2" id="818" />
+<TGConnectingPoint num="3" id="819" />
+<TGConnectingPoint num="4" id="820" />
+<TGConnectingPoint num="5" id="821" />
+<TGConnectingPoint num="6" id="822" />
+<TGConnectingPoint num="7" id="823" />
+<TGConnectingPoint num="8" id="824" />
+<TGConnectingPoint num="9" id="825" />
+<TGConnectingPoint num="10" id="826" />
+<TGConnectingPoint num="11" id="827" />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
@@ -1598,7 +1598,7 @@
<SUBCOMPONENT type="1402" id="866" >
<father id="891" num="0" />
<cdparam x="592" y="502" />
-<sizeparam width="149" height="49" minWidth="80" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="714" minY="0" maxY="824" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
diff --git a/modeling/SysMLSec/at_zeuszitmo.xml b/modeling/SysMLSec/at_zeuszitmo.xml
index 17165afcd7d5a6e44f05e608dfe6425a952b72b5..4b668c6ce5ce7a05f79ac5f115f3431deb00840a 100644
--- a/modeling/SysMLSec/at_zeuszitmo.xml
+++ b/modeling/SysMLSec/at_zeuszitmo.xml
@@ -1,1331 +1,1331 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
<Modeling type="AttackTree" nameTab="Attack Trees" >
<AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="1900" minY="10" maxY="1900" zoom="1.0000000000000016" >
-<CONNECTOR type="137" id="816" >
+<CONNECTOR type="137" id="2" >
<cdparam x="1117" y="751" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="817" />
-<P1 x="1117" y="751" id="805" />
-<P2 x="1005" y="737" id="365" />
+<TGConnectingPoint num="0" id="1" />
+<P1 x="1117" y="751" id="52" />
+<P2 x="1005" y="737" id="380" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1403" id="803" >
-<cdparam x="1128" y="731" />
-<sizeparam width="153" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
-<infoparam name="TGComponent" value="PreventSMSInterception" />
-<TGConnectingPoint num="0" id="804" />
-<TGConnectingPoint num="1" id="805" />
-<TGConnectingPoint num="2" id="806" />
-<TGConnectingPoint num="3" id="807" />
-<TGConnectingPoint num="4" id="808" />
-<TGConnectingPoint num="5" id="809" />
-<TGConnectingPoint num="6" id="810" />
-<TGConnectingPoint num="7" id="811" />
-<TGConnectingPoint num="8" id="812" />
-<TGConnectingPoint num="9" id="813" />
-<TGConnectingPoint num="10" id="814" />
-<TGConnectingPoint num="11" id="815" />
-<extraparam>
-<textline data="blah blah blah" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="133" id="2" >
+<CONNECTOR type="133" id="4" >
<cdparam x="645" y="785" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="1" />
-<P1 x="644" y="785" id="303" />
-<P2 x="757" y="658" id="203" />
+<TGConnectingPoint num="0" id="3" />
+<P1 x="644" y="785" id="318" />
+<P2 x="757" y="658" id="218" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="4" >
+<CONNECTOR type="133" id="6" >
<cdparam x="262" y="1202" />
<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="" />
-<TGConnectingPoint num="0" id="3" />
-<P1 x="278" y="983" id="53" />
-<P2 x="280" y="906" id="216" />
+<TGConnectingPoint num="0" id="5" />
+<P1 x="278" y="983" id="68" />
+<P2 x="280" y="906" id="231" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="6" >
+<CONNECTOR type="133" id="8" >
<cdparam x="415" y="453" />
<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="" />
-<TGConnectingPoint num="0" id="5" />
-<P1 x="568" y="361" id="110" />
-<P2 x="757" y="623" id="200" />
+<TGConnectingPoint num="0" id="7" />
+<P1 x="568" y="361" id="125" />
+<P2 x="757" y="623" id="215" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="8" >
+<CONNECTOR type="133" id="10" >
<cdparam x="1033" y="642" />
<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="" />
-<TGConnectingPoint num="0" id="7" />
-<P1 x="938" y="416" id="651" />
-<P2 x="927" y="382" id="629" />
+<TGConnectingPoint num="0" id="9" />
+<P1 x="938" y="416" id="666" />
+<P2 x="927" y="382" id="644" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="12" >
+<CONNECTOR type="133" id="14" >
<cdparam x="1016" y="560" />
<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="2" />
-<TGConnectingPoint num="0" id="10" />
-<TGConnectingPoint num="1" id="11" />
-<P1 x="927" y="347" id="626" />
-<P2 x="892" y="314" id="675" />
+<TGConnectingPoint num="0" id="12" />
+<TGConnectingPoint num="1" id="13" />
+<P1 x="927" y="347" id="641" />
+<P2 x="892" y="314" id="690" />
<Point x="931" y="331" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9" >
-<father id="12" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="11" >
+<father id="14" num="0" />
<cdparam x="931" y="331" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="14" >
+<CONNECTOR type="133" id="16" >
<cdparam x="916" y="476" />
<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="" />
-<TGConnectingPoint num="0" id="13" />
-<P1 x="861" y="279" id="664" />
-<P2 x="853" y="249" id="579" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="133" id="16" >
-<cdparam x="831" y="1116" />
-<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="1" />
<TGConnectingPoint num="0" id="15" />
-<P1 x="658" y="840" id="228" />
-<P2 x="726" y="814" id="197" />
+<P1 x="861" y="279" id="679" />
+<P2 x="853" y="249" id="594" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="18" >
-<cdparam x="1122" y="893" />
+<cdparam x="831" y="1116" />
<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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="17" />
-<P1 x="889" y="783" id="405" />
-<P2 x="917" y="682" id="184" />
+<P1 x="658" y="840" id="243" />
+<P2 x="726" y="814" id="212" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="20" >
-<cdparam x="1138" y="973" />
+<cdparam x="1122" y="893" />
<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="" />
<TGConnectingPoint num="0" id="19" />
-<P1 x="819" y="805" id="196" />
-<P2 x="838" y="800" id="402" />
+<P1 x="889" y="783" id="420" />
+<P2 x="917" y="682" id="199" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="22" >
-<cdparam x="1098" y="980" />
+<cdparam x="1138" y="973" />
<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="" />
<TGConnectingPoint num="0" id="21" />
-<P1 x="948" y="647" id="174" />
-<P2 x="950" y="613" id="379" />
+<P1 x="819" y="805" id="211" />
+<P2 x="838" y="800" id="417" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="24" >
-<cdparam x="1239" y="878" />
+<cdparam x="1098" y="980" />
<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="" />
<TGConnectingPoint num="0" id="23" />
-<P1 x="972" y="720" id="356" />
-<P2 x="979" y="682" id="185" />
+<P1 x="948" y="647" id="189" />
+<P2 x="950" y="613" id="394" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="26" >
-<cdparam x="484" y="806" />
+<cdparam x="1239" y="878" />
<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="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="25" />
-<P1 x="788" y="658" id="211" />
-<P2 x="788" y="779" id="192" />
+<P1 x="972" y="720" id="371" />
+<P2 x="979" y="682" id="200" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="28" >
-<cdparam x="919" y="515" />
+<cdparam x="484" y="806" />
<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="1" />
+<infoparam name="connector from TGComponent to TGComponent" value="0" />
<TGConnectingPoint num="0" id="27" />
-<P1 x="708" y="347" id="605" />
-<P2 x="830" y="314" id="674" />
+<P1 x="788" y="658" id="226" />
+<P2 x="788" y="779" id="207" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="30" >
-<cdparam x="1010" y="578" />
+<cdparam x="919" y="515" />
<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="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="29" />
-<P1 x="798" y="435" id="679" />
-<P2 x="877" y="433" id="652" />
+<P1 x="708" y="347" id="620" />
+<P2 x="830" y="314" id="689" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="32" >
-<cdparam x="296" y="769" />
+<cdparam x="1010" y="578" />
<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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="0" />
<TGConnectingPoint num="0" id="31" />
-<P1 x="283" y="643" id="531" />
-<P2 x="491" y="589" id="735" />
+<P1 x="798" y="435" id="694" />
+<P2 x="877" y="433" id="667" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="34" >
-<cdparam x="1291" y="918" />
+<cdparam x="296" y="769" />
<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="1" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="33" />
-<P1 x="950" y="578" id="376" />
-<P2 x="938" y="451" id="654" />
+<P1 x="283" y="643" id="546" />
+<P2 x="491" y="589" id="750" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="36" >
-<cdparam x="540" y="630" />
+<cdparam x="1291" y="918" />
<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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="35" />
-<P1 x="641" y="563" id="732" />
-<P2 x="676" y="373" id="609" />
+<P1 x="950" y="578" id="391" />
+<P2 x="938" y="451" id="669" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="38" >
-<cdparam x="622" y="860" />
+<cdparam x="540" y="630" />
<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="" />
<TGConnectingPoint num="0" id="37" />
-<P1 x="661" y="648" id="151" />
-<P2 x="696" y="649" id="208" />
+<P1 x="641" y="563" id="747" />
+<P2 x="676" y="373" id="624" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="40" >
-<cdparam x="559" y="1068" />
+<cdparam x="622" y="860" />
<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="" />
<TGConnectingPoint num="0" id="39" />
-<P1 x="587" y="733" id="278" />
-<P2 x="726" y="658" id="210" />
+<P1 x="661" y="648" id="166" />
+<P2 x="696" y="649" id="223" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="42" >
-<cdparam x="557" y="1176" />
+<cdparam x="559" y="1068" />
<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="" />
<TGConnectingPoint num="0" id="41" />
-<P1 x="395" y="888" id="252" />
-<P2 x="342" y="888" id="215" />
+<P1 x="587" y="733" id="293" />
+<P2 x="726" y="658" id="225" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="44" >
-<cdparam x="159" y="1085" />
+<cdparam x="557" y="1176" />
<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="" />
<TGConnectingPoint num="0" id="43" />
-<P1 x="241" y="830" id="454" />
-<P2 x="249" y="871" id="217" />
+<P1 x="395" y="888" id="267" />
+<P2 x="342" y="888" id="230" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="46" >
-<cdparam x="321" y="1051" />
+<cdparam x="159" y="1085" />
<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="" />
<TGConnectingPoint num="0" id="45" />
-<P1 x="311" y="871" id="218" />
-<P2 x="299" y="773" id="485" />
+<P1 x="241" y="830" id="469" />
+<P2 x="249" y="871" id="232" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="48" >
-<cdparam x="306" y="838" />
+<cdparam x="321" y="1051" />
<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="" />
<TGConnectingPoint num="0" id="47" />
-<P1 x="249" y="747" id="476" />
-<P2 x="255" y="678" id="529" />
+<P1 x="311" y="871" id="233" />
+<P2 x="299" y="773" id="500" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="133" id="50" >
+<cdparam x="306" y="838" />
+<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="" />
+<TGConnectingPoint num="0" id="49" />
+<P1 x="249" y="747" id="491" />
+<P2 x="255" y="678" id="544" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1400" id="98" >
+<COMPONENT type="1403" id="63" >
+<cdparam x="1128" y="731" />
+<sizeparam width="153" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<infoparam name="TGComponent" value="PreventSMSInterception" />
+<TGConnectingPoint num="0" id="51" />
+<TGConnectingPoint num="1" id="52" />
+<TGConnectingPoint num="2" id="53" />
+<TGConnectingPoint num="3" id="54" />
+<TGConnectingPoint num="4" id="55" />
+<TGConnectingPoint num="5" id="56" />
+<TGConnectingPoint num="6" id="57" />
+<TGConnectingPoint num="7" id="58" />
+<TGConnectingPoint num="8" id="59" />
+<TGConnectingPoint num="9" id="60" />
+<TGConnectingPoint num="10" id="61" />
+<TGConnectingPoint num="11" id="62" />
+<extraparam>
+<textline data="blah blah blah" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1400" id="113" >
<cdparam x="192" y="936" />
<sizeparam width="247" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block4" value="OtherSoftwareApplications" />
-<TGConnectingPoint num="0" id="74" />
-<TGConnectingPoint num="1" id="75" />
-<TGConnectingPoint num="2" id="76" />
-<TGConnectingPoint num="3" id="77" />
-<TGConnectingPoint num="4" id="78" />
-<TGConnectingPoint num="5" id="79" />
-<TGConnectingPoint num="6" id="80" />
-<TGConnectingPoint num="7" id="81" />
-<TGConnectingPoint num="8" id="82" />
-<TGConnectingPoint num="9" id="83" />
-<TGConnectingPoint num="10" id="84" />
-<TGConnectingPoint num="11" id="85" />
-<TGConnectingPoint num="12" id="86" />
-<TGConnectingPoint num="13" id="87" />
-<TGConnectingPoint num="14" id="88" />
-<TGConnectingPoint num="15" id="89" />
-<TGConnectingPoint num="16" id="90" />
-<TGConnectingPoint num="17" id="91" />
-<TGConnectingPoint num="18" id="92" />
-<TGConnectingPoint num="19" id="93" />
-<TGConnectingPoint num="20" id="94" />
-<TGConnectingPoint num="21" id="95" />
-<TGConnectingPoint num="22" id="96" />
-<TGConnectingPoint num="23" id="97" />
+<TGConnectingPoint num="0" id="89" />
+<TGConnectingPoint num="1" id="90" />
+<TGConnectingPoint num="2" id="91" />
+<TGConnectingPoint num="3" id="92" />
+<TGConnectingPoint num="4" id="93" />
+<TGConnectingPoint num="5" id="94" />
+<TGConnectingPoint num="6" id="95" />
+<TGConnectingPoint num="7" id="96" />
+<TGConnectingPoint num="8" id="97" />
+<TGConnectingPoint num="9" id="98" />
+<TGConnectingPoint num="10" id="99" />
+<TGConnectingPoint num="11" id="100" />
+<TGConnectingPoint num="12" id="101" />
+<TGConnectingPoint num="13" id="102" />
+<TGConnectingPoint num="14" id="103" />
+<TGConnectingPoint num="15" id="104" />
+<TGConnectingPoint num="16" id="105" />
+<TGConnectingPoint num="17" id="106" />
+<TGConnectingPoint num="18" id="107" />
+<TGConnectingPoint num="19" id="108" />
+<TGConnectingPoint num="20" id="109" />
+<TGConnectingPoint num="21" id="110" />
+<TGConnectingPoint num="22" id="111" />
+<TGConnectingPoint num="23" id="112" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="73" >
-<father id="98" num="0" />
+<SUBCOMPONENT type="1401" id="88" >
+<father id="113" num="0" />
<cdparam x="246" y="983" />
<sizeparam width="130" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="117" minY="0" maxY="48" />
<infoparam name="TGComponent" value="ExploitVulnerability" />
-<TGConnectingPoint num="0" id="49" />
-<TGConnectingPoint num="1" id="50" />
-<TGConnectingPoint num="2" id="51" />
-<TGConnectingPoint num="3" id="52" />
-<TGConnectingPoint num="4" id="53" />
-<TGConnectingPoint num="5" id="54" />
-<TGConnectingPoint num="6" id="55" />
-<TGConnectingPoint num="7" id="56" />
-<TGConnectingPoint num="8" id="57" />
-<TGConnectingPoint num="9" id="58" />
-<TGConnectingPoint num="10" id="59" />
-<TGConnectingPoint num="11" id="60" />
-<TGConnectingPoint num="12" id="61" />
-<TGConnectingPoint num="13" id="62" />
-<TGConnectingPoint num="14" id="63" />
-<TGConnectingPoint num="15" id="64" />
-<TGConnectingPoint num="16" id="65" />
-<TGConnectingPoint num="17" id="66" />
-<TGConnectingPoint num="18" id="67" />
-<TGConnectingPoint num="19" id="68" />
-<TGConnectingPoint num="20" id="69" />
-<TGConnectingPoint num="21" id="70" />
-<TGConnectingPoint num="22" id="71" />
-<TGConnectingPoint num="23" id="72" />
+<TGConnectingPoint num="0" id="64" />
+<TGConnectingPoint num="1" id="65" />
+<TGConnectingPoint num="2" id="66" />
+<TGConnectingPoint num="3" id="67" />
+<TGConnectingPoint num="4" id="68" />
+<TGConnectingPoint num="5" id="69" />
+<TGConnectingPoint num="6" id="70" />
+<TGConnectingPoint num="7" id="71" />
+<TGConnectingPoint num="8" id="72" />
+<TGConnectingPoint num="9" id="73" />
+<TGConnectingPoint num="10" id="74" />
+<TGConnectingPoint num="11" id="75" />
+<TGConnectingPoint num="12" id="76" />
+<TGConnectingPoint num="13" id="77" />
+<TGConnectingPoint num="14" id="78" />
+<TGConnectingPoint num="15" id="79" />
+<TGConnectingPoint num="16" id="80" />
+<TGConnectingPoint num="17" id="81" />
+<TGConnectingPoint num="18" id="82" />
+<TGConnectingPoint num="19" id="83" />
+<TGConnectingPoint num="20" id="84" />
+<TGConnectingPoint num="21" id="85" />
+<TGConnectingPoint num="22" id="86" />
+<TGConnectingPoint num="23" id="87" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="148" >
+<COMPONENT type="1400" id="163" >
<cdparam x="392" y="279" />
<sizeparam width="247" height="108" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block6" value="AttackerWebServer" />
-<TGConnectingPoint num="0" id="124" />
-<TGConnectingPoint num="1" id="125" />
-<TGConnectingPoint num="2" id="126" />
-<TGConnectingPoint num="3" id="127" />
-<TGConnectingPoint num="4" id="128" />
-<TGConnectingPoint num="5" id="129" />
-<TGConnectingPoint num="6" id="130" />
-<TGConnectingPoint num="7" id="131" />
-<TGConnectingPoint num="8" id="132" />
-<TGConnectingPoint num="9" id="133" />
-<TGConnectingPoint num="10" id="134" />
-<TGConnectingPoint num="11" id="135" />
-<TGConnectingPoint num="12" id="136" />
-<TGConnectingPoint num="13" id="137" />
-<TGConnectingPoint num="14" id="138" />
-<TGConnectingPoint num="15" id="139" />
-<TGConnectingPoint num="16" id="140" />
-<TGConnectingPoint num="17" id="141" />
-<TGConnectingPoint num="18" id="142" />
-<TGConnectingPoint num="19" id="143" />
-<TGConnectingPoint num="20" id="144" />
-<TGConnectingPoint num="21" id="145" />
-<TGConnectingPoint num="22" id="146" />
-<TGConnectingPoint num="23" id="147" />
+<TGConnectingPoint num="0" id="139" />
+<TGConnectingPoint num="1" id="140" />
+<TGConnectingPoint num="2" id="141" />
+<TGConnectingPoint num="3" id="142" />
+<TGConnectingPoint num="4" id="143" />
+<TGConnectingPoint num="5" id="144" />
+<TGConnectingPoint num="6" id="145" />
+<TGConnectingPoint num="7" id="146" />
+<TGConnectingPoint num="8" id="147" />
+<TGConnectingPoint num="9" id="148" />
+<TGConnectingPoint num="10" id="149" />
+<TGConnectingPoint num="11" id="150" />
+<TGConnectingPoint num="12" id="151" />
+<TGConnectingPoint num="13" id="152" />
+<TGConnectingPoint num="14" id="153" />
+<TGConnectingPoint num="15" id="154" />
+<TGConnectingPoint num="16" id="155" />
+<TGConnectingPoint num="17" id="156" />
+<TGConnectingPoint num="18" id="157" />
+<TGConnectingPoint num="19" id="158" />
+<TGConnectingPoint num="20" id="159" />
+<TGConnectingPoint num="21" id="160" />
+<TGConnectingPoint num="22" id="161" />
+<TGConnectingPoint num="23" id="162" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="123" >
-<father id="148" num="0" />
+<SUBCOMPONENT type="1401" id="138" >
+<father id="163" num="0" />
<cdparam x="439" y="326" />
<sizeparam width="173" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="74" minY="0" maxY="73" />
<infoparam name="TGComponent" value="GenerateFakeBankWebsite" />
-<TGConnectingPoint num="0" id="99" />
-<TGConnectingPoint num="1" id="100" />
-<TGConnectingPoint num="2" id="101" />
-<TGConnectingPoint num="3" id="102" />
-<TGConnectingPoint num="4" id="103" />
-<TGConnectingPoint num="5" id="104" />
-<TGConnectingPoint num="6" id="105" />
-<TGConnectingPoint num="7" id="106" />
-<TGConnectingPoint num="8" id="107" />
-<TGConnectingPoint num="9" id="108" />
-<TGConnectingPoint num="10" id="109" />
-<TGConnectingPoint num="11" id="110" />
-<TGConnectingPoint num="12" id="111" />
-<TGConnectingPoint num="13" id="112" />
-<TGConnectingPoint num="14" id="113" />
-<TGConnectingPoint num="15" id="114" />
-<TGConnectingPoint num="16" id="115" />
-<TGConnectingPoint num="17" id="116" />
-<TGConnectingPoint num="18" id="117" />
-<TGConnectingPoint num="19" id="118" />
-<TGConnectingPoint num="20" id="119" />
-<TGConnectingPoint num="21" id="120" />
-<TGConnectingPoint num="22" id="121" />
-<TGConnectingPoint num="23" id="122" />
+<TGConnectingPoint num="0" id="114" />
+<TGConnectingPoint num="1" id="115" />
+<TGConnectingPoint num="2" id="116" />
+<TGConnectingPoint num="3" id="117" />
+<TGConnectingPoint num="4" id="118" />
+<TGConnectingPoint num="5" id="119" />
+<TGConnectingPoint num="6" id="120" />
+<TGConnectingPoint num="7" id="121" />
+<TGConnectingPoint num="8" id="122" />
+<TGConnectingPoint num="9" id="123" />
+<TGConnectingPoint num="10" id="124" />
+<TGConnectingPoint num="11" id="125" />
+<TGConnectingPoint num="12" id="126" />
+<TGConnectingPoint num="13" id="127" />
+<TGConnectingPoint num="14" id="128" />
+<TGConnectingPoint num="15" id="129" />
+<TGConnectingPoint num="16" id="130" />
+<TGConnectingPoint num="17" id="131" />
+<TGConnectingPoint num="18" id="132" />
+<TGConnectingPoint num="19" id="133" />
+<TGConnectingPoint num="20" id="134" />
+<TGConnectingPoint num="21" id="135" />
+<TGConnectingPoint num="22" id="136" />
+<TGConnectingPoint num="23" id="137" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1401" id="173" >
+<COMPONENT type="1401" id="188" >
<cdparam x="491" y="631" />
<sizeparam width="170" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="TGComponent" value="ControlFakeHTTPBankURL" />
-<TGConnectingPoint num="0" id="149" />
-<TGConnectingPoint num="1" id="150" />
-<TGConnectingPoint num="2" id="151" />
-<TGConnectingPoint num="3" id="152" />
-<TGConnectingPoint num="4" id="153" />
-<TGConnectingPoint num="5" id="154" />
-<TGConnectingPoint num="6" id="155" />
-<TGConnectingPoint num="7" id="156" />
-<TGConnectingPoint num="8" id="157" />
-<TGConnectingPoint num="9" id="158" />
-<TGConnectingPoint num="10" id="159" />
-<TGConnectingPoint num="11" id="160" />
-<TGConnectingPoint num="12" id="161" />
-<TGConnectingPoint num="13" id="162" />
-<TGConnectingPoint num="14" id="163" />
-<TGConnectingPoint num="15" id="164" />
-<TGConnectingPoint num="16" id="165" />
-<TGConnectingPoint num="17" id="166" />
-<TGConnectingPoint num="18" id="167" />
-<TGConnectingPoint num="19" id="168" />
-<TGConnectingPoint num="20" id="169" />
-<TGConnectingPoint num="21" id="170" />
-<TGConnectingPoint num="22" id="171" />
-<TGConnectingPoint num="23" id="172" />
+<TGConnectingPoint num="0" id="164" />
+<TGConnectingPoint num="1" id="165" />
+<TGConnectingPoint num="2" id="166" />
+<TGConnectingPoint num="3" id="167" />
+<TGConnectingPoint num="4" id="168" />
+<TGConnectingPoint num="5" id="169" />
+<TGConnectingPoint num="6" id="170" />
+<TGConnectingPoint num="7" id="171" />
+<TGConnectingPoint num="8" id="172" />
+<TGConnectingPoint num="9" id="173" />
+<TGConnectingPoint num="10" id="174" />
+<TGConnectingPoint num="11" id="175" />
+<TGConnectingPoint num="12" id="176" />
+<TGConnectingPoint num="13" id="177" />
+<TGConnectingPoint num="14" id="178" />
+<TGConnectingPoint num="15" id="179" />
+<TGConnectingPoint num="16" id="180" />
+<TGConnectingPoint num="17" id="181" />
+<TGConnectingPoint num="18" id="182" />
+<TGConnectingPoint num="19" id="183" />
+<TGConnectingPoint num="20" id="184" />
+<TGConnectingPoint num="21" id="185" />
+<TGConnectingPoint num="22" id="186" />
+<TGConnectingPoint num="23" id="187" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1402" id="186" >
+<COMPONENT type="1402" id="201" >
<cdparam x="887" y="647" />
<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="TGComponent" value="<<AND>>" />
-<TGConnectingPoint num="0" id="174" />
-<TGConnectingPoint num="1" id="175" />
-<TGConnectingPoint num="2" id="176" />
-<TGConnectingPoint num="3" id="177" />
-<TGConnectingPoint num="4" id="178" />
-<TGConnectingPoint num="5" id="179" />
-<TGConnectingPoint num="6" id="180" />
-<TGConnectingPoint num="7" id="181" />
-<TGConnectingPoint num="8" id="182" />
-<TGConnectingPoint num="9" id="183" />
-<TGConnectingPoint num="10" id="184" />
-<TGConnectingPoint num="11" id="185" />
+<TGConnectingPoint num="0" id="189" />
+<TGConnectingPoint num="1" id="190" />
+<TGConnectingPoint num="2" id="191" />
+<TGConnectingPoint num="3" id="192" />
+<TGConnectingPoint num="4" id="193" />
+<TGConnectingPoint num="5" id="194" />
+<TGConnectingPoint num="6" id="195" />
+<TGConnectingPoint num="7" id="196" />
+<TGConnectingPoint num="8" id="197" />
+<TGConnectingPoint num="9" id="198" />
+<TGConnectingPoint num="10" id="199" />
+<TGConnectingPoint num="11" id="200" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1402" id="199" >
+<COMPONENT type="1402" id="214" >
<cdparam x="696" y="779" />
<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="187" />
-<TGConnectingPoint num="1" id="188" />
-<TGConnectingPoint num="2" id="189" />
-<TGConnectingPoint num="3" id="190" />
-<TGConnectingPoint num="4" id="191" />
-<TGConnectingPoint num="5" id="192" />
-<TGConnectingPoint num="6" id="193" />
-<TGConnectingPoint num="7" id="194" />
-<TGConnectingPoint num="8" id="195" />
-<TGConnectingPoint num="9" id="196" />
-<TGConnectingPoint num="10" id="197" />
-<TGConnectingPoint num="11" id="198" />
+<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" />
+<TGConnectingPoint num="8" id="210" />
+<TGConnectingPoint num="9" id="211" />
+<TGConnectingPoint num="10" id="212" />
+<TGConnectingPoint num="11" id="213" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1402" id="212" >
+<COMPONENT type="1402" id="227" >
<cdparam x="696" y="623" />
<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="TGComponent" value="<<AND>>" />
-<TGConnectingPoint num="0" id="200" />
-<TGConnectingPoint num="1" id="201" />
-<TGConnectingPoint num="2" id="202" />
-<TGConnectingPoint num="3" id="203" />
-<TGConnectingPoint num="4" id="204" />
-<TGConnectingPoint num="5" id="205" />
-<TGConnectingPoint num="6" id="206" />
-<TGConnectingPoint num="7" id="207" />
-<TGConnectingPoint num="8" id="208" />
-<TGConnectingPoint num="9" id="209" />
-<TGConnectingPoint num="10" id="210" />
-<TGConnectingPoint num="11" id="211" />
+<TGConnectingPoint num="0" id="215" />
+<TGConnectingPoint num="1" id="216" />
+<TGConnectingPoint num="2" id="217" />
+<TGConnectingPoint num="3" id="218" />
+<TGConnectingPoint num="4" id="219" />
+<TGConnectingPoint num="5" id="220" />
+<TGConnectingPoint num="6" id="221" />
+<TGConnectingPoint num="7" id="222" />
+<TGConnectingPoint num="8" id="223" />
+<TGConnectingPoint num="9" id="224" />
+<TGConnectingPoint num="10" id="225" />
+<TGConnectingPoint num="11" id="226" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1402" id="225" >
+<COMPONENT type="1402" id="240" >
<cdparam x="219" y="871" />
<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="213" />
-<TGConnectingPoint num="1" id="214" />
-<TGConnectingPoint num="2" id="215" />
-<TGConnectingPoint num="3" id="216" />
-<TGConnectingPoint num="4" id="217" />
-<TGConnectingPoint num="5" id="218" />
-<TGConnectingPoint num="6" id="219" />
-<TGConnectingPoint num="7" id="220" />
-<TGConnectingPoint num="8" id="221" />
-<TGConnectingPoint num="9" id="222" />
-<TGConnectingPoint num="10" id="223" />
-<TGConnectingPoint num="11" id="224" />
+<TGConnectingPoint num="0" id="228" />
+<TGConnectingPoint num="1" id="229" />
+<TGConnectingPoint num="2" id="230" />
+<TGConnectingPoint num="3" id="231" />
+<TGConnectingPoint num="4" id="232" />
+<TGConnectingPoint num="5" id="233" />
+<TGConnectingPoint num="6" id="234" />
+<TGConnectingPoint num="7" id="235" />
+<TGConnectingPoint num="8" id="236" />
+<TGConnectingPoint num="9" id="237" />
+<TGConnectingPoint num="10" id="238" />
+<TGConnectingPoint num="11" id="239" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1400" id="350" >
+<COMPONENT type="1400" id="365" >
<cdparam x="360" y="683" />
<sizeparam width="303" height="240" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block3" value="Browser" />
-<TGConnectingPoint num="0" id="326" />
-<TGConnectingPoint num="1" id="327" />
-<TGConnectingPoint num="2" id="328" />
-<TGConnectingPoint num="3" id="329" />
-<TGConnectingPoint num="4" id="330" />
-<TGConnectingPoint num="5" id="331" />
-<TGConnectingPoint num="6" id="332" />
-<TGConnectingPoint num="7" id="333" />
-<TGConnectingPoint num="8" id="334" />
-<TGConnectingPoint num="9" id="335" />
-<TGConnectingPoint num="10" id="336" />
-<TGConnectingPoint num="11" id="337" />
-<TGConnectingPoint num="12" id="338" />
-<TGConnectingPoint num="13" id="339" />
-<TGConnectingPoint num="14" id="340" />
-<TGConnectingPoint num="15" id="341" />
-<TGConnectingPoint num="16" id="342" />
-<TGConnectingPoint num="17" id="343" />
-<TGConnectingPoint num="18" id="344" />
-<TGConnectingPoint num="19" id="345" />
-<TGConnectingPoint num="20" id="346" />
-<TGConnectingPoint num="21" id="347" />
-<TGConnectingPoint num="22" id="348" />
-<TGConnectingPoint num="23" id="349" />
+<TGConnectingPoint num="0" id="341" />
+<TGConnectingPoint num="1" id="342" />
+<TGConnectingPoint num="2" id="343" />
+<TGConnectingPoint num="3" id="344" />
+<TGConnectingPoint num="4" id="345" />
+<TGConnectingPoint num="5" id="346" />
+<TGConnectingPoint num="6" id="347" />
+<TGConnectingPoint num="7" id="348" />
+<TGConnectingPoint num="8" id="349" />
+<TGConnectingPoint num="9" id="350" />
+<TGConnectingPoint num="10" id="351" />
+<TGConnectingPoint num="11" id="352" />
+<TGConnectingPoint num="12" id="353" />
+<TGConnectingPoint num="13" id="354" />
+<TGConnectingPoint num="14" id="355" />
+<TGConnectingPoint num="15" id="356" />
+<TGConnectingPoint num="16" id="357" />
+<TGConnectingPoint num="17" id="358" />
+<TGConnectingPoint num="18" id="359" />
+<TGConnectingPoint num="19" id="360" />
+<TGConnectingPoint num="20" id="361" />
+<TGConnectingPoint num="21" id="362" />
+<TGConnectingPoint num="22" id="363" />
+<TGConnectingPoint num="23" id="364" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="250" >
-<father id="350" num="0" />
+<SUBCOMPONENT type="1401" id="265" >
+<father id="365" num="0" />
<cdparam x="360" y="823" />
<sizeparam width="298" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="5" minY="0" maxY="205" />
<infoparam name="TGComponent" value="RequestUserToInstallMobileFakeBankApplication" />
-<TGConnectingPoint num="0" id="226" />
-<TGConnectingPoint num="1" id="227" />
-<TGConnectingPoint num="2" id="228" />
-<TGConnectingPoint num="3" id="229" />
-<TGConnectingPoint num="4" id="230" />
-<TGConnectingPoint num="5" id="231" />
-<TGConnectingPoint num="6" id="232" />
-<TGConnectingPoint num="7" id="233" />
-<TGConnectingPoint num="8" id="234" />
-<TGConnectingPoint num="9" id="235" />
-<TGConnectingPoint num="10" id="236" />
-<TGConnectingPoint num="11" id="237" />
-<TGConnectingPoint num="12" id="238" />
-<TGConnectingPoint num="13" id="239" />
-<TGConnectingPoint num="14" id="240" />
-<TGConnectingPoint num="15" id="241" />
-<TGConnectingPoint num="16" id="242" />
-<TGConnectingPoint num="17" id="243" />
-<TGConnectingPoint num="18" id="244" />
-<TGConnectingPoint num="19" id="245" />
-<TGConnectingPoint num="20" id="246" />
-<TGConnectingPoint num="21" id="247" />
-<TGConnectingPoint num="22" id="248" />
-<TGConnectingPoint num="23" id="249" />
+<TGConnectingPoint num="0" id="241" />
+<TGConnectingPoint num="1" id="242" />
+<TGConnectingPoint num="2" id="243" />
+<TGConnectingPoint num="3" id="244" />
+<TGConnectingPoint num="4" id="245" />
+<TGConnectingPoint num="5" id="246" />
+<TGConnectingPoint num="6" id="247" />
+<TGConnectingPoint num="7" id="248" />
+<TGConnectingPoint num="8" id="249" />
+<TGConnectingPoint num="9" id="250" />
+<TGConnectingPoint num="10" id="251" />
+<TGConnectingPoint num="11" id="252" />
+<TGConnectingPoint num="12" id="253" />
+<TGConnectingPoint num="13" id="254" />
+<TGConnectingPoint num="14" id="255" />
+<TGConnectingPoint num="15" id="256" />
+<TGConnectingPoint num="16" id="257" />
+<TGConnectingPoint num="17" id="258" />
+<TGConnectingPoint num="18" id="259" />
+<TGConnectingPoint num="19" id="260" />
+<TGConnectingPoint num="20" id="261" />
+<TGConnectingPoint num="21" id="262" />
+<TGConnectingPoint num="22" id="263" />
+<TGConnectingPoint num="23" id="264" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="275" >
-<father id="350" num="1" />
+<SUBCOMPONENT type="1401" id="290" >
+<father id="365" num="1" />
<cdparam x="395" y="871" />
<sizeparam width="127" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="176" minY="0" maxY="205" />
<infoparam name="TGComponent" value="ExploitVunerability" />
-<TGConnectingPoint num="0" id="251" />
-<TGConnectingPoint num="1" id="252" />
-<TGConnectingPoint num="2" id="253" />
-<TGConnectingPoint num="3" id="254" />
-<TGConnectingPoint num="4" id="255" />
-<TGConnectingPoint num="5" id="256" />
-<TGConnectingPoint num="6" id="257" />
-<TGConnectingPoint num="7" id="258" />
-<TGConnectingPoint num="8" id="259" />
-<TGConnectingPoint num="9" id="260" />
-<TGConnectingPoint num="10" id="261" />
-<TGConnectingPoint num="11" id="262" />
-<TGConnectingPoint num="12" id="263" />
-<TGConnectingPoint num="13" id="264" />
-<TGConnectingPoint num="14" id="265" />
-<TGConnectingPoint num="15" id="266" />
-<TGConnectingPoint num="16" id="267" />
-<TGConnectingPoint num="17" id="268" />
-<TGConnectingPoint num="18" id="269" />
-<TGConnectingPoint num="19" id="270" />
-<TGConnectingPoint num="20" id="271" />
-<TGConnectingPoint num="21" id="272" />
-<TGConnectingPoint num="22" id="273" />
-<TGConnectingPoint num="23" id="274" />
+<TGConnectingPoint num="0" id="266" />
+<TGConnectingPoint num="1" id="267" />
+<TGConnectingPoint num="2" id="268" />
+<TGConnectingPoint num="3" id="269" />
+<TGConnectingPoint num="4" id="270" />
+<TGConnectingPoint num="5" id="271" />
+<TGConnectingPoint num="6" id="272" />
+<TGConnectingPoint num="7" id="273" />
+<TGConnectingPoint num="8" id="274" />
+<TGConnectingPoint num="9" id="275" />
+<TGConnectingPoint num="10" id="276" />
+<TGConnectingPoint num="11" id="277" />
+<TGConnectingPoint num="12" id="278" />
+<TGConnectingPoint num="13" id="279" />
+<TGConnectingPoint num="14" id="280" />
+<TGConnectingPoint num="15" id="281" />
+<TGConnectingPoint num="16" id="282" />
+<TGConnectingPoint num="17" id="283" />
+<TGConnectingPoint num="18" id="284" />
+<TGConnectingPoint num="19" id="285" />
+<TGConnectingPoint num="20" id="286" />
+<TGConnectingPoint num="21" id="287" />
+<TGConnectingPoint num="22" id="288" />
+<TGConnectingPoint num="23" id="289" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="300" >
-<father id="350" num="2" />
+<SUBCOMPONENT type="1401" id="315" >
+<father id="365" num="2" />
<cdparam x="448" y="716" />
<sizeparam width="139" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="164" minY="0" maxY="205" />
<infoparam name="TGComponent" value="InstallMaliciousPlugin" />
-<TGConnectingPoint num="0" id="276" />
-<TGConnectingPoint num="1" id="277" />
-<TGConnectingPoint num="2" id="278" />
-<TGConnectingPoint num="3" id="279" />
-<TGConnectingPoint num="4" id="280" />
-<TGConnectingPoint num="5" id="281" />
-<TGConnectingPoint num="6" id="282" />
-<TGConnectingPoint num="7" id="283" />
-<TGConnectingPoint num="8" id="284" />
-<TGConnectingPoint num="9" id="285" />
-<TGConnectingPoint num="10" id="286" />
-<TGConnectingPoint num="11" id="287" />
-<TGConnectingPoint num="12" id="288" />
-<TGConnectingPoint num="13" id="289" />
-<TGConnectingPoint num="14" id="290" />
-<TGConnectingPoint num="15" id="291" />
-<TGConnectingPoint num="16" id="292" />
-<TGConnectingPoint num="17" id="293" />
-<TGConnectingPoint num="18" id="294" />
-<TGConnectingPoint num="19" id="295" />
-<TGConnectingPoint num="20" id="296" />
-<TGConnectingPoint num="21" id="297" />
-<TGConnectingPoint num="22" id="298" />
-<TGConnectingPoint num="23" id="299" />
+<TGConnectingPoint num="0" id="291" />
+<TGConnectingPoint num="1" id="292" />
+<TGConnectingPoint num="2" id="293" />
+<TGConnectingPoint num="3" id="294" />
+<TGConnectingPoint num="4" id="295" />
+<TGConnectingPoint num="5" id="296" />
+<TGConnectingPoint num="6" id="297" />
+<TGConnectingPoint num="7" id="298" />
+<TGConnectingPoint num="8" id="299" />
+<TGConnectingPoint num="9" id="300" />
+<TGConnectingPoint num="10" id="301" />
+<TGConnectingPoint num="11" id="302" />
+<TGConnectingPoint num="12" id="303" />
+<TGConnectingPoint num="13" id="304" />
+<TGConnectingPoint num="14" id="305" />
+<TGConnectingPoint num="15" id="306" />
+<TGConnectingPoint num="16" id="307" />
+<TGConnectingPoint num="17" id="308" />
+<TGConnectingPoint num="18" id="309" />
+<TGConnectingPoint num="19" id="310" />
+<TGConnectingPoint num="20" id="311" />
+<TGConnectingPoint num="21" id="312" />
+<TGConnectingPoint num="22" id="313" />
+<TGConnectingPoint num="23" id="314" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="325" >
-<father id="350" num="3" />
+<SUBCOMPONENT type="1401" id="340" >
+<father id="365" num="3" />
<cdparam x="370" y="768" />
<sizeparam width="274" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="29" minY="0" maxY="205" />
<infoparam name="TGComponent" value="RedirectHTTPRequestFromBankToFakeBank" />
-<TGConnectingPoint num="0" id="301" />
-<TGConnectingPoint num="1" id="302" />
-<TGConnectingPoint num="2" id="303" />
-<TGConnectingPoint num="3" id="304" />
-<TGConnectingPoint num="4" id="305" />
-<TGConnectingPoint num="5" id="306" />
-<TGConnectingPoint num="6" id="307" />
-<TGConnectingPoint num="7" id="308" />
-<TGConnectingPoint num="8" id="309" />
-<TGConnectingPoint num="9" id="310" />
-<TGConnectingPoint num="10" id="311" />
-<TGConnectingPoint num="11" id="312" />
-<TGConnectingPoint num="12" id="313" />
-<TGConnectingPoint num="13" id="314" />
-<TGConnectingPoint num="14" id="315" />
-<TGConnectingPoint num="15" id="316" />
-<TGConnectingPoint num="16" id="317" />
-<TGConnectingPoint num="17" id="318" />
-<TGConnectingPoint num="18" id="319" />
-<TGConnectingPoint num="19" id="320" />
-<TGConnectingPoint num="20" id="321" />
-<TGConnectingPoint num="21" id="322" />
-<TGConnectingPoint num="22" id="323" />
-<TGConnectingPoint num="23" id="324" />
+<TGConnectingPoint num="0" id="316" />
+<TGConnectingPoint num="1" id="317" />
+<TGConnectingPoint num="2" id="318" />
+<TGConnectingPoint num="3" id="319" />
+<TGConnectingPoint num="4" id="320" />
+<TGConnectingPoint num="5" id="321" />
+<TGConnectingPoint num="6" id="322" />
+<TGConnectingPoint num="7" id="323" />
+<TGConnectingPoint num="8" id="324" />
+<TGConnectingPoint num="9" id="325" />
+<TGConnectingPoint num="10" id="326" />
+<TGConnectingPoint num="11" id="327" />
+<TGConnectingPoint num="12" id="328" />
+<TGConnectingPoint num="13" id="329" />
+<TGConnectingPoint num="14" id="330" />
+<TGConnectingPoint num="15" id="331" />
+<TGConnectingPoint num="16" id="332" />
+<TGConnectingPoint num="17" id="333" />
+<TGConnectingPoint num="18" id="334" />
+<TGConnectingPoint num="19" id="335" />
+<TGConnectingPoint num="20" id="336" />
+<TGConnectingPoint num="21" id="337" />
+<TGConnectingPoint num="22" id="338" />
+<TGConnectingPoint num="23" id="339" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="450" >
+<COMPONENT type="1400" id="465" >
<cdparam x="837" y="531" />
<sizeparam width="224" height="331" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block2" value="UserMobilePhone_Android" />
-<TGConnectingPoint num="0" id="426" />
-<TGConnectingPoint num="1" id="427" />
-<TGConnectingPoint num="2" id="428" />
-<TGConnectingPoint num="3" id="429" />
-<TGConnectingPoint num="4" id="430" />
-<TGConnectingPoint num="5" id="431" />
-<TGConnectingPoint num="6" id="432" />
-<TGConnectingPoint num="7" id="433" />
-<TGConnectingPoint num="8" id="434" />
-<TGConnectingPoint num="9" id="435" />
-<TGConnectingPoint num="10" id="436" />
-<TGConnectingPoint num="11" id="437" />
-<TGConnectingPoint num="12" id="438" />
-<TGConnectingPoint num="13" id="439" />
-<TGConnectingPoint num="14" id="440" />
-<TGConnectingPoint num="15" id="441" />
-<TGConnectingPoint num="16" id="442" />
-<TGConnectingPoint num="17" id="443" />
-<TGConnectingPoint num="18" id="444" />
-<TGConnectingPoint num="19" id="445" />
-<TGConnectingPoint num="20" id="446" />
-<TGConnectingPoint num="21" id="447" />
-<TGConnectingPoint num="22" id="448" />
-<TGConnectingPoint num="23" id="449" />
+<TGConnectingPoint num="0" id="441" />
+<TGConnectingPoint num="1" id="442" />
+<TGConnectingPoint num="2" id="443" />
+<TGConnectingPoint num="3" id="444" />
+<TGConnectingPoint num="4" id="445" />
+<TGConnectingPoint num="5" id="446" />
+<TGConnectingPoint num="6" id="447" />
+<TGConnectingPoint num="7" id="448" />
+<TGConnectingPoint num="8" id="449" />
+<TGConnectingPoint num="9" id="450" />
+<TGConnectingPoint num="10" id="451" />
+<TGConnectingPoint num="11" id="452" />
+<TGConnectingPoint num="12" id="453" />
+<TGConnectingPoint num="13" id="454" />
+<TGConnectingPoint num="14" id="455" />
+<TGConnectingPoint num="15" id="456" />
+<TGConnectingPoint num="16" id="457" />
+<TGConnectingPoint num="17" id="458" />
+<TGConnectingPoint num="18" id="459" />
+<TGConnectingPoint num="19" id="460" />
+<TGConnectingPoint num="20" id="461" />
+<TGConnectingPoint num="21" id="462" />
+<TGConnectingPoint num="22" id="463" />
+<TGConnectingPoint num="23" id="464" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="375" >
-<father id="450" num="0" />
+<SUBCOMPONENT type="1401" id="390" >
+<father id="465" num="0" />
<cdparam x="873" y="720" />
<sizeparam width="132" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="false" />
<cdrectangleparam minX="0" maxX="92" minY="0" maxY="296" />
<infoparam name="TGComponent" value="SilentlyInterceptSMS" />
-<TGConnectingPoint num="0" id="351" />
-<TGConnectingPoint num="1" id="352" />
-<TGConnectingPoint num="2" id="353" />
-<TGConnectingPoint num="3" id="354" />
-<TGConnectingPoint num="4" id="355" />
-<TGConnectingPoint num="5" id="356" />
-<TGConnectingPoint num="6" id="357" />
-<TGConnectingPoint num="7" id="358" />
-<TGConnectingPoint num="8" id="359" />
-<TGConnectingPoint num="9" id="360" />
-<TGConnectingPoint num="10" id="361" />
-<TGConnectingPoint num="11" id="362" />
-<TGConnectingPoint num="12" id="363" />
-<TGConnectingPoint num="13" id="364" />
-<TGConnectingPoint num="14" id="365" />
-<TGConnectingPoint num="15" id="366" />
-<TGConnectingPoint num="16" id="367" />
-<TGConnectingPoint num="17" id="368" />
-<TGConnectingPoint num="18" id="369" />
-<TGConnectingPoint num="19" id="370" />
-<TGConnectingPoint num="20" id="371" />
-<TGConnectingPoint num="21" id="372" />
-<TGConnectingPoint num="22" id="373" />
-<TGConnectingPoint num="23" id="374" />
+<TGConnectingPoint num="0" id="366" />
+<TGConnectingPoint num="1" id="367" />
+<TGConnectingPoint num="2" id="368" />
+<TGConnectingPoint num="3" id="369" />
+<TGConnectingPoint num="4" id="370" />
+<TGConnectingPoint num="5" id="371" />
+<TGConnectingPoint num="6" id="372" />
+<TGConnectingPoint num="7" id="373" />
+<TGConnectingPoint num="8" id="374" />
+<TGConnectingPoint num="9" id="375" />
+<TGConnectingPoint num="10" id="376" />
+<TGConnectingPoint num="11" id="377" />
+<TGConnectingPoint num="12" id="378" />
+<TGConnectingPoint num="13" id="379" />
+<TGConnectingPoint num="14" id="380" />
+<TGConnectingPoint num="15" id="381" />
+<TGConnectingPoint num="16" id="382" />
+<TGConnectingPoint num="17" id="383" />
+<TGConnectingPoint num="18" id="384" />
+<TGConnectingPoint num="19" id="385" />
+<TGConnectingPoint num="20" id="386" />
+<TGConnectingPoint num="21" id="387" />
+<TGConnectingPoint num="22" id="388" />
+<TGConnectingPoint num="23" id="389" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="400" >
-<father id="450" num="1" />
+<SUBCOMPONENT type="1401" id="415" >
+<father id="465" num="1" />
<cdparam x="871" y="578" />
<sizeparam width="159" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="65" minY="0" maxY="296" />
<infoparam name="TGComponent" value="RetrieveTransactionTAN" />
-<TGConnectingPoint num="0" id="376" />
-<TGConnectingPoint num="1" id="377" />
-<TGConnectingPoint num="2" id="378" />
-<TGConnectingPoint num="3" id="379" />
-<TGConnectingPoint num="4" id="380" />
-<TGConnectingPoint num="5" id="381" />
-<TGConnectingPoint num="6" id="382" />
-<TGConnectingPoint num="7" id="383" />
-<TGConnectingPoint num="8" id="384" />
-<TGConnectingPoint num="9" id="385" />
-<TGConnectingPoint num="10" id="386" />
-<TGConnectingPoint num="11" id="387" />
-<TGConnectingPoint num="12" id="388" />
-<TGConnectingPoint num="13" id="389" />
-<TGConnectingPoint num="14" id="390" />
-<TGConnectingPoint num="15" id="391" />
-<TGConnectingPoint num="16" id="392" />
-<TGConnectingPoint num="17" id="393" />
-<TGConnectingPoint num="18" id="394" />
-<TGConnectingPoint num="19" id="395" />
-<TGConnectingPoint num="20" id="396" />
-<TGConnectingPoint num="21" id="397" />
-<TGConnectingPoint num="22" id="398" />
-<TGConnectingPoint num="23" id="399" />
+<TGConnectingPoint num="0" id="391" />
+<TGConnectingPoint num="1" id="392" />
+<TGConnectingPoint num="2" id="393" />
+<TGConnectingPoint num="3" id="394" />
+<TGConnectingPoint num="4" id="395" />
+<TGConnectingPoint num="5" id="396" />
+<TGConnectingPoint num="6" id="397" />
+<TGConnectingPoint num="7" id="398" />
+<TGConnectingPoint num="8" id="399" />
+<TGConnectingPoint num="9" id="400" />
+<TGConnectingPoint num="10" id="401" />
+<TGConnectingPoint num="11" id="402" />
+<TGConnectingPoint num="12" id="403" />
+<TGConnectingPoint num="13" id="404" />
+<TGConnectingPoint num="14" id="405" />
+<TGConnectingPoint num="15" id="406" />
+<TGConnectingPoint num="16" id="407" />
+<TGConnectingPoint num="17" id="408" />
+<TGConnectingPoint num="18" id="409" />
+<TGConnectingPoint num="19" id="410" />
+<TGConnectingPoint num="20" id="411" />
+<TGConnectingPoint num="21" id="412" />
+<TGConnectingPoint num="22" id="413" />
+<TGConnectingPoint num="23" id="414" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="425" >
-<father id="450" num="2" />
+<SUBCOMPONENT type="1401" id="440" >
+<father id="465" num="2" />
<cdparam x="838" y="783" />
<sizeparam width="204" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="20" minY="0" maxY="296" />
<infoparam name="TGComponent" value="UserInstallsFakeBankApplication" />
-<TGConnectingPoint num="0" id="401" />
-<TGConnectingPoint num="1" id="402" />
-<TGConnectingPoint num="2" id="403" />
-<TGConnectingPoint num="3" id="404" />
-<TGConnectingPoint num="4" id="405" />
-<TGConnectingPoint num="5" id="406" />
-<TGConnectingPoint num="6" id="407" />
-<TGConnectingPoint num="7" id="408" />
-<TGConnectingPoint num="8" id="409" />
-<TGConnectingPoint num="9" id="410" />
-<TGConnectingPoint num="10" id="411" />
-<TGConnectingPoint num="11" id="412" />
-<TGConnectingPoint num="12" id="413" />
-<TGConnectingPoint num="13" id="414" />
-<TGConnectingPoint num="14" id="415" />
-<TGConnectingPoint num="15" id="416" />
-<TGConnectingPoint num="16" id="417" />
-<TGConnectingPoint num="17" id="418" />
-<TGConnectingPoint num="18" id="419" />
-<TGConnectingPoint num="19" id="420" />
-<TGConnectingPoint num="20" id="421" />
-<TGConnectingPoint num="21" id="422" />
-<TGConnectingPoint num="22" id="423" />
-<TGConnectingPoint num="23" id="424" />
+<TGConnectingPoint num="0" id="416" />
+<TGConnectingPoint num="1" id="417" />
+<TGConnectingPoint num="2" id="418" />
+<TGConnectingPoint num="3" id="419" />
+<TGConnectingPoint num="4" id="420" />
+<TGConnectingPoint num="5" id="421" />
+<TGConnectingPoint num="6" id="422" />
+<TGConnectingPoint num="7" id="423" />
+<TGConnectingPoint num="8" id="424" />
+<TGConnectingPoint num="9" id="425" />
+<TGConnectingPoint num="10" id="426" />
+<TGConnectingPoint num="11" id="427" />
+<TGConnectingPoint num="12" id="428" />
+<TGConnectingPoint num="13" id="429" />
+<TGConnectingPoint num="14" id="430" />
+<TGConnectingPoint num="15" id="431" />
+<TGConnectingPoint num="16" id="432" />
+<TGConnectingPoint num="17" id="433" />
+<TGConnectingPoint num="18" id="434" />
+<TGConnectingPoint num="19" id="435" />
+<TGConnectingPoint num="20" id="436" />
+<TGConnectingPoint num="21" id="437" />
+<TGConnectingPoint num="22" id="438" />
+<TGConnectingPoint num="23" id="439" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="525" >
+<COMPONENT type="1400" id="540" >
<cdparam x="176" y="714" />
<sizeparam width="144" height="128" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block1" value="Windows_Win32" />
-<TGConnectingPoint num="0" id="501" />
-<TGConnectingPoint num="1" id="502" />
-<TGConnectingPoint num="2" id="503" />
-<TGConnectingPoint num="3" id="504" />
-<TGConnectingPoint num="4" id="505" />
-<TGConnectingPoint num="5" id="506" />
-<TGConnectingPoint num="6" id="507" />
-<TGConnectingPoint num="7" id="508" />
-<TGConnectingPoint num="8" id="509" />
-<TGConnectingPoint num="9" id="510" />
-<TGConnectingPoint num="10" id="511" />
-<TGConnectingPoint num="11" id="512" />
-<TGConnectingPoint num="12" id="513" />
-<TGConnectingPoint num="13" id="514" />
-<TGConnectingPoint num="14" id="515" />
-<TGConnectingPoint num="15" id="516" />
-<TGConnectingPoint num="16" id="517" />
-<TGConnectingPoint num="17" id="518" />
-<TGConnectingPoint num="18" id="519" />
-<TGConnectingPoint num="19" id="520" />
-<TGConnectingPoint num="20" id="521" />
-<TGConnectingPoint num="21" id="522" />
-<TGConnectingPoint num="22" id="523" />
-<TGConnectingPoint num="23" id="524" />
+<TGConnectingPoint num="0" id="516" />
+<TGConnectingPoint num="1" id="517" />
+<TGConnectingPoint num="2" id="518" />
+<TGConnectingPoint num="3" id="519" />
+<TGConnectingPoint num="4" id="520" />
+<TGConnectingPoint num="5" id="521" />
+<TGConnectingPoint num="6" id="522" />
+<TGConnectingPoint num="7" id="523" />
+<TGConnectingPoint num="8" id="524" />
+<TGConnectingPoint num="9" id="525" />
+<TGConnectingPoint num="10" id="526" />
+<TGConnectingPoint num="11" id="527" />
+<TGConnectingPoint num="12" id="528" />
+<TGConnectingPoint num="13" id="529" />
+<TGConnectingPoint num="14" id="530" />
+<TGConnectingPoint num="15" id="531" />
+<TGConnectingPoint num="16" id="532" />
+<TGConnectingPoint num="17" id="533" />
+<TGConnectingPoint num="18" id="534" />
+<TGConnectingPoint num="19" id="535" />
+<TGConnectingPoint num="20" id="536" />
+<TGConnectingPoint num="21" id="537" />
+<TGConnectingPoint num="22" id="538" />
+<TGConnectingPoint num="23" id="539" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="475" >
-<father id="525" num="0" />
+<SUBCOMPONENT type="1401" id="490" >
+<father id="540" num="0" />
<cdparam x="176" y="795" />
<sizeparam width="130" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="14" minY="0" maxY="93" />
<infoparam name="TGComponent" value="ExploitVulnerability" />
-<TGConnectingPoint num="0" id="451" />
-<TGConnectingPoint num="1" id="452" />
-<TGConnectingPoint num="2" id="453" />
-<TGConnectingPoint num="3" id="454" />
-<TGConnectingPoint num="4" id="455" />
-<TGConnectingPoint num="5" id="456" />
-<TGConnectingPoint num="6" id="457" />
-<TGConnectingPoint num="7" id="458" />
-<TGConnectingPoint num="8" id="459" />
-<TGConnectingPoint num="9" id="460" />
-<TGConnectingPoint num="10" id="461" />
-<TGConnectingPoint num="11" id="462" />
-<TGConnectingPoint num="12" id="463" />
-<TGConnectingPoint num="13" id="464" />
-<TGConnectingPoint num="14" id="465" />
-<TGConnectingPoint num="15" id="466" />
-<TGConnectingPoint num="16" id="467" />
-<TGConnectingPoint num="17" id="468" />
-<TGConnectingPoint num="18" id="469" />
-<TGConnectingPoint num="19" id="470" />
-<TGConnectingPoint num="20" id="471" />
-<TGConnectingPoint num="21" id="472" />
-<TGConnectingPoint num="22" id="473" />
-<TGConnectingPoint num="23" id="474" />
+<TGConnectingPoint num="0" id="466" />
+<TGConnectingPoint num="1" id="467" />
+<TGConnectingPoint num="2" id="468" />
+<TGConnectingPoint num="3" id="469" />
+<TGConnectingPoint num="4" id="470" />
+<TGConnectingPoint num="5" id="471" />
+<TGConnectingPoint num="6" id="472" />
+<TGConnectingPoint num="7" id="473" />
+<TGConnectingPoint num="8" id="474" />
+<TGConnectingPoint num="9" id="475" />
+<TGConnectingPoint num="10" id="476" />
+<TGConnectingPoint num="11" id="477" />
+<TGConnectingPoint num="12" id="478" />
+<TGConnectingPoint num="13" id="479" />
+<TGConnectingPoint num="14" id="480" />
+<TGConnectingPoint num="15" id="481" />
+<TGConnectingPoint num="16" id="482" />
+<TGConnectingPoint num="17" id="483" />
+<TGConnectingPoint num="18" id="484" />
+<TGConnectingPoint num="19" id="485" />
+<TGConnectingPoint num="20" id="486" />
+<TGConnectingPoint num="21" id="487" />
+<TGConnectingPoint num="22" id="488" />
+<TGConnectingPoint num="23" id="489" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="500" >
-<father id="525" num="1" />
+<SUBCOMPONENT type="1401" id="515" >
+<father id="540" num="1" />
<cdparam x="199" y="747" />
<sizeparam width="100" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="44" minY="0" maxY="93" />
<infoparam name="TGComponent" value="InstallTrojan" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
-<TGConnectingPoint num="2" id="478" />
-<TGConnectingPoint num="3" id="479" />
-<TGConnectingPoint num="4" id="480" />
-<TGConnectingPoint num="5" id="481" />
-<TGConnectingPoint num="6" id="482" />
-<TGConnectingPoint num="7" id="483" />
-<TGConnectingPoint num="8" id="484" />
-<TGConnectingPoint num="9" id="485" />
-<TGConnectingPoint num="10" id="486" />
-<TGConnectingPoint num="11" id="487" />
-<TGConnectingPoint num="12" id="488" />
-<TGConnectingPoint num="13" id="489" />
-<TGConnectingPoint num="14" id="490" />
-<TGConnectingPoint num="15" id="491" />
-<TGConnectingPoint num="16" id="492" />
-<TGConnectingPoint num="17" id="493" />
-<TGConnectingPoint num="18" id="494" />
-<TGConnectingPoint num="19" id="495" />
-<TGConnectingPoint num="20" id="496" />
-<TGConnectingPoint num="21" id="497" />
-<TGConnectingPoint num="22" id="498" />
-<TGConnectingPoint num="23" id="499" />
+<TGConnectingPoint num="0" id="491" />
+<TGConnectingPoint num="1" id="492" />
+<TGConnectingPoint num="2" id="493" />
+<TGConnectingPoint num="3" id="494" />
+<TGConnectingPoint num="4" id="495" />
+<TGConnectingPoint num="5" id="496" />
+<TGConnectingPoint num="6" id="497" />
+<TGConnectingPoint num="7" id="498" />
+<TGConnectingPoint num="8" id="499" />
+<TGConnectingPoint num="9" id="500" />
+<TGConnectingPoint num="10" id="501" />
+<TGConnectingPoint num="11" id="502" />
+<TGConnectingPoint num="12" id="503" />
+<TGConnectingPoint num="13" id="504" />
+<TGConnectingPoint num="14" id="505" />
+<TGConnectingPoint num="15" id="506" />
+<TGConnectingPoint num="16" id="507" />
+<TGConnectingPoint num="17" id="508" />
+<TGConnectingPoint num="18" id="509" />
+<TGConnectingPoint num="19" id="510" />
+<TGConnectingPoint num="20" id="511" />
+<TGConnectingPoint num="21" id="512" />
+<TGConnectingPoint num="22" id="513" />
+<TGConnectingPoint num="23" id="514" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="575" >
+<COMPONENT type="1400" id="590" >
<cdparam x="167" y="611" />
<sizeparam width="503" height="418" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block0" value="UserPC" />
-<TGConnectingPoint num="0" id="551" />
-<TGConnectingPoint num="1" id="552" />
-<TGConnectingPoint num="2" id="553" />
-<TGConnectingPoint num="3" id="554" />
-<TGConnectingPoint num="4" id="555" />
-<TGConnectingPoint num="5" id="556" />
-<TGConnectingPoint num="6" id="557" />
-<TGConnectingPoint num="7" id="558" />
-<TGConnectingPoint num="8" id="559" />
-<TGConnectingPoint num="9" id="560" />
-<TGConnectingPoint num="10" id="561" />
-<TGConnectingPoint num="11" id="562" />
-<TGConnectingPoint num="12" id="563" />
-<TGConnectingPoint num="13" id="564" />
-<TGConnectingPoint num="14" id="565" />
-<TGConnectingPoint num="15" id="566" />
-<TGConnectingPoint num="16" id="567" />
-<TGConnectingPoint num="17" id="568" />
-<TGConnectingPoint num="18" id="569" />
-<TGConnectingPoint num="19" id="570" />
-<TGConnectingPoint num="20" id="571" />
-<TGConnectingPoint num="21" id="572" />
-<TGConnectingPoint num="22" id="573" />
-<TGConnectingPoint num="23" id="574" />
+<TGConnectingPoint num="0" id="566" />
+<TGConnectingPoint num="1" id="567" />
+<TGConnectingPoint num="2" id="568" />
+<TGConnectingPoint num="3" id="569" />
+<TGConnectingPoint num="4" id="570" />
+<TGConnectingPoint num="5" id="571" />
+<TGConnectingPoint num="6" id="572" />
+<TGConnectingPoint num="7" id="573" />
+<TGConnectingPoint num="8" id="574" />
+<TGConnectingPoint num="9" id="575" />
+<TGConnectingPoint num="10" id="576" />
+<TGConnectingPoint num="11" id="577" />
+<TGConnectingPoint num="12" id="578" />
+<TGConnectingPoint num="13" id="579" />
+<TGConnectingPoint num="14" id="580" />
+<TGConnectingPoint num="15" id="581" />
+<TGConnectingPoint num="16" id="582" />
+<TGConnectingPoint num="17" id="583" />
+<TGConnectingPoint num="18" id="584" />
+<TGConnectingPoint num="19" id="585" />
+<TGConnectingPoint num="20" id="586" />
+<TGConnectingPoint num="21" id="587" />
+<TGConnectingPoint num="22" id="588" />
+<TGConnectingPoint num="23" id="589" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="550" >
-<father id="575" num="0" />
+<SUBCOMPONENT type="1401" id="565" >
+<father id="590" num="0" />
<cdparam x="199" y="643" />
<sizeparam width="113" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="390" minY="0" maxY="383" />
<infoparam name="TGComponent" value="InstallKeyLogger" />
-<TGConnectingPoint num="0" id="526" />
-<TGConnectingPoint num="1" id="527" />
-<TGConnectingPoint num="2" id="528" />
-<TGConnectingPoint num="3" id="529" />
-<TGConnectingPoint num="4" id="530" />
-<TGConnectingPoint num="5" id="531" />
-<TGConnectingPoint num="6" id="532" />
-<TGConnectingPoint num="7" id="533" />
-<TGConnectingPoint num="8" id="534" />
-<TGConnectingPoint num="9" id="535" />
-<TGConnectingPoint num="10" id="536" />
-<TGConnectingPoint num="11" id="537" />
-<TGConnectingPoint num="12" id="538" />
-<TGConnectingPoint num="13" id="539" />
-<TGConnectingPoint num="14" id="540" />
-<TGConnectingPoint num="15" id="541" />
-<TGConnectingPoint num="16" id="542" />
-<TGConnectingPoint num="17" id="543" />
-<TGConnectingPoint num="18" id="544" />
-<TGConnectingPoint num="19" id="545" />
-<TGConnectingPoint num="20" id="546" />
-<TGConnectingPoint num="21" id="547" />
-<TGConnectingPoint num="22" id="548" />
-<TGConnectingPoint num="23" id="549" />
+<TGConnectingPoint num="0" id="541" />
+<TGConnectingPoint num="1" id="542" />
+<TGConnectingPoint num="2" id="543" />
+<TGConnectingPoint num="3" id="544" />
+<TGConnectingPoint num="4" id="545" />
+<TGConnectingPoint num="5" id="546" />
+<TGConnectingPoint num="6" id="547" />
+<TGConnectingPoint num="7" id="548" />
+<TGConnectingPoint num="8" id="549" />
+<TGConnectingPoint num="9" id="550" />
+<TGConnectingPoint num="10" id="551" />
+<TGConnectingPoint num="11" id="552" />
+<TGConnectingPoint num="12" id="553" />
+<TGConnectingPoint num="13" id="554" />
+<TGConnectingPoint num="14" id="555" />
+<TGConnectingPoint num="15" id="556" />
+<TGConnectingPoint num="16" id="557" />
+<TGConnectingPoint num="17" id="558" />
+<TGConnectingPoint num="18" id="559" />
+<TGConnectingPoint num="19" id="560" />
+<TGConnectingPoint num="20" id="561" />
+<TGConnectingPoint num="21" id="562" />
+<TGConnectingPoint num="22" id="563" />
+<TGConnectingPoint num="23" id="564" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="726" >
+<COMPONENT type="1400" id="741" >
<cdparam x="665" y="176" />
<sizeparam width="391" height="299" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block5" value="AttackerPC" />
-<TGConnectingPoint num="0" id="702" />
-<TGConnectingPoint num="1" id="703" />
-<TGConnectingPoint num="2" id="704" />
-<TGConnectingPoint num="3" id="705" />
-<TGConnectingPoint num="4" id="706" />
-<TGConnectingPoint num="5" id="707" />
-<TGConnectingPoint num="6" id="708" />
-<TGConnectingPoint num="7" id="709" />
-<TGConnectingPoint num="8" id="710" />
-<TGConnectingPoint num="9" id="711" />
-<TGConnectingPoint num="10" id="712" />
-<TGConnectingPoint num="11" id="713" />
-<TGConnectingPoint num="12" id="714" />
-<TGConnectingPoint num="13" id="715" />
-<TGConnectingPoint num="14" id="716" />
-<TGConnectingPoint num="15" id="717" />
-<TGConnectingPoint num="16" id="718" />
-<TGConnectingPoint num="17" id="719" />
-<TGConnectingPoint num="18" id="720" />
-<TGConnectingPoint num="19" id="721" />
-<TGConnectingPoint num="20" id="722" />
-<TGConnectingPoint num="21" id="723" />
-<TGConnectingPoint num="22" id="724" />
-<TGConnectingPoint num="23" id="725" />
+<TGConnectingPoint num="0" id="717" />
+<TGConnectingPoint num="1" id="718" />
+<TGConnectingPoint num="2" id="719" />
+<TGConnectingPoint num="3" id="720" />
+<TGConnectingPoint num="4" id="721" />
+<TGConnectingPoint num="5" id="722" />
+<TGConnectingPoint num="6" id="723" />
+<TGConnectingPoint num="7" id="724" />
+<TGConnectingPoint num="8" id="725" />
+<TGConnectingPoint num="9" id="726" />
+<TGConnectingPoint num="10" id="727" />
+<TGConnectingPoint num="11" id="728" />
+<TGConnectingPoint num="12" id="729" />
+<TGConnectingPoint num="13" id="730" />
+<TGConnectingPoint num="14" id="731" />
+<TGConnectingPoint num="15" id="732" />
+<TGConnectingPoint num="16" id="733" />
+<TGConnectingPoint num="17" id="734" />
+<TGConnectingPoint num="18" id="735" />
+<TGConnectingPoint num="19" id="736" />
+<TGConnectingPoint num="20" id="737" />
+<TGConnectingPoint num="21" id="738" />
+<TGConnectingPoint num="22" id="739" />
+<TGConnectingPoint num="23" id="740" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="600" >
-<father id="726" num="0" />
+<SUBCOMPONENT type="1401" id="615" >
+<father id="741" num="0" />
<cdparam x="713" y="214" />
<sizeparam width="280" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="111" minY="0" maxY="264" />
<infoparam name="TGComponent" value="IllegalBankAccountTransactionBasedOnToken" />
-<TGConnectingPoint num="0" id="576" />
-<TGConnectingPoint num="1" id="577" />
-<TGConnectingPoint num="2" id="578" />
-<TGConnectingPoint num="3" id="579" />
-<TGConnectingPoint num="4" id="580" />
-<TGConnectingPoint num="5" id="581" />
-<TGConnectingPoint num="6" id="582" />
-<TGConnectingPoint num="7" id="583" />
-<TGConnectingPoint num="8" id="584" />
-<TGConnectingPoint num="9" id="585" />
-<TGConnectingPoint num="10" id="586" />
-<TGConnectingPoint num="11" id="587" />
-<TGConnectingPoint num="12" id="588" />
-<TGConnectingPoint num="13" id="589" />
-<TGConnectingPoint num="14" id="590" />
-<TGConnectingPoint num="15" id="591" />
-<TGConnectingPoint num="16" id="592" />
-<TGConnectingPoint num="17" id="593" />
-<TGConnectingPoint num="18" id="594" />
-<TGConnectingPoint num="19" id="595" />
-<TGConnectingPoint num="20" id="596" />
-<TGConnectingPoint num="21" id="597" />
-<TGConnectingPoint num="22" id="598" />
-<TGConnectingPoint num="23" id="599" />
+<TGConnectingPoint num="0" id="591" />
+<TGConnectingPoint num="1" id="592" />
+<TGConnectingPoint num="2" id="593" />
+<TGConnectingPoint num="3" id="594" />
+<TGConnectingPoint num="4" id="595" />
+<TGConnectingPoint num="5" id="596" />
+<TGConnectingPoint num="6" id="597" />
+<TGConnectingPoint num="7" id="598" />
+<TGConnectingPoint num="8" id="599" />
+<TGConnectingPoint num="9" id="600" />
+<TGConnectingPoint num="10" id="601" />
+<TGConnectingPoint num="11" id="602" />
+<TGConnectingPoint num="12" id="603" />
+<TGConnectingPoint num="13" id="604" />
+<TGConnectingPoint num="14" id="605" />
+<TGConnectingPoint num="15" id="606" />
+<TGConnectingPoint num="16" id="607" />
+<TGConnectingPoint num="17" id="608" />
+<TGConnectingPoint num="18" id="609" />
+<TGConnectingPoint num="19" id="610" />
+<TGConnectingPoint num="20" id="611" />
+<TGConnectingPoint num="21" id="612" />
+<TGConnectingPoint num="22" id="613" />
+<TGConnectingPoint num="23" id="614" />
<accessibility />
<extraparam>
<info description="blah blah blah" root="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="625" >
-<father id="726" num="1" />
+<SUBCOMPONENT type="1401" id="640" >
+<father id="741" num="1" />
<cdparam x="676" y="347" />
<sizeparam width="129" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="262" minY="0" maxY="264" />
<infoparam name="TGComponent" value="LogOnBankAccount" />
-<TGConnectingPoint num="0" id="601" />
-<TGConnectingPoint num="1" id="602" />
-<TGConnectingPoint num="2" id="603" />
-<TGConnectingPoint num="3" id="604" />
-<TGConnectingPoint num="4" id="605" />
-<TGConnectingPoint num="5" id="606" />
-<TGConnectingPoint num="6" id="607" />
-<TGConnectingPoint num="7" id="608" />
-<TGConnectingPoint num="8" id="609" />
-<TGConnectingPoint num="9" id="610" />
-<TGConnectingPoint num="10" id="611" />
-<TGConnectingPoint num="11" id="612" />
-<TGConnectingPoint num="12" id="613" />
-<TGConnectingPoint num="13" id="614" />
-<TGConnectingPoint num="14" id="615" />
-<TGConnectingPoint num="15" id="616" />
-<TGConnectingPoint num="16" id="617" />
-<TGConnectingPoint num="17" id="618" />
-<TGConnectingPoint num="18" id="619" />
-<TGConnectingPoint num="19" id="620" />
-<TGConnectingPoint num="20" id="621" />
-<TGConnectingPoint num="21" id="622" />
-<TGConnectingPoint num="22" id="623" />
-<TGConnectingPoint num="23" id="624" />
+<TGConnectingPoint num="0" id="616" />
+<TGConnectingPoint num="1" id="617" />
+<TGConnectingPoint num="2" id="618" />
+<TGConnectingPoint num="3" id="619" />
+<TGConnectingPoint num="4" id="620" />
+<TGConnectingPoint num="5" id="621" />
+<TGConnectingPoint num="6" id="622" />
+<TGConnectingPoint num="7" id="623" />
+<TGConnectingPoint num="8" id="624" />
+<TGConnectingPoint num="9" id="625" />
+<TGConnectingPoint num="10" id="626" />
+<TGConnectingPoint num="11" id="627" />
+<TGConnectingPoint num="12" id="628" />
+<TGConnectingPoint num="13" id="629" />
+<TGConnectingPoint num="14" id="630" />
+<TGConnectingPoint num="15" id="631" />
+<TGConnectingPoint num="16" id="632" />
+<TGConnectingPoint num="17" id="633" />
+<TGConnectingPoint num="18" id="634" />
+<TGConnectingPoint num="19" id="635" />
+<TGConnectingPoint num="20" id="636" />
+<TGConnectingPoint num="21" id="637" />
+<TGConnectingPoint num="22" id="638" />
+<TGConnectingPoint num="23" id="639" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="650" >
-<father id="726" num="2" />
+<SUBCOMPONENT type="1401" id="665" >
+<father id="741" num="2" />
<cdparam x="818" y="347" />
<sizeparam width="218" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="173" minY="0" maxY="264" />
<infoparam name="TGComponent" value="PerformTokenBasedAuthentication" />
-<TGConnectingPoint num="0" id="626" />
-<TGConnectingPoint num="1" id="627" />
-<TGConnectingPoint num="2" id="628" />
-<TGConnectingPoint num="3" id="629" />
-<TGConnectingPoint num="4" id="630" />
-<TGConnectingPoint num="5" id="631" />
-<TGConnectingPoint num="6" id="632" />
-<TGConnectingPoint num="7" id="633" />
-<TGConnectingPoint num="8" id="634" />
-<TGConnectingPoint num="9" id="635" />
-<TGConnectingPoint num="10" id="636" />
-<TGConnectingPoint num="11" id="637" />
-<TGConnectingPoint num="12" id="638" />
-<TGConnectingPoint num="13" id="639" />
-<TGConnectingPoint num="14" id="640" />
-<TGConnectingPoint num="15" id="641" />
-<TGConnectingPoint num="16" id="642" />
-<TGConnectingPoint num="17" id="643" />
-<TGConnectingPoint num="18" id="644" />
-<TGConnectingPoint num="19" id="645" />
-<TGConnectingPoint num="20" id="646" />
-<TGConnectingPoint num="21" id="647" />
-<TGConnectingPoint num="22" id="648" />
-<TGConnectingPoint num="23" id="649" />
+<TGConnectingPoint num="0" id="641" />
+<TGConnectingPoint num="1" id="642" />
+<TGConnectingPoint num="2" id="643" />
+<TGConnectingPoint num="3" id="644" />
+<TGConnectingPoint num="4" id="645" />
+<TGConnectingPoint num="5" id="646" />
+<TGConnectingPoint num="6" id="647" />
+<TGConnectingPoint num="7" id="648" />
+<TGConnectingPoint num="8" id="649" />
+<TGConnectingPoint num="9" id="650" />
+<TGConnectingPoint num="10" id="651" />
+<TGConnectingPoint num="11" id="652" />
+<TGConnectingPoint num="12" id="653" />
+<TGConnectingPoint num="13" id="654" />
+<TGConnectingPoint num="14" id="655" />
+<TGConnectingPoint num="15" id="656" />
+<TGConnectingPoint num="16" id="657" />
+<TGConnectingPoint num="17" id="658" />
+<TGConnectingPoint num="18" id="659" />
+<TGConnectingPoint num="19" id="660" />
+<TGConnectingPoint num="20" id="661" />
+<TGConnectingPoint num="21" id="662" />
+<TGConnectingPoint num="22" id="663" />
+<TGConnectingPoint num="23" id="664" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="663" >
-<father id="726" num="3" />
+<SUBCOMPONENT type="1402" id="678" >
+<father id="741" num="3" />
<cdparam x="877" y="416" />
<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
<infoparam name="TGComponent" value="<<BEFORE>>" />
-<TGConnectingPoint num="0" id="651" />
-<TGConnectingPoint num="1" id="652" />
-<TGConnectingPoint num="2" id="653" />
-<TGConnectingPoint num="3" id="654" />
-<TGConnectingPoint num="4" id="655" />
-<TGConnectingPoint num="5" id="656" />
-<TGConnectingPoint num="6" id="657" />
-<TGConnectingPoint num="7" id="658" />
-<TGConnectingPoint num="8" id="659" />
-<TGConnectingPoint num="9" id="660" />
-<TGConnectingPoint num="10" id="661" />
-<TGConnectingPoint num="11" id="662" />
+<TGConnectingPoint num="0" id="666" />
+<TGConnectingPoint num="1" id="667" />
+<TGConnectingPoint num="2" id="668" />
+<TGConnectingPoint num="3" id="669" />
+<TGConnectingPoint num="4" id="670" />
+<TGConnectingPoint num="5" id="671" />
+<TGConnectingPoint num="6" id="672" />
+<TGConnectingPoint num="7" id="673" />
+<TGConnectingPoint num="8" id="674" />
+<TGConnectingPoint num="9" id="675" />
+<TGConnectingPoint num="10" id="676" />
+<TGConnectingPoint num="11" id="677" />
<extraparam>
<info equation="120" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="676" >
-<father id="726" num="4" />
+<SUBCOMPONENT type="1402" id="691" >
+<father id="741" num="4" />
<cdparam x="800" y="279" />
<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="664" />
-<TGConnectingPoint num="1" id="665" />
-<TGConnectingPoint num="2" id="666" />
-<TGConnectingPoint num="3" id="667" />
-<TGConnectingPoint num="4" id="668" />
-<TGConnectingPoint num="5" id="669" />
-<TGConnectingPoint num="6" id="670" />
-<TGConnectingPoint num="7" id="671" />
-<TGConnectingPoint num="8" id="672" />
-<TGConnectingPoint num="9" id="673" />
-<TGConnectingPoint num="10" id="674" />
-<TGConnectingPoint num="11" id="675" />
+<TGConnectingPoint num="0" id="679" />
+<TGConnectingPoint num="1" id="680" />
+<TGConnectingPoint num="2" id="681" />
+<TGConnectingPoint num="3" id="682" />
+<TGConnectingPoint num="4" id="683" />
+<TGConnectingPoint num="5" id="684" />
+<TGConnectingPoint num="6" id="685" />
+<TGConnectingPoint num="7" id="686" />
+<TGConnectingPoint num="8" id="687" />
+<TGConnectingPoint num="9" id="688" />
+<TGConnectingPoint num="10" id="689" />
+<TGConnectingPoint num="11" id="690" />
<extraparam>
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="701" >
-<father id="726" num="5" />
+<SUBCOMPONENT type="1401" id="716" >
+<father id="741" num="5" />
<cdparam x="674" y="418" />
<sizeparam width="124" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="267" minY="0" maxY="264" />
<infoparam name="TGComponent" value="SendTANToServer" />
-<TGConnectingPoint num="0" id="677" />
-<TGConnectingPoint num="1" id="678" />
-<TGConnectingPoint num="2" id="679" />
-<TGConnectingPoint num="3" id="680" />
-<TGConnectingPoint num="4" id="681" />
-<TGConnectingPoint num="5" id="682" />
-<TGConnectingPoint num="6" id="683" />
-<TGConnectingPoint num="7" id="684" />
-<TGConnectingPoint num="8" id="685" />
-<TGConnectingPoint num="9" id="686" />
-<TGConnectingPoint num="10" id="687" />
-<TGConnectingPoint num="11" id="688" />
-<TGConnectingPoint num="12" id="689" />
-<TGConnectingPoint num="13" id="690" />
-<TGConnectingPoint num="14" id="691" />
-<TGConnectingPoint num="15" id="692" />
-<TGConnectingPoint num="16" id="693" />
-<TGConnectingPoint num="17" id="694" />
-<TGConnectingPoint num="18" id="695" />
-<TGConnectingPoint num="19" id="696" />
-<TGConnectingPoint num="20" id="697" />
-<TGConnectingPoint num="21" id="698" />
-<TGConnectingPoint num="22" id="699" />
-<TGConnectingPoint num="23" id="700" />
+<TGConnectingPoint num="0" id="692" />
+<TGConnectingPoint num="1" id="693" />
+<TGConnectingPoint num="2" id="694" />
+<TGConnectingPoint num="3" id="695" />
+<TGConnectingPoint num="4" id="696" />
+<TGConnectingPoint num="5" id="697" />
+<TGConnectingPoint num="6" id="698" />
+<TGConnectingPoint num="7" id="699" />
+<TGConnectingPoint num="8" id="700" />
+<TGConnectingPoint num="9" id="701" />
+<TGConnectingPoint num="10" id="702" />
+<TGConnectingPoint num="11" id="703" />
+<TGConnectingPoint num="12" id="704" />
+<TGConnectingPoint num="13" id="705" />
+<TGConnectingPoint num="14" id="706" />
+<TGConnectingPoint num="15" id="707" />
+<TGConnectingPoint num="16" id="708" />
+<TGConnectingPoint num="17" id="709" />
+<TGConnectingPoint num="18" id="710" />
+<TGConnectingPoint num="19" id="711" />
+<TGConnectingPoint num="20" id="712" />
+<TGConnectingPoint num="21" id="713" />
+<TGConnectingPoint num="22" id="714" />
+<TGConnectingPoint num="23" id="715" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="776" >
+<COMPONENT type="1400" id="791" >
<cdparam x="160" y="515" />
<sizeparam width="912" height="528" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block9" value="AttackedSystem" />
-<TGConnectingPoint num="0" id="752" />
-<TGConnectingPoint num="1" id="753" />
-<TGConnectingPoint num="2" id="754" />
-<TGConnectingPoint num="3" id="755" />
-<TGConnectingPoint num="4" id="756" />
-<TGConnectingPoint num="5" id="757" />
-<TGConnectingPoint num="6" id="758" />
-<TGConnectingPoint num="7" id="759" />
-<TGConnectingPoint num="8" id="760" />
-<TGConnectingPoint num="9" id="761" />
-<TGConnectingPoint num="10" id="762" />
-<TGConnectingPoint num="11" id="763" />
-<TGConnectingPoint num="12" id="764" />
-<TGConnectingPoint num="13" id="765" />
-<TGConnectingPoint num="14" id="766" />
-<TGConnectingPoint num="15" id="767" />
-<TGConnectingPoint num="16" id="768" />
-<TGConnectingPoint num="17" id="769" />
-<TGConnectingPoint num="18" id="770" />
-<TGConnectingPoint num="19" id="771" />
-<TGConnectingPoint num="20" id="772" />
-<TGConnectingPoint num="21" id="773" />
-<TGConnectingPoint num="22" id="774" />
-<TGConnectingPoint num="23" id="775" />
+<TGConnectingPoint num="0" id="767" />
+<TGConnectingPoint num="1" id="768" />
+<TGConnectingPoint num="2" id="769" />
+<TGConnectingPoint num="3" id="770" />
+<TGConnectingPoint num="4" id="771" />
+<TGConnectingPoint num="5" id="772" />
+<TGConnectingPoint num="6" id="773" />
+<TGConnectingPoint num="7" id="774" />
+<TGConnectingPoint num="8" id="775" />
+<TGConnectingPoint num="9" id="776" />
+<TGConnectingPoint num="10" id="777" />
+<TGConnectingPoint num="11" id="778" />
+<TGConnectingPoint num="12" id="779" />
+<TGConnectingPoint num="13" id="780" />
+<TGConnectingPoint num="14" id="781" />
+<TGConnectingPoint num="15" id="782" />
+<TGConnectingPoint num="16" id="783" />
+<TGConnectingPoint num="17" id="784" />
+<TGConnectingPoint num="18" id="785" />
+<TGConnectingPoint num="19" id="786" />
+<TGConnectingPoint num="20" id="787" />
+<TGConnectingPoint num="21" id="788" />
+<TGConnectingPoint num="22" id="789" />
+<TGConnectingPoint num="23" id="790" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="751" >
-<father id="776" num="0" />
+<SUBCOMPONENT type="1401" id="766" >
+<father id="791" num="0" />
<cdparam x="491" y="563" />
<sizeparam width="201" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="711" minY="0" maxY="493" />
<infoparam name="TGComponent" value="RetrieveUserLoginAndPassword" />
-<TGConnectingPoint num="0" id="727" />
-<TGConnectingPoint num="1" id="728" />
-<TGConnectingPoint num="2" id="729" />
-<TGConnectingPoint num="3" id="730" />
-<TGConnectingPoint num="4" id="731" />
-<TGConnectingPoint num="5" id="732" />
-<TGConnectingPoint num="6" id="733" />
-<TGConnectingPoint num="7" id="734" />
-<TGConnectingPoint num="8" id="735" />
-<TGConnectingPoint num="9" id="736" />
-<TGConnectingPoint num="10" id="737" />
-<TGConnectingPoint num="11" id="738" />
-<TGConnectingPoint num="12" id="739" />
-<TGConnectingPoint num="13" id="740" />
-<TGConnectingPoint num="14" id="741" />
-<TGConnectingPoint num="15" id="742" />
-<TGConnectingPoint num="16" id="743" />
-<TGConnectingPoint num="17" id="744" />
-<TGConnectingPoint num="18" id="745" />
-<TGConnectingPoint num="19" id="746" />
-<TGConnectingPoint num="20" id="747" />
-<TGConnectingPoint num="21" id="748" />
-<TGConnectingPoint num="22" id="749" />
-<TGConnectingPoint num="23" id="750" />
+<TGConnectingPoint num="0" id="742" />
+<TGConnectingPoint num="1" id="743" />
+<TGConnectingPoint num="2" id="744" />
+<TGConnectingPoint num="3" id="745" />
+<TGConnectingPoint num="4" id="746" />
+<TGConnectingPoint num="5" id="747" />
+<TGConnectingPoint num="6" id="748" />
+<TGConnectingPoint num="7" id="749" />
+<TGConnectingPoint num="8" id="750" />
+<TGConnectingPoint num="9" id="751" />
+<TGConnectingPoint num="10" id="752" />
+<TGConnectingPoint num="11" id="753" />
+<TGConnectingPoint num="12" id="754" />
+<TGConnectingPoint num="13" id="755" />
+<TGConnectingPoint num="14" id="756" />
+<TGConnectingPoint num="15" id="757" />
+<TGConnectingPoint num="16" id="758" />
+<TGConnectingPoint num="17" id="759" />
+<TGConnectingPoint num="18" id="760" />
+<TGConnectingPoint num="19" id="761" />
+<TGConnectingPoint num="20" id="762" />
+<TGConnectingPoint num="21" id="763" />
+<TGConnectingPoint num="22" id="764" />
+<TGConnectingPoint num="23" id="765" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="801" >
+<COMPONENT type="1400" id="816" >
<cdparam x="160" y="171" />
<sizeparam width="908" height="320" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="9" maxX="1899" minY="9" maxY="1899" />
<infoparam name="Block8" value="AttackerSystem" />
-<TGConnectingPoint num="0" id="777" />
-<TGConnectingPoint num="1" id="778" />
-<TGConnectingPoint num="2" id="779" />
-<TGConnectingPoint num="3" id="780" />
-<TGConnectingPoint num="4" id="781" />
-<TGConnectingPoint num="5" id="782" />
-<TGConnectingPoint num="6" id="783" />
-<TGConnectingPoint num="7" id="784" />
-<TGConnectingPoint num="8" id="785" />
-<TGConnectingPoint num="9" id="786" />
-<TGConnectingPoint num="10" id="787" />
-<TGConnectingPoint num="11" id="788" />
-<TGConnectingPoint num="12" id="789" />
-<TGConnectingPoint num="13" id="790" />
-<TGConnectingPoint num="14" id="791" />
-<TGConnectingPoint num="15" id="792" />
-<TGConnectingPoint num="16" id="793" />
-<TGConnectingPoint num="17" id="794" />
-<TGConnectingPoint num="18" id="795" />
-<TGConnectingPoint num="19" id="796" />
-<TGConnectingPoint num="20" id="797" />
-<TGConnectingPoint num="21" id="798" />
-<TGConnectingPoint num="22" id="799" />
-<TGConnectingPoint num="23" id="800" />
+<TGConnectingPoint num="0" id="792" />
+<TGConnectingPoint num="1" id="793" />
+<TGConnectingPoint num="2" id="794" />
+<TGConnectingPoint num="3" id="795" />
+<TGConnectingPoint num="4" id="796" />
+<TGConnectingPoint num="5" id="797" />
+<TGConnectingPoint num="6" id="798" />
+<TGConnectingPoint num="7" id="799" />
+<TGConnectingPoint num="8" id="800" />
+<TGConnectingPoint num="9" id="801" />
+<TGConnectingPoint num="10" id="802" />
+<TGConnectingPoint num="11" id="803" />
+<TGConnectingPoint num="12" id="804" />
+<TGConnectingPoint num="13" id="805" />
+<TGConnectingPoint num="14" id="806" />
+<TGConnectingPoint num="15" id="807" />
+<TGConnectingPoint num="16" id="808" />
+<TGConnectingPoint num="17" id="809" />
+<TGConnectingPoint num="18" id="810" />
+<TGConnectingPoint num="19" id="811" />
+<TGConnectingPoint num="20" id="812" />
+<TGConnectingPoint num="21" id="813" />
+<TGConnectingPoint num="22" id="814" />
+<TGConnectingPoint num="23" id="815" />
</COMPONENT>
@@ -1336,4 +1336,74 @@
+<Modeling type="FaultTree" nameTab="Fault Trees" >
+<FaultTreeDiagramPanel name="FaultTree" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0000000000000002" >
+<COMPONENT type="6103" id="829" >
+<cdparam x="417" y="214" />
+<sizeparam width="153" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="9" maxX="2499" minY="9" maxY="1499" />
+<infoparam name="TGComponent" value="counter01" />
+<TGConnectingPoint num="0" id="817" />
+<TGConnectingPoint num="1" id="818" />
+<TGConnectingPoint num="2" id="819" />
+<TGConnectingPoint num="3" id="820" />
+<TGConnectingPoint num="4" id="821" />
+<TGConnectingPoint num="5" id="822" />
+<TGConnectingPoint num="6" id="823" />
+<TGConnectingPoint num="7" id="824" />
+<TGConnectingPoint num="8" id="825" />
+<TGConnectingPoint num="9" id="826" />
+<TGConnectingPoint num="10" id="827" />
+<TGConnectingPoint num="11" id="828" />
+<extraparam>
+<textline data="blah blah" />
+<textline data="blah" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="6101" id="854" >
+<cdparam x="188" y="211" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="9" maxX="2499" minY="9" maxY="1499" />
+<infoparam name="TGComponent" value="fault0" />
+<TGConnectingPoint num="0" id="830" />
+<TGConnectingPoint num="1" id="831" />
+<TGConnectingPoint num="2" id="832" />
+<TGConnectingPoint num="3" id="833" />
+<TGConnectingPoint num="4" id="834" />
+<TGConnectingPoint num="5" id="835" />
+<TGConnectingPoint num="6" id="836" />
+<TGConnectingPoint num="7" id="837" />
+<TGConnectingPoint num="8" id="838" />
+<TGConnectingPoint num="9" id="839" />
+<TGConnectingPoint num="10" id="840" />
+<TGConnectingPoint num="11" id="841" />
+<TGConnectingPoint num="12" id="842" />
+<TGConnectingPoint num="13" id="843" />
+<TGConnectingPoint num="14" id="844" />
+<TGConnectingPoint num="15" id="845" />
+<TGConnectingPoint num="16" id="846" />
+<TGConnectingPoint num="17" id="847" />
+<TGConnectingPoint num="18" id="848" />
+<TGConnectingPoint num="19" id="849" />
+<TGConnectingPoint num="20" id="850" />
+<TGConnectingPoint num="21" id="851" />
+<TGConnectingPoint num="22" id="852" />
+<TGConnectingPoint num="23" id="853" />
+<extraparam>
+<info description="blah blah blah" root="false" probability="0.5" />
+</extraparam>
+</COMPONENT>
+
+
+</FaultTreeDiagramPanel>
+
+</Modeling>
+
+
+
+
</TURTLEGMODELING>
\ No newline at end of file
diff --git a/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java b/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java
index bbcdf70b196f8a2f514dd7f82cb67461ffd27ba2..b428808e88387043509efc710795fc6cf94fae4e 100644
--- a/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java
+++ b/src/main/java/ui/ftd/FTDCountermeasureConnectingPoint.java
@@ -40,6 +40,7 @@ package ui.ftd;
import ui.CDElement;
import ui.TGComponentManager;
+import ui.TGConnectingPoint;
import ui.TGConnectingPointWidthHeight;
/**
@@ -59,4 +60,18 @@ public class FTDCountermeasureConnectingPoint extends TGConnectingPointWidthHei
public boolean isCompatibleWith(int type) {
return type == TGComponentManager.FTD_COUNTERMEASURE_CONNECTOR;
}
+
+ public boolean isCompatibleWith(int type, TGConnectingPoint outPoint) {
+ if (outPoint != null) {
+ if ((outPoint.getFather() instanceof FTDCountermeasure) && (getFather() instanceof FTDCountermeasure)) {
+ return false;
+ }
+
+ if ((outPoint.getFather() instanceof FTDFault) && (getFather() instanceof FTDFault)) {
+ return false;
+ }
+
+ }
+ return isCompatibleWith(type);
+ }
}
diff --git a/src/main/java/ui/ftd/FTDCountermeasureConnector.java b/src/main/java/ui/ftd/FTDCountermeasureConnector.java
index e2dc28e658b10920466ce9523ce715f24892e013..1b84711e62b8c14b6c592ef8576b5ec3a18367c4 100644
--- a/src/main/java/ui/ftd/FTDCountermeasureConnector.java
+++ b/src/main/java/ui/ftd/FTDCountermeasureConnector.java
@@ -87,27 +87,5 @@ public class FTDCountermeasureConnector extends TGConnectorWithCommentConnectio
public int getType() {
return TGComponentManager.FTD_COUNTERMEASURE_CONNECTOR;
}
-// Issue #31: Moved to upper class
-// public void rescale(double scaleFactor){
-// //
-// int xx, yy;
-//
-// for(int i=0; i<nbInternalTGComponent; i++) {
-// xx = tgcomponent[i].getX();
-// yy = tgcomponent[i].getY();
-// //
-// tgcomponent[i].dx = (tgcomponent[i].dx + xx) / oldScaleFactor * scaleFactor;
-// tgcomponent[i].dy = (tgcomponent[i].dy + yy) / oldScaleFactor * scaleFactor;
-// xx = (int)(tgcomponent[i].dx);
-// tgcomponent[i].dx = tgcomponent[i].dx - xx;
-// yy = (int)(tgcomponent[i].dy);
-// tgcomponent[i].dy = tgcomponent[i].dy - yy;
-//
-// tgcomponent[i].setCd(xx, yy);
-//
-// //
-// }
-//
-// oldScaleFactor = scaleFactor;
-// }
+
}