diff --git a/modeling/SysMLSec/at_chuli.xml b/modeling/SysMLSec/at_chuli.xml
index 83309693f5adc39e558c7d4fbe6e71b73207d201..cf148def4e4137b0c06f98e5b25d5319ba9b33cd 100644
--- a/modeling/SysMLSec/at_chuli.xml
+++ b/modeling/SysMLSec/at_chuli.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="0.99-beta4">
<Modeling type="AttackTree" nameTab="Chuly" >
<AttackTreeDiagramPanel name="Attack Tree" minX="15" maxX="2971" minY="15" maxY="2971" zoom="1.2500000000000004" >
@@ -11,8 +11,8 @@
<TGConnectingPoint num="0" id="3" />
<TGConnectingPoint num="1" id="4" />
<TGConnectingPoint num="2" id="5" />
-<P1 x="595" y="794" id="264" />
-<P2 x="1015" y="891" id="351" />
+<P1 x="630" y="794" id="775" />
+<P2 x="1045" y="891" id="608" />
<Point x="743" y="830" />
<Point x="1015" y="830" />
<AutomaticDrawing data="true" />
@@ -38,8 +38,8 @@
<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="7" />
-<P1 x="559" y="1077" id="530" />
-<P2 x="603" y="1077" id="295" />
+<P1 x="559" y="1077" id="291" />
+<P2 x="603" y="1077" id="692" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="10" >
@@ -47,8 +47,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="9" />
-<P1 x="510" y="806" id="258" />
-<P2 x="465" y="1046" id="528" />
+<P1 x="528" y="806" id="769" />
+<P2 x="465" y="1046" id="289" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="12" >
@@ -56,8 +56,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="11" />
-<P1 x="465" y="1149" id="515" />
-<P2 x="465" y="1108" id="531" />
+<P1 x="465" y="1149" id="302" />
+<P2 x="465" y="1108" id="292" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="14" >
@@ -65,8 +65,8 @@
<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="13" />
-<P1 x="552" y="806" id="266" />
-<P2 x="576" y="898" id="285" />
+<P1 x="579" y="806" id="777" />
+<P2 x="583" y="898" id="720" />
<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="468" y="806" id="265" />
-<P2 x="645" y="1636" id="388" />
+<P1 x="477" y="806" id="776" />
+<P2 x="671" y="1636" id="543" />
<Point x="215" y="1275" />
<Point x="217" y="1654" />
<Point x="645" y="1654" />
@@ -115,8 +115,8 @@
<TGConnectingPoint num="0" id="25" />
<TGConnectingPoint num="1" id="26" />
<TGConnectingPoint num="2" id="27" />
-<P1 x="536" y="1598" id="391" />
-<P2 x="316" y="1423" id="479" />
+<P1 x="536" y="1598" id="546" />
+<P2 x="327" y="1423" id="380" />
<Point x="483" y="1497" />
<Point x="319" y="1497" />
<AutomaticDrawing data="true" />
@@ -142,8 +142,8 @@
<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="29" />
-<P1 x="536" y="1611" id="386" />
-<P2 x="356" y="1560" id="492" />
+<P1 x="536" y="1611" id="541" />
+<P2 x="384" y="1560" id="355" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="34" >
@@ -152,8 +152,8 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="32" />
<TGConnectingPoint num="1" id="33" />
-<P1 x="536" y="1623" id="393" />
-<P2 x="236" y="1328" id="419" />
+<P1 x="536" y="1623" id="548" />
+<P2 x="236" y="1328" id="510" />
<Point x="236" y="1629" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="31" >
@@ -171,8 +171,8 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="36" />
<TGConnectingPoint num="1" id="37" />
-<P1 x="925" y="1525" id="507" />
-<P2 x="737" y="1279" id="407" />
+<P1 x="963" y="1525" id="332" />
+<P2 x="737" y="1279" id="536" />
<Point x="925" y="1390" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="35" >
@@ -190,8 +190,8 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="40" />
<TGConnectingPoint num="1" id="41" />
-<P1 x="754" y="1623" id="394" />
-<P2 x="1081" y="1465" id="474" />
+<P1 x="806" y="1623" id="549" />
+<P2 x="1112" y="1465" id="413" />
<Point x="1064" y="1629" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="39" >
@@ -208,8 +208,8 @@
<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="43" />
-<P1 x="699" y="1586" id="390" />
-<P2 x="784" y="1463" id="460" />
+<P1 x="738" y="1586" id="545" />
+<P2 x="794" y="1463" id="437" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="46" >
@@ -217,8 +217,8 @@
<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="45" />
-<P1 x="590" y="1586" id="389" />
-<P2 x="523" y="1460" id="435" />
+<P1 x="603" y="1586" id="544" />
+<P2 x="548" y="1460" id="488" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="48" >
@@ -226,8 +226,8 @@
<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="47" />
-<P1 x="645" y="1586" id="385" />
-<P2 x="645" y="1462" id="440" />
+<P1 x="671" y="1586" id="540" />
+<P2 x="661" y="1462" id="455" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="50" >
@@ -235,8 +235,8 @@
<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="49" />
-<P1 x="643" y="1233" id="398" />
-<P2 x="643" y="1211" id="232" />
+<P1 x="643" y="1233" id="527" />
+<P2 x="663" y="1211" id="807" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="54" >
@@ -245,8 +245,8 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="52" />
<TGConnectingPoint num="1" id="53" />
-<P1 x="356" y="1510" id="489" />
-<P2 x="550" y="1279" id="406" />
+<P1 x="384" y="1510" id="352" />
+<P2 x="550" y="1279" id="535" />
<Point x="416" y="1398" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="51" >
@@ -263,8 +263,8 @@
<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="55" />
-<P1 x="379" y="1385" id="483" />
-<P2 x="550" y="1264" id="399" />
+<P1 x="401" y="1385" id="384" />
+<P2 x="550" y="1264" id="528" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="58" >
@@ -272,8 +272,8 @@
<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="57" />
-<P1 x="1034" y="1415" id="463" />
-<P2 x="737" y="1248" id="405" />
+<P1 x="1055" y="1415" id="402" />
+<P2 x="737" y="1248" id="534" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="60" >
@@ -281,8 +281,8 @@
<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="59" />
-<P1 x="825" y="1413" id="450" />
-<P2 x="690" y="1295" id="409" />
+<P1 x="845" y="1413" id="427" />
+<P2 x="690" y="1295" id="538" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="62" >
@@ -290,8 +290,8 @@
<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="61" />
-<P1 x="645" y="1412" id="437" />
-<P2 x="643" y="1295" id="401" />
+<P1 x="661" y="1412" id="452" />
+<P2 x="643" y="1295" id="530" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="64" >
@@ -299,8 +299,8 @@
<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="63" />
-<P1 x="490" y="1410" id="424" />
-<P2 x="596" y="1295" id="408" />
+<P1 x="507" y="1410" id="477" />
+<P2 x="596" y="1295" id="537" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="66" >
@@ -308,8 +308,8 @@
<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="65" />
-<P1 x="310" y="1291" id="411" />
-<P2 x="550" y="1248" id="404" />
+<P1 x="328" y="1291" id="502" />
+<P2 x="550" y="1248" id="533" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="68" >
@@ -317,8 +317,8 @@
<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="67" />
-<P1 x="864" y="793" id="372" />
-<P2 x="873" y="772" id="362" />
+<P1 x="864" y="793" id="565" />
+<P2 x="892" y="772" id="581" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="70" >
@@ -326,8 +326,8 @@
<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="69" />
-<P1 x="976" y="891" id="346" />
-<P2 x="911" y="855" id="383" />
+<P1 x="996" y="891" id="603" />
+<P2 x="911" y="855" id="576" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="72" >
@@ -335,8 +335,8 @@
<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="71" />
-<P1 x="776" y="885" id="333" />
-<P2 x="817" y="855" id="382" />
+<P1 x="776" y="885" id="628" />
+<P2 x="817" y="855" id="575" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="74" >
@@ -344,8 +344,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="73" />
-<P1 x="873" y="722" id="359" />
-<P2 x="881" y="690" id="577" />
+<P1 x="892" y="722" id="578" />
+<P2 x="881" y="690" id="865" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="76" >
@@ -353,8 +353,8 @@
<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="75" />
-<P1 x="776" y="969" id="320" />
-<P2 x="776" y="935" id="336" />
+<P1 x="776" y="969" id="653" />
+<P2 x="776" y="935" id="631" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="78" >
@@ -362,8 +362,8 @@
<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="77" />
-<P1 x="920" y="1053" id="307" />
-<P2 x="823" y="1031" id="331" />
+<P1 x="926" y="1053" id="666" />
+<P2 x="823" y="1031" id="664" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="80" >
@@ -371,8 +371,8 @@
<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="79" />
-<P1 x="665" y="1052" id="294" />
-<P2 x="729" y="1031" id="330" />
+<P1 x="665" y="1052" id="691" />
+<P2 x="729" y="1031" id="663" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="82" >
@@ -380,8 +380,8 @@
<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="81" />
-<P1 x="787" y="628" id="570" />
-<P2 x="776" y="521" id="156" />
+<P1 x="787" y="628" id="858" />
+<P2 x="767" y="521" id="129" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="84" >
@@ -389,8 +389,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="83" />
-<P1 x="510" y="758" id="255" />
-<P2 x="573" y="413" id="143" />
+<P1 x="528" y="758" id="766" />
+<P2 x="573" y="413" id="154" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="86" >
@@ -398,8 +398,8 @@
<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="85" />
-<P1 x="381" y="782" id="244" />
-<P2 x="426" y="782" id="256" />
+<P1 x="381" y="782" id="793" />
+<P2 x="426" y="782" id="767" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="88" >
@@ -407,8 +407,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="87" />
-<P1 x="303" y="845" id="268" />
-<P2 x="303" y="806" id="245" />
+<P1 x="330" y="845" id="741" />
+<P2 x="303" y="806" id="794" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="90" >
@@ -416,8 +416,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="89" />
-<P1 x="440" y="547" id="117" />
-<P2 x="264" y="758" id="246" />
+<P1 x="467" y="547" id="192" />
+<P2 x="264" y="758" id="795" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="92" >
@@ -425,8 +425,8 @@
<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="91" />
-<P1 x="444" y="475" id="104" />
-<P2 x="440" y="497" id="114" />
+<P1 x="457" y="475" id="217" />
+<P2 x="467" y="497" id="189" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="94" >
@@ -434,8 +434,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="93" />
-<P1 x="466" y="389" id="129" />
-<P2 x="495" y="389" id="141" />
+<P1 x="479" y="389" id="166" />
+<P2 x="495" y="389" id="152" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="96" >
@@ -443,8 +443,8 @@
<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="3" />
<TGConnectingPoint num="0" id="95" />
-<P1 x="776" y="473" id="153" />
-<P2 x="612" y="413" id="151" />
+<P1 x="767" y="473" id="126" />
+<P2 x="612" y="413" id="162" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="98" >
@@ -452,8 +452,8 @@
<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="97" />
-<P1 x="573" y="365" id="140" />
-<P2 x="564" y="348" id="169" />
+<P1 x="573" y="365" id="151" />
+<P2 x="591" y="348" id="104" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="100" >
@@ -461,49 +461,49 @@
<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="99" />
-<P1 x="638" y="898" id="286" />
-<P2 x="787" y="690" id="576" />
+<P1 x="659" y="898" id="721" />
+<P2 x="787" y="690" id="864" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1400" id="203" >
+<COMPONENT type="1400" id="263" >
<cdparam x="333" y="256" />
<sizeparam width="543" height="295" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="15" maxX="2971" minY="15" maxY="2971" />
+<cdrectangleparam minX="18" maxX="3714" minY="18" maxY="3714" />
<infoparam name="Block5" value="AttackerPC" />
-<TGConnectingPoint num="0" id="179" />
-<TGConnectingPoint num="1" id="180" />
-<TGConnectingPoint num="2" id="181" />
-<TGConnectingPoint num="3" id="182" />
-<TGConnectingPoint num="4" id="183" />
-<TGConnectingPoint num="5" id="184" />
-<TGConnectingPoint num="6" id="185" />
-<TGConnectingPoint num="7" id="186" />
-<TGConnectingPoint num="8" id="187" />
-<TGConnectingPoint num="9" id="188" />
-<TGConnectingPoint num="10" id="189" />
-<TGConnectingPoint num="11" id="190" />
-<TGConnectingPoint num="12" id="191" />
-<TGConnectingPoint num="13" id="192" />
-<TGConnectingPoint num="14" id="193" />
-<TGConnectingPoint num="15" id="194" />
-<TGConnectingPoint num="16" id="195" />
-<TGConnectingPoint num="17" id="196" />
-<TGConnectingPoint num="18" id="197" />
-<TGConnectingPoint num="19" id="198" />
-<TGConnectingPoint num="20" id="199" />
-<TGConnectingPoint num="21" id="200" />
-<TGConnectingPoint num="22" id="201" />
-<TGConnectingPoint num="23" id="202" />
+<TGConnectingPoint num="0" id="239" />
+<TGConnectingPoint num="1" id="240" />
+<TGConnectingPoint num="2" id="241" />
+<TGConnectingPoint num="3" id="242" />
+<TGConnectingPoint num="4" id="243" />
+<TGConnectingPoint num="5" id="244" />
+<TGConnectingPoint num="6" id="245" />
+<TGConnectingPoint num="7" id="246" />
+<TGConnectingPoint num="8" id="247" />
+<TGConnectingPoint num="9" id="248" />
+<TGConnectingPoint num="10" id="249" />
+<TGConnectingPoint num="11" id="250" />
+<TGConnectingPoint num="12" id="251" />
+<TGConnectingPoint num="13" id="252" />
+<TGConnectingPoint num="14" id="253" />
+<TGConnectingPoint num="15" id="254" />
+<TGConnectingPoint num="16" id="255" />
+<TGConnectingPoint num="17" id="256" />
+<TGConnectingPoint num="18" id="257" />
+<TGConnectingPoint num="19" id="258" />
+<TGConnectingPoint num="20" id="259" />
+<TGConnectingPoint num="21" id="260" />
+<TGConnectingPoint num="22" id="261" />
+<TGConnectingPoint num="23" id="262" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="113" >
-<father id="203" num="0" />
-<cdparam x="382" y="427" />
-<sizeparam width="125" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="125" >
+<father id="263" num="0" />
+<cdparam x="458" y="300" />
+<sizeparam width="266" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="418" minY="0" maxY="247" />
-<infoparam name="TGComponent" value="InfectMobilePhone" />
+<cdrectangleparam minX="0" maxX="277" minY="0" maxY="247" />
+<infoparam name="TGComponent" value="GatherInformationOnMobilePhone" />
<TGConnectingPoint num="0" id="101" />
<TGConnectingPoint num="1" id="102" />
<TGConnectingPoint num="2" id="103" />
@@ -516,816 +516,1104 @@
<TGConnectingPoint num="9" id="110" />
<TGConnectingPoint num="10" id="111" />
<TGConnectingPoint num="11" id="112" />
+<TGConnectingPoint num="12" id="113" />
+<TGConnectingPoint num="13" id="114" />
+<TGConnectingPoint num="14" id="115" />
+<TGConnectingPoint num="15" id="116" />
+<TGConnectingPoint num="16" id="117" />
+<TGConnectingPoint num="17" id="118" />
+<TGConnectingPoint num="18" id="119" />
+<TGConnectingPoint num="19" id="120" />
+<TGConnectingPoint num="20" id="121" />
+<TGConnectingPoint num="21" id="122" />
+<TGConnectingPoint num="22" id="123" />
+<TGConnectingPoint num="23" id="124" />
+<accessibility />
<extraparam>
-<info description="blah blah blah" root="false" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="126" >
-<father id="203" num="1" />
-<cdparam x="338" y="497" />
-<sizeparam width="204" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="339" minY="0" maxY="245" />
-<infoparam name="TGComponent" value="SendSpamWithMaliciousPackage" />
-<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" />
-<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="139" >
-<father id="203" num="2" />
-<cdparam x="341" y="364" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="150" >
+<father id="263" num="1" />
+<cdparam x="659" y="473" />
+<sizeparam width="217" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="418" minY="0" maxY="245" />
-<infoparam name="TGComponent" value="StartWebServer" />
-<TGConnectingPoint num="0" id="127" />
-<TGConnectingPoint num="1" id="128" />
-<TGConnectingPoint num="2" id="129" />
-<TGConnectingPoint num="3" id="130" />
-<TGConnectingPoint num="4" id="131" />
-<TGConnectingPoint num="5" id="132" />
-<TGConnectingPoint num="6" id="133" />
-<TGConnectingPoint num="7" id="134" />
-<TGConnectingPoint num="8" id="135" />
-<TGConnectingPoint num="9" id="136" />
-<TGConnectingPoint num="10" id="137" />
-<TGConnectingPoint num="11" id="138" />
+<enabled value="false" />
+<cdrectangleparam minX="0" maxX="326" minY="0" maxY="247" />
+<infoparam name="TGComponent" value="ReceiveRemoteInformation" />
+<TGConnectingPoint num="0" id="126" />
+<TGConnectingPoint num="1" id="127" />
+<TGConnectingPoint num="2" id="128" />
+<TGConnectingPoint num="3" id="129" />
+<TGConnectingPoint num="4" id="130" />
+<TGConnectingPoint num="5" id="131" />
+<TGConnectingPoint num="6" id="132" />
+<TGConnectingPoint num="7" id="133" />
+<TGConnectingPoint num="8" id="134" />
+<TGConnectingPoint num="9" id="135" />
+<TGConnectingPoint num="10" id="136" />
+<TGConnectingPoint num="11" id="137" />
+<TGConnectingPoint num="12" id="138" />
+<TGConnectingPoint num="13" id="139" />
+<TGConnectingPoint num="14" id="140" />
+<TGConnectingPoint num="15" id="141" />
+<TGConnectingPoint num="16" id="142" />
+<TGConnectingPoint num="17" id="143" />
+<TGConnectingPoint num="18" id="144" />
+<TGConnectingPoint num="19" id="145" />
+<TGConnectingPoint num="20" id="146" />
+<TGConnectingPoint num="21" id="147" />
+<TGConnectingPoint num="22" id="148" />
+<TGConnectingPoint num="23" id="149" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="152" >
-<father id="203" num="3" />
+<SUBCOMPONENT type="1402" id="163" >
+<father id="263" num="2" />
<cdparam x="495" y="365" />
<sizeparam width="156" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="308" minY="0" maxY="328" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="140" />
-<TGConnectingPoint num="1" id="141" />
-<TGConnectingPoint num="2" id="142" />
-<TGConnectingPoint num="3" id="143" />
-<TGConnectingPoint num="4" id="144" />
-<TGConnectingPoint num="5" id="145" />
-<TGConnectingPoint num="6" id="146" />
-<TGConnectingPoint num="7" id="147" />
-<TGConnectingPoint num="8" id="148" />
-<TGConnectingPoint num="9" id="149" />
-<TGConnectingPoint num="10" id="150" />
-<TGConnectingPoint num="11" id="151" />
+<TGConnectingPoint num="0" id="151" />
+<TGConnectingPoint num="1" id="152" />
+<TGConnectingPoint num="2" id="153" />
+<TGConnectingPoint num="3" id="154" />
+<TGConnectingPoint num="4" id="155" />
+<TGConnectingPoint num="5" id="156" />
+<TGConnectingPoint num="6" id="157" />
+<TGConnectingPoint num="7" id="158" />
+<TGConnectingPoint num="8" id="159" />
+<TGConnectingPoint num="9" id="160" />
+<TGConnectingPoint num="10" id="161" />
+<TGConnectingPoint num="11" id="162" />
<extraparam>
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="165" >
-<father id="203" num="4" />
-<cdparam x="690" y="473" />
-<sizeparam width="173" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="188" >
+<father id="263" num="3" />
+<cdparam x="341" y="364" />
+<sizeparam width="138" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="false" />
-<cdrectangleparam minX="0" maxX="370" minY="0" maxY="247" />
-<infoparam name="TGComponent" value="ReceiveRemoteInformation" />
-<TGConnectingPoint num="0" id="153" />
-<TGConnectingPoint num="1" id="154" />
-<TGConnectingPoint num="2" id="155" />
-<TGConnectingPoint num="3" id="156" />
-<TGConnectingPoint num="4" id="157" />
-<TGConnectingPoint num="5" id="158" />
-<TGConnectingPoint num="6" id="159" />
-<TGConnectingPoint num="7" id="160" />
-<TGConnectingPoint num="8" id="161" />
-<TGConnectingPoint num="9" id="162" />
-<TGConnectingPoint num="10" id="163" />
-<TGConnectingPoint num="11" id="164" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="405" minY="0" maxY="245" />
+<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" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="178" >
-<father id="203" num="5" />
-<cdparam x="458" y="300" />
-<sizeparam width="213" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="213" >
+<father id="263" num="4" />
+<cdparam x="338" y="497" />
+<sizeparam width="259" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="330" minY="0" maxY="247" />
-<infoparam name="TGComponent" value="GatherInformationOnMobilePhone" />
-<TGConnectingPoint num="0" id="166" />
-<TGConnectingPoint num="1" id="167" />
-<TGConnectingPoint num="2" id="168" />
-<TGConnectingPoint num="3" id="169" />
-<TGConnectingPoint num="4" id="170" />
-<TGConnectingPoint num="5" id="171" />
-<TGConnectingPoint num="6" id="172" />
-<TGConnectingPoint num="7" id="173" />
-<TGConnectingPoint num="8" id="174" />
-<TGConnectingPoint num="9" id="175" />
-<TGConnectingPoint num="10" id="176" />
-<TGConnectingPoint num="11" id="177" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="284" minY="0" maxY="245" />
+<infoparam name="TGComponent" value="SendSpamWithMaliciousPackage" />
+<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" />
+<TGConnectingPoint num="12" id="201" />
+<TGConnectingPoint num="13" id="202" />
+<TGConnectingPoint num="14" id="203" />
+<TGConnectingPoint num="15" id="204" />
+<TGConnectingPoint num="16" id="205" />
+<TGConnectingPoint num="17" id="206" />
+<TGConnectingPoint num="18" id="207" />
+<TGConnectingPoint num="19" id="208" />
+<TGConnectingPoint num="20" id="209" />
+<TGConnectingPoint num="21" id="210" />
+<TGConnectingPoint num="22" id="211" />
+<TGConnectingPoint num="23" id="212" />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1401" id="238" >
+<father id="263" num="5" />
+<cdparam x="382" y="427" />
+<sizeparam width="151" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="392" minY="0" maxY="247" />
+<infoparam name="TGComponent" value="InfectMobilePhone" />
+<TGConnectingPoint num="0" id="214" />
+<TGConnectingPoint num="1" id="215" />
+<TGConnectingPoint num="2" id="216" />
+<TGConnectingPoint num="3" id="217" />
+<TGConnectingPoint num="4" id="218" />
+<TGConnectingPoint num="5" id="219" />
+<TGConnectingPoint num="6" id="220" />
+<TGConnectingPoint num="7" id="221" />
+<TGConnectingPoint num="8" id="222" />
+<TGConnectingPoint num="9" id="223" />
+<TGConnectingPoint num="10" id="224" />
+<TGConnectingPoint num="11" id="225" />
+<TGConnectingPoint num="12" id="226" />
+<TGConnectingPoint num="13" id="227" />
+<TGConnectingPoint num="14" id="228" />
+<TGConnectingPoint num="15" id="229" />
+<TGConnectingPoint num="16" id="230" />
+<TGConnectingPoint num="17" id="231" />
+<TGConnectingPoint num="18" id="232" />
+<TGConnectingPoint num="19" id="233" />
+<TGConnectingPoint num="20" id="234" />
+<TGConnectingPoint num="21" id="235" />
+<TGConnectingPoint num="22" id="236" />
+<TGConnectingPoint num="23" id="237" />
+<extraparam>
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="228" >
+<COMPONENT type="1400" id="288" >
<cdparam x="219" y="222" />
<sizeparam width="855" height="340" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="15" maxX="2971" minY="15" maxY="2971" />
+<cdrectangleparam minX="18" maxX="3714" minY="18" maxY="3714" />
<infoparam name="Block8" value="AttackerSystem" />
-<TGConnectingPoint num="0" id="204" />
-<TGConnectingPoint num="1" id="205" />
-<TGConnectingPoint num="2" id="206" />
-<TGConnectingPoint num="3" id="207" />
-<TGConnectingPoint num="4" id="208" />
-<TGConnectingPoint num="5" id="209" />
-<TGConnectingPoint num="6" id="210" />
-<TGConnectingPoint num="7" id="211" />
-<TGConnectingPoint num="8" id="212" />
-<TGConnectingPoint num="9" id="213" />
-<TGConnectingPoint num="10" id="214" />
-<TGConnectingPoint num="11" id="215" />
-<TGConnectingPoint num="12" id="216" />
-<TGConnectingPoint num="13" id="217" />
-<TGConnectingPoint num="14" id="218" />
-<TGConnectingPoint num="15" id="219" />
-<TGConnectingPoint num="16" id="220" />
-<TGConnectingPoint num="17" id="221" />
-<TGConnectingPoint num="18" id="222" />
-<TGConnectingPoint num="19" id="223" />
-<TGConnectingPoint num="20" id="224" />
-<TGConnectingPoint num="21" id="225" />
-<TGConnectingPoint num="22" id="226" />
-<TGConnectingPoint num="23" id="227" />
+<TGConnectingPoint num="0" id="264" />
+<TGConnectingPoint num="1" id="265" />
+<TGConnectingPoint num="2" id="266" />
+<TGConnectingPoint num="3" id="267" />
+<TGConnectingPoint num="4" id="268" />
+<TGConnectingPoint num="5" id="269" />
+<TGConnectingPoint num="6" id="270" />
+<TGConnectingPoint num="7" id="271" />
+<TGConnectingPoint num="8" id="272" />
+<TGConnectingPoint num="9" id="273" />
+<TGConnectingPoint num="10" id="274" />
+<TGConnectingPoint num="11" id="275" />
+<TGConnectingPoint num="12" id="276" />
+<TGConnectingPoint num="13" id="277" />
+<TGConnectingPoint num="14" id="278" />
+<TGConnectingPoint num="15" id="279" />
+<TGConnectingPoint num="16" id="280" />
+<TGConnectingPoint num="17" id="281" />
+<TGConnectingPoint num="18" id="282" />
+<TGConnectingPoint num="19" id="283" />
+<TGConnectingPoint num="20" id="284" />
+<TGConnectingPoint num="21" id="285" />
+<TGConnectingPoint num="22" id="286" />
+<TGConnectingPoint num="23" id="287" />
</COMPONENT>
-<COMPONENT type="1400" id="565" >
+<COMPONENT type="1400" id="853" >
<cdparam x="197" y="703" />
<sizeparam width="1006" height="989" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="15" maxX="2971" minY="15" maxY="2971" />
+<cdrectangleparam minX="18" maxX="3714" minY="18" maxY="3714" />
<infoparam name="Block2" value="UserMobilePhone_Android" />
-<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" />
+<TGConnectingPoint num="0" id="829" />
+<TGConnectingPoint num="1" id="830" />
+<TGConnectingPoint num="2" id="831" />
+<TGConnectingPoint num="3" id="832" />
+<TGConnectingPoint num="4" id="833" />
+<TGConnectingPoint num="5" id="834" />
+<TGConnectingPoint num="6" id="835" />
+<TGConnectingPoint num="7" id="836" />
+<TGConnectingPoint num="8" id="837" />
+<TGConnectingPoint num="9" id="838" />
+<TGConnectingPoint num="10" id="839" />
+<TGConnectingPoint num="11" id="840" />
+<TGConnectingPoint num="12" id="841" />
+<TGConnectingPoint num="13" id="842" />
+<TGConnectingPoint num="14" id="843" />
+<TGConnectingPoint num="15" id="844" />
+<TGConnectingPoint num="16" id="845" />
+<TGConnectingPoint num="17" id="846" />
+<TGConnectingPoint num="18" id="847" />
+<TGConnectingPoint num="19" id="848" />
+<TGConnectingPoint num="20" id="849" />
+<TGConnectingPoint num="21" id="850" />
+<TGConnectingPoint num="22" id="851" />
+<TGConnectingPoint num="23" id="852" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="241" >
-<father id="565" num="0" />
-<cdparam x="555" y="1161" />
-<sizeparam width="177" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="829" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="RestartMaliciousApplication" />
-<TGConnectingPoint num="0" id="229" />
-<TGConnectingPoint num="1" id="230" />
-<TGConnectingPoint num="2" id="231" />
-<TGConnectingPoint num="3" id="232" />
-<TGConnectingPoint num="4" id="233" />
-<TGConnectingPoint num="5" id="234" />
-<TGConnectingPoint num="6" id="235" />
-<TGConnectingPoint num="7" id="236" />
-<TGConnectingPoint num="8" id="237" />
-<TGConnectingPoint num="9" id="238" />
-<TGConnectingPoint num="10" id="239" />
-<TGConnectingPoint num="11" id="240" />
-<extraparam>
-<info description="blah blah blah" root="true" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="254" >
-<father id="565" num="1" />
-<cdparam x="225" y="758" />
-<sizeparam width="156" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1402" id="301" >
+<father id="853" num="0" />
+<cdparam x="372" y="1046" />
+<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="368" />
+<cdrectangleparam minX="0" maxX="819" minY="0" maxY="1043" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="242" />
-<TGConnectingPoint num="1" id="243" />
-<TGConnectingPoint num="2" id="244" />
-<TGConnectingPoint num="3" id="245" />
-<TGConnectingPoint num="4" id="246" />
-<TGConnectingPoint num="5" id="247" />
-<TGConnectingPoint num="6" id="248" />
-<TGConnectingPoint num="7" id="249" />
-<TGConnectingPoint num="8" id="250" />
-<TGConnectingPoint num="9" id="251" />
-<TGConnectingPoint num="10" id="252" />
-<TGConnectingPoint num="11" id="253" />
+<TGConnectingPoint num="0" id="289" />
+<TGConnectingPoint num="1" id="290" />
+<TGConnectingPoint num="2" id="291" />
+<TGConnectingPoint num="3" id="292" />
+<TGConnectingPoint num="4" id="293" />
+<TGConnectingPoint num="5" id="294" />
+<TGConnectingPoint num="6" id="295" />
+<TGConnectingPoint num="7" id="296" />
+<TGConnectingPoint num="8" id="297" />
+<TGConnectingPoint num="9" id="298" />
+<TGConnectingPoint num="10" id="299" />
+<TGConnectingPoint num="11" id="300" />
<extraparam>
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="267" >
-<father id="565" num="2" />
-<cdparam x="426" y="758" />
-<sizeparam width="169" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="326" >
+<father id="853" num="1" />
+<cdparam x="403" y="1149" />
+<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="837" minY="0" maxY="941" />
-<infoparam name="TGComponent" value="InstallMaliciousApplication" />
-<TGConnectingPoint num="0" id="255" />
-<TGConnectingPoint num="1" id="256" />
-<TGConnectingPoint num="2" id="257" />
-<TGConnectingPoint num="3" id="258" />
-<TGConnectingPoint num="4" id="259" />
-<TGConnectingPoint num="5" id="260" />
-<TGConnectingPoint num="6" id="261" />
-<TGConnectingPoint num="7" id="262" />
-<TGConnectingPoint num="8" id="263" />
-<TGConnectingPoint num="9" id="264" />
-<TGConnectingPoint num="10" id="265" />
-<TGConnectingPoint num="11" id="266" />
+<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
+<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" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="280" >
-<father id="565" num="3" />
-<cdparam x="200" y="845" />
-<sizeparam width="207" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="351" >
+<father id="853" num="2" />
+<cdparam x="775" y="1525" />
+<sizeparam width="251" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="799" minY="0" maxY="941" />
-<infoparam name="TGComponent" value="OpenSpamWithMaliciousPackage" />
-<TGConnectingPoint num="0" id="268" />
-<TGConnectingPoint num="1" id="269" />
-<TGConnectingPoint num="2" id="270" />
-<TGConnectingPoint num="3" id="271" />
-<TGConnectingPoint num="4" id="272" />
-<TGConnectingPoint num="5" id="273" />
-<TGConnectingPoint num="6" id="274" />
-<TGConnectingPoint num="7" id="275" />
-<TGConnectingPoint num="8" id="276" />
-<TGConnectingPoint num="9" id="277" />
-<TGConnectingPoint num="10" id="278" />
-<TGConnectingPoint num="11" id="279" />
+<cdrectangleparam minX="0" maxX="755" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorFailureInDataConnection" />
+<TGConnectingPoint num="0" id="327" />
+<TGConnectingPoint num="1" id="328" />
+<TGConnectingPoint num="2" id="329" />
+<TGConnectingPoint num="3" id="330" />
+<TGConnectingPoint num="4" id="331" />
+<TGConnectingPoint num="5" id="332" />
+<TGConnectingPoint num="6" id="333" />
+<TGConnectingPoint num="7" id="334" />
+<TGConnectingPoint num="8" id="335" />
+<TGConnectingPoint num="9" id="336" />
+<TGConnectingPoint num="10" id="337" />
+<TGConnectingPoint num="11" id="338" />
+<TGConnectingPoint num="12" id="339" />
+<TGConnectingPoint num="13" id="340" />
+<TGConnectingPoint num="14" id="341" />
+<TGConnectingPoint num="15" id="342" />
+<TGConnectingPoint num="16" id="343" />
+<TGConnectingPoint num="17" id="344" />
+<TGConnectingPoint num="18" id="345" />
+<TGConnectingPoint num="19" id="346" />
+<TGConnectingPoint num="20" id="347" />
+<TGConnectingPoint num="21" id="348" />
+<TGConnectingPoint num="22" id="349" />
+<TGConnectingPoint num="23" id="350" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="293" >
-<father id="565" num="4" />
-<cdparam x="545" y="898" />
-<sizeparam width="125" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="376" >
+<father id="853" num="3" />
+<cdparam x="248" y="1510" />
+<sizeparam width="273" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="881" minY="0" maxY="941" />
-<infoparam name="TGComponent" value="RegisterThePhone" />
-<TGConnectingPoint num="0" id="281" />
-<TGConnectingPoint num="1" id="282" />
-<TGConnectingPoint num="2" id="283" />
-<TGConnectingPoint num="3" id="284" />
-<TGConnectingPoint num="4" id="285" />
-<TGConnectingPoint num="5" id="286" />
-<TGConnectingPoint num="6" id="287" />
-<TGConnectingPoint num="7" id="288" />
-<TGConnectingPoint num="8" id="289" />
-<TGConnectingPoint num="9" id="290" />
-<TGConnectingPoint num="10" id="291" />
-<TGConnectingPoint num="11" id="292" />
+<cdrectangleparam minX="0" maxX="733" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorNetworkConnectionChange" />
+<TGConnectingPoint num="0" id="352" />
+<TGConnectingPoint num="1" id="353" />
+<TGConnectingPoint num="2" id="354" />
+<TGConnectingPoint num="3" id="355" />
+<TGConnectingPoint num="4" id="356" />
+<TGConnectingPoint num="5" id="357" />
+<TGConnectingPoint num="6" id="358" />
+<TGConnectingPoint num="7" id="359" />
+<TGConnectingPoint num="8" id="360" />
+<TGConnectingPoint num="9" id="361" />
+<TGConnectingPoint num="10" id="362" />
+<TGConnectingPoint num="11" id="363" />
+<TGConnectingPoint num="12" id="364" />
+<TGConnectingPoint num="13" id="365" />
+<TGConnectingPoint num="14" id="366" />
+<TGConnectingPoint num="15" id="367" />
+<TGConnectingPoint num="16" id="368" />
+<TGConnectingPoint num="17" id="369" />
+<TGConnectingPoint num="18" id="370" />
+<TGConnectingPoint num="19" id="371" />
+<TGConnectingPoint num="20" id="372" />
+<TGConnectingPoint num="21" id="373" />
+<TGConnectingPoint num="22" id="374" />
+<TGConnectingPoint num="23" id="375" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="306" >
-<father id="565" num="5" />
-<cdparam x="603" y="1052" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="401" >
+<father id="853" num="4" />
+<cdparam x="254" y="1373" />
+<sizeparam width="147" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="GatherIntent" />
-<TGConnectingPoint num="0" id="294" />
-<TGConnectingPoint num="1" id="295" />
-<TGConnectingPoint num="2" id="296" />
-<TGConnectingPoint num="3" id="297" />
-<TGConnectingPoint num="4" id="298" />
-<TGConnectingPoint num="5" id="299" />
-<TGConnectingPoint num="6" id="300" />
-<TGConnectingPoint num="7" id="301" />
-<TGConnectingPoint num="8" id="302" />
-<TGConnectingPoint num="9" id="303" />
-<TGConnectingPoint num="10" id="304" />
-<TGConnectingPoint num="11" id="305" />
+<cdrectangleparam minX="0" maxX="859" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorScreenOn" />
+<TGConnectingPoint num="0" id="377" />
+<TGConnectingPoint num="1" id="378" />
+<TGConnectingPoint num="2" id="379" />
+<TGConnectingPoint num="3" id="380" />
+<TGConnectingPoint num="4" id="381" />
+<TGConnectingPoint num="5" id="382" />
+<TGConnectingPoint num="6" id="383" />
+<TGConnectingPoint num="7" id="384" />
+<TGConnectingPoint num="8" id="385" />
+<TGConnectingPoint num="9" id="386" />
+<TGConnectingPoint num="10" id="387" />
+<TGConnectingPoint num="11" id="388" />
+<TGConnectingPoint num="12" id="389" />
+<TGConnectingPoint num="13" id="390" />
+<TGConnectingPoint num="14" id="391" />
+<TGConnectingPoint num="15" id="392" />
+<TGConnectingPoint num="16" id="393" />
+<TGConnectingPoint num="17" id="394" />
+<TGConnectingPoint num="18" id="395" />
+<TGConnectingPoint num="19" id="396" />
+<TGConnectingPoint num="20" id="397" />
+<TGConnectingPoint num="21" id="398" />
+<TGConnectingPoint num="22" id="399" />
+<TGConnectingPoint num="23" id="400" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="319" >
-<father id="565" num="6" />
-<cdparam x="858" y="1053" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="426" >
+<father id="853" num="5" />
+<cdparam x="940" y="1415" />
+<sizeparam width="230" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="BroadcastIntent" />
-<TGConnectingPoint num="0" id="307" />
-<TGConnectingPoint num="1" id="308" />
-<TGConnectingPoint num="2" id="309" />
-<TGConnectingPoint num="3" id="310" />
-<TGConnectingPoint num="4" id="311" />
-<TGConnectingPoint num="5" id="312" />
-<TGConnectingPoint num="6" id="313" />
-<TGConnectingPoint num="7" id="314" />
-<TGConnectingPoint num="8" id="315" />
-<TGConnectingPoint num="9" id="316" />
-<TGConnectingPoint num="10" id="317" />
-<TGConnectingPoint num="11" id="318" />
+<cdrectangleparam minX="0" maxX="776" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorApplicationInstallation" />
+<TGConnectingPoint num="0" id="402" />
+<TGConnectingPoint num="1" id="403" />
+<TGConnectingPoint num="2" id="404" />
+<TGConnectingPoint num="3" id="405" />
+<TGConnectingPoint num="4" id="406" />
+<TGConnectingPoint num="5" id="407" />
+<TGConnectingPoint num="6" id="408" />
+<TGConnectingPoint num="7" id="409" />
+<TGConnectingPoint num="8" id="410" />
+<TGConnectingPoint num="9" id="411" />
+<TGConnectingPoint num="10" id="412" />
+<TGConnectingPoint num="11" id="413" />
+<TGConnectingPoint num="12" id="414" />
+<TGConnectingPoint num="13" id="415" />
+<TGConnectingPoint num="14" id="416" />
+<TGConnectingPoint num="15" id="417" />
+<TGConnectingPoint num="16" id="418" />
+<TGConnectingPoint num="17" id="419" />
+<TGConnectingPoint num="18" id="420" />
+<TGConnectingPoint num="19" id="421" />
+<TGConnectingPoint num="20" id="422" />
+<TGConnectingPoint num="21" id="423" />
+<TGConnectingPoint num="22" id="424" />
+<TGConnectingPoint num="23" id="425" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="332" >
-<father id="565" num="7" />
-<cdparam x="683" y="969" />
-<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="451" >
+<father id="853" num="6" />
+<cdparam x="744" y="1413" />
+<sizeparam width="202" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="687" minY="0" maxY="355" />
-<infoparam name="TGComponent" value="<<AFTER>>" />
-<TGConnectingPoint num="0" id="320" />
-<TGConnectingPoint num="1" id="321" />
-<TGConnectingPoint num="2" id="322" />
-<TGConnectingPoint num="3" id="323" />
-<TGConnectingPoint num="4" id="324" />
-<TGConnectingPoint num="5" id="325" />
-<TGConnectingPoint num="6" id="326" />
-<TGConnectingPoint num="7" id="327" />
-<TGConnectingPoint num="8" id="328" />
-<TGConnectingPoint num="9" id="329" />
-<TGConnectingPoint num="10" id="330" />
-<TGConnectingPoint num="11" id="331" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="804" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorWallPaperChange" />
+<TGConnectingPoint num="0" id="427" />
+<TGConnectingPoint num="1" id="428" />
+<TGConnectingPoint num="2" id="429" />
+<TGConnectingPoint num="3" id="430" />
+<TGConnectingPoint num="4" id="431" />
+<TGConnectingPoint num="5" id="432" />
+<TGConnectingPoint num="6" id="433" />
+<TGConnectingPoint num="7" id="434" />
+<TGConnectingPoint num="8" id="435" />
+<TGConnectingPoint num="9" id="436" />
+<TGConnectingPoint num="10" id="437" />
+<TGConnectingPoint num="11" id="438" />
+<TGConnectingPoint num="12" id="439" />
+<TGConnectingPoint num="13" id="440" />
+<TGConnectingPoint num="14" id="441" />
+<TGConnectingPoint num="15" id="442" />
+<TGConnectingPoint num="16" id="443" />
+<TGConnectingPoint num="17" id="444" />
+<TGConnectingPoint num="18" id="445" />
+<TGConnectingPoint num="19" id="446" />
+<TGConnectingPoint num="20" id="447" />
+<TGConnectingPoint num="21" id="448" />
+<TGConnectingPoint num="22" id="449" />
+<TGConnectingPoint num="23" id="450" />
<extraparam>
-<info equation="1" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="345" >
-<father id="565" num="8" />
-<cdparam x="714" y="885" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="476" >
+<father id="853" num="7" />
+<cdparam x="578" y="1412" />
+<sizeparam width="166" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="ManageIntent" />
-<TGConnectingPoint num="0" id="333" />
-<TGConnectingPoint num="1" id="334" />
-<TGConnectingPoint num="2" id="335" />
-<TGConnectingPoint num="3" id="336" />
-<TGConnectingPoint num="4" id="337" />
-<TGConnectingPoint num="5" id="338" />
-<TGConnectingPoint num="6" id="339" />
-<TGConnectingPoint num="7" id="340" />
-<TGConnectingPoint num="8" id="341" />
-<TGConnectingPoint num="9" id="342" />
-<TGConnectingPoint num="10" id="343" />
-<TGConnectingPoint num="11" id="344" />
+<cdrectangleparam minX="0" maxX="840" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorTimeChange" />
+<TGConnectingPoint num="0" id="452" />
+<TGConnectingPoint num="1" id="453" />
+<TGConnectingPoint num="2" id="454" />
+<TGConnectingPoint num="3" id="455" />
+<TGConnectingPoint num="4" id="456" />
+<TGConnectingPoint num="5" id="457" />
+<TGConnectingPoint num="6" id="458" />
+<TGConnectingPoint num="7" id="459" />
+<TGConnectingPoint num="8" id="460" />
+<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" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="358" >
-<father id="565" num="9" />
-<cdparam x="898" y="891" />
-<sizeparam width="157" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="501" >
+<father id="853" num="8" />
+<cdparam x="424" y="1410" />
+<sizeparam width="166" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="849" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="SpiesIncomingMessages" />
-<TGConnectingPoint num="0" id="346" />
-<TGConnectingPoint num="1" id="347" />
-<TGConnectingPoint num="2" id="348" />
-<TGConnectingPoint num="3" id="349" />
-<TGConnectingPoint num="4" id="350" />
-<TGConnectingPoint num="5" id="351" />
-<TGConnectingPoint num="6" id="352" />
-<TGConnectingPoint num="7" id="353" />
-<TGConnectingPoint num="8" id="354" />
-<TGConnectingPoint num="9" id="355" />
-<TGConnectingPoint num="10" id="356" />
-<TGConnectingPoint num="11" id="357" />
+<cdrectangleparam minX="0" maxX="840" minY="0" maxY="939" />
+<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" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="371" >
-<father id="565" num="10" />
-<cdparam x="797" y="722" />
-<sizeparam width="152" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="526" >
+<father id="853" num="9" />
+<cdparam x="236" y="1291" />
+<sizeparam width="184" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="854" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="SendPrivateInformation" />
-<TGConnectingPoint num="0" id="359" />
-<TGConnectingPoint num="1" id="360" />
-<TGConnectingPoint num="2" id="361" />
-<TGConnectingPoint num="3" id="362" />
-<TGConnectingPoint num="4" id="363" />
-<TGConnectingPoint num="5" id="364" />
-<TGConnectingPoint num="6" id="365" />
-<TGConnectingPoint num="7" id="366" />
-<TGConnectingPoint num="8" id="367" />
-<TGConnectingPoint num="9" id="368" />
-<TGConnectingPoint num="10" id="369" />
-<TGConnectingPoint num="11" id="370" />
+<cdrectangleparam minX="0" maxX="822" minY="0" maxY="939" />
+<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" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="384" >
-<father id="565" num="11" />
-<cdparam x="771" y="793" />
+<SUBCOMPONENT type="1402" id="539" >
+<father id="853" num="10" />
+<cdparam x="550" y="1233" />
<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="819" minY="0" maxY="355" />
+<cdrectangleparam minX="0" maxX="819" minY="0" maxY="530" />
<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="372" />
-<TGConnectingPoint num="1" id="373" />
-<TGConnectingPoint num="2" id="374" />
-<TGConnectingPoint num="3" id="375" />
-<TGConnectingPoint num="4" id="376" />
-<TGConnectingPoint num="5" id="377" />
-<TGConnectingPoint num="6" id="378" />
-<TGConnectingPoint num="7" id="379" />
-<TGConnectingPoint num="8" id="380" />
-<TGConnectingPoint num="9" id="381" />
-<TGConnectingPoint num="10" id="382" />
-<TGConnectingPoint num="11" id="383" />
+<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" />
<extraparam>
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="397" >
-<father id="565" num="12" />
+<SUBCOMPONENT type="1401" id="564" >
+<father id="853" num="11" />
<cdparam x="536" y="1586" />
-<sizeparam width="218" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="270" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="788" minY="0" maxY="939" />
+<cdrectangleparam minX="0" maxX="736" minY="0" maxY="939" />
<infoparam name="TGComponent" value="MonitorMaliciousPackageIsRunning" />
-<TGConnectingPoint num="0" id="385" />
-<TGConnectingPoint num="1" id="386" />
-<TGConnectingPoint num="2" id="387" />
-<TGConnectingPoint num="3" id="388" />
-<TGConnectingPoint num="4" id="389" />
-<TGConnectingPoint num="5" id="390" />
-<TGConnectingPoint num="6" id="391" />
-<TGConnectingPoint num="7" id="392" />
-<TGConnectingPoint num="8" id="393" />
-<TGConnectingPoint num="9" id="394" />
-<TGConnectingPoint num="10" id="395" />
-<TGConnectingPoint num="11" id="396" />
+<TGConnectingPoint num="0" id="540" />
+<TGConnectingPoint num="1" id="541" />
+<TGConnectingPoint num="2" id="542" />
+<TGConnectingPoint num="3" id="543" />
+<TGConnectingPoint num="4" id="544" />
+<TGConnectingPoint num="5" id="545" />
+<TGConnectingPoint num="6" id="546" />
+<TGConnectingPoint num="7" id="547" />
+<TGConnectingPoint num="8" id="548" />
+<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" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="410" >
-<father id="565" num="13" />
-<cdparam x="550" y="1233" />
+<SUBCOMPONENT type="1402" id="577" >
+<father id="853" num="12" />
+<cdparam x="771" y="793" />
<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="819" minY="0" maxY="530" />
+<cdrectangleparam minX="0" maxX="819" minY="0" maxY="355" />
<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="398" />
-<TGConnectingPoint num="1" id="399" />
-<TGConnectingPoint num="2" id="400" />
-<TGConnectingPoint num="3" id="401" />
-<TGConnectingPoint num="4" id="402" />
-<TGConnectingPoint num="5" id="403" />
-<TGConnectingPoint num="6" id="404" />
-<TGConnectingPoint num="7" id="405" />
-<TGConnectingPoint num="8" id="406" />
-<TGConnectingPoint num="9" id="407" />
-<TGConnectingPoint num="10" id="408" />
-<TGConnectingPoint num="11" id="409" />
+<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" />
<extraparam>
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="423" >
-<father id="565" num="14" />
-<cdparam x="236" y="1291" />
-<sizeparam width="148" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="602" >
+<father id="853" num="13" />
+<cdparam x="797" y="722" />
+<sizeparam width="190" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="858" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorDeviceWakeUp" />
-<TGConnectingPoint num="0" id="411" />
-<TGConnectingPoint num="1" id="412" />
-<TGConnectingPoint num="2" id="413" />
-<TGConnectingPoint num="3" id="414" />
-<TGConnectingPoint num="4" id="415" />
-<TGConnectingPoint num="5" id="416" />
-<TGConnectingPoint num="6" id="417" />
-<TGConnectingPoint num="7" id="418" />
-<TGConnectingPoint num="8" id="419" />
-<TGConnectingPoint num="9" id="420" />
-<TGConnectingPoint num="10" id="421" />
-<TGConnectingPoint num="11" id="422" />
+<cdrectangleparam minX="0" maxX="816" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="SendPrivateInformation" />
+<TGConnectingPoint num="0" id="578" />
+<TGConnectingPoint num="1" id="579" />
+<TGConnectingPoint num="2" id="580" />
+<TGConnectingPoint num="3" id="581" />
+<TGConnectingPoint num="4" id="582" />
+<TGConnectingPoint num="5" id="583" />
+<TGConnectingPoint num="6" id="584" />
+<TGConnectingPoint num="7" id="585" />
+<TGConnectingPoint num="8" id="586" />
+<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" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="436" >
-<father id="565" num="15" />
-<cdparam x="424" y="1410" />
-<sizeparam width="132" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="627" >
+<father id="853" num="14" />
+<cdparam x="898" y="891" />
+<sizeparam width="197" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="874" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorBatteryLevel" />
-<TGConnectingPoint num="0" id="424" />
-<TGConnectingPoint num="1" id="425" />
-<TGConnectingPoint num="2" id="426" />
-<TGConnectingPoint num="3" id="427" />
-<TGConnectingPoint num="4" id="428" />
-<TGConnectingPoint num="5" id="429" />
-<TGConnectingPoint num="6" id="430" />
-<TGConnectingPoint num="7" id="431" />
-<TGConnectingPoint num="8" id="432" />
-<TGConnectingPoint num="9" id="433" />
-<TGConnectingPoint num="10" id="434" />
-<TGConnectingPoint num="11" id="435" />
+<cdrectangleparam minX="0" maxX="809" minY="0" maxY="939" />
+<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" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="449" >
-<father id="565" num="16" />
-<cdparam x="578" y="1412" />
-<sizeparam width="135" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="652" >
+<father id="853" num="15" />
+<cdparam x="714" y="885" />
+<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="871" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorTimeChange" />
-<TGConnectingPoint num="0" id="437" />
-<TGConnectingPoint num="1" id="438" />
-<TGConnectingPoint num="2" id="439" />
-<TGConnectingPoint num="3" id="440" />
-<TGConnectingPoint num="4" id="441" />
-<TGConnectingPoint num="5" id="442" />
-<TGConnectingPoint num="6" id="443" />
-<TGConnectingPoint num="7" id="444" />
-<TGConnectingPoint num="8" id="445" />
-<TGConnectingPoint num="9" id="446" />
-<TGConnectingPoint num="10" id="447" />
-<TGConnectingPoint num="11" id="448" />
+<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
+<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" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="462" >
-<father id="565" num="17" />
-<cdparam x="744" y="1413" />
-<sizeparam width="163" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1402" id="665" >
+<father id="853" num="16" />
+<cdparam x="683" y="969" />
+<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="843" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorWallPaperChange" />
-<TGConnectingPoint num="0" id="450" />
-<TGConnectingPoint num="1" id="451" />
-<TGConnectingPoint num="2" id="452" />
-<TGConnectingPoint num="3" id="453" />
-<TGConnectingPoint num="4" id="454" />
-<TGConnectingPoint num="5" id="455" />
-<TGConnectingPoint num="6" id="456" />
-<TGConnectingPoint num="7" id="457" />
-<TGConnectingPoint num="8" id="458" />
-<TGConnectingPoint num="9" id="459" />
-<TGConnectingPoint num="10" id="460" />
-<TGConnectingPoint num="11" id="461" />
+<cdrectangleparam minX="0" maxX="687" minY="0" maxY="355" />
+<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" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="1" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="475" >
-<father id="565" num="18" />
-<cdparam x="940" y="1415" />
-<sizeparam width="188" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="690" >
+<father id="853" num="17" />
+<cdparam x="858" y="1053" />
+<sizeparam width="136" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="818" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorApplicationInstallation" />
-<TGConnectingPoint num="0" id="463" />
-<TGConnectingPoint num="1" id="464" />
-<TGConnectingPoint num="2" id="465" />
-<TGConnectingPoint num="3" id="466" />
-<TGConnectingPoint num="4" id="467" />
-<TGConnectingPoint num="5" id="468" />
-<TGConnectingPoint num="6" id="469" />
-<TGConnectingPoint num="7" id="470" />
-<TGConnectingPoint num="8" id="471" />
-<TGConnectingPoint num="9" id="472" />
-<TGConnectingPoint num="10" id="473" />
-<TGConnectingPoint num="11" id="474" />
+<cdrectangleparam minX="0" maxX="870" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="BroadcastIntent" />
+<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" />
+<TGConnectingPoint num="12" id="678" />
+<TGConnectingPoint num="13" id="679" />
+<TGConnectingPoint num="14" id="680" />
+<TGConnectingPoint num="15" id="681" />
+<TGConnectingPoint num="16" id="682" />
+<TGConnectingPoint num="17" id="683" />
+<TGConnectingPoint num="18" id="684" />
+<TGConnectingPoint num="19" id="685" />
+<TGConnectingPoint num="20" id="686" />
+<TGConnectingPoint num="21" id="687" />
+<TGConnectingPoint num="22" id="688" />
+<TGConnectingPoint num="23" id="689" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="488" >
-<father id="565" num="19" />
-<cdparam x="254" y="1373" />
+<SUBCOMPONENT type="1401" id="715" >
+<father id="853" num="18" />
+<cdparam x="603" y="1052" />
<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorScreenOn" />
-<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" />
+<infoparam name="TGComponent" value="GatherIntent" />
+<TGConnectingPoint num="0" id="691" />
+<TGConnectingPoint num="1" id="692" />
+<TGConnectingPoint num="2" id="693" />
+<TGConnectingPoint num="3" id="694" />
+<TGConnectingPoint num="4" id="695" />
+<TGConnectingPoint num="5" id="696" />
+<TGConnectingPoint num="6" id="697" />
+<TGConnectingPoint num="7" id="698" />
+<TGConnectingPoint num="8" id="699" />
+<TGConnectingPoint num="9" id="700" />
+<TGConnectingPoint num="10" id="701" />
+<TGConnectingPoint num="11" id="702" />
+<TGConnectingPoint num="12" id="703" />
+<TGConnectingPoint num="13" id="704" />
+<TGConnectingPoint num="14" id="705" />
+<TGConnectingPoint num="15" id="706" />
+<TGConnectingPoint num="16" id="707" />
+<TGConnectingPoint num="17" id="708" />
+<TGConnectingPoint num="18" id="709" />
+<TGConnectingPoint num="19" id="710" />
+<TGConnectingPoint num="20" id="711" />
+<TGConnectingPoint num="21" id="712" />
+<TGConnectingPoint num="22" id="713" />
+<TGConnectingPoint num="23" id="714" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="501" >
-<father id="565" num="20" />
-<cdparam x="248" y="1510" />
-<sizeparam width="217" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="740" >
+<father id="853" num="19" />
+<cdparam x="545" y="898" />
+<sizeparam width="152" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="789" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorNetworkConnectionChange" />
-<TGConnectingPoint num="0" id="489" />
-<TGConnectingPoint num="1" id="490" />
-<TGConnectingPoint num="2" id="491" />
-<TGConnectingPoint num="3" id="492" />
-<TGConnectingPoint num="4" id="493" />
-<TGConnectingPoint num="5" id="494" />
-<TGConnectingPoint num="6" id="495" />
-<TGConnectingPoint num="7" id="496" />
-<TGConnectingPoint num="8" id="497" />
-<TGConnectingPoint num="9" id="498" />
-<TGConnectingPoint num="10" id="499" />
-<TGConnectingPoint num="11" id="500" />
+<cdrectangleparam minX="0" maxX="854" minY="0" maxY="941" />
+<infoparam name="TGComponent" value="RegisterThePhone" />
+<TGConnectingPoint num="0" id="716" />
+<TGConnectingPoint num="1" id="717" />
+<TGConnectingPoint num="2" id="718" />
+<TGConnectingPoint num="3" id="719" />
+<TGConnectingPoint num="4" id="720" />
+<TGConnectingPoint num="5" id="721" />
+<TGConnectingPoint num="6" id="722" />
+<TGConnectingPoint num="7" id="723" />
+<TGConnectingPoint num="8" id="724" />
+<TGConnectingPoint num="9" id="725" />
+<TGConnectingPoint num="10" id="726" />
+<TGConnectingPoint num="11" id="727" />
+<TGConnectingPoint num="12" id="728" />
+<TGConnectingPoint num="13" id="729" />
+<TGConnectingPoint num="14" id="730" />
+<TGConnectingPoint num="15" id="731" />
+<TGConnectingPoint num="16" id="732" />
+<TGConnectingPoint num="17" id="733" />
+<TGConnectingPoint num="18" id="734" />
+<TGConnectingPoint num="19" id="735" />
+<TGConnectingPoint num="20" id="736" />
+<TGConnectingPoint num="21" id="737" />
+<TGConnectingPoint num="22" id="738" />
+<TGConnectingPoint num="23" id="739" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="514" >
-<father id="565" num="21" />
-<cdparam x="775" y="1525" />
-<sizeparam width="201" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="765" >
+<father id="853" num="20" />
+<cdparam x="200" y="845" />
+<sizeparam width="261" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="805" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorFailureInDataConnection" />
-<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" />
+<cdrectangleparam minX="0" maxX="745" minY="0" maxY="941" />
+<infoparam name="TGComponent" value="OpenSpamWithMaliciousPackage" />
+<TGConnectingPoint num="0" id="741" />
+<TGConnectingPoint num="1" id="742" />
+<TGConnectingPoint num="2" id="743" />
+<TGConnectingPoint num="3" id="744" />
+<TGConnectingPoint num="4" id="745" />
+<TGConnectingPoint num="5" id="746" />
+<TGConnectingPoint num="6" id="747" />
+<TGConnectingPoint num="7" id="748" />
+<TGConnectingPoint num="8" id="749" />
+<TGConnectingPoint num="9" id="750" />
+<TGConnectingPoint num="10" id="751" />
+<TGConnectingPoint num="11" id="752" />
+<TGConnectingPoint num="12" id="753" />
+<TGConnectingPoint num="13" id="754" />
+<TGConnectingPoint num="14" id="755" />
+<TGConnectingPoint num="15" id="756" />
+<TGConnectingPoint num="16" id="757" />
+<TGConnectingPoint num="17" id="758" />
+<TGConnectingPoint num="18" id="759" />
+<TGConnectingPoint num="19" id="760" />
+<TGConnectingPoint num="20" id="761" />
+<TGConnectingPoint num="21" id="762" />
+<TGConnectingPoint num="22" id="763" />
+<TGConnectingPoint num="23" id="764" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="527" >
-<father id="565" num="22" />
-<cdparam x="403" y="1149" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="790" >
+<father id="853" num="21" />
+<cdparam x="426" y="758" />
+<sizeparam width="204" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorIntent" />
-<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" />
+<cdrectangleparam minX="0" maxX="802" minY="0" maxY="941" />
+<infoparam name="TGComponent" value="InstallMaliciousApplication" />
+<TGConnectingPoint num="0" id="766" />
+<TGConnectingPoint num="1" id="767" />
+<TGConnectingPoint num="2" id="768" />
+<TGConnectingPoint num="3" id="769" />
+<TGConnectingPoint num="4" id="770" />
+<TGConnectingPoint num="5" id="771" />
+<TGConnectingPoint num="6" id="772" />
+<TGConnectingPoint num="7" id="773" />
+<TGConnectingPoint num="8" id="774" />
+<TGConnectingPoint num="9" id="775" />
+<TGConnectingPoint num="10" id="776" />
+<TGConnectingPoint num="11" id="777" />
+<TGConnectingPoint num="12" id="778" />
+<TGConnectingPoint num="13" id="779" />
+<TGConnectingPoint num="14" id="780" />
+<TGConnectingPoint num="15" id="781" />
+<TGConnectingPoint num="16" id="782" />
+<TGConnectingPoint num="17" id="783" />
+<TGConnectingPoint num="18" id="784" />
+<TGConnectingPoint num="19" id="785" />
+<TGConnectingPoint num="20" id="786" />
+<TGConnectingPoint num="21" id="787" />
+<TGConnectingPoint num="22" id="788" />
+<TGConnectingPoint num="23" id="789" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="540" >
-<father id="565" num="23" />
-<cdparam x="372" y="1046" />
-<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1402" id="803" >
+<father id="853" num="22" />
+<cdparam x="225" y="758" />
+<sizeparam width="156" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="819" minY="0" maxY="1043" />
+<cdrectangleparam minX="0" maxX="125" minY="0" maxY="368" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="528" />
-<TGConnectingPoint num="1" id="529" />
-<TGConnectingPoint num="2" id="530" />
-<TGConnectingPoint num="3" id="531" />
-<TGConnectingPoint num="4" id="532" />
-<TGConnectingPoint num="5" id="533" />
-<TGConnectingPoint num="6" id="534" />
-<TGConnectingPoint num="7" id="535" />
-<TGConnectingPoint num="8" id="536" />
-<TGConnectingPoint num="9" id="537" />
-<TGConnectingPoint num="10" id="538" />
-<TGConnectingPoint num="11" id="539" />
+<TGConnectingPoint num="0" id="791" />
+<TGConnectingPoint num="1" id="792" />
+<TGConnectingPoint num="2" id="793" />
+<TGConnectingPoint num="3" id="794" />
+<TGConnectingPoint num="4" id="795" />
+<TGConnectingPoint num="5" id="796" />
+<TGConnectingPoint num="6" id="797" />
+<TGConnectingPoint num="7" id="798" />
+<TGConnectingPoint num="8" id="799" />
+<TGConnectingPoint num="9" id="800" />
+<TGConnectingPoint num="10" id="801" />
+<TGConnectingPoint num="11" id="802" />
<extraparam>
<info equation="" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="1401" id="828" >
+<father id="853" num="23" />
+<cdparam x="555" y="1161" />
+<sizeparam width="217" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="789" minY="0" maxY="939" />
+<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" />
+<extraparam>
+<info description="blah blah blah" root="true" />
+</extraparam>
+</SUBCOMPONENT>
-<COMPONENT type="1400" id="603" >
+<COMPONENT type="1400" id="891" >
<cdparam x="148" y="612" />
<sizeparam width="1079" height="1092" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="15" maxX="2971" minY="15" maxY="2971" />
+<cdrectangleparam minX="18" maxX="3714" minY="18" maxY="3714" />
<infoparam name="Block9" value="AttackedSystem" />
-<TGConnectingPoint num="0" id="579" />
-<TGConnectingPoint num="1" id="580" />
-<TGConnectingPoint num="2" id="581" />
-<TGConnectingPoint num="3" id="582" />
-<TGConnectingPoint num="4" id="583" />
-<TGConnectingPoint num="5" id="584" />
-<TGConnectingPoint num="6" id="585" />
-<TGConnectingPoint num="7" id="586" />
-<TGConnectingPoint num="8" id="587" />
-<TGConnectingPoint num="9" id="588" />
-<TGConnectingPoint num="10" id="589" />
-<TGConnectingPoint num="11" id="590" />
-<TGConnectingPoint num="12" id="591" />
-<TGConnectingPoint num="13" id="592" />
-<TGConnectingPoint num="14" id="593" />
-<TGConnectingPoint num="15" id="594" />
-<TGConnectingPoint num="16" id="595" />
-<TGConnectingPoint num="17" id="596" />
-<TGConnectingPoint num="18" id="597" />
-<TGConnectingPoint num="19" id="598" />
-<TGConnectingPoint num="20" id="599" />
-<TGConnectingPoint num="21" id="600" />
-<TGConnectingPoint num="22" id="601" />
-<TGConnectingPoint num="23" id="602" />
+<TGConnectingPoint num="0" id="867" />
+<TGConnectingPoint num="1" id="868" />
+<TGConnectingPoint num="2" id="869" />
+<TGConnectingPoint num="3" id="870" />
+<TGConnectingPoint num="4" id="871" />
+<TGConnectingPoint num="5" id="872" />
+<TGConnectingPoint num="6" id="873" />
+<TGConnectingPoint num="7" id="874" />
+<TGConnectingPoint num="8" id="875" />
+<TGConnectingPoint num="9" id="876" />
+<TGConnectingPoint num="10" id="877" />
+<TGConnectingPoint num="11" id="878" />
+<TGConnectingPoint num="12" id="879" />
+<TGConnectingPoint num="13" id="880" />
+<TGConnectingPoint num="14" id="881" />
+<TGConnectingPoint num="15" id="882" />
+<TGConnectingPoint num="16" id="883" />
+<TGConnectingPoint num="17" id="884" />
+<TGConnectingPoint num="18" id="885" />
+<TGConnectingPoint num="19" id="886" />
+<TGConnectingPoint num="20" id="887" />
+<TGConnectingPoint num="21" id="888" />
+<TGConnectingPoint num="22" id="889" />
+<TGConnectingPoint num="23" id="890" />
</COMPONENT>
-<SUBCOMPONENT type="1402" id="578" >
-<father id="603" num="0" />
+<SUBCOMPONENT type="1402" id="866" >
+<father id="891" num="0" />
<cdparam x="741" y="628" />
<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="748" minY="0" maxY="518" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<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="0" id="854" />
+<TGConnectingPoint num="1" id="855" />
+<TGConnectingPoint num="2" id="856" />
+<TGConnectingPoint num="3" id="857" />
+<TGConnectingPoint num="4" id="858" />
+<TGConnectingPoint num="5" id="859" />
+<TGConnectingPoint num="6" id="860" />
+<TGConnectingPoint num="7" id="861" />
+<TGConnectingPoint num="8" id="862" />
+<TGConnectingPoint num="9" id="863" />
+<TGConnectingPoint num="10" id="864" />
+<TGConnectingPoint num="11" id="865" />
<extraparam>
<info equation="" />
</extraparam>
diff --git a/src/ui/ColorManager.java b/src/ui/ColorManager.java
index c8aef4469d2bff67e26d51ef4925086edba985a0..57e01a04eba81bea6e09f925d928a5f5528f76a2 100755
--- a/src/ui/ColorManager.java
+++ b/src/ui/ColorManager.java
@@ -154,6 +154,7 @@ public class ColorManager {
public static Color ATD_ATTACK_DISABLED = new Color(214, 206, 198);
public static Color ATD_ROOT_ATTACK = new Color(243, 131, 10);
public static Color ATD_CONSTRAINT = new Color(191, 153, 161);
+ public static Color ATD_COUNTERMEASURE = new Color(209, 218, 174);
//public static final Color AVATAR_BLOCK = new Color(128, 180, 205);
//public static final Color AVATAR_BLOCK = new Color(158, 218, 227);
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index 5cc4bfa936a5884b81852f156e76096ab04b5f60..8b62baf0315180c67d6e19d7cead1e7ac14d9402 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -116,7 +116,7 @@ public class IconManager {
// Attack Tree Diagrams
public static ImageIcon imgic1070, imgic1072, imgic1074, imgic1076, imgic1078;
- public static ImageIcon imgic1080;
+ public static ImageIcon imgic1080, imgic1082;
// TMLDD
public static ImageIcon imgic1100, imgic1102, imgic1104, imgic1106, imgic1108;
@@ -472,6 +472,7 @@ public class IconManager {
private static String icon1076 = "images/atdcomp.gif";
private static String icon1078 = "images/atdcons.gif";
private static String icon1080 = "images/atdlink.gif";
+ private static String icon1082 = "images/atdcountermeasure.gif";
// DIPLODOCUS architecture
private static String icon1100 = "images/tmlcpunode.gif";
@@ -889,6 +890,7 @@ public class IconManager {
imgic1076 = getIcon(icon1076);
imgic1078 = getIcon(icon1078);
imgic1080 = getIcon(icon1080);
+ imgic1082 = getIcon(icon1082);
imgic1100 = getIcon(icon1100);
imgic1102 = getIcon(icon1102);
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index 040fdd5d8f50bbfebfca4ee885fb7fa167e618ab..3bd0639fd1191eff9389278500cb9468c589711b 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -1075,7 +1075,7 @@ public class TGUIAction extends AbstractAction {
actions[ATD_ATTACK_CONNECTOR] = new TAction("atd-attack-connector", "Add a connector between attacks /constraints", IconManager.imgic1080, IconManager.imgic1080, "Connector", "Add a connector between attacks / constraints of the currently opened attack tree diagram", 0);
actions[ATD_COMPOSITION_CONNECTOR] = new TAction("atd-composition-connector", "Add a composition connector between blocks", IconManager.imgic1076, IconManager.imgic1076, "Composition connector", "Add a composition between blocks of the currently opened attack tree diagram", 0);
actions[ATD_CONSTRAINT] = new TAction("atd-constraint", "Add an constraint", IconManager.imgic1078, IconManager.imgic1078, "Constraint", "Add a constraint to the currently opened attack tree diagram", 0);
- actions[ATD_COUNTERMEASURE] = new TAction("atd-countermeasure", "Add a countermeasure", IconManager.imgic1072, IconManager.imgic1072, "Countermeasure", "Add a countermeasure to the currently opened attack tree diagram", 0);
+ actions[ATD_COUNTERMEASURE] = new TAction("atd-countermeasure", "Add a countermeasure", IconManager.imgic1082, IconManager.imgic1082, "Countermeasure", "Add a countermeasure to the currently opened attack tree diagram", 0);
actions[ATD_COUNTERMEASURE_CONNECTOR] = new TAction("atd-countermeasure-connector", "Add a connector between attacks / countermeasures", IconManager.imgic1080, IconManager.imgic1080, "Connector", "Add a connector between attacks / countermeasures of the currently opened attack tree diagram", 0);
// TURTLE-OS
diff --git a/src/ui/atd/ATDCountermeasure.java b/src/ui/atd/ATDCountermeasure.java
index 1751168ecc69bed714f8febae3a3252c457cc205..ef5453f665d9ceddd17148ca9737471d8366c2e5 100755
--- a/src/ui/atd/ATDCountermeasure.java
+++ b/src/ui/atd/ATDCountermeasure.java
@@ -140,7 +140,7 @@ public class ATDCountermeasure extends TGCScalableWithInternalComponent implemen
// Core of the attack
Color c = g.getColor();
g.draw3DRect(x, y, width, height, true);
- g.setColor(ColorManager.ATD_ATTACK);
+ g.setColor(ColorManager.ATD_COUNTERMEASURE);
g.fill3DRect(x+1, y+1, width-1, height-1, true);
diff --git a/src/ui/atd/ATDCountermeasureConnector.java b/src/ui/atd/ATDCountermeasureConnector.java
index 4fd97545f7b8dd02dbb9154b240ede3569875b4c..a21495e54359b694ce0969607f8c88020bd799c4 100755
--- a/src/ui/atd/ATDCountermeasureConnector.java
+++ b/src/ui/atd/ATDCountermeasureConnector.java
@@ -39,7 +39,7 @@
* Class ATDCountermeasureConnector
* Connector used in Attack Tree Diagrams
* Creation: 06/06/2017
- * @version 1.0 06/°6/2017
+ * @version 1.0 06/06/2017
* @author Ludovic APVRILLE
* @see
*/
@@ -72,117 +72,16 @@ public class ATDCountermeasureConnector extends TGConnectorWithCommentConnectio
oldScaleFactor = tdp.getZoom();
}
- protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
- /*if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
- g.drawLine(x1, y1, x2, y2);
- } else {
- GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
- }*/
-
- //g.drawLine(x1, y1, x2, y2);
- int cz = (int)(tdp.getZoom() * c);
-
- // white squares only if ATDConstraint
-
- TGConnectingPoint cp = p1;
- CDElement comp = cp.getFather();
- int decX = 0;
- int decY = 0;
- // Origin = constraint?
- if (comp instanceof ATDConstraint) {
- if (comp.getX() == cp.getX()) {
- decX = 0;
- } else if (comp.getX() + comp.getWidth() == cp.getX()) {
- decX = -cz;
- } else {
- decX = -cz/2;
- }
-
- if (comp.getY() == cp.getY()) {
- decY = 0;
- } else if (comp.getY() + comp.getHeight() == cp.getY()) {
- decY = -cz;
- } else {
- decY = -cz/2;
- }
-
- g.drawRect(cp.getX() + decX, cp.getY() + decY, cz, cz);
- }
- cp = p2;
- comp = cp.getFather();
- if (comp instanceof ATDConstraint) {
- if (comp.getX() == cp.getX()) {
- decX = 0;
- } else if (comp.getX() + comp.getWidth() == cp.getX()) {
- decX = -cz;
- } else {
- decX = -cz/2;
- }
-
- if (comp.getY() == cp.getY()) {
- decY = 0;
- } else if (comp.getY() + comp.getHeight() == cp.getY()) {
- decY = -cz;
- } else {
- decY = -cz/2;
- }
- g.drawRect(x2+decX, y2+decY, cz, cz);
- }
-
- /*g.fillRect(x2-(cz/2), y2-(cz/2), cz, cz);
- g.fillRect(p1.getX()-(cz/2), p1.getY()-(cz/2), cz, cz);*/
-
- Point p = new Point(x2, y2);
- if (p == null) {
- //System.out.println("null point");
- } else {
- if (Point2D.distance(x1, y1, p.x, p.y) < GraphicLib.longueur * 1.5) {
- //System.out.println("p.x=" + p.x + " x1=" + x1 + "p.y=" + p.y + " y1=" + y1);
- if ((p.x != x1) || (p.y != y1)) {
- g.drawLine(x1, y1, p.x, p.y);
- //System.out.println("drawn");
- }
- } else {
- GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, p.x, p.y, true);
- }
- }
-
- if (value.length() > 0) {
- Font f = g.getFont();
- if (tdp.getZoom() < 1) {
- Font f0 = f.deriveFont((float)(fontSize*tdp.getZoom()));
- g.setFont(f0);
- }
- g.drawString(value, x2+(cz/2)+1, y2);
- g.setFont(f);
- }
+ protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
+ GraphicLib.dashedLine(g, x1, y1, x2, y2);
}
- public boolean editOndoubleClick(JFrame frame) {
- String oldValue = value;
- String text = getName() + "Connector";
- String s = (String)JOptionPane.showInputDialog(frame, text,
- "Setting value", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101,
- null,
- getValue());
-
- if (s != null) {
- s = Conversion.removeFirstSpaces(s);
- }
-
- //System.out.println("emptytext=" + emptyText);
-
- if ((s != null) && (!s.equals(oldValue))) {
- setValue(s);
- return true;
- }
-
- return false;
+ protected void drawMiddleSegment(Graphics g, int x1, int y1, int x2, int y2) {
+ GraphicLib.dashedLine(g, x1, y1, x2, y2);
}
-
public int getType() {
return TGComponentManager.ATD_COUNTERMEASURE_CONNECTOR;
}
diff --git a/src/ui/images/atdcountermeasure.gif b/src/ui/images/atdcountermeasure.gif
new file mode 100644
index 0000000000000000000000000000000000000000..716956b379abb736f2601f56ec9e36be322b7f90
Binary files /dev/null and b/src/ui/images/atdcountermeasure.gif differ