diff --git a/modeling/SysMLSec/at_chuli.xml b/modeling/SysMLSec/at_chuli.xml
index cf148def4e4137b0c06f98e5b25d5319ba9b33cd..55dca45ff991a271216645d982bdd6d8e41fb92d 100644
--- a/modeling/SysMLSec/at_chuli.xml
+++ b/modeling/SysMLSec/at_chuli.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<TURTLEGMODELING version="0.99-beta4">
+<TURTLEGMODELING version="1.0beta">
<Modeling type="AttackTree" nameTab="Chuly" >
-<AttackTreeDiagramPanel name="Attack Tree" minX="15" maxX="2971" minY="15" maxY="2971" zoom="1.2500000000000004" >
+<AttackTreeDiagramPanel name="Attack Tree" minX="15" maxX="3714" minY="15" maxY="3714" zoom="1.2500000000000004" >
<CONNECTOR type="133" id="6" >
<cdparam x="595" y="794" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -11,8 +11,8 @@
<TGConnectingPoint num="0" id="3" />
<TGConnectingPoint num="1" id="4" />
<TGConnectingPoint num="2" id="5" />
-<P1 x="630" y="794" id="775" />
-<P2 x="1045" y="891" id="608" />
+<P1 x="630" y="794" id="336" />
+<P2 x="1045" y="891" id="495" />
<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="291" />
-<P2 x="603" y="1077" id="692" />
+<P1 x="559" y="1077" id="818" />
+<P2 x="603" y="1077" id="403" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="10" >
@@ -47,8 +47,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="9" />
-<P1 x="528" y="806" id="769" />
-<P2 x="465" y="1046" id="289" />
+<P1 x="528" y="806" id="330" />
+<P2 x="465" y="1046" id="816" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="12" >
@@ -56,8 +56,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="11" />
-<P1 x="465" y="1149" id="302" />
-<P2 x="465" y="1108" id="292" />
+<P1 x="465" y="1149" id="791" />
+<P2 x="465" y="1108" id="819" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="14" >
@@ -65,8 +65,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="13" />
-<P1 x="579" y="806" id="777" />
-<P2 x="583" y="898" id="720" />
+<P1 x="579" y="806" id="338" />
+<P2 x="583" y="898" id="381" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="22" >
@@ -77,8 +77,8 @@
<TGConnectingPoint num="1" id="19" />
<TGConnectingPoint num="2" id="20" />
<TGConnectingPoint num="3" id="21" />
-<P1 x="477" y="806" id="776" />
-<P2 x="671" y="1636" id="543" />
+<P1 x="477" y="806" id="337" />
+<P2 x="671" y="1636" id="556" />
<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="546" />
-<P2 x="327" y="1423" id="380" />
+<P1 x="536" y="1598" id="559" />
+<P2 x="327" y="1423" id="719" />
<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="541" />
-<P2 x="384" y="1560" id="355" />
+<P1 x="536" y="1611" id="554" />
+<P2 x="384" y="1560" id="744" />
<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="548" />
-<P2 x="236" y="1328" id="510" />
+<P1 x="536" y="1623" id="561" />
+<P2 x="236" y="1328" id="599" />
<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="963" y="1525" id="332" />
-<P2 x="737" y="1279" id="536" />
+<P1 x="963" y="1525" id="771" />
+<P2 x="737" y="1279" id="587" />
<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="806" y="1623" id="549" />
-<P2 x="1112" y="1465" id="413" />
+<P1 x="806" y="1623" id="562" />
+<P2 x="1112" y="1465" id="702" />
<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="738" y="1586" id="545" />
-<P2 x="794" y="1463" id="437" />
+<P1 x="738" y="1586" id="558" />
+<P2 x="794" y="1463" id="676" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="46" >
@@ -217,8 +217,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="45" />
-<P1 x="603" y="1586" id="544" />
-<P2 x="548" y="1460" id="488" />
+<P1 x="603" y="1586" id="557" />
+<P2 x="548" y="1460" id="627" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="48" >
@@ -226,8 +226,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="47" />
-<P1 x="671" y="1586" id="540" />
-<P2 x="661" y="1462" id="455" />
+<P1 x="671" y="1586" id="553" />
+<P2 x="661" y="1462" id="644" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="50" >
@@ -235,8 +235,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="49" />
-<P1 x="643" y="1233" id="527" />
-<P2 x="663" y="1211" id="807" />
+<P1 x="643" y="1233" id="578" />
+<P2 x="663" y="1211" id="292" />
<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="384" y="1510" id="352" />
-<P2 x="550" y="1279" id="535" />
+<P1 x="384" y="1510" id="741" />
+<P2 x="550" y="1279" id="586" />
<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="401" y="1385" id="384" />
-<P2 x="550" y="1264" id="528" />
+<P1 x="401" y="1385" id="723" />
+<P2 x="550" y="1264" id="579" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="58" >
@@ -272,8 +272,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="57" />
-<P1 x="1055" y="1415" id="402" />
-<P2 x="737" y="1248" id="534" />
+<P1 x="1055" y="1415" id="691" />
+<P2 x="737" y="1248" id="585" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="60" >
@@ -281,8 +281,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="59" />
-<P1 x="845" y="1413" id="427" />
-<P2 x="690" y="1295" id="538" />
+<P1 x="845" y="1413" id="666" />
+<P2 x="690" y="1295" id="589" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="62" >
@@ -290,8 +290,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="61" />
-<P1 x="661" y="1412" id="452" />
-<P2 x="643" y="1295" id="530" />
+<P1 x="661" y="1412" id="641" />
+<P2 x="643" y="1295" id="581" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="64" >
@@ -299,8 +299,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="63" />
-<P1 x="507" y="1410" id="477" />
-<P2 x="596" y="1295" id="537" />
+<P1 x="507" y="1410" id="616" />
+<P2 x="596" y="1295" id="588" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="66" >
@@ -308,8 +308,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="65" />
-<P1 x="328" y="1291" id="502" />
-<P2 x="550" y="1248" id="533" />
+<P1 x="328" y="1291" id="591" />
+<P2 x="550" y="1248" id="584" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="68" >
@@ -317,8 +317,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="67" />
-<P1 x="864" y="793" id="565" />
-<P2 x="892" y="772" id="581" />
+<P1 x="864" y="793" id="540" />
+<P2 x="892" y="772" id="518" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="70" >
@@ -326,8 +326,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="69" />
-<P1 x="996" y="891" id="603" />
-<P2 x="911" y="855" id="576" />
+<P1 x="996" y="891" id="490" />
+<P2 x="911" y="855" id="551" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="72" >
@@ -335,8 +335,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="71" />
-<P1 x="776" y="885" id="628" />
-<P2 x="817" y="855" id="575" />
+<P1 x="776" y="885" id="465" />
+<P2 x="817" y="855" id="550" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="74" >
@@ -344,7 +344,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="73" />
-<P1 x="892" y="722" id="578" />
+<P1 x="892" y="722" id="515" />
<P2 x="881" y="690" id="865" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -353,26 +353,26 @@
<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="653" />
-<P2 x="776" y="935" id="631" />
+<P1 x="776" y="969" id="452" />
+<P2 x="776" y="935" id="468" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="78" >
<cdparam x="823" y="992" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="" />
+<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="77" />
-<P1 x="926" y="1053" id="666" />
-<P2 x="823" y="1031" id="664" />
+<P1 x="926" y="1053" id="427" />
+<P2 x="823" y="1031" id="463" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="80" >
<cdparam x="643" y="988" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="" />
+<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="79" />
-<P1 x="665" y="1052" id="691" />
-<P2 x="729" y="1031" id="663" />
+<P1 x="665" y="1052" id="402" />
+<P2 x="729" y="1031" id="462" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="82" >
@@ -381,7 +381,7 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="81" />
<P1 x="787" y="628" id="858" />
-<P2 x="767" y="521" id="129" />
+<P2 x="767" y="521" id="192" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="84" >
@@ -389,8 +389,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="83" />
-<P1 x="528" y="758" id="766" />
-<P2 x="573" y="413" id="154" />
+<P1 x="528" y="758" id="327" />
+<P2 x="573" y="413" id="179" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="86" >
@@ -398,8 +398,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="85" />
-<P1 x="381" y="782" id="793" />
-<P2 x="426" y="782" id="767" />
+<P1 x="381" y="782" id="316" />
+<P2 x="426" y="782" id="328" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="88" >
@@ -407,8 +407,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
<TGConnectingPoint num="0" id="87" />
-<P1 x="330" y="845" id="741" />
-<P2 x="303" y="806" id="794" />
+<P1 x="330" y="845" id="352" />
+<P2 x="303" y="806" id="317" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="90" >
@@ -416,8 +416,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="89" />
-<P1 x="467" y="547" id="192" />
-<P2 x="264" y="758" id="795" />
+<P1 x="467" y="547" id="129" />
+<P2 x="264" y="758" id="318" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="92" >
@@ -425,8 +425,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="91" />
-<P1 x="457" y="475" id="217" />
-<P2 x="467" y="497" id="189" />
+<P1 x="457" y="475" id="104" />
+<P2 x="467" y="497" id="126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="94" >
@@ -434,8 +434,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
<TGConnectingPoint num="0" id="93" />
-<P1 x="479" y="389" id="166" />
-<P2 x="495" y="389" id="152" />
+<P1 x="479" y="389" id="153" />
+<P2 x="495" y="389" id="177" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="96" >
@@ -443,8 +443,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="3" />
<TGConnectingPoint num="0" id="95" />
-<P1 x="767" y="473" id="126" />
-<P2 x="612" y="413" id="162" />
+<P1 x="767" y="473" id="189" />
+<P2 x="612" y="413" id="187" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="98" >
@@ -452,8 +452,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="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="151" />
-<P2 x="591" y="348" id="104" />
+<P1 x="573" y="365" id="176" />
+<P2 x="591" y="348" id="217" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="100" >
@@ -461,7 +461,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="99" />
-<P1 x="659" y="898" id="721" />
+<P1 x="659" y="898" id="382" />
<P2 x="787" y="690" id="864" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -469,7 +469,7 @@
<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="18" maxX="3714" minY="18" maxY="3714" />
+<cdrectangleparam minX="18" maxX="4643" minY="18" maxY="4643" />
<infoparam name="Block5" value="AttackerPC" />
<TGConnectingPoint num="0" id="239" />
<TGConnectingPoint num="1" id="240" />
@@ -498,12 +498,12 @@
</COMPONENT>
<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" />
+<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="277" minY="0" maxY="247" />
-<infoparam name="TGComponent" value="GatherInformationOnMobilePhone" />
+<cdrectangleparam minX="0" maxX="392" minY="0" maxY="247" />
+<infoparam name="TGComponent" value="InfectMobilePhone" />
<TGConnectingPoint num="0" id="101" />
<TGConnectingPoint num="1" id="102" />
<TGConnectingPoint num="2" id="103" />
@@ -528,19 +528,18 @@
<TGConnectingPoint num="21" id="122" />
<TGConnectingPoint num="22" id="123" />
<TGConnectingPoint num="23" id="124" />
-<accessibility />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="150" >
<father id="263" num="1" />
-<cdparam x="659" y="473" />
-<sizeparam width="217" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="false" />
-<cdrectangleparam minX="0" maxX="326" minY="0" maxY="247" />
-<infoparam name="TGComponent" value="ReceiveRemoteInformation" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="284" minY="0" maxY="245" />
+<infoparam name="TGComponent" value="SendSpamWithMaliciousPackage" />
<TGConnectingPoint num="0" id="126" />
<TGConnectingPoint num="1" id="127" />
<TGConnectingPoint num="2" id="128" />
@@ -569,13 +568,14 @@
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="163" >
+<SUBCOMPONENT type="1401" id="175" >
<father id="263" num="2" />
-<cdparam x="495" y="365" />
-<sizeparam width="156" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<cdrectangleparam minX="0" maxX="308" minY="0" maxY="328" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="405" minY="0" maxY="245" />
+<infoparam name="TGComponent" value="StartWebServer" />
<TGConnectingPoint num="0" id="151" />
<TGConnectingPoint num="1" id="152" />
<TGConnectingPoint num="2" id="153" />
@@ -588,54 +588,53 @@
<TGConnectingPoint num="9" id="160" />
<TGConnectingPoint num="10" id="161" />
<TGConnectingPoint num="11" id="162" />
+<TGConnectingPoint num="12" id="163" />
+<TGConnectingPoint num="13" id="164" />
+<TGConnectingPoint num="14" id="165" />
+<TGConnectingPoint num="15" id="166" />
+<TGConnectingPoint num="16" id="167" />
+<TGConnectingPoint num="17" id="168" />
+<TGConnectingPoint num="18" id="169" />
+<TGConnectingPoint num="19" id="170" />
+<TGConnectingPoint num="20" id="171" />
+<TGConnectingPoint num="21" id="172" />
+<TGConnectingPoint num="22" id="173" />
+<TGConnectingPoint num="23" id="174" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="188" >
+<SUBCOMPONENT type="1402" id="188" >
<father id="263" num="3" />
-<cdparam x="341" y="364" />
-<sizeparam width="138" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<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" />
+<cdrectangleparam minX="0" maxX="308" minY="0" maxY="328" />
+<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<TGConnectingPoint num="0" id="176" />
+<TGConnectingPoint num="1" id="177" />
+<TGConnectingPoint num="2" id="178" />
+<TGConnectingPoint num="3" id="179" />
+<TGConnectingPoint num="4" id="180" />
+<TGConnectingPoint num="5" id="181" />
+<TGConnectingPoint num="6" id="182" />
+<TGConnectingPoint num="7" id="183" />
+<TGConnectingPoint num="8" id="184" />
+<TGConnectingPoint num="9" id="185" />
+<TGConnectingPoint num="10" id="186" />
+<TGConnectingPoint num="11" id="187" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="213" >
<father id="263" num="4" />
-<cdparam x="338" y="497" />
-<sizeparam width="259" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="284" minY="0" maxY="245" />
-<infoparam name="TGComponent" value="SendSpamWithMaliciousPackage" />
+<enabled value="false" />
+<cdrectangleparam minX="0" maxX="326" minY="0" maxY="247" />
+<infoparam name="TGComponent" value="ReceiveRemoteInformation" />
<TGConnectingPoint num="0" id="189" />
<TGConnectingPoint num="1" id="190" />
<TGConnectingPoint num="2" id="191" />
@@ -666,12 +665,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="238" >
<father id="263" num="5" />
-<cdparam x="382" y="427" />
-<sizeparam width="151" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="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="392" 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="214" />
<TGConnectingPoint num="1" id="215" />
<TGConnectingPoint num="2" id="216" />
@@ -696,8 +695,9 @@
<TGConnectingPoint num="21" id="235" />
<TGConnectingPoint num="22" id="236" />
<TGConnectingPoint num="23" id="237" />
+<accessibility />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="true" />
</extraparam>
</SUBCOMPONENT>
@@ -705,7 +705,7 @@
<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="18" maxX="3714" minY="18" maxY="3714" />
+<cdrectangleparam minX="18" maxX="4643" minY="18" maxY="4643" />
<infoparam name="Block8" value="AttackerSystem" />
<TGConnectingPoint num="0" id="264" />
<TGConnectingPoint num="1" id="265" />
@@ -737,7 +737,7 @@
<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="18" maxX="3714" minY="18" maxY="3714" />
+<cdrectangleparam minX="18" maxX="4643" minY="18" maxY="4643" />
<infoparam name="Block2" value="UserMobilePhone_Android" />
<TGConnectingPoint num="0" id="829" />
<TGConnectingPoint num="1" id="830" />
@@ -764,13 +764,14 @@
<TGConnectingPoint num="22" id="851" />
<TGConnectingPoint num="23" id="852" />
</COMPONENT>
-<SUBCOMPONENT type="1402" id="301" >
+<SUBCOMPONENT type="1401" id="313" >
<father id="853" num="0" />
-<cdparam x="372" y="1046" />
-<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<cdrectangleparam minX="0" maxX="819" minY="0" maxY="1043" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="789" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="RestartMaliciousApplication" />
<TGConnectingPoint num="0" id="289" />
<TGConnectingPoint num="1" id="290" />
<TGConnectingPoint num="2" id="291" />
@@ -783,54 +784,53 @@
<TGConnectingPoint num="9" id="298" />
<TGConnectingPoint num="10" id="299" />
<TGConnectingPoint num="11" id="300" />
+<TGConnectingPoint num="12" id="301" />
+<TGConnectingPoint num="13" id="302" />
+<TGConnectingPoint num="14" id="303" />
+<TGConnectingPoint num="15" id="304" />
+<TGConnectingPoint num="16" id="305" />
+<TGConnectingPoint num="17" id="306" />
+<TGConnectingPoint num="18" id="307" />
+<TGConnectingPoint num="19" id="308" />
+<TGConnectingPoint num="20" id="309" />
+<TGConnectingPoint num="21" id="310" />
+<TGConnectingPoint num="22" id="311" />
+<TGConnectingPoint num="23" id="312" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="326" >
+<SUBCOMPONENT type="1402" id="326" >
<father id="853" num="1" />
-<cdparam x="403" y="1149" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<enabled value="true" />
-<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" />
+<cdrectangleparam minX="0" maxX="125" minY="0" maxY="368" />
+<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<TGConnectingPoint num="0" id="314" />
+<TGConnectingPoint num="1" id="315" />
+<TGConnectingPoint num="2" id="316" />
+<TGConnectingPoint num="3" id="317" />
+<TGConnectingPoint num="4" id="318" />
+<TGConnectingPoint num="5" id="319" />
+<TGConnectingPoint num="6" id="320" />
+<TGConnectingPoint num="7" id="321" />
+<TGConnectingPoint num="8" id="322" />
+<TGConnectingPoint num="9" id="323" />
+<TGConnectingPoint num="10" id="324" />
+<TGConnectingPoint num="11" id="325" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="351" >
<father id="853" num="2" />
-<cdparam x="775" y="1525" />
-<sizeparam width="251" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="755" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorFailureInDataConnection" />
+<cdrectangleparam minX="0" maxX="802" minY="0" maxY="941" />
+<infoparam name="TGComponent" value="InstallMaliciousApplication" />
<TGConnectingPoint num="0" id="327" />
<TGConnectingPoint num="1" id="328" />
<TGConnectingPoint num="2" id="329" />
@@ -861,12 +861,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="376" >
<father id="853" num="3" />
-<cdparam x="248" y="1510" />
-<sizeparam width="273" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="733" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorNetworkConnectionChange" />
+<cdrectangleparam minX="0" maxX="745" minY="0" maxY="941" />
+<infoparam name="TGComponent" value="OpenSpamWithMaliciousPackage" />
<TGConnectingPoint num="0" id="352" />
<TGConnectingPoint num="1" id="353" />
<TGConnectingPoint num="2" id="354" />
@@ -897,12 +897,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="401" >
<father id="853" num="4" />
-<cdparam x="254" y="1373" />
-<sizeparam width="147" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="859" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorScreenOn" />
+<cdrectangleparam minX="0" maxX="854" minY="0" maxY="941" />
+<infoparam name="TGComponent" value="RegisterThePhone" />
<TGConnectingPoint num="0" id="377" />
<TGConnectingPoint num="1" id="378" />
<TGConnectingPoint num="2" id="379" />
@@ -933,12 +933,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="426" >
<father id="853" num="5" />
-<cdparam x="940" y="1415" />
-<sizeparam width="230" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="776" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorApplicationInstallation" />
+<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="GatherIntent" />
<TGConnectingPoint num="0" id="402" />
<TGConnectingPoint num="1" id="403" />
<TGConnectingPoint num="2" id="404" />
@@ -969,12 +969,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="451" >
<father id="853" num="6" />
-<cdparam x="744" y="1413" />
-<sizeparam width="202" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="804" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorWallPaperChange" />
+<cdrectangleparam minX="0" maxX="870" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="BroadcastIntent" />
<TGConnectingPoint num="0" id="427" />
<TGConnectingPoint num="1" id="428" />
<TGConnectingPoint num="2" id="429" />
@@ -1003,14 +1003,13 @@
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="476" >
+<SUBCOMPONENT type="1402" id="464" >
<father id="853" num="7" />
-<cdparam x="578" y="1412" />
-<sizeparam width="166" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="840" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorTimeChange" />
+<cdrectangleparam minX="0" maxX="687" minY="0" maxY="355" />
+<infoparam name="TGComponent" value="<<AFTER>>" />
<TGConnectingPoint num="0" id="452" />
<TGConnectingPoint num="1" id="453" />
<TGConnectingPoint num="2" id="454" />
@@ -1023,125 +1022,125 @@
<TGConnectingPoint num="9" id="461" />
<TGConnectingPoint num="10" id="462" />
<TGConnectingPoint num="11" id="463" />
-<TGConnectingPoint num="12" id="464" />
-<TGConnectingPoint num="13" id="465" />
-<TGConnectingPoint num="14" id="466" />
-<TGConnectingPoint num="15" id="467" />
-<TGConnectingPoint num="16" id="468" />
-<TGConnectingPoint num="17" id="469" />
-<TGConnectingPoint num="18" id="470" />
-<TGConnectingPoint num="19" id="471" />
-<TGConnectingPoint num="20" id="472" />
-<TGConnectingPoint num="21" id="473" />
-<TGConnectingPoint num="22" id="474" />
-<TGConnectingPoint num="23" id="475" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="1" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="501" >
+<SUBCOMPONENT type="1401" id="489" >
<father id="853" num="8" />
-<cdparam x="424" y="1410" />
-<sizeparam width="166" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="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" />
+<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="ManageIntent" />
+<TGConnectingPoint num="0" id="465" />
+<TGConnectingPoint num="1" id="466" />
+<TGConnectingPoint num="2" id="467" />
+<TGConnectingPoint num="3" id="468" />
+<TGConnectingPoint num="4" id="469" />
+<TGConnectingPoint num="5" id="470" />
+<TGConnectingPoint num="6" id="471" />
+<TGConnectingPoint num="7" id="472" />
+<TGConnectingPoint num="8" id="473" />
+<TGConnectingPoint num="9" id="474" />
+<TGConnectingPoint num="10" id="475" />
+<TGConnectingPoint num="11" id="476" />
+<TGConnectingPoint num="12" id="477" />
+<TGConnectingPoint num="13" id="478" />
+<TGConnectingPoint num="14" id="479" />
+<TGConnectingPoint num="15" id="480" />
+<TGConnectingPoint num="16" id="481" />
+<TGConnectingPoint num="17" id="482" />
+<TGConnectingPoint num="18" id="483" />
+<TGConnectingPoint num="19" id="484" />
+<TGConnectingPoint num="20" id="485" />
+<TGConnectingPoint num="21" id="486" />
+<TGConnectingPoint num="22" id="487" />
+<TGConnectingPoint num="23" id="488" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="526" >
+<SUBCOMPONENT type="1401" id="514" >
<father id="853" num="9" />
-<cdparam x="236" y="1291" />
-<sizeparam width="184" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="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" />
+<cdrectangleparam minX="0" maxX="809" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="SpiesIncomingMessages" />
+<TGConnectingPoint num="0" id="490" />
+<TGConnectingPoint num="1" id="491" />
+<TGConnectingPoint num="2" id="492" />
+<TGConnectingPoint num="3" id="493" />
+<TGConnectingPoint num="4" id="494" />
+<TGConnectingPoint num="5" id="495" />
+<TGConnectingPoint num="6" id="496" />
+<TGConnectingPoint num="7" id="497" />
+<TGConnectingPoint num="8" id="498" />
+<TGConnectingPoint num="9" id="499" />
+<TGConnectingPoint num="10" id="500" />
+<TGConnectingPoint num="11" id="501" />
+<TGConnectingPoint num="12" id="502" />
+<TGConnectingPoint num="13" id="503" />
+<TGConnectingPoint num="14" id="504" />
+<TGConnectingPoint num="15" id="505" />
+<TGConnectingPoint num="16" id="506" />
+<TGConnectingPoint num="17" id="507" />
+<TGConnectingPoint num="18" id="508" />
+<TGConnectingPoint num="19" id="509" />
+<TGConnectingPoint num="20" id="510" />
+<TGConnectingPoint num="21" id="511" />
+<TGConnectingPoint num="22" id="512" />
+<TGConnectingPoint num="23" id="513" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="539" >
+<SUBCOMPONENT type="1401" id="539" >
<father id="853" num="10" />
-<cdparam x="550" y="1233" />
-<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<cdrectangleparam minX="0" maxX="819" minY="0" maxY="530" />
-<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="527" />
-<TGConnectingPoint num="1" id="528" />
-<TGConnectingPoint num="2" id="529" />
-<TGConnectingPoint num="3" id="530" />
-<TGConnectingPoint num="4" id="531" />
-<TGConnectingPoint num="5" id="532" />
-<TGConnectingPoint num="6" id="533" />
-<TGConnectingPoint num="7" id="534" />
-<TGConnectingPoint num="8" id="535" />
-<TGConnectingPoint num="9" id="536" />
-<TGConnectingPoint num="10" id="537" />
-<TGConnectingPoint num="11" id="538" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="816" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="SendPrivateInformation" />
+<TGConnectingPoint num="0" id="515" />
+<TGConnectingPoint num="1" id="516" />
+<TGConnectingPoint num="2" id="517" />
+<TGConnectingPoint num="3" id="518" />
+<TGConnectingPoint num="4" id="519" />
+<TGConnectingPoint num="5" id="520" />
+<TGConnectingPoint num="6" id="521" />
+<TGConnectingPoint num="7" id="522" />
+<TGConnectingPoint num="8" id="523" />
+<TGConnectingPoint num="9" id="524" />
+<TGConnectingPoint num="10" id="525" />
+<TGConnectingPoint num="11" id="526" />
+<TGConnectingPoint num="12" id="527" />
+<TGConnectingPoint num="13" id="528" />
+<TGConnectingPoint num="14" id="529" />
+<TGConnectingPoint num="15" id="530" />
+<TGConnectingPoint num="16" id="531" />
+<TGConnectingPoint num="17" id="532" />
+<TGConnectingPoint num="18" id="533" />
+<TGConnectingPoint num="19" id="534" />
+<TGConnectingPoint num="20" id="535" />
+<TGConnectingPoint num="21" id="536" />
+<TGConnectingPoint num="22" id="537" />
+<TGConnectingPoint num="23" id="538" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="564" >
+<SUBCOMPONENT type="1402" id="552" >
<father id="853" num="11" />
-<cdparam x="536" y="1586" />
-<sizeparam width="270" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="736" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="MonitorMaliciousPackageIsRunning" />
+<cdrectangleparam minX="0" maxX="819" minY="0" maxY="355" />
+<infoparam name="TGComponent" value="<<OR>>" />
<TGConnectingPoint num="0" id="540" />
<TGConnectingPoint num="1" id="541" />
<TGConnectingPoint num="2" id="542" />
@@ -1154,53 +1153,53 @@
<TGConnectingPoint num="9" id="549" />
<TGConnectingPoint num="10" id="550" />
<TGConnectingPoint num="11" id="551" />
-<TGConnectingPoint num="12" id="552" />
-<TGConnectingPoint num="13" id="553" />
-<TGConnectingPoint num="14" id="554" />
-<TGConnectingPoint num="15" id="555" />
-<TGConnectingPoint num="16" id="556" />
-<TGConnectingPoint num="17" id="557" />
-<TGConnectingPoint num="18" id="558" />
-<TGConnectingPoint num="19" id="559" />
-<TGConnectingPoint num="20" id="560" />
-<TGConnectingPoint num="21" id="561" />
-<TGConnectingPoint num="22" id="562" />
-<TGConnectingPoint num="23" id="563" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="577" >
+<SUBCOMPONENT type="1401" id="577" >
<father id="853" num="12" />
-<cdparam x="771" y="793" />
-<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="536" y="1586" />
+<sizeparam width="270" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="819" minY="0" maxY="355" />
-<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="565" />
-<TGConnectingPoint num="1" id="566" />
-<TGConnectingPoint num="2" id="567" />
-<TGConnectingPoint num="3" id="568" />
-<TGConnectingPoint num="4" id="569" />
-<TGConnectingPoint num="5" id="570" />
-<TGConnectingPoint num="6" id="571" />
-<TGConnectingPoint num="7" id="572" />
-<TGConnectingPoint num="8" id="573" />
-<TGConnectingPoint num="9" id="574" />
-<TGConnectingPoint num="10" id="575" />
-<TGConnectingPoint num="11" id="576" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="736" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorMaliciousPackageIsRunning" />
+<TGConnectingPoint num="0" id="553" />
+<TGConnectingPoint num="1" id="554" />
+<TGConnectingPoint num="2" id="555" />
+<TGConnectingPoint num="3" id="556" />
+<TGConnectingPoint num="4" id="557" />
+<TGConnectingPoint num="5" id="558" />
+<TGConnectingPoint num="6" id="559" />
+<TGConnectingPoint num="7" id="560" />
+<TGConnectingPoint num="8" id="561" />
+<TGConnectingPoint num="9" id="562" />
+<TGConnectingPoint num="10" id="563" />
+<TGConnectingPoint num="11" id="564" />
+<TGConnectingPoint num="12" id="565" />
+<TGConnectingPoint num="13" id="566" />
+<TGConnectingPoint num="14" id="567" />
+<TGConnectingPoint num="15" id="568" />
+<TGConnectingPoint num="16" id="569" />
+<TGConnectingPoint num="17" id="570" />
+<TGConnectingPoint num="18" id="571" />
+<TGConnectingPoint num="19" id="572" />
+<TGConnectingPoint num="20" id="573" />
+<TGConnectingPoint num="21" id="574" />
+<TGConnectingPoint num="22" id="575" />
+<TGConnectingPoint num="23" id="576" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="602" >
+<SUBCOMPONENT type="1402" id="590" >
<father id="853" num="13" />
-<cdparam x="797" y="722" />
-<sizeparam width="190" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="816" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="SendPrivateInformation" />
+<cdrectangleparam minX="0" maxX="819" minY="0" maxY="530" />
+<infoparam name="TGComponent" value="<<OR>>" />
<TGConnectingPoint num="0" id="578" />
<TGConnectingPoint num="1" id="579" />
<TGConnectingPoint num="2" id="580" />
@@ -1213,125 +1212,126 @@
<TGConnectingPoint num="9" id="587" />
<TGConnectingPoint num="10" id="588" />
<TGConnectingPoint num="11" id="589" />
-<TGConnectingPoint num="12" id="590" />
-<TGConnectingPoint num="13" id="591" />
-<TGConnectingPoint num="14" id="592" />
-<TGConnectingPoint num="15" id="593" />
-<TGConnectingPoint num="16" id="594" />
-<TGConnectingPoint num="17" id="595" />
-<TGConnectingPoint num="18" id="596" />
-<TGConnectingPoint num="19" id="597" />
-<TGConnectingPoint num="20" id="598" />
-<TGConnectingPoint num="21" id="599" />
-<TGConnectingPoint num="22" id="600" />
-<TGConnectingPoint num="23" id="601" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="627" >
+<SUBCOMPONENT type="1401" id="615" >
<father id="853" num="14" />
-<cdparam x="898" y="891" />
-<sizeparam width="197" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="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" />
+<cdrectangleparam minX="0" maxX="822" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorDeviceWakeUp" />
+<TGConnectingPoint num="0" id="591" />
+<TGConnectingPoint num="1" id="592" />
+<TGConnectingPoint num="2" id="593" />
+<TGConnectingPoint num="3" id="594" />
+<TGConnectingPoint num="4" id="595" />
+<TGConnectingPoint num="5" id="596" />
+<TGConnectingPoint num="6" id="597" />
+<TGConnectingPoint num="7" id="598" />
+<TGConnectingPoint num="8" id="599" />
+<TGConnectingPoint num="9" id="600" />
+<TGConnectingPoint num="10" id="601" />
+<TGConnectingPoint num="11" id="602" />
+<TGConnectingPoint num="12" id="603" />
+<TGConnectingPoint num="13" id="604" />
+<TGConnectingPoint num="14" id="605" />
+<TGConnectingPoint num="15" id="606" />
+<TGConnectingPoint num="16" id="607" />
+<TGConnectingPoint num="17" id="608" />
+<TGConnectingPoint num="18" id="609" />
+<TGConnectingPoint num="19" id="610" />
+<TGConnectingPoint num="20" id="611" />
+<TGConnectingPoint num="21" id="612" />
+<TGConnectingPoint num="22" id="613" />
+<TGConnectingPoint num="23" id="614" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="652" >
+<SUBCOMPONENT type="1401" id="640" >
<father id="853" num="15" />
-<cdparam x="714" y="885" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="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" />
+<cdrectangleparam minX="0" maxX="840" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorBatteryLevel" />
+<TGConnectingPoint num="0" id="616" />
+<TGConnectingPoint num="1" id="617" />
+<TGConnectingPoint num="2" id="618" />
+<TGConnectingPoint num="3" id="619" />
+<TGConnectingPoint num="4" id="620" />
+<TGConnectingPoint num="5" id="621" />
+<TGConnectingPoint num="6" id="622" />
+<TGConnectingPoint num="7" id="623" />
+<TGConnectingPoint num="8" id="624" />
+<TGConnectingPoint num="9" id="625" />
+<TGConnectingPoint num="10" id="626" />
+<TGConnectingPoint num="11" id="627" />
+<TGConnectingPoint num="12" id="628" />
+<TGConnectingPoint num="13" id="629" />
+<TGConnectingPoint num="14" id="630" />
+<TGConnectingPoint num="15" id="631" />
+<TGConnectingPoint num="16" id="632" />
+<TGConnectingPoint num="17" id="633" />
+<TGConnectingPoint num="18" id="634" />
+<TGConnectingPoint num="19" id="635" />
+<TGConnectingPoint num="20" id="636" />
+<TGConnectingPoint num="21" id="637" />
+<TGConnectingPoint num="22" id="638" />
+<TGConnectingPoint num="23" id="639" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="665" >
+<SUBCOMPONENT type="1401" id="665" >
<father id="853" num="16" />
-<cdparam x="683" y="969" />
-<sizeparam width="187" height="62" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<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" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="840" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorTimeChange" />
+<TGConnectingPoint num="0" id="641" />
+<TGConnectingPoint num="1" id="642" />
+<TGConnectingPoint num="2" id="643" />
+<TGConnectingPoint num="3" id="644" />
+<TGConnectingPoint num="4" id="645" />
+<TGConnectingPoint num="5" id="646" />
+<TGConnectingPoint num="6" id="647" />
+<TGConnectingPoint num="7" id="648" />
+<TGConnectingPoint num="8" id="649" />
+<TGConnectingPoint num="9" id="650" />
+<TGConnectingPoint num="10" id="651" />
+<TGConnectingPoint num="11" id="652" />
+<TGConnectingPoint num="12" id="653" />
+<TGConnectingPoint num="13" id="654" />
+<TGConnectingPoint num="14" id="655" />
+<TGConnectingPoint num="15" id="656" />
+<TGConnectingPoint num="16" id="657" />
+<TGConnectingPoint num="17" id="658" />
+<TGConnectingPoint num="18" id="659" />
+<TGConnectingPoint num="19" id="660" />
+<TGConnectingPoint num="20" id="661" />
+<TGConnectingPoint num="21" id="662" />
+<TGConnectingPoint num="22" id="663" />
+<TGConnectingPoint num="23" id="664" />
<extraparam>
-<info equation="1" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="690" >
<father id="853" num="17" />
-<cdparam x="858" y="1053" />
-<sizeparam width="136" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="870" minY="0" maxY="939" />
-<infoparam name="TGComponent" value="BroadcastIntent" />
+<cdrectangleparam minX="0" maxX="804" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorWallPaperChange" />
<TGConnectingPoint num="0" id="666" />
<TGConnectingPoint num="1" id="667" />
<TGConnectingPoint num="2" id="668" />
@@ -1362,12 +1362,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="715" >
<father id="853" num="18" />
-<cdparam x="603" y="1052" />
-<sizeparam width="125" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="GatherIntent" />
+<cdrectangleparam minX="0" maxX="776" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorApplicationInstallation" />
<TGConnectingPoint num="0" id="691" />
<TGConnectingPoint num="1" id="692" />
<TGConnectingPoint num="2" id="693" />
@@ -1398,12 +1398,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="740" >
<father id="853" num="19" />
-<cdparam x="545" y="898" />
-<sizeparam width="152" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="854" minY="0" maxY="941" />
-<infoparam name="TGComponent" value="RegisterThePhone" />
+<cdrectangleparam minX="0" maxX="859" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorScreenOn" />
<TGConnectingPoint num="0" id="716" />
<TGConnectingPoint num="1" id="717" />
<TGConnectingPoint num="2" id="718" />
@@ -1434,12 +1434,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="765" >
<father id="853" num="20" />
-<cdparam x="200" y="845" />
-<sizeparam width="261" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="745" minY="0" maxY="941" />
-<infoparam name="TGComponent" value="OpenSpamWithMaliciousPackage" />
+<cdrectangleparam minX="0" maxX="733" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorNetworkConnectionChange" />
<TGConnectingPoint num="0" id="741" />
<TGConnectingPoint num="1" id="742" />
<TGConnectingPoint num="2" id="743" />
@@ -1470,12 +1470,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="790" >
<father id="853" num="21" />
-<cdparam x="426" y="758" />
-<sizeparam width="204" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="802" minY="0" maxY="941" />
-<infoparam name="TGComponent" value="InstallMaliciousApplication" />
+<cdrectangleparam minX="0" maxX="755" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorFailureInDataConnection" />
<TGConnectingPoint num="0" id="766" />
<TGConnectingPoint num="1" id="767" />
<TGConnectingPoint num="2" id="768" />
@@ -1504,13 +1504,14 @@
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="803" >
+<SUBCOMPONENT type="1401" id="815" >
<father id="853" num="22" />
-<cdparam x="225" y="758" />
-<sizeparam width="156" height="48" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="368" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="881" minY="0" maxY="939" />
+<infoparam name="TGComponent" value="MonitorIntent" />
<TGConnectingPoint num="0" id="791" />
<TGConnectingPoint num="1" id="792" />
<TGConnectingPoint num="2" id="793" />
@@ -1523,44 +1524,43 @@
<TGConnectingPoint num="9" id="800" />
<TGConnectingPoint num="10" id="801" />
<TGConnectingPoint num="11" id="802" />
+<TGConnectingPoint num="12" id="803" />
+<TGConnectingPoint num="13" id="804" />
+<TGConnectingPoint num="14" id="805" />
+<TGConnectingPoint num="15" id="806" />
+<TGConnectingPoint num="16" id="807" />
+<TGConnectingPoint num="17" id="808" />
+<TGConnectingPoint num="18" id="809" />
+<TGConnectingPoint num="19" id="810" />
+<TGConnectingPoint num="20" id="811" />
+<TGConnectingPoint num="21" id="812" />
+<TGConnectingPoint num="22" id="813" />
+<TGConnectingPoint num="23" id="814" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="828" >
+<SUBCOMPONENT type="1402" id="828" >
<father id="853" num="23" />
-<cdparam x="555" y="1161" />
-<sizeparam width="217" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="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" />
-<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" />
+<cdrectangleparam minX="0" maxX="819" minY="0" maxY="1043" />
+<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<TGConnectingPoint num="0" id="816" />
+<TGConnectingPoint num="1" id="817" />
+<TGConnectingPoint num="2" id="818" />
+<TGConnectingPoint num="3" id="819" />
+<TGConnectingPoint num="4" id="820" />
+<TGConnectingPoint num="5" id="821" />
+<TGConnectingPoint num="6" id="822" />
+<TGConnectingPoint num="7" id="823" />
+<TGConnectingPoint num="8" id="824" />
+<TGConnectingPoint num="9" id="825" />
+<TGConnectingPoint num="10" id="826" />
+<TGConnectingPoint num="11" id="827" />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
@@ -1568,7 +1568,7 @@
<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="18" maxX="3714" minY="18" maxY="3714" />
+<cdrectangleparam minX="18" maxX="4643" minY="18" maxY="4643" />
<infoparam name="Block9" value="AttackedSystem" />
<TGConnectingPoint num="0" id="867" />
<TGConnectingPoint num="1" id="868" />
diff --git a/modeling/SysMLSec/at_zeuszitmo.xml b/modeling/SysMLSec/at_zeuszitmo.xml
index 7dcc2df2be15dfce49ee7a3f0debc0bd779b6a37..3facbfdb4870118b15499ff8eb6055ff59b9341e 100644
--- a/modeling/SysMLSec/at_zeuszitmo.xml
+++ b/modeling/SysMLSec/at_zeuszitmo.xml
@@ -9,7 +9,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="1" />
-<P1 x="663" y="785" id="303" />
+<P1 x="663" y="785" id="228" />
<P2 x="757" y="658" id="203" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -36,8 +36,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="7" />
-<P1 x="938" y="416" id="651" />
-<P2 x="937" y="382" id="629" />
+<P1 x="938" y="416" id="614" />
+<P2 x="937" y="382" id="630" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="12" >
@@ -46,8 +46,8 @@
<infoparam name="connector from TGComponent to TGComponent" value="2" />
<TGConnectingPoint num="0" id="10" />
<TGConnectingPoint num="1" id="11" />
-<P1 x="937" y="347" id="626" />
-<P2 x="892" y="314" id="675" />
+<P1 x="937" y="347" id="627" />
+<P2 x="892" y="314" id="612" />
<Point x="931" y="331" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="9" >
@@ -64,8 +64,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="13" />
-<P1 x="861" y="279" id="664" />
-<P2 x="821" y="250" id="579" />
+<P1 x="861" y="279" id="601" />
+<P2 x="821" y="250" id="680" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="16" >
@@ -73,7 +73,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="15" />
-<P1 x="663" y="840" id="228" />
+<P1 x="663" y="840" id="303" />
<P2 x="726" y="814" id="197" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -82,7 +82,7 @@
<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="17" />
-<P1 x="893" y="783" id="405" />
+<P1 x="893" y="783" id="355" />
<P2 x="917" y="682" id="184" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -92,7 +92,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="19" />
<P1 x="819" y="805" id="196" />
-<P2 x="838" y="800" id="402" />
+<P2 x="838" y="800" id="352" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="22" >
@@ -109,7 +109,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="23" />
-<P1 x="983" y="720" id="356" />
+<P1 x="983" y="720" id="406" />
<P2 x="979" y="682" id="185" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -127,8 +127,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="1" />
<TGConnectingPoint num="0" id="27" />
-<P1 x="711" y="347" id="605" />
-<P2 x="830" y="314" id="674" />
+<P1 x="711" y="347" id="656" />
+<P2 x="830" y="314" id="611" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="30" >
@@ -136,8 +136,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="0" />
<TGConnectingPoint num="0" id="29" />
-<P1 x="805" y="435" id="679" />
-<P2 x="877" y="433" id="652" />
+<P1 x="805" y="435" id="578" />
+<P2 x="877" y="433" id="615" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="32" >
@@ -155,7 +155,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="33" />
<P1 x="955" y="578" id="376" />
-<P2 x="938" y="451" id="654" />
+<P2 x="938" y="451" id="617" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="36" >
@@ -164,7 +164,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="35" />
<P1 x="653" y="563" id="732" />
-<P2 x="676" y="373" id="609" />
+<P2 x="676" y="373" id="660" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="38" >
@@ -181,7 +181,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="39" />
-<P1 x="600" y="733" id="278" />
+<P1 x="600" y="733" id="253" />
<P2 x="726" y="658" id="210" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -190,7 +190,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="41" />
-<P1 x="395" y="888" id="252" />
+<P1 x="395" y="888" id="277" />
<P2 x="342" y="888" id="215" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -199,7 +199,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="43" />
-<P1 x="244" y="830" id="454" />
+<P1 x="244" y="830" id="479" />
<P2 x="249" y="871" id="217" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -209,7 +209,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="45" />
<P1 x="311" y="871" id="218" />
-<P2 x="299" y="773" id="485" />
+<P2 x="299" y="773" id="460" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="48" >
@@ -217,7 +217,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="47" />
-<P1 x="249" y="747" id="476" />
+<P1 x="249" y="747" id="451" />
<P2 x="259" y="678" id="529" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -518,12 +518,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="250" >
<father id="350" num="0" />
-<cdparam x="340" y="823" />
-<sizeparam width="323" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="370" y="768" />
+<sizeparam width="293" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="-20" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="RequestUserToInstallMobileFakeBankApplication" />
+<cdrectangleparam minX="0" maxX="10" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="RedirectHTTPRequestFromBankToFakeBank" />
<TGConnectingPoint num="0" id="226" />
<TGConnectingPoint num="1" id="227" />
<TGConnectingPoint num="2" id="228" />
@@ -554,12 +554,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="275" >
<father id="350" num="1" />
-<cdparam x="395" y="871" />
-<sizeparam width="134" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="448" y="716" />
+<sizeparam width="152" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="ExploitVunerability" />
+<cdrectangleparam minX="0" maxX="151" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="InstallMaliciousPlugin" />
<TGConnectingPoint num="0" id="251" />
<TGConnectingPoint num="1" id="252" />
<TGConnectingPoint num="2" id="253" />
@@ -590,12 +590,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="300" >
<father id="350" num="2" />
-<cdparam x="448" y="716" />
-<sizeparam width="152" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="395" y="871" />
+<sizeparam width="134" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="151" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="InstallMaliciousPlugin" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="ExploitVunerability" />
<TGConnectingPoint num="0" id="276" />
<TGConnectingPoint num="1" id="277" />
<TGConnectingPoint num="2" id="278" />
@@ -626,12 +626,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="325" >
<father id="350" num="3" />
-<cdparam x="370" y="768" />
-<sizeparam width="293" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="340" y="823" />
+<sizeparam width="323" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="10" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="RedirectHTTPRequestFromBankToFakeBank" />
+<cdrectangleparam minX="0" maxX="-20" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="RequestUserToInstallMobileFakeBankApplication" />
<TGConnectingPoint num="0" id="301" />
<TGConnectingPoint num="1" id="302" />
<TGConnectingPoint num="2" id="303" />
@@ -694,12 +694,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="375" >
<father id="450" num="0" />
-<cdparam x="873" y="720" />
-<sizeparam width="147" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="838" y="783" />
+<sizeparam width="223" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="77" minY="0" maxY="296" />
-<infoparam name="TGComponent" value="SilentlyInterceptSMS" />
+<cdrectangleparam minX="0" maxX="1" minY="0" maxY="296" />
+<infoparam name="TGComponent" value="UserInstallsFakeBankApplication" />
<TGConnectingPoint num="0" id="351" />
<TGConnectingPoint num="1" id="352" />
<TGConnectingPoint num="2" id="353" />
@@ -766,12 +766,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="425" >
<father id="450" num="2" />
-<cdparam x="838" y="783" />
-<sizeparam width="223" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="873" y="720" />
+<sizeparam width="147" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="1" minY="0" maxY="296" />
-<infoparam name="TGComponent" value="UserInstallsFakeBankApplication" />
+<cdrectangleparam minX="0" maxX="77" minY="0" maxY="296" />
+<infoparam name="TGComponent" value="SilentlyInterceptSMS" />
<TGConnectingPoint num="0" id="401" />
<TGConnectingPoint num="1" id="402" />
<TGConnectingPoint num="2" id="403" />
@@ -834,12 +834,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="475" >
<father id="525" num="0" />
-<cdparam x="176" y="795" />
-<sizeparam width="137" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="199" y="747" />
+<sizeparam width="100" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="7" minY="0" maxY="93" />
-<infoparam name="TGComponent" value="ExploitVulnerability" />
+<cdrectangleparam minX="0" maxX="44" minY="0" maxY="93" />
+<infoparam name="TGComponent" value="InstallTrojan" />
<TGConnectingPoint num="0" id="451" />
<TGConnectingPoint num="1" id="452" />
<TGConnectingPoint num="2" id="453" />
@@ -870,12 +870,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="500" >
<father id="525" num="1" />
-<cdparam x="199" y="747" />
-<sizeparam width="100" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="176" y="795" />
+<sizeparam width="137" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="44" minY="0" maxY="93" />
-<infoparam name="TGComponent" value="InstallTrojan" />
+<cdrectangleparam minX="0" maxX="7" minY="0" maxY="93" />
+<infoparam name="TGComponent" value="ExploitVulnerability" />
<TGConnectingPoint num="0" id="476" />
<TGConnectingPoint num="1" id="477" />
<TGConnectingPoint num="2" id="478" />
@@ -1006,12 +1006,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="600" >
<father id="726" num="0" />
-<cdparam x="668" y="215" />
-<sizeparam width="306" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="674" y="418" />
+<sizeparam width="131" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="85" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="IllegalBankAccountTransactionBasedOnToken" />
+<cdrectangleparam minX="0" maxX="260" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="SendTANToServer" />
<TGConnectingPoint num="0" id="576" />
<TGConnectingPoint num="1" id="577" />
<TGConnectingPoint num="2" id="578" />
@@ -1036,19 +1036,17 @@
<TGConnectingPoint num="21" id="597" />
<TGConnectingPoint num="22" id="598" />
<TGConnectingPoint num="23" id="599" />
-<accessibility />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="625" >
+<SUBCOMPONENT type="1402" id="613" >
<father id="726" num="1" />
-<cdparam x="676" y="347" />
-<sizeparam width="141" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="800" y="279" />
+<sizeparam width="123" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="250" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="LogOnBankAccount" />
+<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="<<SEQUENCE>>" />
<TGConnectingPoint num="0" id="601" />
<TGConnectingPoint num="1" id="602" />
<TGConnectingPoint num="2" id="603" />
@@ -1061,113 +1059,114 @@
<TGConnectingPoint num="9" id="610" />
<TGConnectingPoint num="10" id="611" />
<TGConnectingPoint num="11" id="612" />
-<TGConnectingPoint num="12" id="613" />
-<TGConnectingPoint num="13" id="614" />
-<TGConnectingPoint num="14" id="615" />
-<TGConnectingPoint num="15" id="616" />
-<TGConnectingPoint num="16" id="617" />
-<TGConnectingPoint num="17" id="618" />
-<TGConnectingPoint num="18" id="619" />
-<TGConnectingPoint num="19" id="620" />
-<TGConnectingPoint num="20" id="621" />
-<TGConnectingPoint num="21" id="622" />
-<TGConnectingPoint num="22" id="623" />
-<TGConnectingPoint num="23" id="624" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="650" >
+<SUBCOMPONENT type="1402" id="626" >
<father id="726" num="2" />
+<cdparam x="877" y="416" />
+<sizeparam width="123" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="<<BEFORE>>" />
+<TGConnectingPoint num="0" id="614" />
+<TGConnectingPoint num="1" id="615" />
+<TGConnectingPoint num="2" id="616" />
+<TGConnectingPoint num="3" id="617" />
+<TGConnectingPoint num="4" id="618" />
+<TGConnectingPoint num="5" id="619" />
+<TGConnectingPoint num="6" id="620" />
+<TGConnectingPoint num="7" id="621" />
+<TGConnectingPoint num="8" id="622" />
+<TGConnectingPoint num="9" id="623" />
+<TGConnectingPoint num="10" id="624" />
+<TGConnectingPoint num="11" id="625" />
+<extraparam>
+<info equation="120" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1401" id="651" >
+<father id="726" num="3" />
<cdparam x="818" y="347" />
<sizeparam width="238" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="153" minY="0" maxY="264" />
<infoparam name="TGComponent" value="PerformTokenBasedAuthentication" />
-<TGConnectingPoint num="0" id="626" />
-<TGConnectingPoint num="1" id="627" />
-<TGConnectingPoint num="2" id="628" />
-<TGConnectingPoint num="3" id="629" />
-<TGConnectingPoint num="4" id="630" />
-<TGConnectingPoint num="5" id="631" />
-<TGConnectingPoint num="6" id="632" />
-<TGConnectingPoint num="7" id="633" />
-<TGConnectingPoint num="8" id="634" />
-<TGConnectingPoint num="9" id="635" />
-<TGConnectingPoint num="10" id="636" />
-<TGConnectingPoint num="11" id="637" />
-<TGConnectingPoint num="12" id="638" />
-<TGConnectingPoint num="13" id="639" />
-<TGConnectingPoint num="14" id="640" />
-<TGConnectingPoint num="15" id="641" />
-<TGConnectingPoint num="16" id="642" />
-<TGConnectingPoint num="17" id="643" />
-<TGConnectingPoint num="18" id="644" />
-<TGConnectingPoint num="19" id="645" />
-<TGConnectingPoint num="20" id="646" />
-<TGConnectingPoint num="21" id="647" />
-<TGConnectingPoint num="22" id="648" />
-<TGConnectingPoint num="23" id="649" />
+<TGConnectingPoint num="0" id="627" />
+<TGConnectingPoint num="1" id="628" />
+<TGConnectingPoint num="2" id="629" />
+<TGConnectingPoint num="3" id="630" />
+<TGConnectingPoint num="4" id="631" />
+<TGConnectingPoint num="5" id="632" />
+<TGConnectingPoint num="6" id="633" />
+<TGConnectingPoint num="7" id="634" />
+<TGConnectingPoint num="8" id="635" />
+<TGConnectingPoint num="9" id="636" />
+<TGConnectingPoint num="10" id="637" />
+<TGConnectingPoint num="11" id="638" />
+<TGConnectingPoint num="12" id="639" />
+<TGConnectingPoint num="13" id="640" />
+<TGConnectingPoint num="14" id="641" />
+<TGConnectingPoint num="15" id="642" />
+<TGConnectingPoint num="16" id="643" />
+<TGConnectingPoint num="17" id="644" />
+<TGConnectingPoint num="18" id="645" />
+<TGConnectingPoint num="19" id="646" />
+<TGConnectingPoint num="20" id="647" />
+<TGConnectingPoint num="21" id="648" />
+<TGConnectingPoint num="22" id="649" />
+<TGConnectingPoint num="23" id="650" />
<latencyCheck />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="663" >
-<father id="726" num="3" />
-<cdparam x="877" y="416" />
-<sizeparam width="123" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="<<BEFORE>>" />
-<TGConnectingPoint num="0" id="651" />
-<TGConnectingPoint num="1" id="652" />
-<TGConnectingPoint num="2" id="653" />
-<TGConnectingPoint num="3" id="654" />
-<TGConnectingPoint num="4" id="655" />
-<TGConnectingPoint num="5" id="656" />
-<TGConnectingPoint num="6" id="657" />
-<TGConnectingPoint num="7" id="658" />
-<TGConnectingPoint num="8" id="659" />
-<TGConnectingPoint num="9" id="660" />
-<TGConnectingPoint num="10" id="661" />
-<TGConnectingPoint num="11" id="662" />
-<extraparam>
-<info equation="120" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="676" >
+<SUBCOMPONENT type="1401" id="676" >
<father id="726" num="4" />
-<cdparam x="800" y="279" />
-<sizeparam width="123" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="676" y="347" />
+<sizeparam width="141" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="664" />
-<TGConnectingPoint num="1" id="665" />
-<TGConnectingPoint num="2" id="666" />
-<TGConnectingPoint num="3" id="667" />
-<TGConnectingPoint num="4" id="668" />
-<TGConnectingPoint num="5" id="669" />
-<TGConnectingPoint num="6" id="670" />
-<TGConnectingPoint num="7" id="671" />
-<TGConnectingPoint num="8" id="672" />
-<TGConnectingPoint num="9" id="673" />
-<TGConnectingPoint num="10" id="674" />
-<TGConnectingPoint num="11" id="675" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="250" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="LogOnBankAccount" />
+<TGConnectingPoint num="0" id="652" />
+<TGConnectingPoint num="1" id="653" />
+<TGConnectingPoint num="2" id="654" />
+<TGConnectingPoint num="3" id="655" />
+<TGConnectingPoint num="4" id="656" />
+<TGConnectingPoint num="5" id="657" />
+<TGConnectingPoint num="6" id="658" />
+<TGConnectingPoint num="7" id="659" />
+<TGConnectingPoint num="8" id="660" />
+<TGConnectingPoint num="9" id="661" />
+<TGConnectingPoint num="10" id="662" />
+<TGConnectingPoint num="11" id="663" />
+<TGConnectingPoint num="12" id="664" />
+<TGConnectingPoint num="13" id="665" />
+<TGConnectingPoint num="14" id="666" />
+<TGConnectingPoint num="15" id="667" />
+<TGConnectingPoint num="16" id="668" />
+<TGConnectingPoint num="17" id="669" />
+<TGConnectingPoint num="18" id="670" />
+<TGConnectingPoint num="19" id="671" />
+<TGConnectingPoint num="20" id="672" />
+<TGConnectingPoint num="21" id="673" />
+<TGConnectingPoint num="22" id="674" />
+<TGConnectingPoint num="23" id="675" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="701" >
<father id="726" num="5" />
-<cdparam x="674" y="418" />
-<sizeparam width="131" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="668" y="215" />
+<sizeparam width="306" height="35" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="260" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="SendTANToServer" />
+<cdrectangleparam minX="0" maxX="85" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="IllegalBankAccountTransactionBasedOnToken" />
<TGConnectingPoint num="0" id="677" />
<TGConnectingPoint num="1" id="678" />
<TGConnectingPoint num="2" id="679" />
@@ -1192,8 +1191,9 @@
<TGConnectingPoint num="21" id="698" />
<TGConnectingPoint num="22" id="699" />
<TGConnectingPoint num="23" id="700" />
+<accessibility />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="true" />
</extraparam>
</SUBCOMPONENT>
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 86d53936852daebb9f9d48816fa347dec6d3bf90..13b40c37dd0d13f356848f11915584a47eb33d09 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -693,11 +693,11 @@ public class TGUIAction extends AbstractAction {
}
public void init() {
- actions[ACT_NEW] = new TAction("new-command", "New", IconManager.imgic20, IconManager.imgic21, "New", "New modeling", 'N');
- actions[ACT_NEW_PROJECT] = new TAction("new-project-command", "New project", IconManager.imgic20, IconManager.imgic21, "New project", "New project", 0);
+ actions[ACT_NEW] = new TAction("new-command", "New Model", IconManager.imgic20, IconManager.imgic21, "New Model" , "New model", 'N');
+ actions[ACT_NEW_PROJECT] = new TAction("new-project-command", "New project", IconManager.imgic20_proj, IconManager.imgic21_proj, "New project", "New project", 0);
actions[ACT_NEW_DESIGN] = new TAction("new-command-design", "New design", IconManager.imgic14, IconManager.imgic14, "New design", "New TURTLE design", 0);
actions[ACT_NEW_ANALYSIS] = new TAction("new-command-analysis", "New analysis", IconManager.imgic17, IconManager.imgic17, "New analysis", "New TURTLE analysis", 0);
- actions[ACT_OPEN] = new TAction("open-command","Open", IconManager.imgic22, IconManager.imgic23, "Open", "Open an existing TTool model",'O', true);
+ actions[ACT_OPEN] = new TAction("open-command","Open Model", IconManager.imgic22, IconManager.imgic23, "Open Model", "Open an existing TTool model",'O', true);
actions[ACT_OPEN_PROJECT] = new TAction("open-project-command","Open project", IconManager.imgic22, IconManager.imgic23, "Open project", "Open an existing TTool project",'O', true);
actions[ACT_OPEN_FROM_NETWORK] = new TAction("open-command-from-network","Open project from TTool repository", IconManager.imgic22, IconManager.imgic23, "Open project from TTool repository", "Open an existing TTool model from the TTool repository (TTool website)",'0', true);
actions[ACT_OPEN_LAST] = new TAction("openlast-command","Open file: " + ConfigurationTTool.LastOpenFile, IconManager.imgic22, IconManager.imgic23, "Open: " + ConfigurationTTool.LastOpenFile, "Open the lastly saved TTool model", 0);
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index 791a86af96201dcdff21c03364c5955c8055ebb9..e8d971e2af905ad990e2817a1bef05b7214fab53 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -65,6 +65,7 @@ public class IconManager {
public static ImageIcon imgic13, imgic14, imgic15, imgic16, imgic17, imgic18, imgic19;
public static ImageIcon imgic20, imgic21, imgic22, imgic23, imgic24, imgic25, imgic26, imgic27, imgic28, imgic29;
+ public static ImageIcon imgic20_proj, imgic21_proj;
public static ImageIcon imgic30, imgic31, imgic32, imgic33, imgic34, imgic35, imgic36, imgic37, imgic38, imgic39;
@@ -206,8 +207,10 @@ public class IconManager {
private static String icon18 = "sd.gif";
private static String icon19 = "ucd.gif";
- private static String icon20 = "toolbarButtonGraphics/general/New16.gif";
- private static String icon21 = "toolbarButtonGraphics/general/New24.gif";
+ private static String icon20 = "New16.gif";
+ private static String icon21 = "New24.gif";
+ private static String icon20_proj = "NewP16.gif";
+ private static String icon21_proj = "NewP24.gif";
private static String icon22 = "toolbarButtonGraphics/general/Open16.gif";
private static String icon23 = "toolbarButtonGraphics/general/Open24.gif";
private static String icon24 = "toolbarButtonGraphics/general/Save16.gif";
@@ -473,7 +476,9 @@ public class IconManager {
private static String icon1016 = "reqref.gif";
private static String icon1018 = "reqsatisfy.gif";
+ties can even contribute by pushing commits if they want to.
+Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.
// EBRDD
private static String icon1050 = "ebrdderc.gif";
@@ -703,6 +708,8 @@ public class IconManager {
imgic20 = getIcon(icon20);
imgic21 = getIcon(icon21);
+ imgic20_proj = getIcon(icon20_proj);
+ imgic21_proj = getIcon(icon21_proj);
imgic22 = getIcon(icon22);
imgic23 = getIcon(icon23);
imgic24 = getIcon(icon24);
diff --git a/src/main/resources/ui/util/New16.gif b/src/main/resources/ui/util/New16.gif
new file mode 100755
index 0000000000000000000000000000000000000000..cba29d844d6b595d15d05f76dc41ae733191c4b0
Binary files /dev/null and b/src/main/resources/ui/util/New16.gif differ
diff --git a/src/main/resources/ui/util/New24.gif b/src/main/resources/ui/util/New24.gif
new file mode 100755
index 0000000000000000000000000000000000000000..86d6faf08cda91f57a7a5d9bfa40a17fc8f1ec3b
Binary files /dev/null and b/src/main/resources/ui/util/New24.gif differ
diff --git a/src/main/resources/ui/util/NewP16.gif b/src/main/resources/ui/util/NewP16.gif
new file mode 100755
index 0000000000000000000000000000000000000000..155b8df34fa48baa07b732ba77e277c97371f55d
Binary files /dev/null and b/src/main/resources/ui/util/NewP16.gif differ
diff --git a/src/main/resources/ui/util/NewP24.gif b/src/main/resources/ui/util/NewP24.gif
new file mode 100755
index 0000000000000000000000000000000000000000..21f81c4d4c2ac467cc000812e207100404b7f491
Binary files /dev/null and b/src/main/resources/ui/util/NewP24.gif differ