From 23dd334c8f56f8f7e87e41d5fda6c5cac215bee9 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 18 Jun 2020 17:23:29 +0200
Subject: [PATCH] Update on connecting point management
---
modeling/SysMLSec/at_zeuszitmo.xml | 308 +++++++++---------
src/main/java/ui/TDiagramMouseManager.java | 2 +-
src/main/java/ui/TGComponent.java | 8 +-
.../atd/ATDCountermeasureConnectingPoint.java | 7 +-
4 files changed, 161 insertions(+), 164 deletions(-)
diff --git a/modeling/SysMLSec/at_zeuszitmo.xml b/modeling/SysMLSec/at_zeuszitmo.xml
index b77c2a29bf..7c00c3b435 100644
--- a/modeling/SysMLSec/at_zeuszitmo.xml
+++ b/modeling/SysMLSec/at_zeuszitmo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
<Modeling type="AttackTree" nameTab="Attack Trees" >
<AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="1900" minY="10" maxY="1900" zoom="1.0000000000000016" >
@@ -10,7 +10,7 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="1" />
<P1 x="1117" y="751" id="65" />
-<P2 x="1005" y="737" id="393" />
+<P2 x="1005" y="737" id="443" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="4" >
@@ -18,7 +18,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="3" />
-<P1 x="644" y="785" id="331" />
+<P1 x="644" y="785" id="256" />
<P2 x="757" y="658" id="231" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -45,8 +45,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="9" />
-<P1 x="938" y="416" id="679" />
-<P2 x="927" y="382" id="657" />
+<P1 x="938" y="416" id="642" />
+<P2 x="927" y="382" id="658" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="14" >
@@ -55,8 +55,8 @@
<infoparam name="connector from TGComponent to TGComponent" value="2" />
<TGConnectingPoint num="0" id="12" />
<TGConnectingPoint num="1" id="13" />
-<P1 x="927" y="347" id="654" />
-<P2 x="892" y="314" id="703" />
+<P1 x="927" y="347" id="655" />
+<P2 x="892" y="314" id="640" />
<Point x="931" y="331" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="11" >
@@ -73,8 +73,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="15" />
-<P1 x="861" y="279" id="692" />
-<P2 x="853" y="249" id="607" />
+<P1 x="861" y="279" id="629" />
+<P2 x="853" y="249" id="708" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="18" >
@@ -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="1" />
<TGConnectingPoint num="0" id="17" />
-<P1 x="658" y="840" id="256" />
+<P1 x="658" y="840" id="331" />
<P2 x="726" y="814" id="225" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -91,7 +91,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="19" />
-<P1 x="889" y="783" id="433" />
+<P1 x="889" y="783" id="383" />
<P2 x="917" y="682" id="212" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -101,7 +101,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="21" />
<P1 x="819" y="805" id="224" />
-<P2 x="838" y="800" id="430" />
+<P2 x="838" y="800" id="380" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="24" >
@@ -118,7 +118,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="25" />
-<P1 x="972" y="720" id="384" />
+<P1 x="972" y="720" id="434" />
<P2 x="979" y="682" id="213" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -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="1" />
<TGConnectingPoint num="0" id="29" />
-<P1 x="708" y="347" id="633" />
-<P2 x="830" y="314" id="702" />
+<P1 x="708" y="347" id="684" />
+<P2 x="830" y="314" id="639" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="32" >
@@ -145,8 +145,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="31" />
-<P1 x="798" y="435" id="707" />
-<P2 x="877" y="433" id="680" />
+<P1 x="798" y="435" id="606" />
+<P2 x="877" y="433" id="643" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="34" >
@@ -164,7 +164,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="1" />
<TGConnectingPoint num="0" id="35" />
<P1 x="950" y="578" id="404" />
-<P2 x="938" y="451" id="682" />
+<P2 x="938" y="451" id="645" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="38" >
@@ -173,7 +173,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="37" />
<P1 x="641" y="563" id="760" />
-<P2 x="676" y="373" id="637" />
+<P2 x="676" y="373" id="688" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="40" >
@@ -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="587" y="733" id="306" />
+<P1 x="587" y="733" id="281" />
<P2 x="726" y="658" id="238" />
<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="395" y="888" id="280" />
+<P1 x="395" y="888" id="305" />
<P2 x="342" y="888" id="243" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -208,7 +208,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="45" />
-<P1 x="241" y="830" id="482" />
+<P1 x="241" y="830" id="507" />
<P2 x="249" y="871" id="245" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -218,7 +218,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="47" />
<P1 x="311" y="871" id="246" />
-<P2 x="299" y="773" id="513" />
+<P2 x="299" y="773" id="488" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="50" >
@@ -226,7 +226,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="49" />
-<P1 x="249" y="747" id="504" />
+<P1 x="249" y="747" id="479" />
<P2 x="255" y="678" id="557" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -573,12 +573,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="278" >
<father id="378" num="0" />
-<cdparam x="360" y="823" />
-<sizeparam width="298" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="370" y="768" />
+<sizeparam width="274" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="5" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="RequestUserToInstallMobileFakeBankApplication" />
+<cdrectangleparam minX="0" maxX="29" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="RedirectHTTPRequestFromBankToFakeBank" />
<TGConnectingPoint num="0" id="254" />
<TGConnectingPoint num="1" id="255" />
<TGConnectingPoint num="2" id="256" />
@@ -609,12 +609,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="303" >
<father id="378" num="1" />
-<cdparam x="395" y="871" />
-<sizeparam width="127" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="448" y="716" />
+<sizeparam width="139" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="176" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="ExploitVunerability" />
+<cdrectangleparam minX="0" maxX="164" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="InstallMaliciousPlugin" />
<TGConnectingPoint num="0" id="279" />
<TGConnectingPoint num="1" id="280" />
<TGConnectingPoint num="2" id="281" />
@@ -645,12 +645,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="328" >
<father id="378" num="2" />
-<cdparam x="448" y="716" />
-<sizeparam width="139" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="395" y="871" />
+<sizeparam width="127" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="164" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="InstallMaliciousPlugin" />
+<cdrectangleparam minX="0" maxX="176" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="ExploitVunerability" />
<TGConnectingPoint num="0" id="304" />
<TGConnectingPoint num="1" id="305" />
<TGConnectingPoint num="2" id="306" />
@@ -681,12 +681,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="353" >
<father id="378" num="3" />
-<cdparam x="370" y="768" />
-<sizeparam width="274" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="360" y="823" />
+<sizeparam width="298" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="205" />
-<infoparam name="TGComponent" value="RedirectHTTPRequestFromBankToFakeBank" />
+<cdrectangleparam minX="0" maxX="5" minY="0" maxY="205" />
+<infoparam name="TGComponent" value="RequestUserToInstallMobileFakeBankApplication" />
<TGConnectingPoint num="0" id="329" />
<TGConnectingPoint num="1" id="330" />
<TGConnectingPoint num="2" id="331" />
@@ -749,12 +749,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="403" >
<father id="478" num="0" />
-<cdparam x="873" y="720" />
-<sizeparam width="132" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="838" y="783" />
+<sizeparam width="204" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="false" />
-<cdrectangleparam minX="0" maxX="92" minY="0" maxY="296" />
-<infoparam name="TGComponent" value="SilentlyInterceptSMS" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="296" />
+<infoparam name="TGComponent" value="UserInstallsFakeBankApplication" />
<TGConnectingPoint num="0" id="379" />
<TGConnectingPoint num="1" id="380" />
<TGConnectingPoint num="2" id="381" />
@@ -821,12 +821,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="453" >
<father id="478" num="2" />
-<cdparam x="838" y="783" />
-<sizeparam width="204" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="873" y="720" />
+<sizeparam width="132" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="296" />
-<infoparam name="TGComponent" value="UserInstallsFakeBankApplication" />
+<enabled value="false" />
+<cdrectangleparam minX="0" maxX="92" minY="0" maxY="296" />
+<infoparam name="TGComponent" value="SilentlyInterceptSMS" />
<TGConnectingPoint num="0" id="429" />
<TGConnectingPoint num="1" id="430" />
<TGConnectingPoint num="2" id="431" />
@@ -889,12 +889,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="503" >
<father id="553" num="0" />
-<cdparam x="176" y="795" />
-<sizeparam width="130" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="199" y="747" />
+<sizeparam width="100" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="14" 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="479" />
<TGConnectingPoint num="1" id="480" />
<TGConnectingPoint num="2" id="481" />
@@ -925,12 +925,12 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="528" >
<father id="553" num="1" />
-<cdparam x="199" y="747" />
-<sizeparam width="100" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="176" y="795" />
+<sizeparam width="130" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="44" minY="0" maxY="93" />
-<infoparam name="TGComponent" value="InstallTrojan" />
+<cdrectangleparam minX="0" maxX="14" minY="0" maxY="93" />
+<infoparam name="TGComponent" value="ExploitVulnerability" />
<TGConnectingPoint num="0" id="504" />
<TGConnectingPoint num="1" id="505" />
<TGConnectingPoint num="2" id="506" />
@@ -1061,12 +1061,12 @@
</COMPONENT>
<SUBCOMPONENT type="1401" id="628" >
<father id="754" num="0" />
-<cdparam x="713" y="214" />
-<sizeparam width="280" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="674" y="418" />
+<sizeparam width="124" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="111" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="IllegalBankAccountTransactionBasedOnToken" />
+<cdrectangleparam minX="0" maxX="267" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="SendTANToServer" />
<TGConnectingPoint num="0" id="604" />
<TGConnectingPoint num="1" id="605" />
<TGConnectingPoint num="2" id="606" />
@@ -1091,19 +1091,17 @@
<TGConnectingPoint num="21" id="625" />
<TGConnectingPoint num="22" id="626" />
<TGConnectingPoint num="23" id="627" />
-<accessibility />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="653" >
+<SUBCOMPONENT type="1402" id="641" >
<father id="754" num="1" />
-<cdparam x="676" y="347" />
-<sizeparam width="129" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="800" y="279" />
+<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="262" 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="629" />
<TGConnectingPoint num="1" id="630" />
<TGConnectingPoint num="2" id="631" />
@@ -1116,112 +1114,113 @@
<TGConnectingPoint num="9" id="638" />
<TGConnectingPoint num="10" id="639" />
<TGConnectingPoint num="11" id="640" />
-<TGConnectingPoint num="12" id="641" />
-<TGConnectingPoint num="13" id="642" />
-<TGConnectingPoint num="14" id="643" />
-<TGConnectingPoint num="15" id="644" />
-<TGConnectingPoint num="16" id="645" />
-<TGConnectingPoint num="17" id="646" />
-<TGConnectingPoint num="18" id="647" />
-<TGConnectingPoint num="19" id="648" />
-<TGConnectingPoint num="20" id="649" />
-<TGConnectingPoint num="21" id="650" />
-<TGConnectingPoint num="22" id="651" />
-<TGConnectingPoint num="23" id="652" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="678" >
+<SUBCOMPONENT type="1402" id="654" >
<father id="754" num="2" />
+<cdparam x="877" y="416" />
+<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="<<BEFORE>>" />
+<TGConnectingPoint num="0" id="642" />
+<TGConnectingPoint num="1" id="643" />
+<TGConnectingPoint num="2" id="644" />
+<TGConnectingPoint num="3" id="645" />
+<TGConnectingPoint num="4" id="646" />
+<TGConnectingPoint num="5" id="647" />
+<TGConnectingPoint num="6" id="648" />
+<TGConnectingPoint num="7" id="649" />
+<TGConnectingPoint num="8" id="650" />
+<TGConnectingPoint num="9" id="651" />
+<TGConnectingPoint num="10" id="652" />
+<TGConnectingPoint num="11" id="653" />
+<extraparam>
+<info equation="120" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1401" id="679" >
+<father id="754" num="3" />
<cdparam x="818" y="347" />
<sizeparam width="218" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="173" minY="0" maxY="264" />
<infoparam name="TGComponent" value="PerformTokenBasedAuthentication" />
-<TGConnectingPoint num="0" id="654" />
-<TGConnectingPoint num="1" id="655" />
-<TGConnectingPoint num="2" id="656" />
-<TGConnectingPoint num="3" id="657" />
-<TGConnectingPoint num="4" id="658" />
-<TGConnectingPoint num="5" id="659" />
-<TGConnectingPoint num="6" id="660" />
-<TGConnectingPoint num="7" id="661" />
-<TGConnectingPoint num="8" id="662" />
-<TGConnectingPoint num="9" id="663" />
-<TGConnectingPoint num="10" id="664" />
-<TGConnectingPoint num="11" id="665" />
-<TGConnectingPoint num="12" id="666" />
-<TGConnectingPoint num="13" id="667" />
-<TGConnectingPoint num="14" id="668" />
-<TGConnectingPoint num="15" id="669" />
-<TGConnectingPoint num="16" id="670" />
-<TGConnectingPoint num="17" id="671" />
-<TGConnectingPoint num="18" id="672" />
-<TGConnectingPoint num="19" id="673" />
-<TGConnectingPoint num="20" id="674" />
-<TGConnectingPoint num="21" id="675" />
-<TGConnectingPoint num="22" id="676" />
-<TGConnectingPoint num="23" id="677" />
+<TGConnectingPoint num="0" id="655" />
+<TGConnectingPoint num="1" id="656" />
+<TGConnectingPoint num="2" id="657" />
+<TGConnectingPoint num="3" id="658" />
+<TGConnectingPoint num="4" id="659" />
+<TGConnectingPoint num="5" id="660" />
+<TGConnectingPoint num="6" id="661" />
+<TGConnectingPoint num="7" id="662" />
+<TGConnectingPoint num="8" id="663" />
+<TGConnectingPoint num="9" id="664" />
+<TGConnectingPoint num="10" id="665" />
+<TGConnectingPoint num="11" id="666" />
+<TGConnectingPoint num="12" id="667" />
+<TGConnectingPoint num="13" id="668" />
+<TGConnectingPoint num="14" id="669" />
+<TGConnectingPoint num="15" id="670" />
+<TGConnectingPoint num="16" id="671" />
+<TGConnectingPoint num="17" id="672" />
+<TGConnectingPoint num="18" id="673" />
+<TGConnectingPoint num="19" id="674" />
+<TGConnectingPoint num="20" id="675" />
+<TGConnectingPoint num="21" id="676" />
+<TGConnectingPoint num="22" id="677" />
+<TGConnectingPoint num="23" id="678" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="691" >
-<father id="754" num="3" />
-<cdparam x="877" y="416" />
-<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="<<BEFORE>>" />
-<TGConnectingPoint num="0" id="679" />
-<TGConnectingPoint num="1" id="680" />
-<TGConnectingPoint num="2" id="681" />
-<TGConnectingPoint num="3" id="682" />
-<TGConnectingPoint num="4" id="683" />
-<TGConnectingPoint num="5" id="684" />
-<TGConnectingPoint num="6" id="685" />
-<TGConnectingPoint num="7" id="686" />
-<TGConnectingPoint num="8" id="687" />
-<TGConnectingPoint num="9" id="688" />
-<TGConnectingPoint num="10" id="689" />
-<TGConnectingPoint num="11" id="690" />
-<extraparam>
-<info equation="120" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="704" >
+<SUBCOMPONENT type="1401" id="704" >
<father id="754" num="4" />
-<cdparam x="800" y="279" />
-<sizeparam width="123" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="676" y="347" />
+<sizeparam width="129" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="245" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="692" />
-<TGConnectingPoint num="1" id="693" />
-<TGConnectingPoint num="2" id="694" />
-<TGConnectingPoint num="3" id="695" />
-<TGConnectingPoint num="4" id="696" />
-<TGConnectingPoint num="5" id="697" />
-<TGConnectingPoint num="6" id="698" />
-<TGConnectingPoint num="7" id="699" />
-<TGConnectingPoint num="8" id="700" />
-<TGConnectingPoint num="9" id="701" />
-<TGConnectingPoint num="10" id="702" />
-<TGConnectingPoint num="11" id="703" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="262" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="LogOnBankAccount" />
+<TGConnectingPoint num="0" id="680" />
+<TGConnectingPoint num="1" id="681" />
+<TGConnectingPoint num="2" id="682" />
+<TGConnectingPoint num="3" id="683" />
+<TGConnectingPoint num="4" id="684" />
+<TGConnectingPoint num="5" id="685" />
+<TGConnectingPoint num="6" id="686" />
+<TGConnectingPoint num="7" id="687" />
+<TGConnectingPoint num="8" id="688" />
+<TGConnectingPoint num="9" id="689" />
+<TGConnectingPoint num="10" id="690" />
+<TGConnectingPoint num="11" id="691" />
+<TGConnectingPoint num="12" id="692" />
+<TGConnectingPoint num="13" id="693" />
+<TGConnectingPoint num="14" id="694" />
+<TGConnectingPoint num="15" id="695" />
+<TGConnectingPoint num="16" id="696" />
+<TGConnectingPoint num="17" id="697" />
+<TGConnectingPoint num="18" id="698" />
+<TGConnectingPoint num="19" id="699" />
+<TGConnectingPoint num="20" id="700" />
+<TGConnectingPoint num="21" id="701" />
+<TGConnectingPoint num="22" id="702" />
+<TGConnectingPoint num="23" id="703" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1401" id="729" >
<father id="754" num="5" />
-<cdparam x="674" y="418" />
-<sizeparam width="124" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="713" y="214" />
+<sizeparam width="280" height="35" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="267" minY="0" maxY="264" />
-<infoparam name="TGComponent" value="SendTANToServer" />
+<cdrectangleparam minX="0" maxX="111" minY="0" maxY="264" />
+<infoparam name="TGComponent" value="IllegalBankAccountTransactionBasedOnToken" />
<TGConnectingPoint num="0" id="705" />
<TGConnectingPoint num="1" id="706" />
<TGConnectingPoint num="2" id="707" />
@@ -1246,8 +1245,9 @@
<TGConnectingPoint num="21" id="726" />
<TGConnectingPoint num="22" id="727" />
<TGConnectingPoint num="23" id="728" />
+<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/TDiagramMouseManager.java b/src/main/java/ui/TDiagramMouseManager.java
index f0d375ad98..6fc363e1a5 100644
--- a/src/main/java/ui/TDiagramMouseManager.java
+++ b/src/main/java/ui/TDiagramMouseManager.java
@@ -161,7 +161,7 @@ public class TDiagramMouseManager extends MouseAdapter {//implements MouseListen
TGConnectingPoint p1;
//TraceManager.addDev("Working on TGC=" + tgc);
if (tgc.getDefaultConnector() != -1) {
- p1 = tgc.getFreeTGConnectingPointAtAndCompatible(e.getX(), e.getY(), tgc.getDefaultConnector());
+ p1 = tgc.getFreeTGConnectingPointAtAndCompatible(e.getX(), e.getY(), tgc.getDefaultConnector(), null);
if ((p1 != null) && (p1.isOut())) {
// add connector
actionMade = true;
diff --git a/src/main/java/ui/TGComponent.java b/src/main/java/ui/TGComponent.java
index 3079b84d3f..6b5c9e47e6 100644
--- a/src/main/java/ui/TGComponent.java
+++ b/src/main/java/ui/TGComponent.java
@@ -2012,18 +2012,18 @@ public abstract class TGComponent extends AbstractCDElement implements /*CDElem
return null;
}*/
- public TGConnectingPoint getFreeTGConnectingPointAtAndCompatible(int x, int y, int type) {
+ /*public TGConnectingPoint getFreeTGConnectingPointAtAndCompatible(int x, int y, int type) {
return getTopFather().getFromTopFreeTGConnectingPointAtAndCompatible(x, y, type);
- }
+ }*/
public TGConnectingPoint getFreeTGConnectingPointAtAndCompatible(int x, int y, int type, TGConnectingPoint outPoint) {
return getTopFather().getFromTopFreeTGConnectingPointAtAndCompatible(x, y, type, outPoint);
}
- public TGConnectingPoint getFromTopFreeTGConnectingPointAtAndCompatible(int x, int y, int type) {
+ /*public TGConnectingPoint getFromTopFreeTGConnectingPointAtAndCompatible(int x, int y, int type) {
//TraceManager.addDev("With null out");
return getFromTopFreeTGConnectingPointAtAndCompatible(x, y, type, null);
- }
+ }*/
public TGConnectingPoint getFromTopFreeTGConnectingPointAtAndCompatible(int x, int y, int type, TGConnectingPoint outPoint) {
//TraceManager.addDev("Getting TGConnecting point outPoint=");
diff --git a/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java b/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java
index c83427f002..69c31bf981 100644
--- a/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java
+++ b/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java
@@ -63,13 +63,10 @@ public class ATDCountermeasureConnectingPoint extends TGConnectingPointWidthHei
}
public boolean isCompatibleWith(int type, TGConnectingPoint outPoint) {
- TraceManager.addDev("Is compatible with type=" + type);
- if (outPoint == null) {
- TraceManager.addDev("Null outpoint");
- }
+
if (outPoint != null) {
- TraceManager.addDev("Instances out: " + outPoint.getFather() + " new: " + getFather());
+ //TraceManager.addDev("Instances out: " + outPoint.getFather() + " new: " + getFather());
if ((outPoint.getFather() instanceof ATDCountermeasure) && (getFather() instanceof ATDCountermeasure)) {
return false;
}
--
GitLab