diff --git a/.idea/misc.xml b/.idea/misc.xml
index 51e5191ed4bd4e6ffe2a1823753c5d6f92894ab9..b755d8ca46c060cb7a2b6b29b7ec83e02b8b71e2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
<property name="caretWidth" class="java.lang.Integer" />
</properties>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build" />
</component>
</project>
\ No newline at end of file
diff --git a/MPSoC/Makefile.forsoclib b/MPSoC/Makefile.forsoclib
index cbaca871c833bc40574cf718489b67dcf91a8174..c19f4485d68b5571f170b3b0ecff12df763b32d0 100755
--- a/MPSoC/Makefile.forsoclib
+++ b/MPSoC/Makefile.forsoclib
@@ -44,4 +44,4 @@ runsoclib:
echo "running soclib"
cd soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial; make; SOCLIB_GDB=S ./system.x $(SOCLIB_CPU):$(SOCLIB_CPU_COUNT) ../../../../../mutekh/avatar-soclib-$(MUTEKH_CPU).out
-allsoclib: updateruntime updategeneratedcode compilesoclib runsoclib
+allsoclib: updategeneratedcode compilesoclib runsoclib
diff --git a/MPSoC/mutekh/arch/soclib/ldscript.cpp b/MPSoC/mutekh/arch/soclib/ldscript.cpp
index 780572d6274483b394f01ad82a86ea6a89266e50..8c7619853fa165607b0645f66a0f65c781135cea 100644
--- a/MPSoC/mutekh/arch/soclib/ldscript.cpp
+++ b/MPSoC/mutekh/arch/soclib/ldscript.cpp
@@ -73,12 +73,7 @@ MEMORY
mem_rom (RXAL): ORIGIN = CONFIG_ROM_ADDR, LENGTH = CONFIG_ROM_SIZE
#endif
mem_ram (RWAL): ORIGIN = CONFIG_RAM_ADDR, LENGTH = CONFIG_RAM_SIZE
-//ajoute DG provisiore
-//mwmr_ram (RWAL): ORIGIN = 0xA0200000, LENGTH = 0x00001000
-//mwmrd_ram (RWAL): ORIGIN = 0xB0200000, LENGTH = 0x00003000
-//19.05. une seule RAMLOCKS en cas de besoin (actually unused)
-vci_locks (RWAL): ORIGIN = 0xC0200000, LENGTH = 0x100
-//ajoute DG
+
#if defined(DEPLOY_RAM0_NAME)
DEPLOY_RAM0_NAME (RWAL): ORIGIN = DEPLOY_RAM0_ADDR, LENGTH = DEPLOY_RAM0_SIZE
#endif
diff --git a/SysCAMSGenerationCode/Makefile b/SysCAMSGenerationCode/Makefile
index 42951da8865322b66734b7a042d8e0f74c699864..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/SysCAMSGenerationCode/Makefile
+++ b/SysCAMSGenerationCode/Makefile
@@ -1,19 +0,0 @@
-# Compiler and linker flags
-CXXFLAGS = -g -Wall -I. $(SYSTEMC_INCLUDE_DIRS)
-LDFLAGS = $(SYSTEMC_LIBRARY_DIRS)
-
-# List of all ecutables to be compiled
-EXECUTABLES = cluster_tb
-
-# .PHONY targets don't generate files
-.PHONY: all clean
-
-# Default targets
-all: $(EXECUTABLES)
-
-cluster_tb: cluster_tb.cpp Block_TDF_0.h
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -lsystemc-ams -lsystemc | c++filt
-
-# Clean rule to delete temporary and generated files
-clean:
- rm -rf *~ *.o *.dat *.vcd *.dSYM $(EXECUTABLES)
diff --git a/SysCAMSGenerationCode/generated_H/Block_DE_0.h b/SysCAMSGenerationCode/generated_H/Block_DE_0.h
index 9693c5cbb85775eddb0f1161e08a3ac7a91d887b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/SysCAMSGenerationCode/generated_H/Block_DE_0.h
+++ b/SysCAMSGenerationCode/generated_H/Block_DE_0.h
@@ -1,41 +0,0 @@
-#ifndef BLOCK_DE_0_H
-#define BLOCK_DE_0_H
-
-#include <cmath>
-#include <iostream>
-#include <systemc>
-
-template<int NBits>
-class Block_DE_0 : public sca_core::sca_module {
-
-public:
- typedef sc_dt::sc_int<NBits> output;
-
- struct parameters {
- int hi;
- parameters()
- : hi(4)
- };
-
- sca_core::sca_out<double> out;
- sca_core::sca_in<bool> clk;
-
- SC_HAS_PROCESS(Block_DE_0);
- explicit Block_DE_0(sc_core::sc_module_name nm, const parameters& p = parameters())
- : out("out")
- , clk("clk")
- , hi(p.hi)
- {
- SC_METHOD(attributeCode);
- sensitive << clk.pos();
- }
-
-protected:
- void attributeCode() {
- }
-
-private:
- const int hi;
-};
-
-#endif // BLOCK_DE_0_H
diff --git a/SysCAMSGenerationCode/generated_H/Block_TDF_0.h b/SysCAMSGenerationCode/generated_H/Block_TDF_0.h
index d1415225353b232dd65eb9758c9ab62ba688bd93..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/SysCAMSGenerationCode/generated_H/Block_TDF_0.h
+++ b/SysCAMSGenerationCode/generated_H/Block_TDF_0.h
@@ -1,27 +0,0 @@
-#ifndef BLOCK_TDF_0_H
-#define BLOCK_TDF_0_H
-
-#include <cmath>
-#include <iostream>
-#include <systemc-ams>
-
-class Block_TDF_0 : public sca_tdf::sca_module {
-
-public:
-
- sca_tdf::sca_in<int> port2;
-
- sca_tdf::sca_de::sca_out<int> port1;
-
- explicit Block_TDF_0(sc_core::sc_module_name nm)
- : port2("port2")
- , port1("port1")
- {}
-
-protected:
- void processing() {
- }
-
-};
-
-#endif // BLOCK_TDF_0_H
\ No newline at end of file
diff --git a/build.txt b/build.txt
index 5d04cd54ab07e66aeed232151ba5d75ca0c8f007..f6b4b4266db27d9f41a39754e8c428d2a5583d45 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-12693
\ No newline at end of file
+12708
\ No newline at end of file
diff --git a/doc/codegeneration/codegeneration_documentation.tex b/doc/codegeneration/codegeneration_documentation.tex
index 79d7e0cb7c4d3ea26acdbdea25feb046eeb4bdd2..3a8777b430291cd73d47877a2d3a55011f072aed 100644
--- a/doc/codegeneration/codegeneration_documentation.tex
+++ b/doc/codegeneration/codegeneration_documentation.tex
@@ -145,7 +145,7 @@ Open your configuration file, and set the following lines accordingly with your
<AVATARExecutableCodeDirectory data="../executablecode/" />
\end{verbatim}
\begin{itemize}
-This configuration works only for models. For TTool project, the default directory is "AVATAR_executablecode" which is automatically created in the sub folder of the project.
+\item This configuration works only for models. For TTool projects, the default directory is "AVATAR\_executablecode" which is automatically created in the sub folder of the project.
\item Host that is intended to perform the code compilation and execution. Default value is "localhost".
\begin{verbatim}
<AVATARExecutableCodeHost data="localhost"/>
@@ -212,7 +212,7 @@ Once the code has been generated, the dialog window should automatically switch
\item Compile the code for your localhost (\textbf{You should select this option}).
\item Compile the code for the SoCLib platform. This option is not addressed in this document.
\end{itemize}
-If the compilation fails, you can try to remove all old .o files using the first tab of the dialog window: "Generate Code", "Remove .o files". If the compilation still fails, it could be due to a bad installation of a C compiler. We strongly recommend to use the GNU C Compiler (\textit{gcc}). You could also edit the Makefile you have selected (see section \ref{sec:conf}) to adapt it to your localhost particularities. Note that the compilation process also compiles the Avatar runtime C sources\footnote{These sources are located in: TTool/executablecode/src or in your project directory: AVATAR_executablecode}, and links all resulting object files together.
+If the compilation fails, you can try to remove all old .o files using the first tab of the dialog window: "Generate Code", "Remove .o files". If the compilation still fails, it could be due to a bad installation of a C compiler. We strongly recommend to use the GNU C Compiler (\textit{gcc}). You could also edit the Makefile you have selected (see section \ref{sec:conf}) to adapt it to your localhost particularities. Note that the compilation process also compiles the Avatar runtime C sources\footnote{These sources are located in: TTool/executablecode/src or in your project directory: AVATAR\_executablecode}, and links all resulting object files together.
\begin{figure}[htbp]
\centering
diff --git a/modeling/AVATAR/testReq.xml b/modeling/AVATAR/testReq.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e69993f1eae34c1082f8500a2d0cb5fc8adf5dc6
--- /dev/null
+++ b/modeling/AVATAR/testReq.xml
@@ -0,0 +1,4341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<TURTLEGMODELING version="1.0beta">
+
+<Modeling type="AttackTree" nameTab="Attack Trees" >
+<AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1402" id="13" >
+<cdparam x="551" y="348" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="<<OR>>" />
+<TGConnectingPoint num="0" id="1" />
+<TGConnectingPoint num="1" id="2" />
+<TGConnectingPoint num="2" id="3" />
+<TGConnectingPoint num="3" id="4" />
+<TGConnectingPoint num="4" id="5" />
+<TGConnectingPoint num="5" id="6" />
+<TGConnectingPoint num="6" id="7" />
+<TGConnectingPoint num="7" id="8" />
+<TGConnectingPoint num="8" id="9" />
+<TGConnectingPoint num="9" id="10" />
+<TGConnectingPoint num="10" id="11" />
+<TGConnectingPoint num="11" id="12" />
+<extraparam>
+<info equation="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1403" id="26" >
+<cdparam x="577" y="126" />
+<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="counter01" />
+<TGConnectingPoint num="0" id="14" />
+<TGConnectingPoint num="1" id="15" />
+<TGConnectingPoint num="2" id="16" />
+<TGConnectingPoint num="3" id="17" />
+<TGConnectingPoint num="4" id="18" />
+<TGConnectingPoint num="5" id="19" />
+<TGConnectingPoint num="6" id="20" />
+<TGConnectingPoint num="7" id="21" />
+<TGConnectingPoint num="8" id="22" />
+<TGConnectingPoint num="9" id="23" />
+<TGConnectingPoint num="10" id="24" />
+<TGConnectingPoint num="11" id="25" />
+<extraparam>
+<textline data="blah blah blah" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1401" id="51" >
+<cdparam x="563" y="241" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="attack0" />
+<TGConnectingPoint num="0" id="27" />
+<TGConnectingPoint num="1" id="28" />
+<TGConnectingPoint num="2" id="29" />
+<TGConnectingPoint num="3" id="30" />
+<TGConnectingPoint num="4" id="31" />
+<TGConnectingPoint num="5" id="32" />
+<TGConnectingPoint num="6" id="33" />
+<TGConnectingPoint num="7" id="34" />
+<TGConnectingPoint num="8" id="35" />
+<TGConnectingPoint num="9" id="36" />
+<TGConnectingPoint num="10" id="37" />
+<TGConnectingPoint num="11" id="38" />
+<TGConnectingPoint num="12" id="39" />
+<TGConnectingPoint num="13" id="40" />
+<TGConnectingPoint num="14" id="41" />
+<TGConnectingPoint num="15" id="42" />
+<TGConnectingPoint num="16" id="43" />
+<TGConnectingPoint num="17" id="44" />
+<TGConnectingPoint num="18" id="45" />
+<TGConnectingPoint num="19" id="46" />
+<TGConnectingPoint num="20" id="47" />
+<TGConnectingPoint num="21" id="48" />
+<TGConnectingPoint num="22" id="49" />
+<TGConnectingPoint num="23" id="50" />
+<extraparam>
+<info description="blah blah blah" root="false" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1400" id="76" >
+<cdparam x="221" y="192" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block0" value="Block0" />
+<TGConnectingPoint num="0" id="52" />
+<TGConnectingPoint num="1" id="53" />
+<TGConnectingPoint num="2" id="54" />
+<TGConnectingPoint num="3" id="55" />
+<TGConnectingPoint num="4" id="56" />
+<TGConnectingPoint num="5" id="57" />
+<TGConnectingPoint num="6" id="58" />
+<TGConnectingPoint num="7" id="59" />
+<TGConnectingPoint num="8" id="60" />
+<TGConnectingPoint num="9" id="61" />
+<TGConnectingPoint num="10" id="62" />
+<TGConnectingPoint num="11" id="63" />
+<TGConnectingPoint num="12" id="64" />
+<TGConnectingPoint num="13" id="65" />
+<TGConnectingPoint num="14" id="66" />
+<TGConnectingPoint num="15" id="67" />
+<TGConnectingPoint num="16" id="68" />
+<TGConnectingPoint num="17" id="69" />
+<TGConnectingPoint num="18" id="70" />
+<TGConnectingPoint num="19" id="71" />
+<TGConnectingPoint num="20" id="72" />
+<TGConnectingPoint num="21" id="73" />
+<TGConnectingPoint num="22" id="74" />
+<TGConnectingPoint num="23" id="75" />
+</COMPONENT>
+
+
+</AttackTreeDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+<CONNECTOR type="5002" id="78" >
+<cdparam x="321" y="567" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block1 to Block0" value="" />
+<TGConnectingPoint num="0" id="77" />
+<P1 x="559" y="330" id="139" />
+<P2 x="560" y="377" id="172" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<isd value="in pushCoffeeButton()" />
+<oso value="out push()" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5002" id="80" >
+<cdparam x="275" y="114" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block0 to Block0" value="" />
+<TGConnectingPoint num="0" id="79" />
+<P1 x="306" y="109" id="94" />
+<P2 x="445" y="108" id="168" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<iso value="in getCoin(int nbOfCoins)" />
+<osd value="out ejectCoin(int nbOfCoins)" />
+<isd value="in getCoin(int nbOfCoins)" />
+<oso value="out putCoin(int nbOfCoins)" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5002" id="82" >
+<cdparam x="623" y="565" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block1 to Block0" value="" />
+<TGConnectingPoint num="0" id="81" />
+<P1 x="789" y="326" id="114" />
+<P2 x="790" y="377" id="173" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<isd value="in pushTeaButton()" />
+<oso value="out push()" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="5000" id="107" >
+<cdparam x="106" y="55" />
+<sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="Wallet" />
+<TGConnectingPoint num="0" id="83" />
+<TGConnectingPoint num="1" id="84" />
+<TGConnectingPoint num="2" id="85" />
+<TGConnectingPoint num="3" id="86" />
+<TGConnectingPoint num="4" id="87" />
+<TGConnectingPoint num="5" id="88" />
+<TGConnectingPoint num="6" id="89" />
+<TGConnectingPoint num="7" id="90" />
+<TGConnectingPoint num="8" id="91" />
+<TGConnectingPoint num="9" id="92" />
+<TGConnectingPoint num="10" id="93" />
+<TGConnectingPoint num="11" id="94" />
+<TGConnectingPoint num="12" id="95" />
+<TGConnectingPoint num="13" id="96" />
+<TGConnectingPoint num="14" id="97" />
+<TGConnectingPoint num="15" id="98" />
+<TGConnectingPoint num="16" id="99" />
+<TGConnectingPoint num="17" id="100" />
+<TGConnectingPoint num="18" id="101" />
+<TGConnectingPoint num="19" id="102" />
+<TGConnectingPoint num="20" id="103" />
+<TGConnectingPoint num="21" id="104" />
+<TGConnectingPoint num="22" id="105" />
+<TGConnectingPoint num="23" id="106" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
+<Attribute access="0" id="x" value="1" type="8" typeOther="" />
+<Attribute access="0" id="minUserDelay" value="50" type="8" typeOther="" />
+<Attribute access="0" id="maxUserDelay" value="70" type="8" typeOther="" />
+<Method value="contentOfWallet(int nbOfCoins)" />
+<Signal value="in getCoin(int nbOfCoins)" attached="true" />
+<Signal value="out putCoin(int nbOfCoins)" attached="true" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5000" id="182" >
+<cdparam x="445" y="19" />
+<sizeparam width="461" height="358" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="158" />
+<TGConnectingPoint num="1" id="159" />
+<TGConnectingPoint num="2" id="160" />
+<TGConnectingPoint num="3" id="161" />
+<TGConnectingPoint num="4" id="162" />
+<TGConnectingPoint num="5" id="163" />
+<TGConnectingPoint num="6" id="164" />
+<TGConnectingPoint num="7" id="165" />
+<TGConnectingPoint num="8" id="166" />
+<TGConnectingPoint num="9" id="167" />
+<TGConnectingPoint num="10" id="168" />
+<TGConnectingPoint num="11" id="169" />
+<TGConnectingPoint num="12" id="170" />
+<TGConnectingPoint num="13" id="171" />
+<TGConnectingPoint num="14" id="172" />
+<TGConnectingPoint num="15" id="173" />
+<TGConnectingPoint num="16" id="174" />
+<TGConnectingPoint num="17" id="175" />
+<TGConnectingPoint num="18" id="176" />
+<TGConnectingPoint num="19" id="177" />
+<TGConnectingPoint num="20" id="178" />
+<TGConnectingPoint num="21" id="179" />
+<TGConnectingPoint num="22" id="180" />
+<TGConnectingPoint num="23" id="181" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
+<Attribute access="0" id="teaMaxDelay" value="8" type="8" typeOther="" />
+<Attribute access="0" id="coffeeMinDelay" value="5" type="8" typeOther="" />
+<Attribute access="0" id="coffeeMaxDelay" value="10" type="8" typeOther="" />
+<Attribute access="0" id="coinDelay" value="50" type="8" typeOther="" />
+<Attribute access="0" id="x" value="0" type="8" typeOther="" />
+<Attribute access="0" id="nbOfCoins" value="0" type="8" typeOther="" />
+<Method value="beverageReady()" />
+<Signal value="in pushCoffeeButton()" attached="true" />
+<Signal value="in pushTeaButton()" attached="true" />
+<Signal value="in getCoin(int nbOfCoins)" attached="true" />
+<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5000" id="132" >
+<father id="182" num="0" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="108" />
+<TGConnectingPoint num="1" id="109" />
+<TGConnectingPoint num="2" id="110" />
+<TGConnectingPoint num="3" id="111" />
+<TGConnectingPoint num="4" id="112" />
+<TGConnectingPoint num="5" id="113" />
+<TGConnectingPoint num="6" id="114" />
+<TGConnectingPoint num="7" id="115" />
+<TGConnectingPoint num="8" id="116" />
+<TGConnectingPoint num="9" id="117" />
+<TGConnectingPoint num="10" id="118" />
+<TGConnectingPoint num="11" id="119" />
+<TGConnectingPoint num="12" id="120" />
+<TGConnectingPoint num="13" id="121" />
+<TGConnectingPoint num="14" id="122" />
+<TGConnectingPoint num="15" id="123" />
+<TGConnectingPoint num="16" id="124" />
+<TGConnectingPoint num="17" id="125" />
+<TGConnectingPoint num="18" id="126" />
+<TGConnectingPoint num="19" id="127" />
+<TGConnectingPoint num="20" id="128" />
+<TGConnectingPoint num="21" id="129" />
+<TGConnectingPoint num="22" id="130" />
+<TGConnectingPoint num="23" id="131" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
+<Signal value="out push()" attached="true" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="157" >
+<father id="182" num="1" />
+<cdparam x="464" y="228" />
+<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
+<TGConnectingPoint num="0" id="133" />
+<TGConnectingPoint num="1" id="134" />
+<TGConnectingPoint num="2" id="135" />
+<TGConnectingPoint num="3" id="136" />
+<TGConnectingPoint num="4" id="137" />
+<TGConnectingPoint num="5" id="138" />
+<TGConnectingPoint num="6" id="139" />
+<TGConnectingPoint num="7" id="140" />
+<TGConnectingPoint num="8" id="141" />
+<TGConnectingPoint num="9" id="142" />
+<TGConnectingPoint num="10" id="143" />
+<TGConnectingPoint num="11" id="144" />
+<TGConnectingPoint num="12" id="145" />
+<TGConnectingPoint num="13" id="146" />
+<TGConnectingPoint num="14" id="147" />
+<TGConnectingPoint num="15" id="148" />
+<TGConnectingPoint num="16" id="149" />
+<TGConnectingPoint num="17" id="150" />
+<TGConnectingPoint num="18" id="151" />
+<TGConnectingPoint num="19" id="152" />
+<TGConnectingPoint num="20" id="153" />
+<TGConnectingPoint num="21" id="154" />
+<TGConnectingPoint num="22" id="155" />
+<TGConnectingPoint num="23" id="156" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
+<Signal value="out push()" attached="true" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="189" >
+<cdparam x="516" y="264" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="188" />
+<P1 x="485" y="219" id="230" />
+<P2 x="485" y="275" id="241" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="187" >
+<father id="189" num="0" />
+<cdparam x="493" y="251" />
+<sizeparam width="161" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="183" />
+<TGConnectingPoint num="1" id="184" />
+<TGConnectingPoint num="2" id="185" />
+<TGConnectingPoint num="3" id="186" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = nbOfCoins + x" />
+<actions value="contentOfWallet(nbOfCoins)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="196" >
+<cdparam x="382" y="165" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="195" />
+<P1 x="382" y="165" id="337" />
+<P2 x="485" y="189" id="229" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="194" >
+<father id="196" num="0" />
+<cdparam x="382" y="205" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="190" />
+<TGConnectingPoint num="1" id="191" />
+<TGConnectingPoint num="2" id="192" />
+<TGConnectingPoint num="3" id="193" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="203" >
+<cdparam x="223" y="260" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="202" />
+<P1 x="251" y="231" id="219" />
+<P2 x="252" y="300" id="282" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="201" >
+<father id="203" num="0" />
+<cdparam x="175" y="246" />
+<sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="197" />
+<TGConnectingPoint num="1" id="198" />
+<TGConnectingPoint num="2" id="199" />
+<TGConnectingPoint num="3" id="200" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="minUserDelay" />
+<afterMax value="maxUserDelay" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="0.99" />
+<actions value="nbOfCoins = nbOfCoins - x" />
+<actions value="contentOfWallet(nbOfCoins)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="210" >
+<cdparam x="357" y="165" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="209" />
+<P1 x="357" y="165" id="336" />
+<P2 x="251" y="201" id="218" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="208" >
+<father id="210" num="0" />
+<cdparam x="220" y="174" />
+<sizeparam width="93" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="204" />
+<TGConnectingPoint num="1" id="205" />
+<TGConnectingPoint num="2" id="206" />
+<TGConnectingPoint num="3" id="207" />
+<extraparam>
+<guard value="[nbOfCoins > 0]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="217" >
+<cdparam x="369" y="115" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="216" />
+<P1 x="370" y="64" id="363" />
+<P2 x="370" y="135" id="323" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="215" >
+<father id="217" num="0" />
+<cdparam x="376" y="105" />
+<sizeparam width="156" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="211" />
+<TGConnectingPoint num="1" id="212" />
+<TGConnectingPoint num="2" id="213" />
+<TGConnectingPoint num="3" id="214" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="contentOfWallet(nbOfCoins)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5103" id="228" >
+<cdparam x="217" y="206" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="putCoin(x)" />
+<TGConnectingPoint num="0" id="218" />
+<TGConnectingPoint num="1" id="219" />
+<TGConnectingPoint num="2" id="220" />
+<TGConnectingPoint num="3" id="221" />
+<TGConnectingPoint num="4" id="222" />
+<TGConnectingPoint num="5" id="223" />
+<TGConnectingPoint num="6" id="224" />
+<TGConnectingPoint num="7" id="225" />
+<TGConnectingPoint num="8" id="226" />
+<TGConnectingPoint num="9" id="227" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="239" >
+<cdparam x="447" y="194" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="getCoin(x)" />
+<TGConnectingPoint num="0" id="229" />
+<TGConnectingPoint num="1" id="230" />
+<TGConnectingPoint num="2" id="231" />
+<TGConnectingPoint num="3" id="232" />
+<TGConnectingPoint num="4" id="233" />
+<TGConnectingPoint num="5" id="234" />
+<TGConnectingPoint num="6" id="235" />
+<TGConnectingPoint num="7" id="236" />
+<TGConnectingPoint num="8" id="237" />
+<TGConnectingPoint num="9" id="238" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="280" >
+<cdparam x="460" y="275" />
+<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="240" />
+<TGConnectingPoint num="1" id="241" />
+<TGConnectingPoint num="2" id="242" />
+<TGConnectingPoint num="3" id="243" />
+<TGConnectingPoint num="4" id="244" />
+<TGConnectingPoint num="5" id="245" />
+<TGConnectingPoint num="6" id="246" />
+<TGConnectingPoint num="7" id="247" />
+<TGConnectingPoint num="8" id="248" />
+<TGConnectingPoint num="9" id="249" />
+<TGConnectingPoint num="10" id="250" />
+<TGConnectingPoint num="11" id="251" />
+<TGConnectingPoint num="12" id="252" />
+<TGConnectingPoint num="13" id="253" />
+<TGConnectingPoint num="14" id="254" />
+<TGConnectingPoint num="15" id="255" />
+<TGConnectingPoint num="16" id="256" />
+<TGConnectingPoint num="17" id="257" />
+<TGConnectingPoint num="18" id="258" />
+<TGConnectingPoint num="19" id="259" />
+<TGConnectingPoint num="20" id="260" />
+<TGConnectingPoint num="21" id="261" />
+<TGConnectingPoint num="22" id="262" />
+<TGConnectingPoint num="23" id="263" />
+<TGConnectingPoint num="24" id="264" />
+<TGConnectingPoint num="25" id="265" />
+<TGConnectingPoint num="26" id="266" />
+<TGConnectingPoint num="27" id="267" />
+<TGConnectingPoint num="28" id="268" />
+<TGConnectingPoint num="29" id="269" />
+<TGConnectingPoint num="30" id="270" />
+<TGConnectingPoint num="31" id="271" />
+<TGConnectingPoint num="32" id="272" />
+<TGConnectingPoint num="33" id="273" />
+<TGConnectingPoint num="34" id="274" />
+<TGConnectingPoint num="35" id="275" />
+<TGConnectingPoint num="36" id="276" />
+<TGConnectingPoint num="37" id="277" />
+<TGConnectingPoint num="38" id="278" />
+<TGConnectingPoint num="39" id="279" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="321" >
+<cdparam x="227" y="300" />
+<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="281" />
+<TGConnectingPoint num="1" id="282" />
+<TGConnectingPoint num="2" id="283" />
+<TGConnectingPoint num="3" id="284" />
+<TGConnectingPoint num="4" id="285" />
+<TGConnectingPoint num="5" id="286" />
+<TGConnectingPoint num="6" id="287" />
+<TGConnectingPoint num="7" id="288" />
+<TGConnectingPoint num="8" id="289" />
+<TGConnectingPoint num="9" id="290" />
+<TGConnectingPoint num="10" id="291" />
+<TGConnectingPoint num="11" id="292" />
+<TGConnectingPoint num="12" id="293" />
+<TGConnectingPoint num="13" id="294" />
+<TGConnectingPoint num="14" id="295" />
+<TGConnectingPoint num="15" id="296" />
+<TGConnectingPoint num="16" id="297" />
+<TGConnectingPoint num="17" id="298" />
+<TGConnectingPoint num="18" id="299" />
+<TGConnectingPoint num="19" id="300" />
+<TGConnectingPoint num="20" id="301" />
+<TGConnectingPoint num="21" id="302" />
+<TGConnectingPoint num="22" id="303" />
+<TGConnectingPoint num="23" id="304" />
+<TGConnectingPoint num="24" id="305" />
+<TGConnectingPoint num="25" id="306" />
+<TGConnectingPoint num="26" id="307" />
+<TGConnectingPoint num="27" id="308" />
+<TGConnectingPoint num="28" id="309" />
+<TGConnectingPoint num="29" id="310" />
+<TGConnectingPoint num="30" id="311" />
+<TGConnectingPoint num="31" id="312" />
+<TGConnectingPoint num="32" id="313" />
+<TGConnectingPoint num="33" id="314" />
+<TGConnectingPoint num="34" id="315" />
+<TGConnectingPoint num="35" id="316" />
+<TGConnectingPoint num="36" id="317" />
+<TGConnectingPoint num="37" id="318" />
+<TGConnectingPoint num="38" id="319" />
+<TGConnectingPoint num="39" id="320" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="362" >
+<cdparam x="345" y="135" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="322" />
+<TGConnectingPoint num="1" id="323" />
+<TGConnectingPoint num="2" id="324" />
+<TGConnectingPoint num="3" id="325" />
+<TGConnectingPoint num="4" id="326" />
+<TGConnectingPoint num="5" id="327" />
+<TGConnectingPoint num="6" id="328" />
+<TGConnectingPoint num="7" id="329" />
+<TGConnectingPoint num="8" id="330" />
+<TGConnectingPoint num="9" id="331" />
+<TGConnectingPoint num="10" id="332" />
+<TGConnectingPoint num="11" id="333" />
+<TGConnectingPoint num="12" id="334" />
+<TGConnectingPoint num="13" id="335" />
+<TGConnectingPoint num="14" id="336" />
+<TGConnectingPoint num="15" id="337" />
+<TGConnectingPoint num="16" id="338" />
+<TGConnectingPoint num="17" id="339" />
+<TGConnectingPoint num="18" id="340" />
+<TGConnectingPoint num="19" id="341" />
+<TGConnectingPoint num="20" id="342" />
+<TGConnectingPoint num="21" id="343" />
+<TGConnectingPoint num="22" id="344" />
+<TGConnectingPoint num="23" id="345" />
+<TGConnectingPoint num="24" id="346" />
+<TGConnectingPoint num="25" id="347" />
+<TGConnectingPoint num="26" id="348" />
+<TGConnectingPoint num="27" id="349" />
+<TGConnectingPoint num="28" id="350" />
+<TGConnectingPoint num="29" id="351" />
+<TGConnectingPoint num="30" id="352" />
+<TGConnectingPoint num="31" id="353" />
+<TGConnectingPoint num="32" id="354" />
+<TGConnectingPoint num="33" id="355" />
+<TGConnectingPoint num="34" id="356" />
+<TGConnectingPoint num="35" id="357" />
+<TGConnectingPoint num="36" id="358" />
+<TGConnectingPoint num="37" id="359" />
+<TGConnectingPoint num="38" id="360" />
+<TGConnectingPoint num="39" id="361" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="364" >
+<cdparam x="363" y="44" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="363" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
+<CONNECTOR type="118" id="365" >
+<cdparam x="372" y="83" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="412" y="82" id="641" />
+<P2 x="472" y="82" id="474" />
+<AutomaticDrawing data="false" />
+</CONNECTOR>
+<CONNECTOR type="5102" id="372" >
+<cdparam x="691" y="288" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="371" />
+<P1 x="699" y="289" id="527" />
+<P2 x="699" y="316" id="499" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="370" >
+<father id="372" num="0" />
+<cdparam x="691" y="328" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="366" />
+<TGConnectingPoint num="1" id="367" />
+<TGConnectingPoint num="2" id="368" />
+<TGConnectingPoint num="3" id="369" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="379" >
+<cdparam x="481" y="501" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="378" />
+<P1 x="442" y="527" id="729" />
+<P2 x="323" y="748" id="655" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="377" >
+<father id="379" num="0" />
+<cdparam x="420" y="552" />
+<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="373" />
+<TGConnectingPoint num="1" id="374" />
+<TGConnectingPoint num="2" id="375" />
+<TGConnectingPoint num="3" id="376" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="386" >
+<cdparam x="555" y="559" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="385" />
+<P1 x="326" y="457" id="756" />
+<P2 x="442" y="497" id="728" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="384" >
+<father id="386" num="0" />
+<cdparam x="395" y="448" />
+<sizeparam width="94" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="380" />
+<TGConnectingPoint num="1" id="381" />
+<TGConnectingPoint num="2" id="382" />
+<TGConnectingPoint num="3" id="383" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="coinDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="393" >
+<cdparam x="355" y="545" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="392" />
+<P1 x="298" y="554" id="794" />
+<P2 x="289" y="748" id="647" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="391" >
+<father id="393" num="0" />
+<cdparam x="284" y="594" />
+<sizeparam width="228" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="387" />
+<TGConnectingPoint num="1" id="388" />
+<TGConnectingPoint num="2" id="389" />
+<TGConnectingPoint num="3" id="390" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="teaMinDelay" />
+<computeMax value="teaMaxDelay" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
+<actions value="beverageReady()" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="400" >
+<cdparam x="295" y="465" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="399" />
+<P1 x="293" y="477" id="767" />
+<P2 x="298" y="524" id="793" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="398" >
+<father id="400" num="0" />
+<cdparam x="295" y="505" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="394" />
+<TGConnectingPoint num="1" id="395" />
+<TGConnectingPoint num="2" id="396" />
+<TGConnectingPoint num="3" id="397" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="407" >
+<cdparam x="148" y="549" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="406" />
+<P1 x="126" y="554" id="740" />
+<P2 x="255" y="748" id="654" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="405" >
+<father id="407" num="0" />
+<cdparam x="32" y="587" />
+<sizeparam width="262" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="401" />
+<TGConnectingPoint num="1" id="402" />
+<TGConnectingPoint num="2" id="403" />
+<TGConnectingPoint num="3" id="404" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="coffeeMinDelay" />
+<computeMax value="coffeeMaxDelay" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
+<actions value="beverageReady()" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="414" >
+<cdparam x="229" y="465" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="413" />
+<P1 x="227" y="477" id="766" />
+<P2 x="126" y="524" id="739" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="412" >
+<father id="414" num="0" />
+<cdparam x="229" y="505" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="408" />
+<TGConnectingPoint num="1" id="409" />
+<TGConnectingPoint num="2" id="410" />
+<TGConnectingPoint num="3" id="411" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="421" >
+<cdparam x="280" y="420" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="420" />
+<P1 x="261" y="421" id="750" />
+<P2 x="260" y="437" id="753" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="419" >
+<father id="421" num="0" />
+<cdparam x="280" y="460" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="415" />
+<TGConnectingPoint num="1" id="416" />
+<TGConnectingPoint num="2" id="417" />
+<TGConnectingPoint num="3" id="418" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="428" >
+<cdparam x="667" y="346" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="427" />
+<P1 x="699" y="346" id="500" />
+<P2 x="699" y="381" id="688" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="426" >
+<father id="428" num="0" />
+<cdparam x="707" y="368" />
+<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="422" />
+<TGConnectingPoint num="1" id="423" />
+<TGConnectingPoint num="2" id="424" />
+<TGConnectingPoint num="3" id="425" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="435" >
+<cdparam x="348" y="228" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="434" />
+<P1 x="388" y="208" id="566" />
+<P2 x="649" y="264" id="524" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="433" >
+<father id="435" num="0" />
+<cdparam x="411" y="206" />
+<sizeparam width="94" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="429" />
+<TGConnectingPoint num="1" id="430" />
+<TGConnectingPoint num="2" id="431" />
+<TGConnectingPoint num="3" id="432" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="coinDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="0.1" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="442" >
+<cdparam x="243" y="319" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="441" />
+<P1 x="277" y="305" id="511" />
+<P2 x="311" y="372" id="805" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="440" >
+<father id="442" num="0" />
+<cdparam x="243" y="359" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="436" />
+<TGConnectingPoint num="1" id="437" />
+<TGConnectingPoint num="2" id="438" />
+<TGConnectingPoint num="3" id="439" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="449" >
+<cdparam x="270" y="224" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="448" />
+<P1 x="270" y="228" id="576" />
+<P2 x="277" y="275" id="510" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="447" >
+<father id="449" num="0" />
+<cdparam x="270" y="264" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="443" />
+<TGConnectingPoint num="1" id="444" />
+<TGConnectingPoint num="2" id="445" />
+<TGConnectingPoint num="3" id="446" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="456" >
+<cdparam x="309" y="160" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="455" />
+<P1 x="306" y="166" id="489" />
+<P2 x="309" y="188" id="563" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="454" >
+<father id="456" num="0" />
+<cdparam x="328" y="178" />
+<sizeparam width="161" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="450" />
+<TGConnectingPoint num="1" id="451" />
+<TGConnectingPoint num="2" id="452" />
+<TGConnectingPoint num="3" id="453" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = nbOfCoins + x" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="463" >
+<cdparam x="303" y="103" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="462" />
+<P1 x="302" y="102" id="611" />
+<P2 x="306" y="136" id="488" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="461" >
+<father id="463" num="0" />
+<cdparam x="303" y="143" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="457" />
+<TGConnectingPoint num="1" id="458" />
+<TGConnectingPoint num="2" id="459" />
+<TGConnectingPoint num="3" id="460" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="470" >
+<cdparam x="303" y="40" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="469" />
+<P1 x="303" y="40" id="603" />
+<P2 x="302" y="62" id="606" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="468" >
+<father id="470" num="0" />
+<cdparam x="303" y="80" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="464" />
+<TGConnectingPoint num="1" id="465" />
+<TGConnectingPoint num="2" id="466" />
+<TGConnectingPoint num="3" id="467" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="301" id="487" >
+<cdparam x="472" y="75" />
+<sizeparam width="100" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="UML Note" value="Activity1.docx
+" />
+<TGConnectingPoint num="0" id="471" />
+<TGConnectingPoint num="1" id="472" />
+<TGConnectingPoint num="2" id="473" />
+<TGConnectingPoint num="3" id="474" />
+<TGConnectingPoint num="4" id="475" />
+<TGConnectingPoint num="5" id="476" />
+<TGConnectingPoint num="6" id="477" />
+<TGConnectingPoint num="7" id="478" />
+<TGConnectingPoint num="8" id="479" />
+<TGConnectingPoint num="9" id="480" />
+<TGConnectingPoint num="10" id="481" />
+<TGConnectingPoint num="11" id="482" />
+<TGConnectingPoint num="12" id="483" />
+<TGConnectingPoint num="13" id="484" />
+<TGConnectingPoint num="14" id="485" />
+<TGConnectingPoint num="15" id="486" />
+<extraparam>
+<Line value="Activity1.docx" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="498" >
+<cdparam x="268" y="141" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Receive signal" value="getCoin(x)" />
+<TGConnectingPoint num="0" id="488" />
+<TGConnectingPoint num="1" id="489" />
+<TGConnectingPoint num="2" id="490" />
+<TGConnectingPoint num="3" id="491" />
+<TGConnectingPoint num="4" id="492" />
+<TGConnectingPoint num="5" id="493" />
+<TGConnectingPoint num="6" id="494" />
+<TGConnectingPoint num="7" id="495" />
+<TGConnectingPoint num="8" id="496" />
+<TGConnectingPoint num="9" id="497" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="509" >
+<cdparam x="634" y="321" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="499" />
+<TGConnectingPoint num="1" id="500" />
+<TGConnectingPoint num="2" id="501" />
+<TGConnectingPoint num="3" id="502" />
+<TGConnectingPoint num="4" id="503" />
+<TGConnectingPoint num="5" id="504" />
+<TGConnectingPoint num="6" id="505" />
+<TGConnectingPoint num="7" id="506" />
+<TGConnectingPoint num="8" id="507" />
+<TGConnectingPoint num="9" id="508" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="520" >
+<cdparam x="239" y="280" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Receive signal" value="getCoin(x)" />
+<TGConnectingPoint num="0" id="510" />
+<TGConnectingPoint num="1" id="511" />
+<TGConnectingPoint num="2" id="512" />
+<TGConnectingPoint num="3" id="513" />
+<TGConnectingPoint num="4" id="514" />
+<TGConnectingPoint num="5" id="515" />
+<TGConnectingPoint num="6" id="516" />
+<TGConnectingPoint num="7" id="517" />
+<TGConnectingPoint num="8" id="518" />
+<TGConnectingPoint num="9" id="519" />
+<accessibility />
+</COMPONENT>
+
+<COMPONENT type="5106" id="561" >
+<cdparam x="649" y="239" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="ejectState" />
+<TGConnectingPoint num="0" id="521" />
+<TGConnectingPoint num="1" id="522" />
+<TGConnectingPoint num="2" id="523" />
+<TGConnectingPoint num="3" id="524" />
+<TGConnectingPoint num="4" id="525" />
+<TGConnectingPoint num="5" id="526" />
+<TGConnectingPoint num="6" id="527" />
+<TGConnectingPoint num="7" id="528" />
+<TGConnectingPoint num="8" id="529" />
+<TGConnectingPoint num="9" id="530" />
+<TGConnectingPoint num="10" id="531" />
+<TGConnectingPoint num="11" id="532" />
+<TGConnectingPoint num="12" id="533" />
+<TGConnectingPoint num="13" id="534" />
+<TGConnectingPoint num="14" id="535" />
+<TGConnectingPoint num="15" id="536" />
+<TGConnectingPoint num="16" id="537" />
+<TGConnectingPoint num="17" id="538" />
+<TGConnectingPoint num="18" id="539" />
+<TGConnectingPoint num="19" id="540" />
+<TGConnectingPoint num="20" id="541" />
+<TGConnectingPoint num="21" id="542" />
+<TGConnectingPoint num="22" id="543" />
+<TGConnectingPoint num="23" id="544" />
+<TGConnectingPoint num="24" id="545" />
+<TGConnectingPoint num="25" id="546" />
+<TGConnectingPoint num="26" id="547" />
+<TGConnectingPoint num="27" id="548" />
+<TGConnectingPoint num="28" id="549" />
+<TGConnectingPoint num="29" id="550" />
+<TGConnectingPoint num="30" id="551" />
+<TGConnectingPoint num="31" id="552" />
+<TGConnectingPoint num="32" id="553" />
+<TGConnectingPoint num="33" id="554" />
+<TGConnectingPoint num="34" id="555" />
+<TGConnectingPoint num="35" id="556" />
+<TGConnectingPoint num="36" id="557" />
+<TGConnectingPoint num="37" id="558" />
+<TGConnectingPoint num="38" id="559" />
+<TGConnectingPoint num="39" id="560" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="602" >
+<cdparam x="231" y="188" />
+<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitingForSecondCoin" />
+<TGConnectingPoint num="0" id="562" />
+<TGConnectingPoint num="1" id="563" />
+<TGConnectingPoint num="2" id="564" />
+<TGConnectingPoint num="3" id="565" />
+<TGConnectingPoint num="4" id="566" />
+<TGConnectingPoint num="5" id="567" />
+<TGConnectingPoint num="6" id="568" />
+<TGConnectingPoint num="7" id="569" />
+<TGConnectingPoint num="8" id="570" />
+<TGConnectingPoint num="9" id="571" />
+<TGConnectingPoint num="10" id="572" />
+<TGConnectingPoint num="11" id="573" />
+<TGConnectingPoint num="12" id="574" />
+<TGConnectingPoint num="13" id="575" />
+<TGConnectingPoint num="14" id="576" />
+<TGConnectingPoint num="15" id="577" />
+<TGConnectingPoint num="16" id="578" />
+<TGConnectingPoint num="17" id="579" />
+<TGConnectingPoint num="18" id="580" />
+<TGConnectingPoint num="19" id="581" />
+<TGConnectingPoint num="20" id="582" />
+<TGConnectingPoint num="21" id="583" />
+<TGConnectingPoint num="22" id="584" />
+<TGConnectingPoint num="23" id="585" />
+<TGConnectingPoint num="24" id="586" />
+<TGConnectingPoint num="25" id="587" />
+<TGConnectingPoint num="26" id="588" />
+<TGConnectingPoint num="27" id="589" />
+<TGConnectingPoint num="28" id="590" />
+<TGConnectingPoint num="29" id="591" />
+<TGConnectingPoint num="30" id="592" />
+<TGConnectingPoint num="31" id="593" />
+<TGConnectingPoint num="32" id="594" />
+<TGConnectingPoint num="33" id="595" />
+<TGConnectingPoint num="34" id="596" />
+<TGConnectingPoint num="35" id="597" />
+<TGConnectingPoint num="36" id="598" />
+<TGConnectingPoint num="37" id="599" />
+<TGConnectingPoint num="38" id="600" />
+<TGConnectingPoint num="39" id="601" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="604" >
+<cdparam x="296" y="20" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="603" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="645" >
+<cdparam x="192" y="62" />
+<sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitingForFirstCoin" />
+<TGConnectingPoint num="0" id="605" />
+<TGConnectingPoint num="1" id="606" />
+<TGConnectingPoint num="2" id="607" />
+<TGConnectingPoint num="3" id="608" />
+<TGConnectingPoint num="4" id="609" />
+<TGConnectingPoint num="5" id="610" />
+<TGConnectingPoint num="6" id="611" />
+<TGConnectingPoint num="7" id="612" />
+<TGConnectingPoint num="8" id="613" />
+<TGConnectingPoint num="9" id="614" />
+<TGConnectingPoint num="10" id="615" />
+<TGConnectingPoint num="11" id="616" />
+<TGConnectingPoint num="12" id="617" />
+<TGConnectingPoint num="13" id="618" />
+<TGConnectingPoint num="14" id="619" />
+<TGConnectingPoint num="15" id="620" />
+<TGConnectingPoint num="16" id="621" />
+<TGConnectingPoint num="17" id="622" />
+<TGConnectingPoint num="18" id="623" />
+<TGConnectingPoint num="19" id="624" />
+<TGConnectingPoint num="20" id="625" />
+<TGConnectingPoint num="21" id="626" />
+<TGConnectingPoint num="22" id="627" />
+<TGConnectingPoint num="23" id="628" />
+<TGConnectingPoint num="24" id="629" />
+<TGConnectingPoint num="25" id="630" />
+<TGConnectingPoint num="26" id="631" />
+<TGConnectingPoint num="27" id="632" />
+<TGConnectingPoint num="28" id="633" />
+<TGConnectingPoint num="29" id="634" />
+<TGConnectingPoint num="30" id="635" />
+<TGConnectingPoint num="31" id="636" />
+<TGConnectingPoint num="32" id="637" />
+<TGConnectingPoint num="33" id="638" />
+<TGConnectingPoint num="34" id="639" />
+<TGConnectingPoint num="35" id="640" />
+<TGConnectingPoint num="36" id="641" />
+<TGConnectingPoint num="37" id="642" />
+<TGConnectingPoint num="38" id="643" />
+<TGConnectingPoint num="39" id="644" />
+<latencyCheck />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="686" >
+<cdparam x="221" y="748" />
+<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitingForFirstCoin" />
+<TGConnectingPoint num="0" id="646" />
+<TGConnectingPoint num="1" id="647" />
+<TGConnectingPoint num="2" id="648" />
+<TGConnectingPoint num="3" id="649" />
+<TGConnectingPoint num="4" id="650" />
+<TGConnectingPoint num="5" id="651" />
+<TGConnectingPoint num="6" id="652" />
+<TGConnectingPoint num="7" id="653" />
+<TGConnectingPoint num="8" id="654" />
+<TGConnectingPoint num="9" id="655" />
+<TGConnectingPoint num="10" id="656" />
+<TGConnectingPoint num="11" id="657" />
+<TGConnectingPoint num="12" id="658" />
+<TGConnectingPoint num="13" id="659" />
+<TGConnectingPoint num="14" id="660" />
+<TGConnectingPoint num="15" id="661" />
+<TGConnectingPoint num="16" id="662" />
+<TGConnectingPoint num="17" id="663" />
+<TGConnectingPoint num="18" id="664" />
+<TGConnectingPoint num="19" id="665" />
+<TGConnectingPoint num="20" id="666" />
+<TGConnectingPoint num="21" id="667" />
+<TGConnectingPoint num="22" id="668" />
+<TGConnectingPoint num="23" id="669" />
+<TGConnectingPoint num="24" id="670" />
+<TGConnectingPoint num="25" id="671" />
+<TGConnectingPoint num="26" id="672" />
+<TGConnectingPoint num="27" id="673" />
+<TGConnectingPoint num="28" id="674" />
+<TGConnectingPoint num="29" id="675" />
+<TGConnectingPoint num="30" id="676" />
+<TGConnectingPoint num="31" id="677" />
+<TGConnectingPoint num="32" id="678" />
+<TGConnectingPoint num="33" id="679" />
+<TGConnectingPoint num="34" id="680" />
+<TGConnectingPoint num="35" id="681" />
+<TGConnectingPoint num="36" id="682" />
+<TGConnectingPoint num="37" id="683" />
+<TGConnectingPoint num="38" id="684" />
+<TGConnectingPoint num="39" id="685" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="727" >
+<cdparam x="631" y="381" />
+<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitingForFirstCoin" />
+<TGConnectingPoint num="0" id="687" />
+<TGConnectingPoint num="1" id="688" />
+<TGConnectingPoint num="2" id="689" />
+<TGConnectingPoint num="3" id="690" />
+<TGConnectingPoint num="4" id="691" />
+<TGConnectingPoint num="5" id="692" />
+<TGConnectingPoint num="6" id="693" />
+<TGConnectingPoint num="7" id="694" />
+<TGConnectingPoint num="8" id="695" />
+<TGConnectingPoint num="9" id="696" />
+<TGConnectingPoint num="10" id="697" />
+<TGConnectingPoint num="11" id="698" />
+<TGConnectingPoint num="12" id="699" />
+<TGConnectingPoint num="13" id="700" />
+<TGConnectingPoint num="14" id="701" />
+<TGConnectingPoint num="15" id="702" />
+<TGConnectingPoint num="16" id="703" />
+<TGConnectingPoint num="17" id="704" />
+<TGConnectingPoint num="18" id="705" />
+<TGConnectingPoint num="19" id="706" />
+<TGConnectingPoint num="20" id="707" />
+<TGConnectingPoint num="21" id="708" />
+<TGConnectingPoint num="22" id="709" />
+<TGConnectingPoint num="23" id="710" />
+<TGConnectingPoint num="24" id="711" />
+<TGConnectingPoint num="25" id="712" />
+<TGConnectingPoint num="26" id="713" />
+<TGConnectingPoint num="27" id="714" />
+<TGConnectingPoint num="28" id="715" />
+<TGConnectingPoint num="29" id="716" />
+<TGConnectingPoint num="30" id="717" />
+<TGConnectingPoint num="31" id="718" />
+<TGConnectingPoint num="32" id="719" />
+<TGConnectingPoint num="33" id="720" />
+<TGConnectingPoint num="34" id="721" />
+<TGConnectingPoint num="35" id="722" />
+<TGConnectingPoint num="36" id="723" />
+<TGConnectingPoint num="37" id="724" />
+<TGConnectingPoint num="38" id="725" />
+<TGConnectingPoint num="39" id="726" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="844" >
+<cdparam x="23" y="372" />
+<sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="Beverage" />
+<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" />
+<TGConnectingPoint num="24" id="828" />
+<TGConnectingPoint num="25" id="829" />
+<TGConnectingPoint num="26" id="830" />
+<TGConnectingPoint num="27" id="831" />
+<TGConnectingPoint num="28" id="832" />
+<TGConnectingPoint num="29" id="833" />
+<TGConnectingPoint num="30" id="834" />
+<TGConnectingPoint num="31" id="835" />
+<TGConnectingPoint num="32" id="836" />
+<TGConnectingPoint num="33" id="837" />
+<TGConnectingPoint num="34" id="838" />
+<TGConnectingPoint num="35" id="839" />
+<TGConnectingPoint num="36" id="840" />
+<TGConnectingPoint num="37" id="841" />
+<TGConnectingPoint num="38" id="842" />
+<TGConnectingPoint num="39" id="843" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5103" id="738" >
+<father id="844" num="0" />
+<cdparam x="377" y="502" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="728" />
+<TGConnectingPoint num="1" id="729" />
+<TGConnectingPoint num="2" id="730" />
+<TGConnectingPoint num="3" id="731" />
+<TGConnectingPoint num="4" id="732" />
+<TGConnectingPoint num="5" id="733" />
+<TGConnectingPoint num="6" id="734" />
+<TGConnectingPoint num="7" id="735" />
+<TGConnectingPoint num="8" id="736" />
+<TGConnectingPoint num="9" id="737" />
+<accessibility />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5104" id="749" >
+<father id="844" num="1" />
+<cdparam x="63" y="529" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="739" />
+<TGConnectingPoint num="1" id="740" />
+<TGConnectingPoint num="2" id="741" />
+<TGConnectingPoint num="3" id="742" />
+<TGConnectingPoint num="4" id="743" />
+<TGConnectingPoint num="5" id="744" />
+<TGConnectingPoint num="6" id="745" />
+<TGConnectingPoint num="7" id="746" />
+<TGConnectingPoint num="8" id="747" />
+<TGConnectingPoint num="9" id="748" />
+<accessibility />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="751" >
+<father id="844" num="2" />
+<cdparam x="254" y="401" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="750" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="792" >
+<father id="844" num="3" />
+<cdparam x="194" y="437" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="752" />
+<TGConnectingPoint num="1" id="753" />
+<TGConnectingPoint num="2" id="754" />
+<TGConnectingPoint num="3" id="755" />
+<TGConnectingPoint num="4" id="756" />
+<TGConnectingPoint num="5" id="757" />
+<TGConnectingPoint num="6" id="758" />
+<TGConnectingPoint num="7" id="759" />
+<TGConnectingPoint num="8" id="760" />
+<TGConnectingPoint num="9" id="761" />
+<TGConnectingPoint num="10" id="762" />
+<TGConnectingPoint num="11" id="763" />
+<TGConnectingPoint num="12" id="764" />
+<TGConnectingPoint num="13" id="765" />
+<TGConnectingPoint num="14" id="766" />
+<TGConnectingPoint num="15" id="767" />
+<TGConnectingPoint num="16" id="768" />
+<TGConnectingPoint num="17" id="769" />
+<TGConnectingPoint num="18" id="770" />
+<TGConnectingPoint num="19" id="771" />
+<TGConnectingPoint num="20" id="772" />
+<TGConnectingPoint num="21" id="773" />
+<TGConnectingPoint num="22" id="774" />
+<TGConnectingPoint num="23" id="775" />
+<TGConnectingPoint num="24" id="776" />
+<TGConnectingPoint num="25" id="777" />
+<TGConnectingPoint num="26" id="778" />
+<TGConnectingPoint num="27" id="779" />
+<TGConnectingPoint num="28" id="780" />
+<TGConnectingPoint num="29" id="781" />
+<TGConnectingPoint num="30" id="782" />
+<TGConnectingPoint num="31" id="783" />
+<TGConnectingPoint num="32" id="784" />
+<TGConnectingPoint num="33" id="785" />
+<TGConnectingPoint num="34" id="786" />
+<TGConnectingPoint num="35" id="787" />
+<TGConnectingPoint num="36" id="788" />
+<TGConnectingPoint num="37" id="789" />
+<TGConnectingPoint num="38" id="790" />
+<TGConnectingPoint num="39" id="791" />
+<latencyCheck />
+<extraparam>
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5104" id="803" >
+<father id="844" num="4" />
+<cdparam x="242" y="529" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
+<TGConnectingPoint num="0" id="793" />
+<TGConnectingPoint num="1" id="794" />
+<TGConnectingPoint num="2" id="795" />
+<TGConnectingPoint num="3" id="796" />
+<TGConnectingPoint num="4" id="797" />
+<TGConnectingPoint num="5" id="798" />
+<TGConnectingPoint num="6" id="799" />
+<TGConnectingPoint num="7" id="800" />
+<TGConnectingPoint num="8" id="801" />
+<TGConnectingPoint num="9" id="802" />
+<accessibility />
+</SUBCOMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="851" >
+<cdparam x="177" y="199" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="850" />
+<P1 x="340" y="233" id="957" />
+<P2 x="353" y="252" id="959" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="849" >
+<father id="851" num="0" />
+<cdparam x="177" y="239" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="845" />
+<TGConnectingPoint num="1" id="846" />
+<TGConnectingPoint num="2" id="847" />
+<TGConnectingPoint num="3" id="848" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="858" >
+<cdparam x="322" y="69" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="857" />
+<P1 x="322" y="69" id="955" />
+<P2 x="323" y="88" id="915" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="856" >
+<father id="858" num="0" />
+<cdparam x="322" y="109" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="852" />
+<TGConnectingPoint num="1" id="853" />
+<TGConnectingPoint num="2" id="854" />
+<TGConnectingPoint num="3" id="855" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="865" >
+<cdparam x="377" y="144" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="864" />
+<P1 x="323" y="118" id="920" />
+<P2 x="356" y="174" id="971" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="863" >
+<father id="865" num="0" />
+<cdparam x="377" y="184" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="859" />
+<TGConnectingPoint num="1" id="860" />
+<TGConnectingPoint num="2" id="861" />
+<TGConnectingPoint num="3" id="862" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="872" >
+<cdparam x="377" y="187" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="871" />
+<P1 x="353" y="282" id="960" />
+<P2 x="399" y="352" id="874" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="870" >
+<father id="872" num="0" />
+<cdparam x="417" y="335" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="866" />
+<TGConnectingPoint num="1" id="867" />
+<TGConnectingPoint num="2" id="868" />
+<TGConnectingPoint num="3" id="869" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="mechanicalDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5106" id="913" >
+<cdparam x="374" y="352" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="873" />
+<TGConnectingPoint num="1" id="874" />
+<TGConnectingPoint num="2" id="875" />
+<TGConnectingPoint num="3" id="876" />
+<TGConnectingPoint num="4" id="877" />
+<TGConnectingPoint num="5" id="878" />
+<TGConnectingPoint num="6" id="879" />
+<TGConnectingPoint num="7" id="880" />
+<TGConnectingPoint num="8" id="881" />
+<TGConnectingPoint num="9" id="882" />
+<TGConnectingPoint num="10" id="883" />
+<TGConnectingPoint num="11" id="884" />
+<TGConnectingPoint num="12" id="885" />
+<TGConnectingPoint num="13" id="886" />
+<TGConnectingPoint num="14" id="887" />
+<TGConnectingPoint num="15" id="888" />
+<TGConnectingPoint num="16" id="889" />
+<TGConnectingPoint num="17" id="890" />
+<TGConnectingPoint num="18" id="891" />
+<TGConnectingPoint num="19" id="892" />
+<TGConnectingPoint num="20" id="893" />
+<TGConnectingPoint num="21" id="894" />
+<TGConnectingPoint num="22" id="895" />
+<TGConnectingPoint num="23" id="896" />
+<TGConnectingPoint num="24" id="897" />
+<TGConnectingPoint num="25" id="898" />
+<TGConnectingPoint num="26" id="899" />
+<TGConnectingPoint num="27" id="900" />
+<TGConnectingPoint num="28" id="901" />
+<TGConnectingPoint num="29" id="902" />
+<TGConnectingPoint num="30" id="903" />
+<TGConnectingPoint num="31" id="904" />
+<TGConnectingPoint num="32" id="905" />
+<TGConnectingPoint num="33" id="906" />
+<TGConnectingPoint num="34" id="907" />
+<TGConnectingPoint num="35" id="908" />
+<TGConnectingPoint num="36" id="909" />
+<TGConnectingPoint num="37" id="910" />
+<TGConnectingPoint num="38" id="911" />
+<TGConnectingPoint num="39" id="912" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="954" >
+<cdparam x="298" y="88" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="914" />
+<TGConnectingPoint num="1" id="915" />
+<TGConnectingPoint num="2" id="916" />
+<TGConnectingPoint num="3" id="917" />
+<TGConnectingPoint num="4" id="918" />
+<TGConnectingPoint num="5" id="919" />
+<TGConnectingPoint num="6" id="920" />
+<TGConnectingPoint num="7" id="921" />
+<TGConnectingPoint num="8" id="922" />
+<TGConnectingPoint num="9" id="923" />
+<TGConnectingPoint num="10" id="924" />
+<TGConnectingPoint num="11" id="925" />
+<TGConnectingPoint num="12" id="926" />
+<TGConnectingPoint num="13" id="927" />
+<TGConnectingPoint num="14" id="928" />
+<TGConnectingPoint num="15" id="929" />
+<TGConnectingPoint num="16" id="930" />
+<TGConnectingPoint num="17" id="931" />
+<TGConnectingPoint num="18" id="932" />
+<TGConnectingPoint num="19" id="933" />
+<TGConnectingPoint num="20" id="934" />
+<TGConnectingPoint num="21" id="935" />
+<TGConnectingPoint num="22" id="936" />
+<TGConnectingPoint num="23" id="937" />
+<TGConnectingPoint num="24" id="938" />
+<TGConnectingPoint num="25" id="939" />
+<TGConnectingPoint num="26" id="940" />
+<TGConnectingPoint num="27" id="941" />
+<TGConnectingPoint num="28" id="942" />
+<TGConnectingPoint num="29" id="943" />
+<TGConnectingPoint num="30" id="944" />
+<TGConnectingPoint num="31" id="945" />
+<TGConnectingPoint num="32" id="946" />
+<TGConnectingPoint num="33" id="947" />
+<TGConnectingPoint num="34" id="948" />
+<TGConnectingPoint num="35" id="949" />
+<TGConnectingPoint num="36" id="950" />
+<TGConnectingPoint num="37" id="951" />
+<TGConnectingPoint num="38" id="952" />
+<TGConnectingPoint num="39" id="953" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="956" >
+<cdparam x="315" y="49" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="955" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1010" >
+<cdparam x="264" y="174" />
+<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="970" />
+<TGConnectingPoint num="1" id="971" />
+<TGConnectingPoint num="2" id="972" />
+<TGConnectingPoint num="3" id="973" />
+<TGConnectingPoint num="4" id="974" />
+<TGConnectingPoint num="5" id="975" />
+<TGConnectingPoint num="6" id="976" />
+<TGConnectingPoint num="7" id="977" />
+<TGConnectingPoint num="8" id="978" />
+<TGConnectingPoint num="9" id="979" />
+<TGConnectingPoint num="10" id="980" />
+<TGConnectingPoint num="11" id="981" />
+<TGConnectingPoint num="12" id="982" />
+<TGConnectingPoint num="13" id="983" />
+<TGConnectingPoint num="14" id="984" />
+<TGConnectingPoint num="15" id="985" />
+<TGConnectingPoint num="16" id="986" />
+<TGConnectingPoint num="17" id="987" />
+<TGConnectingPoint num="18" id="988" />
+<TGConnectingPoint num="19" id="989" />
+<TGConnectingPoint num="20" id="990" />
+<TGConnectingPoint num="21" id="991" />
+<TGConnectingPoint num="22" id="992" />
+<TGConnectingPoint num="23" id="993" />
+<TGConnectingPoint num="24" id="994" />
+<TGConnectingPoint num="25" id="995" />
+<TGConnectingPoint num="26" id="996" />
+<TGConnectingPoint num="27" id="997" />
+<TGConnectingPoint num="28" id="998" />
+<TGConnectingPoint num="29" id="999" />
+<TGConnectingPoint num="30" id="1000" />
+<TGConnectingPoint num="31" id="1001" />
+<TGConnectingPoint num="32" id="1002" />
+<TGConnectingPoint num="33" id="1003" />
+<TGConnectingPoint num="34" id="1004" />
+<TGConnectingPoint num="35" id="1005" />
+<TGConnectingPoint num="36" id="1006" />
+<TGConnectingPoint num="37" id="1007" />
+<TGConnectingPoint num="38" id="1008" />
+<TGConnectingPoint num="39" id="1009" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5100" id="958" >
+<father id="1010" num="0" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="957" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5103" id="969" >
+<father id="1010" num="1" />
+<cdparam x="330" y="257" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="959" />
+<TGConnectingPoint num="1" id="960" />
+<TGConnectingPoint num="2" id="961" />
+<TGConnectingPoint num="3" id="962" />
+<TGConnectingPoint num="4" id="963" />
+<TGConnectingPoint num="5" id="964" />
+<TGConnectingPoint num="6" id="965" />
+<TGConnectingPoint num="7" id="966" />
+<TGConnectingPoint num="8" id="967" />
+<TGConnectingPoint num="9" id="968" />
+</SUBCOMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1017" >
+<cdparam x="363" y="193" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1016" />
+<P1 x="363" y="204" id="1033" />
+<P2 x="362" y="257" id="1044" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1015" >
+<father id="1017" num="0" />
+<cdparam x="380" y="228" />
+<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1011" />
+<TGConnectingPoint num="1" id="1012" />
+<TGConnectingPoint num="2" id="1013" />
+<TGConnectingPoint num="3" id="1014" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="mechanicalDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1024" >
+<cdparam x="363" y="150" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1023" />
+<P1 x="363" y="150" id="1090" />
+<P2 x="363" y="174" id="1032" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1022" >
+<father id="1024" num="0" />
+<cdparam x="363" y="190" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1018" />
+<TGConnectingPoint num="1" id="1019" />
+<TGConnectingPoint num="2" id="1020" />
+<TGConnectingPoint num="3" id="1021" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1031" >
+<cdparam x="362" y="101" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1030" />
+<P1 x="362" y="101" id="1125" />
+<P2 x="363" y="120" id="1085" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1029" >
+<father id="1031" num="0" />
+<cdparam x="362" y="141" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1025" />
+<TGConnectingPoint num="1" id="1026" />
+<TGConnectingPoint num="2" id="1027" />
+<TGConnectingPoint num="3" id="1028" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5103" id="1042" >
+<cdparam x="338" y="179" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1032" />
+<TGConnectingPoint num="1" id="1033" />
+<TGConnectingPoint num="2" id="1034" />
+<TGConnectingPoint num="3" id="1035" />
+<TGConnectingPoint num="4" id="1036" />
+<TGConnectingPoint num="5" id="1037" />
+<TGConnectingPoint num="6" id="1038" />
+<TGConnectingPoint num="7" id="1039" />
+<TGConnectingPoint num="8" id="1040" />
+<TGConnectingPoint num="9" id="1041" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1083" >
+<cdparam x="337" y="257" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="1043" />
+<TGConnectingPoint num="1" id="1044" />
+<TGConnectingPoint num="2" id="1045" />
+<TGConnectingPoint num="3" id="1046" />
+<TGConnectingPoint num="4" id="1047" />
+<TGConnectingPoint num="5" id="1048" />
+<TGConnectingPoint num="6" id="1049" />
+<TGConnectingPoint num="7" id="1050" />
+<TGConnectingPoint num="8" id="1051" />
+<TGConnectingPoint num="9" id="1052" />
+<TGConnectingPoint num="10" id="1053" />
+<TGConnectingPoint num="11" id="1054" />
+<TGConnectingPoint num="12" id="1055" />
+<TGConnectingPoint num="13" id="1056" />
+<TGConnectingPoint num="14" id="1057" />
+<TGConnectingPoint num="15" id="1058" />
+<TGConnectingPoint num="16" id="1059" />
+<TGConnectingPoint num="17" id="1060" />
+<TGConnectingPoint num="18" id="1061" />
+<TGConnectingPoint num="19" id="1062" />
+<TGConnectingPoint num="20" id="1063" />
+<TGConnectingPoint num="21" id="1064" />
+<TGConnectingPoint num="22" id="1065" />
+<TGConnectingPoint num="23" id="1066" />
+<TGConnectingPoint num="24" id="1067" />
+<TGConnectingPoint num="25" id="1068" />
+<TGConnectingPoint num="26" id="1069" />
+<TGConnectingPoint num="27" id="1070" />
+<TGConnectingPoint num="28" id="1071" />
+<TGConnectingPoint num="29" id="1072" />
+<TGConnectingPoint num="30" id="1073" />
+<TGConnectingPoint num="31" id="1074" />
+<TGConnectingPoint num="32" id="1075" />
+<TGConnectingPoint num="33" id="1076" />
+<TGConnectingPoint num="34" id="1077" />
+<TGConnectingPoint num="35" id="1078" />
+<TGConnectingPoint num="36" id="1079" />
+<TGConnectingPoint num="37" id="1080" />
+<TGConnectingPoint num="38" id="1081" />
+<TGConnectingPoint num="39" id="1082" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1124" >
+<cdparam x="338" y="120" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="1084" />
+<TGConnectingPoint num="1" id="1085" />
+<TGConnectingPoint num="2" id="1086" />
+<TGConnectingPoint num="3" id="1087" />
+<TGConnectingPoint num="4" id="1088" />
+<TGConnectingPoint num="5" id="1089" />
+<TGConnectingPoint num="6" id="1090" />
+<TGConnectingPoint num="7" id="1091" />
+<TGConnectingPoint num="8" id="1092" />
+<TGConnectingPoint num="9" id="1093" />
+<TGConnectingPoint num="10" id="1094" />
+<TGConnectingPoint num="11" id="1095" />
+<TGConnectingPoint num="12" id="1096" />
+<TGConnectingPoint num="13" id="1097" />
+<TGConnectingPoint num="14" id="1098" />
+<TGConnectingPoint num="15" id="1099" />
+<TGConnectingPoint num="16" id="1100" />
+<TGConnectingPoint num="17" id="1101" />
+<TGConnectingPoint num="18" id="1102" />
+<TGConnectingPoint num="19" id="1103" />
+<TGConnectingPoint num="20" id="1104" />
+<TGConnectingPoint num="21" id="1105" />
+<TGConnectingPoint num="22" id="1106" />
+<TGConnectingPoint num="23" id="1107" />
+<TGConnectingPoint num="24" id="1108" />
+<TGConnectingPoint num="25" id="1109" />
+<TGConnectingPoint num="26" id="1110" />
+<TGConnectingPoint num="27" id="1111" />
+<TGConnectingPoint num="28" id="1112" />
+<TGConnectingPoint num="29" id="1113" />
+<TGConnectingPoint num="30" id="1114" />
+<TGConnectingPoint num="31" id="1115" />
+<TGConnectingPoint num="32" id="1116" />
+<TGConnectingPoint num="33" id="1117" />
+<TGConnectingPoint num="34" id="1118" />
+<TGConnectingPoint num="35" id="1119" />
+<TGConnectingPoint num="36" id="1120" />
+<TGConnectingPoint num="37" id="1121" />
+<TGConnectingPoint num="38" id="1122" />
+<TGConnectingPoint num="39" id="1123" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1126" >
+<cdparam x="355" y="81" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1125" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="Avatar Requirement" nameTab="MainRequirements" >
+<AvatarRDPanel name="ReqMain" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0000000000000002" >
+<COMPONENT type="5200" id="1170" >
+<cdparam x="12" y="10" />
+<sizeparam width="144" height="97" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="58" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="Other" />
+<TGConnectingPoint num="0" id="1127" />
+<TGConnectingPoint num="1" id="1128" />
+<TGConnectingPoint num="2" id="1129" />
+<TGConnectingPoint num="3" id="1130" />
+<TGConnectingPoint num="4" id="1131" />
+<TGConnectingPoint num="5" id="1132" />
+<TGConnectingPoint num="6" id="1133" />
+<TGConnectingPoint num="7" id="1134" />
+<TGConnectingPoint num="8" id="1135" />
+<TGConnectingPoint num="9" id="1136" />
+<TGConnectingPoint num="10" id="1137" />
+<TGConnectingPoint num="11" id="1138" />
+<TGConnectingPoint num="12" id="1139" />
+<TGConnectingPoint num="13" id="1140" />
+<TGConnectingPoint num="14" id="1141" />
+<TGConnectingPoint num="15" id="1142" />
+<TGConnectingPoint num="16" id="1143" />
+<TGConnectingPoint num="17" id="1144" />
+<TGConnectingPoint num="18" id="1145" />
+<TGConnectingPoint num="19" id="1146" />
+<TGConnectingPoint num="20" id="1147" />
+<TGConnectingPoint num="21" id="1148" />
+<TGConnectingPoint num="22" id="1149" />
+<TGConnectingPoint num="23" id="1150" />
+<TGConnectingPoint num="24" id="1151" />
+<TGConnectingPoint num="25" id="1152" />
+<TGConnectingPoint num="26" id="1153" />
+<TGConnectingPoint num="27" id="1154" />
+<TGConnectingPoint num="28" id="1155" />
+<TGConnectingPoint num="29" id="1156" />
+<TGConnectingPoint num="30" id="1157" />
+<TGConnectingPoint num="31" id="1158" />
+<TGConnectingPoint num="32" id="1159" />
+<TGConnectingPoint num="33" id="1160" />
+<TGConnectingPoint num="34" id="1161" />
+<TGConnectingPoint num="35" id="1162" />
+<TGConnectingPoint num="36" id="1163" />
+<TGConnectingPoint num="37" id="1164" />
+<TGConnectingPoint num="38" id="1165" />
+<TGConnectingPoint num="39" id="1166" />
+<TGConnectingPoint num="40" id="1167" />
+<TGConnectingPoint num="41" id="1168" />
+<TGConnectingPoint num="42" id="1169" />
+<extraparam>
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="1214" >
+<cdparam x="1230" y="389" />
+<sizeparam width="200" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="73" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="ReqNew" />
+<TGConnectingPoint num="0" id="1171" />
+<TGConnectingPoint num="1" id="1172" />
+<TGConnectingPoint num="2" id="1173" />
+<TGConnectingPoint num="3" id="1174" />
+<TGConnectingPoint num="4" id="1175" />
+<TGConnectingPoint num="5" id="1176" />
+<TGConnectingPoint num="6" id="1177" />
+<TGConnectingPoint num="7" id="1178" />
+<TGConnectingPoint num="8" id="1179" />
+<TGConnectingPoint num="9" id="1180" />
+<TGConnectingPoint num="10" id="1181" />
+<TGConnectingPoint num="11" id="1182" />
+<TGConnectingPoint num="12" id="1183" />
+<TGConnectingPoint num="13" id="1184" />
+<TGConnectingPoint num="14" id="1185" />
+<TGConnectingPoint num="15" id="1186" />
+<TGConnectingPoint num="16" id="1187" />
+<TGConnectingPoint num="17" id="1188" />
+<TGConnectingPoint num="18" id="1189" />
+<TGConnectingPoint num="19" id="1190" />
+<TGConnectingPoint num="20" id="1191" />
+<TGConnectingPoint num="21" id="1192" />
+<TGConnectingPoint num="22" id="1193" />
+<TGConnectingPoint num="23" id="1194" />
+<TGConnectingPoint num="24" id="1195" />
+<TGConnectingPoint num="25" id="1196" />
+<TGConnectingPoint num="26" id="1197" />
+<TGConnectingPoint num="27" id="1198" />
+<TGConnectingPoint num="28" id="1199" />
+<TGConnectingPoint num="29" id="1200" />
+<TGConnectingPoint num="30" id="1201" />
+<TGConnectingPoint num="31" id="1202" />
+<TGConnectingPoint num="32" id="1203" />
+<TGConnectingPoint num="33" id="1204" />
+<TGConnectingPoint num="34" id="1205" />
+<TGConnectingPoint num="35" id="1206" />
+<TGConnectingPoint num="36" id="1207" />
+<TGConnectingPoint num="37" id="1208" />
+<TGConnectingPoint num="38" id="1209" />
+<TGConnectingPoint num="39" id="1210" />
+<TGConnectingPoint num="40" id="1211" />
+<TGConnectingPoint num="41" id="1212" />
+<TGConnectingPoint num="42" id="1213" />
+<extraparam>
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5208" id="1258" >
+<cdparam x="1107" y="86" />
+<sizeparam width="383" height="164" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="ReqMain::req2" />
+<TGConnectingPoint num="0" id="1215" />
+<TGConnectingPoint num="1" id="1216" />
+<TGConnectingPoint num="2" id="1217" />
+<TGConnectingPoint num="3" id="1218" />
+<TGConnectingPoint num="4" id="1219" />
+<TGConnectingPoint num="5" id="1220" />
+<TGConnectingPoint num="6" id="1221" />
+<TGConnectingPoint num="7" id="1222" />
+<TGConnectingPoint num="8" id="1223" />
+<TGConnectingPoint num="9" id="1224" />
+<TGConnectingPoint num="10" id="1225" />
+<TGConnectingPoint num="11" id="1226" />
+<TGConnectingPoint num="12" id="1227" />
+<TGConnectingPoint num="13" id="1228" />
+<TGConnectingPoint num="14" id="1229" />
+<TGConnectingPoint num="15" id="1230" />
+<TGConnectingPoint num="16" id="1231" />
+<TGConnectingPoint num="17" id="1232" />
+<TGConnectingPoint num="18" id="1233" />
+<TGConnectingPoint num="19" id="1234" />
+<TGConnectingPoint num="20" id="1235" />
+<TGConnectingPoint num="21" id="1236" />
+<TGConnectingPoint num="22" id="1237" />
+<TGConnectingPoint num="23" id="1238" />
+<TGConnectingPoint num="24" id="1239" />
+<TGConnectingPoint num="25" id="1240" />
+<TGConnectingPoint num="26" id="1241" />
+<TGConnectingPoint num="27" id="1242" />
+<TGConnectingPoint num="28" id="1243" />
+<TGConnectingPoint num="29" id="1244" />
+<TGConnectingPoint num="30" id="1245" />
+<TGConnectingPoint num="31" id="1246" />
+<TGConnectingPoint num="32" id="1247" />
+<TGConnectingPoint num="33" id="1248" />
+<TGConnectingPoint num="34" id="1249" />
+<TGConnectingPoint num="35" id="1250" />
+<TGConnectingPoint num="36" id="1251" />
+<TGConnectingPoint num="37" id="1252" />
+<TGConnectingPoint num="38" id="1253" />
+<TGConnectingPoint num="39" id="1254" />
+<TGConnectingPoint num="40" id="1255" />
+<TGConnectingPoint num="41" id="1256" />
+<TGConnectingPoint num="42" id="1257" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1302" >
+<cdparam x="979" y="315" />
+<sizeparam width="200" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="Requirement_1" />
+<TGConnectingPoint num="0" id="1259" />
+<TGConnectingPoint num="1" id="1260" />
+<TGConnectingPoint num="2" id="1261" />
+<TGConnectingPoint num="3" id="1262" />
+<TGConnectingPoint num="4" id="1263" />
+<TGConnectingPoint num="5" id="1264" />
+<TGConnectingPoint num="6" id="1265" />
+<TGConnectingPoint num="7" id="1266" />
+<TGConnectingPoint num="8" id="1267" />
+<TGConnectingPoint num="9" id="1268" />
+<TGConnectingPoint num="10" id="1269" />
+<TGConnectingPoint num="11" id="1270" />
+<TGConnectingPoint num="12" id="1271" />
+<TGConnectingPoint num="13" id="1272" />
+<TGConnectingPoint num="14" id="1273" />
+<TGConnectingPoint num="15" id="1274" />
+<TGConnectingPoint num="16" id="1275" />
+<TGConnectingPoint num="17" id="1276" />
+<TGConnectingPoint num="18" id="1277" />
+<TGConnectingPoint num="19" id="1278" />
+<TGConnectingPoint num="20" id="1279" />
+<TGConnectingPoint num="21" id="1280" />
+<TGConnectingPoint num="22" id="1281" />
+<TGConnectingPoint num="23" id="1282" />
+<TGConnectingPoint num="24" id="1283" />
+<TGConnectingPoint num="25" id="1284" />
+<TGConnectingPoint num="26" id="1285" />
+<TGConnectingPoint num="27" id="1286" />
+<TGConnectingPoint num="28" id="1287" />
+<TGConnectingPoint num="29" id="1288" />
+<TGConnectingPoint num="30" id="1289" />
+<TGConnectingPoint num="31" id="1290" />
+<TGConnectingPoint num="32" id="1291" />
+<TGConnectingPoint num="33" id="1292" />
+<TGConnectingPoint num="34" id="1293" />
+<TGConnectingPoint num="35" id="1294" />
+<TGConnectingPoint num="36" id="1295" />
+<TGConnectingPoint num="37" id="1296" />
+<TGConnectingPoint num="38" id="1297" />
+<TGConnectingPoint num="39" id="1298" />
+<TGConnectingPoint num="40" id="1299" />
+<TGConnectingPoint num="41" id="1300" />
+<TGConnectingPoint num="42" id="1301" />
+<extraparam>
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="1346" >
+<cdparam x="844" y="479" />
+<sizeparam width="200" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="Requirement_0" />
+<TGConnectingPoint num="0" id="1303" />
+<TGConnectingPoint num="1" id="1304" />
+<TGConnectingPoint num="2" id="1305" />
+<TGConnectingPoint num="3" id="1306" />
+<TGConnectingPoint num="4" id="1307" />
+<TGConnectingPoint num="5" id="1308" />
+<TGConnectingPoint num="6" id="1309" />
+<TGConnectingPoint num="7" id="1310" />
+<TGConnectingPoint num="8" id="1311" />
+<TGConnectingPoint num="9" id="1312" />
+<TGConnectingPoint num="10" id="1313" />
+<TGConnectingPoint num="11" id="1314" />
+<TGConnectingPoint num="12" id="1315" />
+<TGConnectingPoint num="13" id="1316" />
+<TGConnectingPoint num="14" id="1317" />
+<TGConnectingPoint num="15" id="1318" />
+<TGConnectingPoint num="16" id="1319" />
+<TGConnectingPoint num="17" id="1320" />
+<TGConnectingPoint num="18" id="1321" />
+<TGConnectingPoint num="19" id="1322" />
+<TGConnectingPoint num="20" id="1323" />
+<TGConnectingPoint num="21" id="1324" />
+<TGConnectingPoint num="22" id="1325" />
+<TGConnectingPoint num="23" id="1326" />
+<TGConnectingPoint num="24" id="1327" />
+<TGConnectingPoint num="25" id="1328" />
+<TGConnectingPoint num="26" id="1329" />
+<TGConnectingPoint num="27" id="1330" />
+<TGConnectingPoint num="28" id="1331" />
+<TGConnectingPoint num="29" id="1332" />
+<TGConnectingPoint num="30" id="1333" />
+<TGConnectingPoint num="31" id="1334" />
+<TGConnectingPoint num="32" id="1335" />
+<TGConnectingPoint num="33" id="1336" />
+<TGConnectingPoint num="34" id="1337" />
+<TGConnectingPoint num="35" id="1338" />
+<TGConnectingPoint num="36" id="1339" />
+<TGConnectingPoint num="37" id="1340" />
+<TGConnectingPoint num="38" id="1341" />
+<TGConnectingPoint num="39" id="1342" />
+<TGConnectingPoint num="40" id="1343" />
+<TGConnectingPoint num="41" id="1344" />
+<TGConnectingPoint num="42" id="1345" />
+<extraparam>
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5207" id="1362" >
+<cdparam x="727" y="252" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="107" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="AvatarElementReference" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="1347" />
+<TGConnectingPoint num="1" id="1348" />
+<TGConnectingPoint num="2" id="1349" />
+<TGConnectingPoint num="3" id="1350" />
+<TGConnectingPoint num="4" id="1351" />
+<TGConnectingPoint num="5" id="1352" />
+<TGConnectingPoint num="6" id="1353" />
+<TGConnectingPoint num="7" id="1354" />
+<TGConnectingPoint num="8" id="1355" />
+<TGConnectingPoint num="9" id="1356" />
+<TGConnectingPoint num="10" id="1357" />
+<TGConnectingPoint num="11" id="1358" />
+<TGConnectingPoint num="12" id="1359" />
+<TGConnectingPoint num="13" id="1360" />
+<TGConnectingPoint num="14" id="1361" />
+</COMPONENT>
+
+<COMPONENT type="5207" id="1378" >
+<cdparam x="741" y="201" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="57" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="AvatarElementReference" value="Wallet" />
+<TGConnectingPoint num="0" id="1363" />
+<TGConnectingPoint num="1" id="1364" />
+<TGConnectingPoint num="2" id="1365" />
+<TGConnectingPoint num="3" id="1366" />
+<TGConnectingPoint num="4" id="1367" />
+<TGConnectingPoint num="5" id="1368" />
+<TGConnectingPoint num="6" id="1369" />
+<TGConnectingPoint num="7" id="1370" />
+<TGConnectingPoint num="8" id="1371" />
+<TGConnectingPoint num="9" id="1372" />
+<TGConnectingPoint num="10" id="1373" />
+<TGConnectingPoint num="11" id="1374" />
+<TGConnectingPoint num="12" id="1375" />
+<TGConnectingPoint num="13" id="1376" />
+<TGConnectingPoint num="14" id="1377" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1422" >
+<cdparam x="673" y="13" />
+<sizeparam width="278" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="59" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="req00" />
+<TGConnectingPoint num="0" id="1379" />
+<TGConnectingPoint num="1" id="1380" />
+<TGConnectingPoint num="2" id="1381" />
+<TGConnectingPoint num="3" id="1382" />
+<TGConnectingPoint num="4" id="1383" />
+<TGConnectingPoint num="5" id="1384" />
+<TGConnectingPoint num="6" id="1385" />
+<TGConnectingPoint num="7" id="1386" />
+<TGConnectingPoint num="8" id="1387" />
+<TGConnectingPoint num="9" id="1388" />
+<TGConnectingPoint num="10" id="1389" />
+<TGConnectingPoint num="11" id="1390" />
+<TGConnectingPoint num="12" id="1391" />
+<TGConnectingPoint num="13" id="1392" />
+<TGConnectingPoint num="14" id="1393" />
+<TGConnectingPoint num="15" id="1394" />
+<TGConnectingPoint num="16" id="1395" />
+<TGConnectingPoint num="17" id="1396" />
+<TGConnectingPoint num="18" id="1397" />
+<TGConnectingPoint num="19" id="1398" />
+<TGConnectingPoint num="20" id="1399" />
+<TGConnectingPoint num="21" id="1400" />
+<TGConnectingPoint num="22" id="1401" />
+<TGConnectingPoint num="23" id="1402" />
+<TGConnectingPoint num="24" id="1403" />
+<TGConnectingPoint num="25" id="1404" />
+<TGConnectingPoint num="26" id="1405" />
+<TGConnectingPoint num="27" id="1406" />
+<TGConnectingPoint num="28" id="1407" />
+<TGConnectingPoint num="29" id="1408" />
+<TGConnectingPoint num="30" id="1409" />
+<TGConnectingPoint num="31" id="1410" />
+<TGConnectingPoint num="32" id="1411" />
+<TGConnectingPoint num="33" id="1412" />
+<TGConnectingPoint num="34" id="1413" />
+<TGConnectingPoint num="35" id="1414" />
+<TGConnectingPoint num="36" id="1415" />
+<TGConnectingPoint num="37" id="1416" />
+<TGConnectingPoint num="38" id="1417" />
+<TGConnectingPoint num="39" id="1418" />
+<TGConnectingPoint num="40" id="1419" />
+<TGConnectingPoint num="41" id="1420" />
+<TGConnectingPoint num="42" id="1421" />
+<extraparam>
+<textline data="A coin not used within 50 seconds " />
+<textline data="must be ejected" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="SafetyRequirement" color="-10040065" />
+<id data="0.1.1" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="1466" >
+<cdparam x="46" y="491" />
+<sizeparam width="301" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="Req_Availability" />
+<TGConnectingPoint num="0" id="1423" />
+<TGConnectingPoint num="1" id="1424" />
+<TGConnectingPoint num="2" id="1425" />
+<TGConnectingPoint num="3" id="1426" />
+<TGConnectingPoint num="4" id="1427" />
+<TGConnectingPoint num="5" id="1428" />
+<TGConnectingPoint num="6" id="1429" />
+<TGConnectingPoint num="7" id="1430" />
+<TGConnectingPoint num="8" id="1431" />
+<TGConnectingPoint num="9" id="1432" />
+<TGConnectingPoint num="10" id="1433" />
+<TGConnectingPoint num="11" id="1434" />
+<TGConnectingPoint num="12" id="1435" />
+<TGConnectingPoint num="13" id="1436" />
+<TGConnectingPoint num="14" id="1437" />
+<TGConnectingPoint num="15" id="1438" />
+<TGConnectingPoint num="16" id="1439" />
+<TGConnectingPoint num="17" id="1440" />
+<TGConnectingPoint num="18" id="1441" />
+<TGConnectingPoint num="19" id="1442" />
+<TGConnectingPoint num="20" id="1443" />
+<TGConnectingPoint num="21" id="1444" />
+<TGConnectingPoint num="22" id="1445" />
+<TGConnectingPoint num="23" id="1446" />
+<TGConnectingPoint num="24" id="1447" />
+<TGConnectingPoint num="25" id="1448" />
+<TGConnectingPoint num="26" id="1449" />
+<TGConnectingPoint num="27" id="1450" />
+<TGConnectingPoint num="28" id="1451" />
+<TGConnectingPoint num="29" id="1452" />
+<TGConnectingPoint num="30" id="1453" />
+<TGConnectingPoint num="31" id="1454" />
+<TGConnectingPoint num="32" id="1455" />
+<TGConnectingPoint num="33" id="1456" />
+<TGConnectingPoint num="34" id="1457" />
+<TGConnectingPoint num="35" id="1458" />
+<TGConnectingPoint num="36" id="1459" />
+<TGConnectingPoint num="37" id="1460" />
+<TGConnectingPoint num="38" id="1461" />
+<TGConnectingPoint num="39" id="1462" />
+<TGConnectingPoint num="40" id="1463" />
+<TGConnectingPoint num="41" id="1464" />
+<TGConnectingPoint num="42" id="1465" />
+<extraparam>
+<textline data="The availability of the machine shall be" />
+<textline data="no less than 99.99%" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0.4" />
+<satisfied data="true" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="1510" >
+<cdparam x="10" y="182" />
+<sizeparam width="150" height="120" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="Req_CoffeeMachine" />
+<TGConnectingPoint num="0" id="1467" />
+<TGConnectingPoint num="1" id="1468" />
+<TGConnectingPoint num="2" id="1469" />
+<TGConnectingPoint num="3" id="1470" />
+<TGConnectingPoint num="4" id="1471" />
+<TGConnectingPoint num="5" id="1472" />
+<TGConnectingPoint num="6" id="1473" />
+<TGConnectingPoint num="7" id="1474" />
+<TGConnectingPoint num="8" id="1475" />
+<TGConnectingPoint num="9" id="1476" />
+<TGConnectingPoint num="10" id="1477" />
+<TGConnectingPoint num="11" id="1478" />
+<TGConnectingPoint num="12" id="1479" />
+<TGConnectingPoint num="13" id="1480" />
+<TGConnectingPoint num="14" id="1481" />
+<TGConnectingPoint num="15" id="1482" />
+<TGConnectingPoint num="16" id="1483" />
+<TGConnectingPoint num="17" id="1484" />
+<TGConnectingPoint num="18" id="1485" />
+<TGConnectingPoint num="19" id="1486" />
+<TGConnectingPoint num="20" id="1487" />
+<TGConnectingPoint num="21" id="1488" />
+<TGConnectingPoint num="22" id="1489" />
+<TGConnectingPoint num="23" id="1490" />
+<TGConnectingPoint num="24" id="1491" />
+<TGConnectingPoint num="25" id="1492" />
+<TGConnectingPoint num="26" id="1493" />
+<TGConnectingPoint num="27" id="1494" />
+<TGConnectingPoint num="28" id="1495" />
+<TGConnectingPoint num="29" id="1496" />
+<TGConnectingPoint num="30" id="1497" />
+<TGConnectingPoint num="31" id="1498" />
+<TGConnectingPoint num="32" id="1499" />
+<TGConnectingPoint num="33" id="1500" />
+<TGConnectingPoint num="34" id="1501" />
+<TGConnectingPoint num="35" id="1502" />
+<TGConnectingPoint num="36" id="1503" />
+<TGConnectingPoint num="37" id="1504" />
+<TGConnectingPoint num="38" id="1505" />
+<TGConnectingPoint num="39" id="1506" />
+<TGConnectingPoint num="40" id="1507" />
+<TGConnectingPoint num="41" id="1508" />
+<TGConnectingPoint num="42" id="1509" />
+<extraparam>
+<textline data="Requirements of the coffee machine" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5201" id="1526" >
+<cdparam x="678" y="396" />
+<sizeparam width="171" height="30" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="AvatarProperty" value="BeverageDeliverProperty" />
+<TGConnectingPoint num="0" id="1511" />
+<TGConnectingPoint num="1" id="1512" />
+<TGConnectingPoint num="2" id="1513" />
+<TGConnectingPoint num="3" id="1514" />
+<TGConnectingPoint num="4" id="1515" />
+<TGConnectingPoint num="5" id="1516" />
+<TGConnectingPoint num="6" id="1517" />
+<TGConnectingPoint num="7" id="1518" />
+<TGConnectingPoint num="8" id="1519" />
+<TGConnectingPoint num="9" id="1520" />
+<TGConnectingPoint num="10" id="1521" />
+<TGConnectingPoint num="11" id="1522" />
+<TGConnectingPoint num="12" id="1523" />
+<TGConnectingPoint num="13" id="1524" />
+<TGConnectingPoint num="14" id="1525" />
+</COMPONENT>
+
+<COMPONENT type="5201" id="1542" >
+<cdparam x="650" y="325" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="128" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="AvatarProperty" value="WalletCoinProperty" />
+<TGConnectingPoint num="0" id="1527" />
+<TGConnectingPoint num="1" id="1528" />
+<TGConnectingPoint num="2" id="1529" />
+<TGConnectingPoint num="3" id="1530" />
+<TGConnectingPoint num="4" id="1531" />
+<TGConnectingPoint num="5" id="1532" />
+<TGConnectingPoint num="6" id="1533" />
+<TGConnectingPoint num="7" id="1534" />
+<TGConnectingPoint num="8" id="1535" />
+<TGConnectingPoint num="9" id="1536" />
+<TGConnectingPoint num="10" id="1537" />
+<TGConnectingPoint num="11" id="1538" />
+<TGConnectingPoint num="12" id="1539" />
+<TGConnectingPoint num="13" id="1540" />
+<TGConnectingPoint num="14" id="1541" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1586" >
+<cdparam x="233" y="147" />
+<sizeparam width="271" height="104" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="req1" />
+<TGConnectingPoint num="0" id="1543" />
+<TGConnectingPoint num="1" id="1544" />
+<TGConnectingPoint num="2" id="1545" />
+<TGConnectingPoint num="3" id="1546" />
+<TGConnectingPoint num="4" id="1547" />
+<TGConnectingPoint num="5" id="1548" />
+<TGConnectingPoint num="6" id="1549" />
+<TGConnectingPoint num="7" id="1550" />
+<TGConnectingPoint num="8" id="1551" />
+<TGConnectingPoint num="9" id="1552" />
+<TGConnectingPoint num="10" id="1553" />
+<TGConnectingPoint num="11" id="1554" />
+<TGConnectingPoint num="12" id="1555" />
+<TGConnectingPoint num="13" id="1556" />
+<TGConnectingPoint num="14" id="1557" />
+<TGConnectingPoint num="15" id="1558" />
+<TGConnectingPoint num="16" id="1559" />
+<TGConnectingPoint num="17" id="1560" />
+<TGConnectingPoint num="18" id="1561" />
+<TGConnectingPoint num="19" id="1562" />
+<TGConnectingPoint num="20" id="1563" />
+<TGConnectingPoint num="21" id="1564" />
+<TGConnectingPoint num="22" id="1565" />
+<TGConnectingPoint num="23" id="1566" />
+<TGConnectingPoint num="24" id="1567" />
+<TGConnectingPoint num="25" id="1568" />
+<TGConnectingPoint num="26" id="1569" />
+<TGConnectingPoint num="27" id="1570" />
+<TGConnectingPoint num="28" id="1571" />
+<TGConnectingPoint num="29" id="1572" />
+<TGConnectingPoint num="30" id="1573" />
+<TGConnectingPoint num="31" id="1574" />
+<TGConnectingPoint num="32" id="1575" />
+<TGConnectingPoint num="33" id="1576" />
+<TGConnectingPoint num="34" id="1577" />
+<TGConnectingPoint num="35" id="1578" />
+<TGConnectingPoint num="36" id="1579" />
+<TGConnectingPoint num="37" id="1580" />
+<TGConnectingPoint num="38" id="1581" />
+<TGConnectingPoint num="39" id="1582" />
+<TGConnectingPoint num="40" id="1583" />
+<TGConnectingPoint num="41" id="1584" />
+<TGConnectingPoint num="42" id="1585" />
+<extraparam>
+<textline data="A wallet must never contain a " />
+<textline data="negative number of coins" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="SafetyRequirement" color="-10040065" />
+<id data="0.2" />
+<satisfied data="true" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5201" id="1602" >
+<cdparam x="626" y="153" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="AvatarProperty" value="OneCoinProperty" />
+<TGConnectingPoint num="0" id="1587" />
+<TGConnectingPoint num="1" id="1588" />
+<TGConnectingPoint num="2" id="1589" />
+<TGConnectingPoint num="3" id="1590" />
+<TGConnectingPoint num="4" id="1591" />
+<TGConnectingPoint num="5" id="1592" />
+<TGConnectingPoint num="6" id="1593" />
+<TGConnectingPoint num="7" id="1594" />
+<TGConnectingPoint num="8" id="1595" />
+<TGConnectingPoint num="9" id="1596" />
+<TGConnectingPoint num="10" id="1597" />
+<TGConnectingPoint num="11" id="1598" />
+<TGConnectingPoint num="12" id="1599" />
+<TGConnectingPoint num="13" id="1600" />
+<TGConnectingPoint num="14" id="1601" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1646" >
+<cdparam x="259" y="10" />
+<sizeparam width="304" height="110" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="75" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="req3456" />
+<TGConnectingPoint num="0" id="1603" />
+<TGConnectingPoint num="1" id="1604" />
+<TGConnectingPoint num="2" id="1605" />
+<TGConnectingPoint num="3" id="1606" />
+<TGConnectingPoint num="4" id="1607" />
+<TGConnectingPoint num="5" id="1608" />
+<TGConnectingPoint num="6" id="1609" />
+<TGConnectingPoint num="7" id="1610" />
+<TGConnectingPoint num="8" id="1611" />
+<TGConnectingPoint num="9" id="1612" />
+<TGConnectingPoint num="10" id="1613" />
+<TGConnectingPoint num="11" id="1614" />
+<TGConnectingPoint num="12" id="1615" />
+<TGConnectingPoint num="13" id="1616" />
+<TGConnectingPoint num="14" id="1617" />
+<TGConnectingPoint num="15" id="1618" />
+<TGConnectingPoint num="16" id="1619" />
+<TGConnectingPoint num="17" id="1620" />
+<TGConnectingPoint num="18" id="1621" />
+<TGConnectingPoint num="19" id="1622" />
+<TGConnectingPoint num="20" id="1623" />
+<TGConnectingPoint num="21" id="1624" />
+<TGConnectingPoint num="22" id="1625" />
+<TGConnectingPoint num="23" id="1626" />
+<TGConnectingPoint num="24" id="1627" />
+<TGConnectingPoint num="25" id="1628" />
+<TGConnectingPoint num="26" id="1629" />
+<TGConnectingPoint num="27" id="1630" />
+<TGConnectingPoint num="28" id="1631" />
+<TGConnectingPoint num="29" id="1632" />
+<TGConnectingPoint num="30" id="1633" />
+<TGConnectingPoint num="31" id="1634" />
+<TGConnectingPoint num="32" id="1635" />
+<TGConnectingPoint num="33" id="1636" />
+<TGConnectingPoint num="34" id="1637" />
+<TGConnectingPoint num="35" id="1638" />
+<TGConnectingPoint num="36" id="1639" />
+<TGConnectingPoint num="37" id="1640" />
+<TGConnectingPoint num="38" id="1641" />
+<TGConnectingPoint num="39" id="1642" />
+<TGConnectingPoint num="40" id="1643" />
+<TGConnectingPoint num="41" id="1644" />
+<TGConnectingPoint num="42" id="1645" />
+<extraparam>
+<textline data="The coffee machine never has one coin " />
+<textline data=" inserted more than 50 units of time" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="AMSRequirement" color="-13108" />
+<id data="0.1" />
+<satisfied data="false" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="1690" >
+<cdparam x="208" y="294" />
+<sizeparam width="357" height="174" minWidth="1" minHeight="37" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
+<infoparam name="Requirement" value="req2" />
+<TGConnectingPoint num="0" id="1647" />
+<TGConnectingPoint num="1" id="1648" />
+<TGConnectingPoint num="2" id="1649" />
+<TGConnectingPoint num="3" id="1650" />
+<TGConnectingPoint num="4" id="1651" />
+<TGConnectingPoint num="5" id="1652" />
+<TGConnectingPoint num="6" id="1653" />
+<TGConnectingPoint num="7" id="1654" />
+<TGConnectingPoint num="8" id="1655" />
+<TGConnectingPoint num="9" id="1656" />
+<TGConnectingPoint num="10" id="1657" />
+<TGConnectingPoint num="11" id="1658" />
+<TGConnectingPoint num="12" id="1659" />
+<TGConnectingPoint num="13" id="1660" />
+<TGConnectingPoint num="14" id="1661" />
+<TGConnectingPoint num="15" id="1662" />
+<TGConnectingPoint num="16" id="1663" />
+<TGConnectingPoint num="17" id="1664" />
+<TGConnectingPoint num="18" id="1665" />
+<TGConnectingPoint num="19" id="1666" />
+<TGConnectingPoint num="20" id="1667" />
+<TGConnectingPoint num="21" id="1668" />
+<TGConnectingPoint num="22" id="1669" />
+<TGConnectingPoint num="23" id="1670" />
+<TGConnectingPoint num="24" id="1671" />
+<TGConnectingPoint num="25" id="1672" />
+<TGConnectingPoint num="26" id="1673" />
+<TGConnectingPoint num="27" id="1674" />
+<TGConnectingPoint num="28" id="1675" />
+<TGConnectingPoint num="29" id="1676" />
+<TGConnectingPoint num="30" id="1677" />
+<TGConnectingPoint num="31" id="1678" />
+<TGConnectingPoint num="32" id="1679" />
+<TGConnectingPoint num="33" id="1680" />
+<TGConnectingPoint num="34" id="1681" />
+<TGConnectingPoint num="35" id="1682" />
+<TGConnectingPoint num="36" id="1683" />
+<TGConnectingPoint num="37" id="1684" />
+<TGConnectingPoint num="38" id="1685" />
+<TGConnectingPoint num="39" id="1686" />
+<TGConnectingPoint num="40" id="1687" />
+<TGConnectingPoint num="41" id="1688" />
+<TGConnectingPoint num="42" id="1689" />
+<extraparam>
+<textline data="When the application starts, if the wallet contains " />
+<textline data="at least 2 coins, then a beverage may be delivered. " />
+<textline data="On the contrary, if the wallet contains less than 2" />
+<textline data="coins, no beverage will be delivered by the" />
+<textline data="machine." />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="SecurityRequirement" color="-1773070" />
+<id data="0.3" />
+<satisfied data="true" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="RefAttack" />
+<extraAttribute id="Hypothèse" value="le système ..." />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="5205" id="1692" >
+<cdparam x="156" y="58" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1691" />
+<P1 x="156" y="58" id="1131" />
+<P2 x="259" y="65" id="1604" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1694" >
+<cdparam x="504" y="199" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1693" />
+<P1 x="504" y="199" id="1547" />
+<P2 x="673" y="103" id="1381" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1696" >
+<cdparam x="1230" y="479" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1695" />
+<P1 x="1230" y="479" id="1173" />
+<P2 x="565" y="424" id="1652" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1698" >
+<cdparam x="1261" y="250" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1697" />
+<P1 x="1298" y="250" id="1225" />
+<P2 x="1330" y="389" id="1178" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1700" >
+<cdparam x="939" y="76" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1699" />
+<P1 x="951" y="73" id="1383" />
+<P2 x="1107" y="168" id="1216" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1702" >
+<cdparam x="1120" y="344" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1701" />
+<P1 x="979" y="405" id="1261" />
+<P2 x="504" y="225" id="1548" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5202" id="1704" >
+<cdparam x="894" y="479" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="1703" />
+<P1 x="894" y="479" id="1309" />
+<P2 x="951" y="103" id="1384" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5202" id="1706" >
+<cdparam x="800" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="1705" />
+<P1 x="812" y="133" id="1389" />
+<P2 x="563" y="37" id="1606" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5206" id="1708" >
+<cdparam x="271" y="491" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<refine>>" />
+<TGConnectingPoint num="0" id="1707" />
+<P1 x="271" y="491" id="1431" />
+<P2 x="297" y="468" id="1656" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5206" id="1714" >
+<cdparam x="271" y="611" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<refine>>" />
+<TGConnectingPoint num="0" id="1711" />
+<TGConnectingPoint num="1" id="1712" />
+<TGConnectingPoint num="2" id="1713" />
+<P1 x="271" y="611" id="1434" />
+<P2 x="944" y="599" id="1313" />
+<Point x="318" y="685" />
+<Point x="769" y="688" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1709" >
+<father id="1714" num="0" />
+<cdparam x="318" y="685" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1710" >
+<father id="1714" num="1" />
+<cdparam x="769" y="688" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5206" id="1716" >
+<cdparam x="894" y="599" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<refine>>" />
+<TGConnectingPoint num="0" id="1715" />
+<P1 x="894" y="599" id="1312" />
+<P2 x="347" y="581" id="1428" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1718" >
+<cdparam x="47" y="302" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1717" />
+<P1 x="47" y="302" id="1476" />
+<P2 x="46" y="521" id="1423" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1720" >
+<cdparam x="844" y="569" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1719" />
+<P1 x="844" y="569" id="1305" />
+<P2 x="347" y="551" id="1427" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1722" >
+<cdparam x="869" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1721" />
+<P1 x="881" y="133" id="1390" />
+<P2 x="944" y="479" id="1310" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1724" >
+<cdparam x="661" y="76" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1723" />
+<P1 x="673" y="73" id="1380" />
+<P2 x="563" y="65" id="1607" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5208" id="1726" >
+<cdparam x="749" y="267" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<satisfy>>" />
+<TGConnectingPoint num="0" id="1725" />
+<P1 x="727" y="267" id="1348" />
+<P2 x="504" y="199" id="1575" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5208" id="1728" >
+<cdparam x="783" y="223" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<satisfy>>" />
+<TGConnectingPoint num="0" id="1727" />
+<P1 x="741" y="223" id="1365" />
+<P2 x="504" y="173" id="1574" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1730" >
+<cdparam x="124" y="457" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1729" />
+<P1 x="121" y="491" id="1429" />
+<P2 x="122" y="302" id="1478" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1732" >
+<cdparam x="244" y="315" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1731" />
+<P1 x="208" y="337" id="1647" />
+<P2 x="160" y="272" id="1472" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1734" >
+<cdparam x="249" y="199" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1733" />
+<P1 x="233" y="199" id="1544" />
+<P2 x="160" y="212" id="1470" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1736" >
+<cdparam x="237" y="98" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
+<TGConnectingPoint num="0" id="1735" />
+<P1 x="259" y="92" id="1605" />
+<P2 x="122" y="182" id="1475" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5203" id="1738" >
+<cdparam x="538" y="537" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
+<TGConnectingPoint num="0" id="1737" />
+<P1 x="678" y="411" id="1512" />
+<P2 x="565" y="381" id="1663" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5203" id="1740" >
+<cdparam x="545" y="329" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
+<TGConnectingPoint num="0" id="1739" />
+<P1 x="650" y="340" id="1528" />
+<P2 x="504" y="199" id="1559" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5203" id="1742" >
+<cdparam x="563" y="148" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
+<TGConnectingPoint num="0" id="1741" />
+<P1 x="626" y="168" id="1588" />
+<P2 x="563" y="92" id="1620" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</AvatarRDPanel>
+
+<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
+<CONNECTOR type="5312" id="1744" >
+<cdparam x="582" y="248" />
+<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="reg" />
+<TGConnectingPoint num="0" id="1743" />
+<P1 x="503" y="258" id="1869" />
+<P2 x="507" y="334" id="1757" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5310" id="1750" >
+<cdparam x="247" y="616" />
+<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="1747" />
+<TGConnectingPoint num="1" id="1748" />
+<TGConnectingPoint num="2" id="1749" />
+<P1 x="492" y="126" id="1832" />
+<P2 x="492" y="209" id="1873" />
+<Point x="467" y="147" />
+<Point x="467" y="192" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1745" >
+<father id="1750" num="0" />
+<cdparam x="467" y="147" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1746" >
+<father id="1750" num="1" />
+<cdparam x="467" y="192" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5311" id="1752" >
+<cdparam x="280" y="200" />
+<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="1751" />
+<P1 x="318" y="261" id="1795" />
+<P2 x="361" y="261" id="1770" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1754" >
+<cdparam x="473" y="190" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1753" />
+<P1 x="390" y="286" id="1768" />
+<P2 x="394" y="331" id="1762" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5311" id="1756" >
+<cdparam x="276" y="190" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1755" />
+<P1 x="318" y="211" id="1782" />
+<P2 x="361" y="211" id="1769" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<COMPONENT type="5308" id="1761" >
+<cdparam x="446" y="334" />
+<sizeparam width="122" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="WalletCoinProperty" />
+<TGConnectingPoint num="0" id="1757" />
+<TGConnectingPoint num="1" id="1758" />
+<TGConnectingPoint num="2" id="1759" />
+<TGConnectingPoint num="3" id="1760" />
+<extraparam>
+<liveness data="0" />
+<not data="false" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5308" id="1766" >
+<cdparam x="340" y="331" />
+<sizeparam width="108" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="oneCoinProperty" />
+<TGConnectingPoint num="0" id="1762" />
+<TGConnectingPoint num="1" id="1763" />
+<TGConnectingPoint num="2" id="1764" />
+<TGConnectingPoint num="3" id="1765" />
+<extraparam>
+<liveness data="1" />
+<not data="true" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5302" id="1779" >
+<cdparam x="361" y="187" />
+<sizeparam width="59" height="99" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value=">50" />
+<TGConnectingPoint num="0" id="1767" />
+<TGConnectingPoint num="1" id="1768" />
+<TGConnectingPoint num="2" id="1769" />
+<TGConnectingPoint num="3" id="1770" />
+<TGConnectingPoint num="4" id="1771" />
+<TGConnectingPoint num="5" id="1772" />
+<TGConnectingPoint num="6" id="1773" />
+<TGConnectingPoint num="7" id="1774" />
+<TGConnectingPoint num="8" id="1775" />
+<TGConnectingPoint num="9" id="1776" />
+<TGConnectingPoint num="10" id="1777" />
+<TGConnectingPoint num="11" id="1778" />
+</COMPONENT>
+
+<COMPONENT type="5300" id="1830" >
+<cdparam x="150" y="142" />
+<sizeparam width="168" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="Block0" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="1806" />
+<TGConnectingPoint num="1" id="1807" />
+<TGConnectingPoint num="2" id="1808" />
+<TGConnectingPoint num="3" id="1809" />
+<TGConnectingPoint num="4" id="1810" />
+<TGConnectingPoint num="5" id="1811" />
+<TGConnectingPoint num="6" id="1812" />
+<TGConnectingPoint num="7" id="1813" />
+<TGConnectingPoint num="8" id="1814" />
+<TGConnectingPoint num="9" id="1815" />
+<TGConnectingPoint num="10" id="1816" />
+<TGConnectingPoint num="11" id="1817" />
+<TGConnectingPoint num="12" id="1818" />
+<TGConnectingPoint num="13" id="1819" />
+<TGConnectingPoint num="14" id="1820" />
+<TGConnectingPoint num="15" id="1821" />
+<TGConnectingPoint num="16" id="1822" />
+<TGConnectingPoint num="17" id="1823" />
+<TGConnectingPoint num="18" id="1824" />
+<TGConnectingPoint num="19" id="1825" />
+<TGConnectingPoint num="20" id="1826" />
+<TGConnectingPoint num="21" id="1827" />
+<TGConnectingPoint num="22" id="1828" />
+<TGConnectingPoint num="23" id="1829" />
+</COMPONENT>
+<SUBCOMPONENT type="5304" id="1792" >
+<father id="1830" num="0" />
+<cdparam x="166" y="191" />
+<sizeparam width="152" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="16" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<TGConnectingPoint num="0" id="1780" />
+<TGConnectingPoint num="1" id="1781" />
+<TGConnectingPoint num="2" id="1782" />
+<TGConnectingPoint num="3" id="1783" />
+<TGConnectingPoint num="4" id="1784" />
+<TGConnectingPoint num="5" id="1785" />
+<TGConnectingPoint num="6" id="1786" />
+<TGConnectingPoint num="7" id="1787" />
+<TGConnectingPoint num="8" id="1788" />
+<TGConnectingPoint num="9" id="1789" />
+<TGConnectingPoint num="10" id="1790" />
+<TGConnectingPoint num="11" id="1791" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="1805" >
+<father id="1830" num="1" />
+<cdparam x="154" y="241" />
+<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="4" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<TGConnectingPoint num="0" id="1793" />
+<TGConnectingPoint num="1" id="1794" />
+<TGConnectingPoint num="2" id="1795" />
+<TGConnectingPoint num="3" id="1796" />
+<TGConnectingPoint num="4" id="1797" />
+<TGConnectingPoint num="5" id="1798" />
+<TGConnectingPoint num="6" id="1799" />
+<TGConnectingPoint num="7" id="1800" />
+<TGConnectingPoint num="8" id="1801" />
+<TGConnectingPoint num="9" id="1802" />
+<TGConnectingPoint num="10" id="1803" />
+<TGConnectingPoint num="11" id="1804" />
+</SUBCOMPONENT>
+
+<COMPONENT type="5300" id="1868" >
+<cdparam x="459" y="61" />
+<sizeparam width="150" height="116" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="Block0" value="Wallet" />
+<TGConnectingPoint num="0" id="1844" />
+<TGConnectingPoint num="1" id="1845" />
+<TGConnectingPoint num="2" id="1846" />
+<TGConnectingPoint num="3" id="1847" />
+<TGConnectingPoint num="4" id="1848" />
+<TGConnectingPoint num="5" id="1849" />
+<TGConnectingPoint num="6" id="1850" />
+<TGConnectingPoint num="7" id="1851" />
+<TGConnectingPoint num="8" id="1852" />
+<TGConnectingPoint num="9" id="1853" />
+<TGConnectingPoint num="10" id="1854" />
+<TGConnectingPoint num="11" id="1855" />
+<TGConnectingPoint num="12" id="1856" />
+<TGConnectingPoint num="13" id="1857" />
+<TGConnectingPoint num="14" id="1858" />
+<TGConnectingPoint num="15" id="1859" />
+<TGConnectingPoint num="16" id="1860" />
+<TGConnectingPoint num="17" id="1861" />
+<TGConnectingPoint num="18" id="1862" />
+<TGConnectingPoint num="19" id="1863" />
+<TGConnectingPoint num="20" id="1864" />
+<TGConnectingPoint num="21" id="1865" />
+<TGConnectingPoint num="22" id="1866" />
+<TGConnectingPoint num="23" id="1867" />
+</COMPONENT>
+<SUBCOMPONENT type="5303" id="1843" >
+<father id="1868" num="0" />
+<cdparam x="492" y="102" />
+<sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="50" minY="0" maxY="67" />
+<infoparam name="TGComponent" value="nbOfCoins" />
+<TGConnectingPoint num="0" id="1831" />
+<TGConnectingPoint num="1" id="1832" />
+<TGConnectingPoint num="2" id="1833" />
+<TGConnectingPoint num="3" id="1834" />
+<TGConnectingPoint num="4" id="1835" />
+<TGConnectingPoint num="5" id="1836" />
+<TGConnectingPoint num="6" id="1837" />
+<TGConnectingPoint num="7" id="1838" />
+<TGConnectingPoint num="8" id="1839" />
+<TGConnectingPoint num="9" id="1840" />
+<TGConnectingPoint num="10" id="1841" />
+<TGConnectingPoint num="11" id="1842" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5306" id="1880" >
+<cdparam x="467" y="209" />
+<sizeparam width="103" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="nbOfCoins >= 0" />
+<TGConnectingPoint num="0" id="1869" />
+<TGConnectingPoint num="1" id="1870" />
+<TGConnectingPoint num="2" id="1871" />
+<TGConnectingPoint num="3" id="1872" />
+<TGConnectingPoint num="4" id="1873" />
+<TGConnectingPoint num="5" id="1874" />
+<TGConnectingPoint num="6" id="1875" />
+<TGConnectingPoint num="7" id="1876" />
+<TGConnectingPoint num="8" id="1877" />
+<TGConnectingPoint num="9" id="1878" />
+<TGConnectingPoint num="10" id="1879" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
+</COMPONENT>
+
+
+</AvatarPDPanel>
+
+<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
+<CONNECTOR type="5312" id="1882" >
+<cdparam x="580" y="547" />
+<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="reg" />
+<TGConnectingPoint num="0" id="1881" />
+<P1 x="637" y="538" id="2063" />
+<P2 x="638" y="563" id="1914" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1884" >
+<cdparam x="506" y="493" />
+<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="reg" />
+<TGConnectingPoint num="0" id="1883" />
+<P1 x="577" y="471" id="2068" />
+<P2 x="617" y="498" id="2056" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1886" >
+<cdparam x="694" y="460" />
+<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="reg" />
+<TGConnectingPoint num="0" id="1885" />
+<P1 x="694" y="472" id="1910" />
+<P2 x="657" y="498" id="2058" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5311" id="1892" >
+<cdparam x="581" y="133" />
+<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="1889" />
+<TGConnectingPoint num="1" id="1890" />
+<TGConnectingPoint num="2" id="1891" />
+<P1 x="581" y="154" id="1965" />
+<P2 x="546" y="305" id="2035" />
+<Point x="518" y="154" />
+<Point x="518" y="305" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1887" >
+<father id="1892" num="0" />
+<cdparam x="518" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1888" >
+<father id="1892" num="1" />
+<cdparam x="518" y="305" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5311" id="1896" >
+<cdparam x="631" y="143" />
+<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="1894" />
+<TGConnectingPoint num="1" id="1895" />
+<P1 x="631" y="164" id="1960" />
+<P2 x="667" y="310" id="2022" />
+<Point x="631" y="310" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1893" >
+<father id="1896" num="0" />
+<cdparam x="631" y="310" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5312" id="1898" >
+<cdparam x="695" y="396" />
+<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="reg" />
+<TGConnectingPoint num="0" id="1897" />
+<P1 x="696" y="385" id="2021" />
+<P2 x="694" y="417" id="1909" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5310" id="1902" >
+<cdparam x="877" y="168" />
+<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="1900" />
+<TGConnectingPoint num="1" id="1901" />
+<P1 x="721" y="158" id="1971" />
+<P2 x="700" y="204" id="2012" />
+<Point x="700" y="158" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1899" >
+<father id="1902" num="0" />
+<cdparam x="700" y="158" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5312" id="1904" >
+<cdparam x="915" y="307" />
+<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="reg" />
+<TGConnectingPoint num="0" id="1903" />
+<P1 x="710" y="254" id="2008" />
+<P2 x="711" y="285" id="2020" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1906" >
+<cdparam x="993" y="581" />
+<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="reg" />
+<TGConnectingPoint num="0" id="1905" />
+<P1 x="576" y="385" id="2034" />
+<P2 x="577" y="416" id="2067" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5311" id="1908" >
+<cdparam x="426" y="264" />
+<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="1907" />
+<P1 x="492" y="345" id="1921" />
+<P2 x="546" y="345" id="2039" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<COMPONENT type="5308" id="1913" >
+<cdparam x="644" y="417" />
+<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="prop01" />
+<TGConnectingPoint num="0" id="1909" />
+<TGConnectingPoint num="1" id="1910" />
+<TGConnectingPoint num="2" id="1911" />
+<TGConnectingPoint num="3" id="1912" />
+<extraparam>
+<liveness data="1" />
+<not data="false" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5308" id="1918" >
+<cdparam x="559" y="563" />
+<sizeparam width="158" height="54" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="BeverageDeliverProperty" />
+<TGConnectingPoint num="0" id="1914" />
+<TGConnectingPoint num="1" id="1915" />
+<TGConnectingPoint num="2" id="1916" />
+<TGConnectingPoint num="3" id="1917" />
+<extraparam>
+<liveness data="0" />
+<not data="false" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5300" id="1956" >
+<cdparam x="372" y="227" />
+<sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Block0" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="1932" />
+<TGConnectingPoint num="1" id="1933" />
+<TGConnectingPoint num="2" id="1934" />
+<TGConnectingPoint num="3" id="1935" />
+<TGConnectingPoint num="4" id="1936" />
+<TGConnectingPoint num="5" id="1937" />
+<TGConnectingPoint num="6" id="1938" />
+<TGConnectingPoint num="7" id="1939" />
+<TGConnectingPoint num="8" id="1940" />
+<TGConnectingPoint num="9" id="1941" />
+<TGConnectingPoint num="10" id="1942" />
+<TGConnectingPoint num="11" id="1943" />
+<TGConnectingPoint num="12" id="1944" />
+<TGConnectingPoint num="13" id="1945" />
+<TGConnectingPoint num="14" id="1946" />
+<TGConnectingPoint num="15" id="1947" />
+<TGConnectingPoint num="16" id="1948" />
+<TGConnectingPoint num="17" id="1949" />
+<TGConnectingPoint num="18" id="1950" />
+<TGConnectingPoint num="19" id="1951" />
+<TGConnectingPoint num="20" id="1952" />
+<TGConnectingPoint num="21" id="1953" />
+<TGConnectingPoint num="22" id="1954" />
+<TGConnectingPoint num="23" id="1955" />
+</COMPONENT>
+<SUBCOMPONENT type="5304" id="1931" >
+<father id="1956" num="0" />
+<cdparam x="391" y="326" />
+<sizeparam width="101" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="31" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="beverageReady" />
+<TGConnectingPoint num="0" id="1919" />
+<TGConnectingPoint num="1" id="1920" />
+<TGConnectingPoint num="2" id="1921" />
+<TGConnectingPoint num="3" id="1922" />
+<TGConnectingPoint num="4" id="1923" />
+<TGConnectingPoint num="5" id="1924" />
+<TGConnectingPoint num="6" id="1925" />
+<TGConnectingPoint num="7" id="1926" />
+<TGConnectingPoint num="8" id="1927" />
+<TGConnectingPoint num="9" id="1928" />
+<TGConnectingPoint num="10" id="1929" />
+<TGConnectingPoint num="11" id="1930" />
+</SUBCOMPONENT>
+
+<COMPONENT type="5300" id="2007" >
+<cdparam x="563" y="78" />
+<sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Block0" value="Wallet" />
+<TGConnectingPoint num="0" id="1983" />
+<TGConnectingPoint num="1" id="1984" />
+<TGConnectingPoint num="2" id="1985" />
+<TGConnectingPoint num="3" id="1986" />
+<TGConnectingPoint num="4" id="1987" />
+<TGConnectingPoint num="5" id="1988" />
+<TGConnectingPoint num="6" id="1989" />
+<TGConnectingPoint num="7" id="1990" />
+<TGConnectingPoint num="8" id="1991" />
+<TGConnectingPoint num="9" id="1992" />
+<TGConnectingPoint num="10" id="1993" />
+<TGConnectingPoint num="11" id="1994" />
+<TGConnectingPoint num="12" id="1995" />
+<TGConnectingPoint num="13" id="1996" />
+<TGConnectingPoint num="14" id="1997" />
+<TGConnectingPoint num="15" id="1998" />
+<TGConnectingPoint num="16" id="1999" />
+<TGConnectingPoint num="17" id="2000" />
+<TGConnectingPoint num="18" id="2001" />
+<TGConnectingPoint num="19" id="2002" />
+<TGConnectingPoint num="20" id="2003" />
+<TGConnectingPoint num="21" id="2004" />
+<TGConnectingPoint num="22" id="2005" />
+<TGConnectingPoint num="23" id="2006" />
+</COMPONENT>
+<SUBCOMPONENT type="5304" id="1969" >
+<father id="2007" num="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
+<TGConnectingPoint num="0" id="1957" />
+<TGConnectingPoint num="1" id="1958" />
+<TGConnectingPoint num="2" id="1959" />
+<TGConnectingPoint num="3" id="1960" />
+<TGConnectingPoint num="4" id="1961" />
+<TGConnectingPoint num="5" id="1962" />
+<TGConnectingPoint num="6" id="1963" />
+<TGConnectingPoint num="7" id="1964" />
+<TGConnectingPoint num="8" id="1965" />
+<TGConnectingPoint num="9" id="1966" />
+<TGConnectingPoint num="10" id="1967" />
+<TGConnectingPoint num="11" id="1968" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5303" id="1982" >
+<father id="2007" num="1" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
+<infoparam name="TGComponent" value="nbOfCoins" />
+<TGConnectingPoint num="0" id="1970" />
+<TGConnectingPoint num="1" id="1971" />
+<TGConnectingPoint num="2" id="1972" />
+<TGConnectingPoint num="3" id="1973" />
+<TGConnectingPoint num="4" id="1974" />
+<TGConnectingPoint num="5" id="1975" />
+<TGConnectingPoint num="6" id="1976" />
+<TGConnectingPoint num="7" id="1977" />
+<TGConnectingPoint num="8" id="1978" />
+<TGConnectingPoint num="9" id="1979" />
+<TGConnectingPoint num="10" id="1980" />
+<TGConnectingPoint num="11" id="1981" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5306" id="2019" >
+<cdparam x="675" y="204" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="nbOfCoins > 1" />
+<TGConnectingPoint num="0" id="2008" />
+<TGConnectingPoint num="1" id="2009" />
+<TGConnectingPoint num="2" id="2010" />
+<TGConnectingPoint num="3" id="2011" />
+<TGConnectingPoint num="4" id="2012" />
+<TGConnectingPoint num="5" id="2013" />
+<TGConnectingPoint num="6" id="2014" />
+<TGConnectingPoint num="7" id="2015" />
+<TGConnectingPoint num="8" id="2016" />
+<TGConnectingPoint num="9" id="2017" />
+<TGConnectingPoint num="10" id="2018" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5302" id="2032" >
+<cdparam x="667" y="285" />
+<sizeparam width="59" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="=0" />
+<TGConnectingPoint num="0" id="2020" />
+<TGConnectingPoint num="1" id="2021" />
+<TGConnectingPoint num="2" id="2022" />
+<TGConnectingPoint num="3" id="2023" />
+<TGConnectingPoint num="4" id="2024" />
+<TGConnectingPoint num="5" id="2025" />
+<TGConnectingPoint num="6" id="2026" />
+<TGConnectingPoint num="7" id="2027" />
+<TGConnectingPoint num="8" id="2028" />
+<TGConnectingPoint num="9" id="2029" />
+<TGConnectingPoint num="10" id="2030" />
+<TGConnectingPoint num="11" id="2031" />
+</COMPONENT>
+
+<COMPONENT type="5301" id="2053" >
+<cdparam x="546" y="285" />
+<sizeparam width="60" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="<<LS>>" />
+<TGConnectingPoint num="0" id="2033" />
+<TGConnectingPoint num="1" id="2034" />
+<TGConnectingPoint num="2" id="2035" />
+<TGConnectingPoint num="3" id="2036" />
+<TGConnectingPoint num="4" id="2037" />
+<TGConnectingPoint num="5" id="2038" />
+<TGConnectingPoint num="6" id="2039" />
+<TGConnectingPoint num="7" id="2040" />
+<TGConnectingPoint num="8" id="2041" />
+<TGConnectingPoint num="9" id="2042" />
+<TGConnectingPoint num="10" id="2043" />
+<TGConnectingPoint num="11" id="2044" />
+<TGConnectingPoint num="12" id="2045" />
+<TGConnectingPoint num="13" id="2046" />
+<TGConnectingPoint num="14" id="2047" />
+<TGConnectingPoint num="15" id="2048" />
+<TGConnectingPoint num="16" id="2049" />
+<TGConnectingPoint num="17" id="2050" />
+<TGConnectingPoint num="18" id="2051" />
+<TGConnectingPoint num="19" id="2052" />
+</COMPONENT>
+
+<COMPONENT type="5309" id="2066" >
+<cdparam x="597" y="498" />
+<sizeparam width="80" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="<=>" />
+<TGConnectingPoint num="0" id="2054" />
+<TGConnectingPoint num="1" id="2055" />
+<TGConnectingPoint num="2" id="2056" />
+<TGConnectingPoint num="3" id="2057" />
+<TGConnectingPoint num="4" id="2058" />
+<TGConnectingPoint num="5" id="2059" />
+<TGConnectingPoint num="6" id="2060" />
+<TGConnectingPoint num="7" id="2061" />
+<TGConnectingPoint num="8" id="2062" />
+<TGConnectingPoint num="9" id="2063" />
+<TGConnectingPoint num="10" id="2064" />
+<TGConnectingPoint num="11" id="2065" />
+</COMPONENT>
+
+<COMPONENT type="5308" id="2071" >
+<cdparam x="527" y="416" />
+<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="prop02" />
+<TGConnectingPoint num="0" id="2067" />
+<TGConnectingPoint num="1" id="2068" />
+<TGConnectingPoint num="2" id="2069" />
+<TGConnectingPoint num="3" id="2070" />
+<extraparam>
+<liveness data="1" />
+<not data="false" />
+</extraparam>
+</COMPONENT>
+
+
+</AvatarPDPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="Avatar Requirement" nameTab="Requirements" >
+<AvatarRDPanel name="ReqSec" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="5208" id="2115" >
+<cdparam x="399" y="809" />
+<sizeparam width="300" height="164" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="ReqMain::req3456" />
+<TGConnectingPoint num="0" id="2072" />
+<TGConnectingPoint num="1" id="2073" />
+<TGConnectingPoint num="2" id="2074" />
+<TGConnectingPoint num="3" id="2075" />
+<TGConnectingPoint num="4" id="2076" />
+<TGConnectingPoint num="5" id="2077" />
+<TGConnectingPoint num="6" id="2078" />
+<TGConnectingPoint num="7" id="2079" />
+<TGConnectingPoint num="8" id="2080" />
+<TGConnectingPoint num="9" id="2081" />
+<TGConnectingPoint num="10" id="2082" />
+<TGConnectingPoint num="11" id="2083" />
+<TGConnectingPoint num="12" id="2084" />
+<TGConnectingPoint num="13" id="2085" />
+<TGConnectingPoint num="14" id="2086" />
+<TGConnectingPoint num="15" id="2087" />
+<TGConnectingPoint num="16" id="2088" />
+<TGConnectingPoint num="17" id="2089" />
+<TGConnectingPoint num="18" id="2090" />
+<TGConnectingPoint num="19" id="2091" />
+<TGConnectingPoint num="20" id="2092" />
+<TGConnectingPoint num="21" id="2093" />
+<TGConnectingPoint num="22" id="2094" />
+<TGConnectingPoint num="23" id="2095" />
+<TGConnectingPoint num="24" id="2096" />
+<TGConnectingPoint num="25" id="2097" />
+<TGConnectingPoint num="26" id="2098" />
+<TGConnectingPoint num="27" id="2099" />
+<TGConnectingPoint num="28" id="2100" />
+<TGConnectingPoint num="29" id="2101" />
+<TGConnectingPoint num="30" id="2102" />
+<TGConnectingPoint num="31" id="2103" />
+<TGConnectingPoint num="32" id="2104" />
+<TGConnectingPoint num="33" id="2105" />
+<TGConnectingPoint num="34" id="2106" />
+<TGConnectingPoint num="35" id="2107" />
+<TGConnectingPoint num="36" id="2108" />
+<TGConnectingPoint num="37" id="2109" />
+<TGConnectingPoint num="38" id="2110" />
+<TGConnectingPoint num="39" id="2111" />
+<TGConnectingPoint num="40" id="2112" />
+<TGConnectingPoint num="41" id="2113" />
+<TGConnectingPoint num="42" id="2114" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="2159" >
+<cdparam x="131" y="398" />
+<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="106" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Requirement" value="OtherReqSon" />
+<TGConnectingPoint num="0" id="2116" />
+<TGConnectingPoint num="1" id="2117" />
+<TGConnectingPoint num="2" id="2118" />
+<TGConnectingPoint num="3" id="2119" />
+<TGConnectingPoint num="4" id="2120" />
+<TGConnectingPoint num="5" id="2121" />
+<TGConnectingPoint num="6" id="2122" />
+<TGConnectingPoint num="7" id="2123" />
+<TGConnectingPoint num="8" id="2124" />
+<TGConnectingPoint num="9" id="2125" />
+<TGConnectingPoint num="10" id="2126" />
+<TGConnectingPoint num="11" id="2127" />
+<TGConnectingPoint num="12" id="2128" />
+<TGConnectingPoint num="13" id="2129" />
+<TGConnectingPoint num="14" id="2130" />
+<TGConnectingPoint num="15" id="2131" />
+<TGConnectingPoint num="16" id="2132" />
+<TGConnectingPoint num="17" id="2133" />
+<TGConnectingPoint num="18" id="2134" />
+<TGConnectingPoint num="19" id="2135" />
+<TGConnectingPoint num="20" id="2136" />
+<TGConnectingPoint num="21" id="2137" />
+<TGConnectingPoint num="22" id="2138" />
+<TGConnectingPoint num="23" id="2139" />
+<TGConnectingPoint num="24" id="2140" />
+<TGConnectingPoint num="25" id="2141" />
+<TGConnectingPoint num="26" id="2142" />
+<TGConnectingPoint num="27" id="2143" />
+<TGConnectingPoint num="28" id="2144" />
+<TGConnectingPoint num="29" id="2145" />
+<TGConnectingPoint num="30" id="2146" />
+<TGConnectingPoint num="31" id="2147" />
+<TGConnectingPoint num="32" id="2148" />
+<TGConnectingPoint num="33" id="2149" />
+<TGConnectingPoint num="34" id="2150" />
+<TGConnectingPoint num="35" id="2151" />
+<TGConnectingPoint num="36" id="2152" />
+<TGConnectingPoint num="37" id="2153" />
+<TGConnectingPoint num="38" id="2154" />
+<TGConnectingPoint num="39" id="2155" />
+<TGConnectingPoint num="40" id="2156" />
+<TGConnectingPoint num="41" id="2157" />
+<TGConnectingPoint num="42" id="2158" />
+<extraparam>
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="AMSRequirement" color="-13108" />
+<id data="2" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="2203" >
+<cdparam x="129" y="628" />
+<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="71" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Requirement" value="ReqSon" />
+<TGConnectingPoint num="0" id="2160" />
+<TGConnectingPoint num="1" id="2161" />
+<TGConnectingPoint num="2" id="2162" />
+<TGConnectingPoint num="3" id="2163" />
+<TGConnectingPoint num="4" id="2164" />
+<TGConnectingPoint num="5" id="2165" />
+<TGConnectingPoint num="6" id="2166" />
+<TGConnectingPoint num="7" id="2167" />
+<TGConnectingPoint num="8" id="2168" />
+<TGConnectingPoint num="9" id="2169" />
+<TGConnectingPoint num="10" id="2170" />
+<TGConnectingPoint num="11" id="2171" />
+<TGConnectingPoint num="12" id="2172" />
+<TGConnectingPoint num="13" id="2173" />
+<TGConnectingPoint num="14" id="2174" />
+<TGConnectingPoint num="15" id="2175" />
+<TGConnectingPoint num="16" id="2176" />
+<TGConnectingPoint num="17" id="2177" />
+<TGConnectingPoint num="18" id="2178" />
+<TGConnectingPoint num="19" id="2179" />
+<TGConnectingPoint num="20" id="2180" />
+<TGConnectingPoint num="21" id="2181" />
+<TGConnectingPoint num="22" id="2182" />
+<TGConnectingPoint num="23" id="2183" />
+<TGConnectingPoint num="24" id="2184" />
+<TGConnectingPoint num="25" id="2185" />
+<TGConnectingPoint num="26" id="2186" />
+<TGConnectingPoint num="27" id="2187" />
+<TGConnectingPoint num="28" id="2188" />
+<TGConnectingPoint num="29" id="2189" />
+<TGConnectingPoint num="30" id="2190" />
+<TGConnectingPoint num="31" id="2191" />
+<TGConnectingPoint num="32" id="2192" />
+<TGConnectingPoint num="33" id="2193" />
+<TGConnectingPoint num="34" id="2194" />
+<TGConnectingPoint num="35" id="2195" />
+<TGConnectingPoint num="36" id="2196" />
+<TGConnectingPoint num="37" id="2197" />
+<TGConnectingPoint num="38" id="2198" />
+<TGConnectingPoint num="39" id="2199" />
+<TGConnectingPoint num="40" id="2200" />
+<TGConnectingPoint num="41" id="2201" />
+<TGConnectingPoint num="42" id="2202" />
+<extraparam>
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="SafetyRequirement" color="-10040065" />
+<id data="1" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5201" id="2219" >
+<cdparam x="954" y="284" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="99" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="AvatarProperty" value="SecondProp" />
+<TGConnectingPoint num="0" id="2204" />
+<TGConnectingPoint num="1" id="2205" />
+<TGConnectingPoint num="2" id="2206" />
+<TGConnectingPoint num="3" id="2207" />
+<TGConnectingPoint num="4" id="2208" />
+<TGConnectingPoint num="5" id="2209" />
+<TGConnectingPoint num="6" id="2210" />
+<TGConnectingPoint num="7" id="2211" />
+<TGConnectingPoint num="8" id="2212" />
+<TGConnectingPoint num="9" id="2213" />
+<TGConnectingPoint num="10" id="2214" />
+<TGConnectingPoint num="11" id="2215" />
+<TGConnectingPoint num="12" id="2216" />
+<TGConnectingPoint num="13" id="2217" />
+<TGConnectingPoint num="14" id="2218" />
+</COMPONENT>
+
+<COMPONENT type="5201" id="2235" >
+<cdparam x="1043" y="557" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="79" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="AvatarProperty" value="FirstProp" />
+<TGConnectingPoint num="0" id="2220" />
+<TGConnectingPoint num="1" id="2221" />
+<TGConnectingPoint num="2" id="2222" />
+<TGConnectingPoint num="3" id="2223" />
+<TGConnectingPoint num="4" id="2224" />
+<TGConnectingPoint num="5" id="2225" />
+<TGConnectingPoint num="6" id="2226" />
+<TGConnectingPoint num="7" id="2227" />
+<TGConnectingPoint num="8" id="2228" />
+<TGConnectingPoint num="9" id="2229" />
+<TGConnectingPoint num="10" id="2230" />
+<TGConnectingPoint num="11" id="2231" />
+<TGConnectingPoint num="12" id="2232" />
+<TGConnectingPoint num="13" id="2233" />
+<TGConnectingPoint num="14" id="2234" />
+</COMPONENT>
+
+<COMPONENT type="5208" id="2279" >
+<cdparam x="471" y="441" />
+<sizeparam width="387" height="241" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="ReqMain::req1" />
+<TGConnectingPoint num="0" id="2236" />
+<TGConnectingPoint num="1" id="2237" />
+<TGConnectingPoint num="2" id="2238" />
+<TGConnectingPoint num="3" id="2239" />
+<TGConnectingPoint num="4" id="2240" />
+<TGConnectingPoint num="5" id="2241" />
+<TGConnectingPoint num="6" id="2242" />
+<TGConnectingPoint num="7" id="2243" />
+<TGConnectingPoint num="8" id="2244" />
+<TGConnectingPoint num="9" id="2245" />
+<TGConnectingPoint num="10" id="2246" />
+<TGConnectingPoint num="11" id="2247" />
+<TGConnectingPoint num="12" id="2248" />
+<TGConnectingPoint num="13" id="2249" />
+<TGConnectingPoint num="14" id="2250" />
+<TGConnectingPoint num="15" id="2251" />
+<TGConnectingPoint num="16" id="2252" />
+<TGConnectingPoint num="17" id="2253" />
+<TGConnectingPoint num="18" id="2254" />
+<TGConnectingPoint num="19" id="2255" />
+<TGConnectingPoint num="20" id="2256" />
+<TGConnectingPoint num="21" id="2257" />
+<TGConnectingPoint num="22" id="2258" />
+<TGConnectingPoint num="23" id="2259" />
+<TGConnectingPoint num="24" id="2260" />
+<TGConnectingPoint num="25" id="2261" />
+<TGConnectingPoint num="26" id="2262" />
+<TGConnectingPoint num="27" id="2263" />
+<TGConnectingPoint num="28" id="2264" />
+<TGConnectingPoint num="29" id="2265" />
+<TGConnectingPoint num="30" id="2266" />
+<TGConnectingPoint num="31" id="2267" />
+<TGConnectingPoint num="32" id="2268" />
+<TGConnectingPoint num="33" id="2269" />
+<TGConnectingPoint num="34" id="2270" />
+<TGConnectingPoint num="35" id="2271" />
+<TGConnectingPoint num="36" id="2272" />
+<TGConnectingPoint num="37" id="2273" />
+<TGConnectingPoint num="38" id="2274" />
+<TGConnectingPoint num="39" id="2275" />
+<TGConnectingPoint num="40" id="2276" />
+<TGConnectingPoint num="41" id="2277" />
+<TGConnectingPoint num="42" id="2278" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="2323" >
+<cdparam x="139" y="89" />
+<sizeparam width="360" height="223" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="63" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Requirement" value="MyReq" />
+<TGConnectingPoint num="0" id="2280" />
+<TGConnectingPoint num="1" id="2281" />
+<TGConnectingPoint num="2" id="2282" />
+<TGConnectingPoint num="3" id="2283" />
+<TGConnectingPoint num="4" id="2284" />
+<TGConnectingPoint num="5" id="2285" />
+<TGConnectingPoint num="6" id="2286" />
+<TGConnectingPoint num="7" id="2287" />
+<TGConnectingPoint num="8" id="2288" />
+<TGConnectingPoint num="9" id="2289" />
+<TGConnectingPoint num="10" id="2290" />
+<TGConnectingPoint num="11" id="2291" />
+<TGConnectingPoint num="12" id="2292" />
+<TGConnectingPoint num="13" id="2293" />
+<TGConnectingPoint num="14" id="2294" />
+<TGConnectingPoint num="15" id="2295" />
+<TGConnectingPoint num="16" id="2296" />
+<TGConnectingPoint num="17" id="2297" />
+<TGConnectingPoint num="18" id="2298" />
+<TGConnectingPoint num="19" id="2299" />
+<TGConnectingPoint num="20" id="2300" />
+<TGConnectingPoint num="21" id="2301" />
+<TGConnectingPoint num="22" id="2302" />
+<TGConnectingPoint num="23" id="2303" />
+<TGConnectingPoint num="24" id="2304" />
+<TGConnectingPoint num="25" id="2305" />
+<TGConnectingPoint num="26" id="2306" />
+<TGConnectingPoint num="27" id="2307" />
+<TGConnectingPoint num="28" id="2308" />
+<TGConnectingPoint num="29" id="2309" />
+<TGConnectingPoint num="30" id="2310" />
+<TGConnectingPoint num="31" id="2311" />
+<TGConnectingPoint num="32" id="2312" />
+<TGConnectingPoint num="33" id="2313" />
+<TGConnectingPoint num="34" id="2314" />
+<TGConnectingPoint num="35" id="2315" />
+<TGConnectingPoint num="36" id="2316" />
+<TGConnectingPoint num="37" id="2317" />
+<TGConnectingPoint num="38" id="2318" />
+<TGConnectingPoint num="39" id="2319" />
+<TGConnectingPoint num="40" id="2320" />
+<TGConnectingPoint num="41" id="2321" />
+<TGConnectingPoint num="42" id="2322" />
+<extraparam>
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="AMSRequirement" color="-13108" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="5205" id="2327" >
+<cdparam x="399" y="913" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="2325" />
+<TGConnectingPoint num="1" id="2326" />
+<P1 x="399" y="891" id="2073" />
+<P2 x="229" y="748" id="2170" />
+<Point x="250" y="891" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2324" >
+<father id="2327" num="0" />
+<cdparam x="250" y="891" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5205" id="2329" >
+<cdparam x="360" y="458" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="2328" />
+<P1 x="331" y="458" id="2120" />
+<P2 x="471" y="501" id="2236" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="2331" >
+<cdparam x="329" y="688" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="2330" />
+<P1 x="329" y="688" id="2164" />
+<P2 x="471" y="621" id="2238" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="2335" >
+<cdparam x="664" y="441" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<composition>>" />
+<TGConnectingPoint num="0" id="2333" />
+<TGConnectingPoint num="1" id="2334" />
+<P1 x="664" y="441" id="2243" />
+<P2 x="499" y="200" id="2284" />
+<Point x="648" y="243" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2332" >
+<father id="2335" num="0" />
+<cdparam x="648" y="243" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5203" id="2337" >
+<cdparam x="991" y="314" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<verify>>" />
+<TGConnectingPoint num="0" id="2336" />
+<P1 x="991" y="314" id="2213" />
+<P2 x="761" y="441" id="2256" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="5203" id="2339" >
+<cdparam x="1043" y="572" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<verify>>" />
+<TGConnectingPoint num="0" id="2338" />
+<P1 x="1043" y="572" id="2221" />
+<P2 x="858" y="561" id="2252" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</AvatarRDPanel>
+
+</Modeling>
+
+
+
+
+</TURTLEGMODELING>
\ No newline at end of file
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml b/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml
index 1676feaf83e9089261ea5cca374d0d63d25a390b..238cd6094990c05ca6373c94c38a9215d2ab6242 100644
--- a/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol_sec.xml
@@ -314,7 +314,7 @@
<textline data="and its Interface shall be confidential" />
<kind data="Confidentiality" />
<criticality data="High" />
-<reqType data="SecurityRequirement" />
+<reqType data="SecurityRequirement" color="-1773070" />
<id data="0" />
<satisfied data="false" />
<verified data="false" />
@@ -347,16 +347,16 @@
<cdparam x="535" y="347" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="556" y="347" id="299" />
-<P2 x="547" y="382" id="254" />
+<P1 x="556" y="347" id="355" />
+<P2 x="547" y="382" id="402" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="189" >
<cdparam x="820" y="398" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1025" y="497" id="396" />
-<P2 x="761" y="574" id="284" />
+<P1 x="1025" y="497" id="249" />
+<P2 x="761" y="574" id="370" />
<Point x="887" y="577" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="188" >
@@ -372,128 +372,128 @@
<cdparam x="568" y="323" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="710" y="403" id="282" />
-<P2 x="693" y="347" id="321" />
+<P1 x="710" y="403" id="372" />
+<P2 x="693" y="347" id="333" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="191" >
<cdparam x="522" y="390" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="521" y="382" id="249" />
-<P2 x="466" y="335" id="228" />
+<P1 x="521" y="382" id="397" />
+<P2 x="466" y="335" id="236" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="192" >
<cdparam x="409" y="124" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="401" y="83" id="226" />
-<P2 x="593" y="84" id="297" />
+<P1 x="401" y="83" id="238" />
+<P2 x="593" y="84" id="357" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="193" >
<cdparam x="656" y="426" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="552" id="278" />
-<P2 x="969" y="495" id="382" />
+<P1 x="816" y="552" id="376" />
+<P2 x="969" y="495" id="263" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="194" >
<cdparam x="656" y="400" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="519" id="276" />
-<P2 x="921" y="476" id="384" />
+<P1 x="816" y="519" id="378" />
+<P2 x="921" y="476" id="261" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="195" >
<cdparam x="602" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="750" y="406" id="268" />
-<P2 x="828" y="375" id="348" />
+<P1 x="750" y="406" id="386" />
+<P2 x="828" y="375" id="291" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="196" >
<cdparam x="689" y="292" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="854" y="375" id="352" />
-<P2 x="921" y="362" id="374" />
+<P1 x="854" y="375" id="295" />
+<P2 x="921" y="362" id="271" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="197" >
<cdparam x="656" y="377" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="491" id="272" />
-<P2 x="921" y="453" id="376" />
+<P1 x="816" y="491" id="382" />
+<P2 x="921" y="453" id="269" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="198" >
<cdparam x="656" y="351" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="458" id="274" />
-<P2 x="921" y="426" id="378" />
+<P1 x="816" y="458" id="380" />
+<P2 x="921" y="426" id="267" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="199" >
<cdparam x="741" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="921" y="397" id="380" />
-<P2 x="816" y="429" id="270" />
+<P1 x="921" y="397" id="265" />
+<P2 x="816" y="429" id="384" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="200" >
<cdparam x="735" y="260" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="918" y="330" id="372" />
-<P2 x="747" y="282" id="309" />
+<P1 x="918" y="330" id="273" />
+<P2 x="747" y="282" id="345" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="201" >
<cdparam x="641" y="230" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="747" y="248" id="311" />
-<P2 x="918" y="291" id="370" />
+<P1 x="747" y="248" id="343" />
+<P2 x="918" y="291" id="275" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="202" >
<cdparam x="641" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="747" y="203" id="313" />
-<P2 x="918" y="248" id="368" />
+<P1 x="747" y="203" id="341" />
+<P2 x="918" y="248" id="277" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="203" >
<cdparam x="740" y="353" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="828" y="375" id="347" />
-<P2 x="747" y="314" id="315" />
+<P1 x="828" y="375" id="290" />
+<P2 x="747" y="314" id="339" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="204" >
<cdparam x="460" y="270" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="521" y="303" id="305" />
-<P2 x="466" y="303" id="234" />
+<P1 x="521" y="303" id="349" />
+<P2 x="466" y="303" id="230" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="205" >
<cdparam x="387" y="129" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="464" y="126" id="238" />
-<P2 x="524" y="126" id="317" />
+<P1 x="464" y="126" id="226" />
+<P2 x="524" y="126" id="337" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="206" >
@@ -501,63 +501,63 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="466" y="215" id="232" />
-<P2 x="521" y="215" id="303" />
+<P2 x="521" y="215" id="351" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="207" >
<cdparam x="460" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="521" y="260" id="301" />
-<P2 x="466" y="260" id="230" />
+<P1 x="521" y="260" id="353" />
+<P2 x="466" y="260" id="234" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="208" >
<cdparam x="389" y="163" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="466" y="169" id="236" />
-<P2 x="521" y="169" id="307" />
+<P1 x="466" y="169" id="228" />
+<P2 x="521" y="169" id="347" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="209" >
<cdparam x="967" y="190" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="918" y="198" id="366" />
-<P2 x="747" y="124" id="295" />
+<P1 x="918" y="198" id="279" />
+<P2 x="747" y="124" id="359" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="210" >
<cdparam x="1028" y="535" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="630" y="345" id="319" />
-<P2 x="669" y="406" id="280" />
+<P1 x="630" y="345" id="335" />
+<P2 x="669" y="406" id="374" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="211" >
<cdparam x="1308" y="303" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1222" y="378" id="332" />
-<P2 x="1178" y="380" id="386" />
+<P1 x="1222" y="378" id="313" />
+<P2 x="1178" y="380" id="259" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="212" >
<cdparam x="1172" y="437" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1178" y="415" id="388" />
-<P2 x="1222" y="413" id="334" />
+<P1 x="1178" y="415" id="257" />
+<P2 x="1222" y="413" id="311" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="215" >
<cdparam x="1041" y="162" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1178" y="208" id="390" />
-<P2 x="1178" y="276" id="392" />
+<P1 x="1178" y="208" id="255" />
+<P2 x="1178" y="276" id="253" />
<Point x="1227" y="207" />
<Point x="1227" y="247" />
<AutomaticDrawing data="true" />
@@ -582,8 +582,8 @@
<cdparam x="877" y="343" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1178" y="454" id="394" />
-<P2 x="1222" y="441" id="336" />
+<P1 x="1178" y="454" id="251" />
+<P2 x="1222" y="441" id="309" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1205" id="225" >
@@ -631,15 +631,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="227" >
<father id="248" num="0" />
-<reference id="184" />
-<cdparam x="388" y="83" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="443" y="116" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
+<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
+<infoparam name="TGComponent" value="Request activation" />
<TGConnectingPoint num="0" id="226" />
<extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -649,16 +648,16 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="229" >
<father id="248" num="1" />
-<cdparam x="440" y="322" />
+<cdparam x="440" y="156" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<infoparam name="TGComponent" value="Event data_Ready" />
<TGConnectingPoint num="0" id="228" />
<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -666,15 +665,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="231" >
<father id="248" num="2" />
-<reference id="184" />
-<cdparam x="440" y="247" />
+<cdparam x="440" y="290" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
<TGConnectingPoint num="0" id="230" />
<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -692,7 +690,7 @@
<infoparam name="TGComponent" value="Channel fromDtoSC" />
<TGConnectingPoint num="0" id="232" />
<extraparam>
-<Prop commName="fromDtoSC" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="2" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="fromDtoSC" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="3" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -702,14 +700,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="235" >
<father id="248" num="4" />
-<cdparam x="440" y="290" />
+<reference id="184" />
+<cdparam x="440" y="247" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
<TGConnectingPoint num="0" id="234" />
<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -719,16 +718,16 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="237" >
<father id="248" num="5" />
-<cdparam x="440" y="156" />
+<cdparam x="440" y="322" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
<TGConnectingPoint num="0" id="236" />
<extraparam>
-<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -736,14 +735,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="239" >
<father id="248" num="6" />
-<cdparam x="443" y="116" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<reference id="184" />
+<cdparam x="388" y="83" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
-<infoparam name="TGComponent" value="Request activation" />
+<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
+<infoparam name="TGComponent" value="Event reset, pTS, end" />
<TGConnectingPoint num="0" id="238" />
<extraparam>
-<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -770,61 +770,61 @@
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1201" id="267" >
+<SUBCOMPONENT type="1200" id="332" >
<father id="424" num="0" />
-<cdparam x="521" y="369" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="841" y="133" />
+<sizeparam width="570" height="485" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="249" />
-<TGConnectingPoint num="1" id="250" />
-<TGConnectingPoint num="2" id="251" />
-<TGConnectingPoint num="3" id="252" />
-<TGConnectingPoint num="4" id="253" />
-<TGConnectingPoint num="5" id="254" />
-<TGConnectingPoint num="6" id="255" />
-<TGConnectingPoint num="7" id="256" />
-<TGConnectingPoint num="8" id="257" />
-<TGConnectingPoint num="9" id="258" />
-<TGConnectingPoint num="10" id="259" />
-<TGConnectingPoint num="11" id="260" />
-<TGConnectingPoint num="12" id="261" />
-<TGConnectingPoint num="13" id="262" />
-<TGConnectingPoint num="14" id="263" />
-<TGConnectingPoint num="15" id="264" />
-<TGConnectingPoint num="16" id="265" />
-<TGConnectingPoint num="17" id="266" />
+<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
+<infoparam name="TGComponent" value="TCPIP Entities" />
+<TGConnectingPoint num="0" id="324" />
+<TGConnectingPoint num="1" id="325" />
+<TGConnectingPoint num="2" id="326" />
+<TGConnectingPoint num="3" id="327" />
+<TGConnectingPoint num="4" id="328" />
+<TGConnectingPoint num="5" id="329" />
+<TGConnectingPoint num="6" id="330" />
+<TGConnectingPoint num="7" id="331" />
+<extraparam>
+<info hiddeni="false" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="294" >
-<father id="424" num="1" />
-<cdparam x="565" y="416" />
-<sizeparam width="240" height="145" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="289" >
+<father id="332" num="0" />
+<cdparam x="931" y="167" />
+<sizeparam width="236" height="317" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
-<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="286" />
-<TGConnectingPoint num="1" id="287" />
-<TGConnectingPoint num="2" id="288" />
-<TGConnectingPoint num="3" id="289" />
-<TGConnectingPoint num="4" id="290" />
-<TGConnectingPoint num="5" id="291" />
-<TGConnectingPoint num="6" id="292" />
-<TGConnectingPoint num="7" id="293" />
+<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
+<infoparam name="TGComponent" value="TCPIP" />
+<TGConnectingPoint num="0" id="281" />
+<TGConnectingPoint num="1" id="282" />
+<TGConnectingPoint num="2" id="283" />
+<TGConnectingPoint num="3" id="284" />
+<TGConnectingPoint num="4" id="285" />
+<TGConnectingPoint num="5" id="286" />
+<TGConnectingPoint num="6" id="287" />
+<TGConnectingPoint num="7" id="288" />
<extraparam>
<Data isAttacker="No" />
+<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
+<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" />
+<Attribute access="2" id="i" value="" type="0" typeOther="" />
+<Attribute access="2" id="j" value="" type="0" typeOther="" />
+<Attribute access="2" id="a" value="0" type="0" typeOther="" />
+<Attribute access="2" id="b" value="0" type="0" typeOther="" />
+<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="269" >
-<father id="294" num="0" />
-<cdparam x="740" y="406" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="250" >
+<father id="289" num="0" />
+<cdparam x="1012" y="471" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="268" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="Primitive port" value="Event opened" />
+<TGConnectingPoint num="0" id="249" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -832,16 +832,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="271" >
-<father id="294" num="1" />
-<cdparam x="795" y="419" />
+<SUBCOMPONENT type="1203" id="252" >
+<father id="289" num="1" />
+<cdparam x="1157" y="444" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="270" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="251" />
<extraparam>
-<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -849,16 +849,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="273" >
-<father id="294" num="2" />
-<cdparam x="795" y="481" />
+<SUBCOMPONENT type="1203" id="254" >
+<father id="289" num="2" />
+<cdparam x="1157" y="266" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="272" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="253" />
<extraparam>
-<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -866,16 +866,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="275" >
-<father id="294" num="3" />
-<cdparam x="795" y="448" />
+<SUBCOMPONENT type="1203" id="256" >
+<father id="289" num="3" />
+<cdparam x="1157" y="198" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="274" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="255" />
<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -883,16 +883,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="277" >
-<father id="294" num="4" />
-<cdparam x="795" y="509" />
+<SUBCOMPONENT type="1203" id="258" >
+<father id="289" num="4" />
+<cdparam x="1157" y="405" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="276" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="257" />
<extraparam>
-<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -900,16 +900,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="279" >
-<father id="294" num="5" />
-<cdparam x="795" y="542" />
+<SUBCOMPONENT type="1203" id="260" >
+<father id="289" num="5" />
+<cdparam x="1157" y="370" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="278" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="259" />
<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -917,16 +917,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="281" >
-<father id="294" num="6" />
-<cdparam x="659" y="406" />
+<SUBCOMPONENT type="1203" id="262" >
+<father id="289" num="6" />
+<cdparam x="921" y="466" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="280" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="261" />
<extraparam>
-<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -934,16 +934,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="283" >
-<father id="294" num="7" />
-<cdparam x="697" y="403" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="264" >
+<father id="289" num="7" />
+<cdparam x="959" y="474" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="282" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="263" />
<extraparam>
-<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -951,16 +951,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="285" >
-<father id="294" num="8" />
-<cdparam x="748" y="548" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="266" >
+<father id="289" num="8" />
+<cdparam x="921" y="387" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="284" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
+<TGConnectingPoint num="0" id="265" />
<extraparam>
-<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -968,43 +968,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="331" >
-<father id="424" num="2" />
-<cdparam x="534" y="97" />
-<sizeparam width="200" height="237" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
-<infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="323" />
-<TGConnectingPoint num="1" id="324" />
-<TGConnectingPoint num="2" id="325" />
-<TGConnectingPoint num="3" id="326" />
-<TGConnectingPoint num="4" id="327" />
-<TGConnectingPoint num="5" id="328" />
-<TGConnectingPoint num="6" id="329" />
-<TGConnectingPoint num="7" id="330" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="" type="4" typeOther="" />
-<Attribute access="2" id="i" value="0" type="0" typeOther="" />
-<Attribute access="2" id="j" value="0" type="0" typeOther="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
-<Attribute access="2" id="t" value="" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="296" >
-<father id="331" num="0" />
-<cdparam x="721" y="111" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="268" >
+<father id="289" num="9" />
+<cdparam x="921" y="416" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="295" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="267" />
<extraparam>
-<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1012,17 +985,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="298" >
-<father id="331" num="1" />
-<reference id="184" />
-<cdparam x="580" y="84" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="270" >
+<father id="289" num="10" />
+<cdparam x="921" y="443" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
-<TGConnectingPoint num="0" id="297" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="269" />
<extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1030,16 +1002,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="300" >
-<father id="331" num="2" />
-<cdparam x="543" y="321" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="272" >
+<father id="289" num="11" />
+<cdparam x="921" y="352" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="299" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="271" />
<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1047,17 +1019,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="302" >
-<father id="331" num="3" />
-<reference id="184" />
-<cdparam x="521" y="247" />
+<SUBCOMPONENT type="1203" id="274" >
+<father id="289" num="12" />
+<cdparam x="918" y="317" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="301" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="273" />
<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="2" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1065,17 +1036,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="304" >
-<father id="331" num="4" />
-<reference id="184" />
-<cdparam x="521" y="202" />
+<SUBCOMPONENT type="1203" id="276" >
+<father id="289" num="13" />
+<cdparam x="918" y="278" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="303" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="275" />
<extraparam>
-<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1083,16 +1053,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="306" >
-<father id="331" num="5" />
-<cdparam x="521" y="290" />
+<SUBCOMPONENT type="1203" id="278" >
+<father id="289" num="14" />
+<cdparam x="918" y="235" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="305" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="277" />
<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1100,33 +1070,79 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="308" >
-<father id="331" num="6" />
-<cdparam x="521" y="156" />
+<SUBCOMPONENT type="1203" id="280" >
+<father id="289" num="15" />
+<cdparam x="918" y="185" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready" />
-<TGConnectingPoint num="0" id="307" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="279" />
<extraparam>
-<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
+<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="310" >
-<father id="331" num="7" />
-<cdparam x="721" y="269" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1201" id="308" >
+<father id="332" num="1" />
+<cdparam x="828" y="362" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
+<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="290" />
+<TGConnectingPoint num="1" id="291" />
+<TGConnectingPoint num="2" id="292" />
+<TGConnectingPoint num="3" id="293" />
+<TGConnectingPoint num="4" id="294" />
+<TGConnectingPoint num="5" id="295" />
+<TGConnectingPoint num="6" id="296" />
+<TGConnectingPoint num="7" id="297" />
+<TGConnectingPoint num="8" id="298" />
+<TGConnectingPoint num="9" id="299" />
+<TGConnectingPoint num="10" id="300" />
+<TGConnectingPoint num="11" id="301" />
+<TGConnectingPoint num="12" id="302" />
+<TGConnectingPoint num="13" id="303" />
+<TGConnectingPoint num="14" id="304" />
+<TGConnectingPoint num="15" id="305" />
+<TGConnectingPoint num="16" id="306" />
+<TGConnectingPoint num="17" id="307" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="323" >
+<father id="332" num="2" />
+<cdparam x="1232" y="328" />
+<sizeparam width="140" height="141" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
+<infoparam name="TGComponent" value="Timer" />
+<TGConnectingPoint num="0" id="315" />
+<TGConnectingPoint num="1" id="316" />
+<TGConnectingPoint num="2" id="317" />
+<TGConnectingPoint num="3" id="318" />
+<TGConnectingPoint num="4" id="319" />
+<TGConnectingPoint num="5" id="320" />
+<TGConnectingPoint num="6" id="321" />
+<TGConnectingPoint num="7" id="322" />
+<extraparam>
+<Data isAttacker="No" />
+<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="310" >
+<father id="323" num="0" />
+<cdparam x="1222" y="431" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Event stop" />
<TGConnectingPoint num="0" id="309" />
<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1135,15 +1151,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="312" >
-<father id="331" num="8" />
-<cdparam x="721" y="235" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="323" num="1" />
+<cdparam x="1222" y="403" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Request req_Timer" />
<TGConnectingPoint num="0" id="311" />
<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1152,15 +1168,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="314" >
-<father id="331" num="9" />
-<cdparam x="721" y="190" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="323" num="2" />
+<cdparam x="1222" y="368" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event receive" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Event timeOut" />
<TGConnectingPoint num="0" id="313" />
<extraparam>
-<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1168,16 +1184,43 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="316" >
-<father id="331" num="10" />
-<cdparam x="721" y="301" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="369" >
+<father id="424" num="1" />
+<cdparam x="534" y="97" />
+<sizeparam width="200" height="237" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
+<infoparam name="TGComponent" value="SmartCard" />
+<TGConnectingPoint num="0" id="361" />
+<TGConnectingPoint num="1" id="362" />
+<TGConnectingPoint num="2" id="363" />
+<TGConnectingPoint num="3" id="364" />
+<TGConnectingPoint num="4" id="365" />
+<TGConnectingPoint num="5" id="366" />
+<TGConnectingPoint num="6" id="367" />
+<TGConnectingPoint num="7" id="368" />
+<extraparam>
+<Data isAttacker="No" />
+<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
+<Attribute access="2" id="a" value="0" type="0" typeOther="" />
+<Attribute access="2" id="b" value="" type="4" typeOther="" />
+<Attribute access="2" id="i" value="0" type="0" typeOther="" />
+<Attribute access="2" id="j" value="0" type="0" typeOther="" />
+<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
+<Attribute access="2" id="t" value="" type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="334" >
+<father id="369" num="0" />
+<cdparam x="680" y="321" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="315" />
+<infoparam name="Primitive port" value="Event connectionOpened" />
+<TGConnectingPoint num="0" id="333" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1185,16 +1228,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="318" >
-<father id="331" num="11" />
-<cdparam x="524" y="116" />
+<SUBCOMPONENT type="1203" id="336" >
+<father id="369" num="1" />
+<cdparam x="620" y="324" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="317" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="335" />
<extraparam>
-<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1202,16 +1245,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="320" >
-<father id="331" num="12" />
-<cdparam x="620" y="324" />
+<SUBCOMPONENT type="1203" id="338" >
+<father id="369" num="2" />
+<cdparam x="524" y="116" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="319" />
+<infoparam name="TGComponent" value="Request activation" />
+<TGConnectingPoint num="0" id="337" />
<extraparam>
-<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1219,16 +1262,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="322" >
-<father id="331" num="13" />
-<cdparam x="680" y="321" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="340" >
+<father id="369" num="3" />
+<cdparam x="721" y="301" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="321" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="339" />
<extraparam>
-<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1236,55 +1279,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1200" id="415" >
-<father id="424" num="3" />
-<cdparam x="841" y="133" />
-<sizeparam width="570" height="485" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
-<infoparam name="TGComponent" value="TCPIP Entities" />
-<TGConnectingPoint num="0" id="407" />
-<TGConnectingPoint num="1" id="408" />
-<TGConnectingPoint num="2" id="409" />
-<TGConnectingPoint num="3" id="410" />
-<TGConnectingPoint num="4" id="411" />
-<TGConnectingPoint num="5" id="412" />
-<TGConnectingPoint num="6" id="413" />
-<TGConnectingPoint num="7" id="414" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="346" >
-<father id="415" num="0" />
-<cdparam x="1232" y="328" />
-<sizeparam width="140" height="141" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
-<infoparam name="TGComponent" value="Timer" />
-<TGConnectingPoint num="0" id="338" />
-<TGConnectingPoint num="1" id="339" />
-<TGConnectingPoint num="2" id="340" />
-<TGConnectingPoint num="3" id="341" />
-<TGConnectingPoint num="4" id="342" />
-<TGConnectingPoint num="5" id="343" />
-<TGConnectingPoint num="6" id="344" />
-<TGConnectingPoint num="7" id="345" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="333" >
-<father id="346" num="0" />
-<cdparam x="1222" y="368" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="342" >
+<father id="369" num="4" />
+<cdparam x="721" y="190" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="332" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="341" />
<extraparam>
-<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1292,16 +1296,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="335" >
-<father id="346" num="1" />
-<cdparam x="1222" y="403" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="344" >
+<father id="369" num="5" />
+<cdparam x="721" y="235" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="334" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="343" />
<extraparam>
-<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1309,16 +1313,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="337" >
-<father id="346" num="2" />
-<cdparam x="1222" y="431" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="346" >
+<father id="369" num="6" />
+<cdparam x="721" y="269" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="336" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="345" />
<extraparam>
-<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1326,68 +1330,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="365" >
-<father id="415" num="1" />
-<cdparam x="828" y="362" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="348" >
+<father id="369" num="7" />
+<cdparam x="521" y="156" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
-<infoparam name="Composite port" value="" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event data_Ready" />
<TGConnectingPoint num="0" id="347" />
-<TGConnectingPoint num="1" id="348" />
-<TGConnectingPoint num="2" id="349" />
-<TGConnectingPoint num="3" id="350" />
-<TGConnectingPoint num="4" id="351" />
-<TGConnectingPoint num="5" id="352" />
-<TGConnectingPoint num="6" id="353" />
-<TGConnectingPoint num="7" id="354" />
-<TGConnectingPoint num="8" id="355" />
-<TGConnectingPoint num="9" id="356" />
-<TGConnectingPoint num="10" id="357" />
-<TGConnectingPoint num="11" id="358" />
-<TGConnectingPoint num="12" id="359" />
-<TGConnectingPoint num="13" id="360" />
-<TGConnectingPoint num="14" id="361" />
-<TGConnectingPoint num="15" id="362" />
-<TGConnectingPoint num="16" id="363" />
-<TGConnectingPoint num="17" id="364" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="406" >
-<father id="415" num="2" />
-<cdparam x="931" y="167" />
-<sizeparam width="236" height="317" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
-<infoparam name="TGComponent" value="TCPIP" />
-<TGConnectingPoint num="0" id="398" />
-<TGConnectingPoint num="1" id="399" />
-<TGConnectingPoint num="2" id="400" />
-<TGConnectingPoint num="3" id="401" />
-<TGConnectingPoint num="4" id="402" />
-<TGConnectingPoint num="5" id="403" />
-<TGConnectingPoint num="6" id="404" />
-<TGConnectingPoint num="7" id="405" />
<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
-<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" />
-<Attribute access="2" id="i" value="" type="0" typeOther="" />
-<Attribute access="2" id="j" value="" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
+<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="367" >
-<father id="406" num="0" />
-<cdparam x="918" y="185" />
+<SUBCOMPONENT type="1203" id="350" >
+<father id="369" num="8" />
+<cdparam x="521" y="290" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="366" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<TGConnectingPoint num="0" id="349" />
<extraparam>
-<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1395,16 +1364,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="369" >
-<father id="406" num="1" />
-<cdparam x="918" y="235" />
+<SUBCOMPONENT type="1203" id="352" >
+<father id="369" num="9" />
+<reference id="184" />
+<cdparam x="521" y="202" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="368" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromDtoSC" />
+<TGConnectingPoint num="0" id="351" />
<extraparam>
-<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1412,16 +1382,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="371" >
-<father id="406" num="2" />
-<cdparam x="918" y="278" />
+<SUBCOMPONENT type="1203" id="354" >
+<father id="369" num="10" />
+<reference id="184" />
+<cdparam x="521" y="247" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="370" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<TGConnectingPoint num="0" id="353" />
<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="3" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1429,16 +1400,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="373" >
-<father id="406" num="3" />
-<cdparam x="918" y="317" />
+<SUBCOMPONENT type="1203" id="356" >
+<father id="369" num="11" />
+<cdparam x="543" y="321" />
<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="372" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<TGConnectingPoint num="0" id="355" />
<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1446,16 +1417,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="375" >
-<father id="406" num="4" />
-<cdparam x="921" y="352" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="358" >
+<father id="369" num="12" />
+<reference id="184" />
+<cdparam x="580" y="84" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="374" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event reset, pTS, end" />
+<TGConnectingPoint num="0" id="357" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1463,16 +1435,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="377" >
-<father id="406" num="5" />
-<cdparam x="921" y="443" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="360" >
+<father id="369" num="13" />
+<cdparam x="721" y="111" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="376" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="359" />
<extraparam>
-<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1480,16 +1452,35 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="379" >
-<father id="406" num="6" />
-<cdparam x="921" y="416" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="396" >
+<father id="424" num="2" />
+<cdparam x="565" y="416" />
+<sizeparam width="240" height="145" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="378" />
+<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
+<infoparam name="TGComponent" value="Application" />
+<TGConnectingPoint num="0" id="388" />
+<TGConnectingPoint num="1" id="389" />
+<TGConnectingPoint num="2" id="390" />
+<TGConnectingPoint num="3" id="391" />
+<TGConnectingPoint num="4" id="392" />
+<TGConnectingPoint num="5" id="393" />
+<TGConnectingPoint num="6" id="394" />
+<TGConnectingPoint num="7" id="395" />
<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Data isAttacker="No" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="371" >
+<father id="396" num="0" />
+<cdparam x="748" y="548" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
+<infoparam name="Primitive port" value="Event opened" />
+<TGConnectingPoint num="0" id="370" />
+<extraparam>
+<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1497,16 +1488,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="381" >
-<father id="406" num="7" />
-<cdparam x="921" y="387" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="373" >
+<father id="396" num="1" />
+<cdparam x="697" y="403" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="380" />
+<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
+<infoparam name="Primitive port" value="Event connectionOpened" />
+<TGConnectingPoint num="0" id="372" />
<extraparam>
-<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1514,16 +1505,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="383" >
-<father id="406" num="8" />
-<cdparam x="959" y="474" />
+<SUBCOMPONENT type="1203" id="375" >
+<father id="396" num="2" />
+<cdparam x="659" y="406" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="382" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="374" />
<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1531,16 +1522,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="385" >
-<father id="406" num="9" />
-<cdparam x="921" y="466" />
+<SUBCOMPONENT type="1203" id="377" >
+<father id="396" num="3" />
+<cdparam x="795" y="542" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="384" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="376" />
<extraparam>
-<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1548,16 +1539,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="387" >
-<father id="406" num="10" />
-<cdparam x="1157" y="370" />
+<SUBCOMPONENT type="1203" id="379" >
+<father id="396" num="4" />
+<cdparam x="795" y="509" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="386" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="378" />
<extraparam>
-<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1565,16 +1556,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="389" >
-<father id="406" num="11" />
-<cdparam x="1157" y="405" />
+<SUBCOMPONENT type="1203" id="381" >
+<father id="396" num="5" />
+<cdparam x="795" y="448" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="388" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="380" />
<extraparam>
-<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1582,16 +1573,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="391" >
-<father id="406" num="12" />
-<cdparam x="1157" y="198" />
+<SUBCOMPONENT type="1203" id="383" >
+<father id="396" num="6" />
+<cdparam x="795" y="481" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="390" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="382" />
<extraparam>
-<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1599,16 +1590,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="393" >
-<father id="406" num="13" />
-<cdparam x="1157" y="266" />
+<SUBCOMPONENT type="1203" id="385" >
+<father id="396" num="7" />
+<cdparam x="795" y="419" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="392" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
+<TGConnectingPoint num="0" id="384" />
<extraparam>
-<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1616,16 +1607,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="395" >
-<father id="406" num="14" />
-<cdparam x="1157" y="444" />
+<SUBCOMPONENT type="1203" id="387" >
+<father id="396" num="8" />
+<cdparam x="740" y="406" />
<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="394" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="386" />
<extraparam>
-<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1633,22 +1624,31 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="397" >
-<father id="406" num="15" />
-<cdparam x="1012" y="471" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1201" id="415" >
+<father id="424" num="3" />
+<cdparam x="521" y="369" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="396" />
-<extraparam>
-<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
+<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="397" />
+<TGConnectingPoint num="1" id="398" />
+<TGConnectingPoint num="2" id="399" />
+<TGConnectingPoint num="3" id="400" />
+<TGConnectingPoint num="4" id="401" />
+<TGConnectingPoint num="5" id="402" />
+<TGConnectingPoint num="6" id="403" />
+<TGConnectingPoint num="7" id="404" />
+<TGConnectingPoint num="8" id="405" />
+<TGConnectingPoint num="9" id="406" />
+<TGConnectingPoint num="10" id="407" />
+<TGConnectingPoint num="11" id="408" />
+<TGConnectingPoint num="12" id="409" />
+<TGConnectingPoint num="13" id="410" />
+<TGConnectingPoint num="14" id="411" />
+<TGConnectingPoint num="15" id="412" />
+<TGConnectingPoint num="16" id="413" />
+<TGConnectingPoint num="17" id="414" />
</SUBCOMPONENT>
@@ -1854,7 +1854,7 @@
<TGConnectingPoint num="0" id="478" />
<TGConnectingPoint num="1" id="479" />
<extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -1914,7 +1914,7 @@
<TGConnectingPoint num="0" id="491" />
<TGConnectingPoint num="1" id="492" />
<extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -2147,2464 +2147,2916 @@
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" >
-<COMPONENT type="1008" id="529" >
-<cdparam x="159" y="424" />
-<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1013" id="530" >
+<cdparam x="505" y="259" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="opened()" />
-<TGConnectingPoint num="0" id="527" />
-<TGConnectingPoint num="1" id="528" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="528" />
+<TGConnectingPoint num="1" id="529" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="527" >
+<father id="530" num="0" />
+<cdparam x="520" y="279" />
+<sizeparam width="16" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="10" />
+</SUBCOMPONENT>
+
+<COMPONENT type="1010" id="533" >
+<cdparam x="476" y="129" />
+<sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="opened() " />
+<TGConnectingPoint num="0" id="531" />
+<TGConnectingPoint num="1" id="532" />
<extraparam>
<Data eventName="opened" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="537" >
-<cdparam x="2086" y="1378" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="536" >
+<cdparam x="442" y="192" />
+<sizeparam width="139" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="533" />
-<TGConnectingPoint num="1" id="534" />
-<TGConnectingPoint num="2" id="535" />
-<TGConnectingPoint num="3" id="536" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="connectionOpened()" />
+<TGConnectingPoint num="0" id="534" />
+<TGConnectingPoint num="1" id="535" />
+<extraparam>
+<Data eventName="connectionOpened" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="530" >
-<father id="537" num="0" />
-<cdparam x="2061" y="1388" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="531" >
-<father id="537" num="1" />
-<cdparam x="2121" y="1388" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="532" >
-<father id="537" num="2" />
-<cdparam x="2106" y="1426" />
-<sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==10 ]" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="545" >
-<cdparam x="2262" y="951" />
+<COMPONENT type="1012" id="544" >
+<cdparam x="495" y="514" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="541" />
-<TGConnectingPoint num="1" id="542" />
-<TGConnectingPoint num="2" id="543" />
-<TGConnectingPoint num="3" id="544" />
+<TGConnectingPoint num="0" id="540" />
+<TGConnectingPoint num="1" id="541" />
+<TGConnectingPoint num="2" id="542" />
+<TGConnectingPoint num="3" id="543" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="538" >
-<father id="545" num="0" />
-<cdparam x="2212" y="961" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="537" >
+<father id="544" num="0" />
+<cdparam x="470" y="524" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==1 ]" />
+<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="539" >
-<father id="545" num="1" />
-<cdparam x="2301" y="975" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="538" >
+<father id="544" num="1" />
+<cdparam x="530" y="524" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ tcpctrl.state ==3 ]" />
+<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="540" >
-<father id="545" num="2" />
-<cdparam x="2282" y="996" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="539" >
+<father id="544" num="2" />
+<cdparam x="515" y="559" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ else ]" />
+<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="553" >
-<cdparam x="1981" y="1346" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="546" >
+<cdparam x="498" y="33" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="549" />
-<TGConnectingPoint num="1" id="550" />
-<TGConnectingPoint num="2" id="551" />
-<TGConnectingPoint num="3" id="552" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="545" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="546" >
-<father id="553" num="0" />
-<cdparam x="1934" y="1356" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==5 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="547" >
-<father id="553" num="1" />
-<cdparam x="2016" y="1356" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="548" >
-<father id="553" num="2" />
-<cdparam x="2001" y="1391" />
-<sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state == 7 ]" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="561" >
-<cdparam x="1811" y="1269" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="549" >
+<cdparam x="479" y="71" />
+<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="557" />
-<TGConnectingPoint num="1" id="558" />
-<TGConnectingPoint num="2" id="559" />
-<TGConnectingPoint num="3" id="560" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="open()" />
+<TGConnectingPoint num="0" id="547" />
+<TGConnectingPoint num="1" id="548" />
+<extraparam>
+<Data eventName="open" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="554" >
-<father id="561" num="0" />
-<cdparam x="1762" y="1279" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="555" >
-<father id="561" num="1" />
-<cdparam x="1846" y="1279" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1006" id="552" >
+<cdparam x="467" y="353" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="556" >
-<father id="561" num="2" />
-<cdparam x="1831" y="1314" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="write channel" value="fromAtoT(1)" />
+<TGConnectingPoint num="0" id="550" />
+<TGConnectingPoint num="1" id="551" />
+<extraparam>
+<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="555" >
+<cdparam x="468" y="399" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==2 ]" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="send_TCP()" />
+<TGConnectingPoint num="0" id="553" />
+<TGConnectingPoint num="1" id="554" />
+<accessibility />
+<extraparam>
+<Data eventName="send_TCP" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
-<COMPONENT type="1012" id="569" >
-<cdparam x="1713" y="1141" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="557" >
+<cdparam x="577" y="648" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="565" />
-<TGConnectingPoint num="1" id="566" />
-<TGConnectingPoint num="2" id="567" />
-<TGConnectingPoint num="3" id="568" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="556" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="562" >
-<father id="569" num="0" />
-<cdparam x="1688" y="1151" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1008" id="560" >
+<cdparam x="560" y="589" />
+<sizeparam width="54" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="563" >
-<father id="569" num="1" />
-<cdparam x="1748" y="1151" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="abort()" />
+<TGConnectingPoint num="0" id="558" />
+<TGConnectingPoint num="1" id="559" />
+<extraparam>
+<Data eventName="abort" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="563" >
+<cdparam x="407" y="597" />
+<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="564" >
-<father id="569" num="2" />
-<cdparam x="1733" y="1186" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="close()" />
+<TGConnectingPoint num="0" id="561" />
+<TGConnectingPoint num="1" id="562" />
+<extraparam>
+<Data eventName="close" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
-<COMPONENT type="1013" id="573" >
-<cdparam x="1524" y="1254" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="565" >
+<cdparam x="423" y="646" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="571" />
-<TGConnectingPoint num="1" id="572" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="564" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="570" >
-<father id="573" num="0" />
-<cdparam x="1539" y="1274" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1013" id="577" >
-<cdparam x="1524" y="1064" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="115" id="566" >
+<cdparam x="510" y="294" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="510" y="294" id="529" />
+<P2 x="509" y="348" id="550" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="567" >
+<cdparam x="508" y="424" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="508" y="424" id="554" />
+<P2 x="510" y="504" id="540" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="568" >
+<cdparam x="512" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="512" y="154" id="532" />
+<P2 x="511" y="187" id="534" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="569" >
+<cdparam x="594" y="221" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="511" y="217" id="535" />
+<P2 x="510" y="254" id="528" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="570" >
+<cdparam x="506" y="36" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to send event" value="null" />
+<P1 x="505" y="53" id="545" />
+<P2 x="505" y="66" id="547" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="571" >
+<cdparam x="508" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1 x="505" y="96" id="548" />
+<P2 x="512" y="124" id="531" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="572" >
+<cdparam x="509" y="397" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to send event" value="null" />
+<P1 x="509" y="378" id="551" />
+<P2 x="508" y="394" id="553" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="573" >
+<cdparam x="587" y="614" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1 x="587" y="614" id="559" />
+<P2 x="587" y="643" id="556" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="574" >
+<cdparam x="471" y="608" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1 x="470" y="529" id="541" />
+<P2 x="433" y="592" id="561" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="575" >
+<cdparam x="433" y="622" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1 x="433" y="622" id="562" />
+<P2 x="433" y="641" id="564" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="576" >
+<cdparam x="551" y="608" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1 x="550" y="529" id="542" />
+<P2 x="587" y="584" id="558" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1001" id="578" >
+<cdparam x="430" y="408" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="575" />
-<TGConnectingPoint num="1" id="576" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="577" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="574" >
-<father id="577" num="0" />
-<cdparam x="1538" y="1088" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="585" >
-<cdparam x="1592" y="1006" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="581" >
+<cdparam x="416" y="364" />
+<sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="581" />
-<TGConnectingPoint num="1" id="582" />
-<TGConnectingPoint num="2" id="583" />
-<TGConnectingPoint num="3" id="584" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="end() " />
+<TGConnectingPoint num="0" id="579" />
+<TGConnectingPoint num="1" id="580" />
+<extraparam>
+<Data eventName="end" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="578" >
-<father id="585" num="0" />
-<cdparam x="1542" y="1016" />
-<sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state == 4 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="579" >
-<father id="585" num="1" />
-<cdparam x="1627" y="1016" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="580" >
-<father id="585" num="2" />
-<cdparam x="1612" y="1051" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="593" >
-<cdparam x="1713" y="875" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="584" >
+<cdparam x="231" y="201" />
+<sizeparam width="143" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="589" />
-<TGConnectingPoint num="1" id="590" />
-<TGConnectingPoint num="2" id="591" />
-<TGConnectingPoint num="3" id="592" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="connectionOpened() " />
+<TGConnectingPoint num="0" id="582" />
+<TGConnectingPoint num="1" id="583" />
+<extraparam>
+<Data eventName="connectionOpened" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="586" >
-<father id="593" num="0" />
-<cdparam x="1688" y="885" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1000" id="586" >
+<cdparam x="159" y="66" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="587" >
-<father id="593" num="1" />
-<cdparam x="1748" y="885" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="585" />
+</COMPONENT>
+
+<COMPONENT type="1010" id="589" >
+<cdparam x="138" y="129" />
+<sizeparam width="57" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="588" >
-<father id="593" num="2" />
-<cdparam x="1733" y="920" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="reset() " />
+<TGConnectingPoint num="0" id="587" />
+<TGConnectingPoint num="1" id="588" />
+<extraparam>
+<Data eventName="reset" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="592" >
+<cdparam x="108" y="182" />
+<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="answerToReset()" />
+<TGConnectingPoint num="0" id="590" />
+<TGConnectingPoint num="1" id="591" />
+<extraparam>
+<Data eventName="answerToReset" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
-<COMPONENT type="1013" id="597" >
-<cdparam x="1636" y="1235" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="595" >
+<cdparam x="143" y="237" />
+<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="595" />
-<TGConnectingPoint num="1" id="596" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="pTS() " />
+<TGConnectingPoint num="0" id="593" />
+<TGConnectingPoint num="1" id="594" />
+<extraparam>
+<Data eventName="pTS" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="594" >
-<father id="597" num="0" />
-<cdparam x="1655" y="1254" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1008" id="598" >
+<cdparam x="121" y="308" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="pTSConfirm()" />
+<TGConnectingPoint num="0" id="596" />
+<TGConnectingPoint num="1" id="597" />
+<extraparam>
+<Data eventName="pTSConfirm" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
-<COMPONENT type="1013" id="601" >
-<cdparam x="2232" y="1059" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="615" >
+<cdparam x="376" y="98" />
+<sizeparam width="249" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="UML Note" value="The first two layers of the OSI model
+are used to communicate between
+the smart card and the terminal
+" />
<TGConnectingPoint num="0" id="599" />
<TGConnectingPoint num="1" id="600" />
+<TGConnectingPoint num="2" id="601" />
+<TGConnectingPoint num="3" id="602" />
+<TGConnectingPoint num="4" id="603" />
+<TGConnectingPoint num="5" id="604" />
+<TGConnectingPoint num="6" id="605" />
+<TGConnectingPoint num="7" id="606" />
+<TGConnectingPoint num="8" id="607" />
+<TGConnectingPoint num="9" id="608" />
+<TGConnectingPoint num="10" id="609" />
+<TGConnectingPoint num="11" id="610" />
+<TGConnectingPoint num="12" id="611" />
+<TGConnectingPoint num="13" id="612" />
+<TGConnectingPoint num="14" id="613" />
+<TGConnectingPoint num="15" id="614" />
+<extraparam>
+<Line value="The first two layers of the OSI model " />
+<Line value="are used to communicate between " />
+<Line value="the smart card and the terminal" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="598" >
-<father id="601" num="0" />
-<cdparam x="2219" y="1083" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1013" id="605" >
-<cdparam x="2312" y="1024" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="618" >
+<cdparam x="250" y="97" />
+<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="603" />
-<TGConnectingPoint num="1" id="604" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send request" value="start_TCP_IP()" />
+<TGConnectingPoint num="0" id="616" />
+<TGConnectingPoint num="1" id="617" />
+<extraparam>
+<Data requestName="start_TCP_IP" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="602" >
-<father id="605" num="0" />
-<cdparam x="2288" y="1044" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="613" >
-<cdparam x="1193" y="1020" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="621" >
+<cdparam x="236" y="148" />
+<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="609" />
-<TGConnectingPoint num="1" id="610" />
-<TGConnectingPoint num="2" id="611" />
-<TGConnectingPoint num="3" id="612" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send request" value="start_Application()" />
+<TGConnectingPoint num="0" id="619" />
+<TGConnectingPoint num="1" id="620" />
+<breakpoint />
+<extraparam>
+<Data requestName="start_Application" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="606" >
-<father id="613" num="0" />
-<cdparam x="1168" y="1030" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1001" id="623" >
+<cdparam x="581" y="550" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="607" >
-<father id="613" num="1" />
-<cdparam x="1228" y="1030" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="622" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="626" >
+<cdparam x="236" y="471" />
+<sizeparam width="115" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="608" >
-<father id="613" num="2" />
-<cdparam x="1213" y="1065" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==6 ]" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="data_Ready_SC()" />
+<TGConnectingPoint num="0" id="624" />
+<TGConnectingPoint num="1" id="625" />
+<extraparam>
+<Data eventName="data_Ready_SC" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
-<COMPONENT type="1013" id="617" >
-<cdparam x="1203" y="1107" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="628" >
+<cdparam x="283" y="547" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="615" />
-<TGConnectingPoint num="1" id="616" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="627" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="614" >
-<father id="617" num="0" />
-<cdparam x="1218" y="1127" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="625" >
-<cdparam x="557" y="712" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="631" >
+<cdparam x="249" y="429" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="621" />
-<TGConnectingPoint num="1" id="622" />
-<TGConnectingPoint num="2" id="623" />
-<TGConnectingPoint num="3" id="624" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="read channel" value="fromTtoP(1) " />
+<TGConnectingPoint num="0" id="629" />
+<TGConnectingPoint num="1" id="630" />
+<extraparam>
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="618" >
-<father id="625" num="0" />
-<cdparam x="482" y="747" />
-<sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state == 1 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="619" >
-<father id="625" num="1" />
-<cdparam x="592" y="722" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="620" >
-<father id="625" num="2" />
-<cdparam x="577" y="757" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-<COMPONENT type="1013" id="629" >
-<cdparam x="717" y="694" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="634" >
+<cdparam x="266" y="385" />
+<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="627" />
-<TGConnectingPoint num="1" id="628" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="send() " />
+<TGConnectingPoint num="0" id="632" />
+<TGConnectingPoint num="1" id="633" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="626" >
-<father id="629" num="0" />
-<cdparam x="732" y="714" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1013" id="633" >
-<cdparam x="938" y="1025" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="637" >
+<cdparam x="246" y="513" />
+<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="631" />
-<TGConnectingPoint num="1" id="632" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="write channel" value="fromSCtoD(1)" />
+<TGConnectingPoint num="0" id="635" />
+<TGConnectingPoint num="1" id="636" />
+<extraparam>
+<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="630" >
-<father id="633" num="0" />
-<cdparam x="953" y="1045" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="641" >
-<cdparam x="1034" y="939" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="640" >
+<cdparam x="559" y="472" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="637" />
-<TGConnectingPoint num="1" id="638" />
-<TGConnectingPoint num="2" id="639" />
-<TGConnectingPoint num="3" id="640" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="receive()" />
+<TGConnectingPoint num="0" id="638" />
+<TGConnectingPoint num="1" id="639" />
+<extraparam>
+<Data eventName="receive" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="634" >
-<father id="641" num="0" />
-<cdparam x="959" y="974" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="635" >
-<father id="641" num="1" />
-<cdparam x="1070" y="949" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="636" >
-<father id="641" num="2" />
-<cdparam x="1054" y="984" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state == 5]" />
-</SUBCOMPONENT>
-<COMPONENT type="1013" id="645" >
-<cdparam x="795" y="1009" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="643" >
+<cdparam x="542" y="433" />
+<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="643" />
-<TGConnectingPoint num="1" id="644" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="read channel" value="fromDtoSC(1) " />
+<TGConnectingPoint num="0" id="641" />
+<TGConnectingPoint num="1" id="642" />
+<extraparam>
+<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="642" >
-<father id="645" num="0" />
-<cdparam x="818" y="1031" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="653" >
-<cdparam x="828" y="869" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="646" >
+<cdparam x="549" y="509" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="649" />
-<TGConnectingPoint num="1" id="650" />
-<TGConnectingPoint num="2" id="651" />
-<TGConnectingPoint num="3" id="652" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="write channel" value="fromPtoT(1)" />
+<TGConnectingPoint num="0" id="644" />
+<TGConnectingPoint num="1" id="645" />
+<extraparam>
+<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="646" >
-<father id="653" num="0" />
-<cdparam x="753" y="885" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="647" >
-<father id="653" num="1" />
-<cdparam x="863" y="879" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="648" >
-<father id="653" num="2" />
-<cdparam x="848" y="914" />
-<sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state==0 ]" />
-</SUBCOMPONENT>
-<COMPONENT type="1013" id="657" >
-<cdparam x="341" y="764" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="649" >
+<cdparam x="532" y="390" />
+<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="655" />
-<TGConnectingPoint num="1" id="656" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="data_Ready(t, b) " />
+<TGConnectingPoint num="0" id="647" />
+<TGConnectingPoint num="1" id="648" />
+<breakpoint />
+<extraparam>
+<Data eventName="data_Ready" nbOfParams="5" />
+<Param index="0" value="t" />
+<Param index="1" value="b" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="654" >
-<father id="657" num="0" />
-<cdparam x="354" y="785" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1013" id="661" >
-<cdparam x="127" y="794" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1014" id="653" >
+<cdparam x="236" y="261" />
+<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="659" />
-<TGConnectingPoint num="1" id="660" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="for loop" value="for(j=0;x==0;j = j)" />
+<TGConnectingPoint num="0" id="650" />
+<TGConnectingPoint num="1" id="651" />
+<TGConnectingPoint num="2" id="652" />
+<extraparam>
+<Data init="j=0" condition="x==0" increment="j = j" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="658" >
-<father id="661" num="0" />
-<cdparam x="146" y="818" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-<COMPONENT type="1012" id="669" >
-<cdparam x="993" y="780" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="655" >
+<cdparam x="275" y="309" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="665" />
-<TGConnectingPoint num="1" id="666" />
-<TGConnectingPoint num="2" id="667" />
-<TGConnectingPoint num="3" id="668" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="654" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="662" >
-<father id="669" num="0" />
-<cdparam x="949" y="793" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1018" id="666" >
+<cdparam x="424" y="285" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="663" >
-<father id="669" num="1" />
-<cdparam x="1028" y="790" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="select" value="null" />
+<TGConnectingPoint num="0" id="656" />
+<TGConnectingPoint num="1" id="657" />
+<TGConnectingPoint num="2" id="658" />
+<TGConnectingPoint num="3" id="659" />
+<TGConnectingPoint num="4" id="660" />
+<TGConnectingPoint num="5" id="661" />
+<TGConnectingPoint num="6" id="662" />
+<TGConnectingPoint num="7" id="663" />
+<TGConnectingPoint num="8" id="664" />
+<TGConnectingPoint num="9" id="665" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="667" >
+<cdparam x="302" y="227" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="302" y="226" id="583" />
+<P2 x="298" y="256" id="650" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="672" >
+<cdparam x="111" y="331" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to send request" value="null" />
+<P1 x="166" y="333" id="597" />
+<P2 x="298" y="92" id="616" />
+<Point x="166" y="353" />
+<Point x="225" y="353" />
+<Point x="225" y="72" />
+<Point x="278" y="72" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="668" >
+<father id="672" num="0" />
+<cdparam x="166" y="353" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="664" >
-<father id="669" num="2" />
-<cdparam x="1013" y="825" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="669" >
+<father id="672" num="1" />
+<cdparam x="225" y="353" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="673" >
-<cdparam x="1003" y="701" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="671" />
-<TGConnectingPoint num="1" id="672" />
-</COMPONENT>
<SUBCOMPONENT type="-1" id="670" >
-<father id="673" num="0" />
-<cdparam x="1018" y="721" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="672" num="2" />
+<cdparam x="225" y="72" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="677" >
-<cdparam x="459" y="783" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="675" />
-<TGConnectingPoint num="1" id="676" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="674" >
-<father id="677" num="0" />
-<cdparam x="474" y="802" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="671" >
+<father id="672" num="3" />
+<cdparam x="278" y="72" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="681" >
-<cdparam x="225" y="863" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="115" id="673" >
+<cdparam x="166" y="64" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to wait event" value="null" />
+<P1 x="166" y="86" id="585" />
+<P2 x="166" y="124" id="587" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="674" >
+<cdparam x="166" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to send event" value="null" />
+<P1 x="166" y="154" id="588" />
+<P2 x="166" y="177" id="590" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="675" >
+<cdparam x="312" y="133" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send request to send request" value="null" />
+<P1 x="298" y="122" id="617" />
+<P2 x="298" y="143" id="619" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="676" >
+<cdparam x="286" y="421" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to read channel" value="null" />
+<P1 x="293" y="410" id="633" />
+<P2 x="293" y="424" id="629" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="677" >
+<cdparam x="286" y="486" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to send event" value="null" />
+<P1 x="293" y="454" id="630" />
+<P2 x="293" y="466" id="624" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="678" >
+<cdparam x="286" y="538" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1 x="293" y="496" id="625" />
+<P2 x="293" y="508" id="635" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="679" >
+<cdparam x="286" y="594" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to stop state" value="null" />
+<P1 x="293" y="538" id="636" />
+<P2 x="293" y="542" id="627" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="680" >
+<cdparam x="607" y="480" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to send event" value="null" />
+<P1 x="591" y="458" id="642" />
+<P2 x="591" y="467" id="638" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="681" >
+<cdparam x="606" y="524" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1 x="591" y="497" id="639" />
+<P2 x="591" y="504" id="644" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="682" >
+<cdparam x="609" y="427" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to read channel" value="null" />
+<P1 x="591" y="415" id="648" />
+<P2 x="591" y="428" id="641" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="683" >
+<cdparam x="606" y="586" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to stop state" value="null" />
+<P1 x="591" y="534" id="645" />
+<P2 x="591" y="545" id="622" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="684" >
+<cdparam x="298" y="173" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send request to for loop" value="null" />
+<P1 x="298" y="173" id="620" />
+<P2 x="302" y="196" id="582" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="685" >
+<cdparam x="328" y="291" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from for loop to stop state" value="null" />
+<P1 x="298" y="286" id="652" />
+<P2 x="285" y="304" id="654" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="686" >
+<cdparam x="385" y="404" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from select to wait event" value="null" />
+<P1 x="399" y="300" id="657" />
+<P2 x="293" y="380" id="632" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="687" >
+<cdparam x="533" y="462" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from select to wait event" value="null" />
+<P1 x="479" y="300" id="658" />
+<P2 x="591" y="385" id="647" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="688" >
+<cdparam x="391" y="341" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from for loop to select" value="null" />
+<P1 x="360" y="275" id="651" />
+<P2 x="439" y="275" id="656" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="689" >
+<cdparam x="164" y="262" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to send event" value="null" />
+<P1 x="166" y="262" id="594" />
+<P2 x="166" y="303" id="596" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="690" >
+<cdparam x="166" y="207" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to wait event" value="null" />
+<P1 x="166" y="207" id="591" />
+<P2 x="166" y="232" id="593" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="691" >
+<cdparam x="439" y="340" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="439" y="340" id="659" />
+<P2 x="440" y="359" id="579" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="692" >
+<cdparam x="440" y="389" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="440" y="389" id="580" />
+<P2 x="440" y="403" id="577" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1012" id="700" >
+<cdparam x="509" y="222" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="679" />
-<TGConnectingPoint num="1" id="680" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="696" />
+<TGConnectingPoint num="1" id="697" />
+<TGConnectingPoint num="2" id="698" />
+<TGConnectingPoint num="3" id="699" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="678" >
-<father id="681" num="0" />
-<cdparam x="245" y="885" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="693" >
+<father id="700" num="0" />
+<cdparam x="464" y="232" />
+<sizeparam width="52" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ x==0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="694" >
+<father id="700" num="1" />
+<cdparam x="544" y="234" />
+<sizeparam width="42" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ x>0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="695" >
+<father id="700" num="2" />
+<cdparam x="529" y="267" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="685" >
-<cdparam x="1044" y="1057" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="702" >
+<cdparam x="489" y="26" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="683" />
-<TGConnectingPoint num="1" id="684" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="701" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="682" >
-<father id="685" num="0" />
-<cdparam x="1059" y="1077" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1001" id="704" >
+<cdparam x="417" y="407" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="703" />
+</COMPONENT>
-<COMPONENT type="1012" id="693" >
-<cdparam x="173" y="486" />
+<COMPONENT type="1008" id="707" >
+<cdparam x="393" y="339" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="timeOut()" />
+<TGConnectingPoint num="0" id="705" />
+<TGConnectingPoint num="1" id="706" />
+<extraparam>
+<Data eventName="timeOut" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1010" id="710" >
+<cdparam x="596" y="300" />
+<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="stop() " />
+<TGConnectingPoint num="0" id="708" />
+<TGConnectingPoint num="1" id="709" />
+<extraparam>
+<Data eventName="stop" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="712" >
+<cdparam x="612" y="365" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="711" />
+</COMPONENT>
+
+<COMPONENT type="1017" id="715" >
+<cdparam x="489" y="157" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="notified event" value="x=?stop()" />
+<TGConnectingPoint num="0" id="713" />
+<TGConnectingPoint num="1" id="714" />
+<extraparam>
+<Data eventName="stop" variable="x" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="115" id="716" >
+<cdparam x="496" y="46" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="496" y="46" id="701" />
+<P2 x="526" y="152" id="713" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="717" >
+<cdparam x="484" y="237" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="484" y="237" id="697" />
+<P2 x="427" y="334" id="705" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="718" >
+<cdparam x="427" y="364" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1 x="427" y="364" id="706" />
+<P2 x="427" y="402" id="703" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="719" >
+<cdparam x="622" y="325" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to stop state" value="null" />
+<P1 x="622" y="325" id="709" />
+<P2 x="622" y="360" id="711" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="720" >
+<cdparam x="524" y="175" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from notified event to choice" value="null" />
+<P1 x="526" y="182" id="714" />
+<P2 x="524" y="212" id="696" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="721" >
+<cdparam x="564" y="237" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to wait event" value="null" />
+<P1 x="564" y="237" id="698" />
+<P2 x="622" y="295" id="708" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" >
+<COMPONENT type="1008" id="724" >
+<cdparam x="156" y="424" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="opened()" />
+<TGConnectingPoint num="0" id="722" />
+<TGConnectingPoint num="1" id="723" />
+<extraparam>
+<Data eventName="opened" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1012" id="732" >
+<cdparam x="2086" y="1378" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="689" />
-<TGConnectingPoint num="1" id="690" />
-<TGConnectingPoint num="2" id="691" />
-<TGConnectingPoint num="3" id="692" />
+<TGConnectingPoint num="0" id="728" />
+<TGConnectingPoint num="1" id="729" />
+<TGConnectingPoint num="2" id="730" />
+<TGConnectingPoint num="3" id="731" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="686" >
-<father id="693" num="0" />
-<cdparam x="98" y="496" />
-<sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="725" >
+<father id="732" num="0" />
+<cdparam x="2061" y="1388" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state==0 ]" />
+<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="687" >
-<father id="693" num="1" />
-<cdparam x="208" y="496" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="726" >
+<father id="732" num="1" />
+<cdparam x="2121" y="1388" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="688" >
-<father id="693" num="2" />
-<cdparam x="193" y="531" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="727" >
+<father id="732" num="2" />
+<cdparam x="2106" y="1426" />
+<sizeparam width="135" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
+<infoparam name="guard 3" value="[ tcpctrl.state ==10 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="701" >
-<cdparam x="359" y="192" />
+<COMPONENT type="1012" id="740" >
+<cdparam x="2262" y="951" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="697" />
-<TGConnectingPoint num="1" id="698" />
-<TGConnectingPoint num="2" id="699" />
-<TGConnectingPoint num="3" id="700" />
+<TGConnectingPoint num="0" id="736" />
+<TGConnectingPoint num="1" id="737" />
+<TGConnectingPoint num="2" id="738" />
+<TGConnectingPoint num="3" id="739" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="694" >
-<father id="701" num="0" />
-<cdparam x="317" y="202" />
-<sizeparam width="81" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="733" >
+<father id="740" num="0" />
+<cdparam x="2212" y="961" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.a>0 ]" />
+<infoparam name="guard 1" value="[ tcpctrl.state ==1 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="695" >
-<father id="701" num="1" />
-<cdparam x="394" y="202" />
-<sizeparam width="91" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="734" >
+<father id="740" num="1" />
+<cdparam x="2301" y="975" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ tcpctrl.a==0 ]" />
+<infoparam name="guard 2" value="[ tcpctrl.state ==3 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="696" >
-<father id="701" num="2" />
-<cdparam x="379" y="237" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="735" >
+<father id="740" num="2" />
+<cdparam x="2282" y="996" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
+<infoparam name="guard 3" value="[ else ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="709" >
-<cdparam x="449" y="582" />
+<COMPONENT type="1012" id="748" >
+<cdparam x="1981" y="1346" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="705" />
-<TGConnectingPoint num="1" id="706" />
-<TGConnectingPoint num="2" id="707" />
-<TGConnectingPoint num="3" id="708" />
+<TGConnectingPoint num="0" id="744" />
+<TGConnectingPoint num="1" id="745" />
+<TGConnectingPoint num="2" id="746" />
+<TGConnectingPoint num="3" id="747" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="702" >
-<father id="709" num="0" />
-<cdparam x="404" y="592" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="741" >
+<father id="748" num="0" />
+<cdparam x="1934" y="1356" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==9 ]" />
+<infoparam name="guard 1" value="[ tcpctrl.state ==5 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="703" >
-<father id="709" num="1" />
-<cdparam x="500" y="599" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="742" >
+<father id="748" num="1" />
+<cdparam x="2016" y="1356" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="704" >
-<father id="709" num="2" />
-<cdparam x="469" y="627" />
-<sizeparam width="252" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="743" >
+<father id="748" num="2" />
+<cdparam x="2001" y="1391" />
+<sizeparam width="131" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ (tcpctrl.state ==2) or (tcpctrl.state ==4) ]" />
+<infoparam name="guard 3" value="[ tcpctrl.state == 7 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="717" >
-<cdparam x="274" y="564" />
+<COMPONENT type="1012" id="756" >
+<cdparam x="1811" y="1269" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="713" />
-<TGConnectingPoint num="1" id="714" />
-<TGConnectingPoint num="2" id="715" />
-<TGConnectingPoint num="3" id="716" />
+<TGConnectingPoint num="0" id="752" />
+<TGConnectingPoint num="1" id="753" />
+<TGConnectingPoint num="2" id="754" />
+<TGConnectingPoint num="3" id="755" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="710" >
-<father id="717" num="0" />
-<cdparam x="228" y="574" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="749" >
+<father id="756" num="0" />
+<cdparam x="1762" y="1279" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state == 1]" />
+<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="711" >
-<father id="717" num="1" />
-<cdparam x="317" y="584" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="750" >
+<father id="756" num="1" />
+<cdparam x="1846" y="1279" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="712" >
-<father id="717" num="2" />
-<cdparam x="306" y="616" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="751" >
+<father id="756" num="2" />
+<cdparam x="1831" y="1314" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==4 ]" />
+<infoparam name="guard 3" value="[ tcpctrl.state ==2 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="719" >
-<cdparam x="227" y="27" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="764" >
+<cdparam x="1713" y="1141" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="718" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="760" />
+<TGConnectingPoint num="1" id="761" />
+<TGConnectingPoint num="2" id="762" />
+<TGConnectingPoint num="3" id="763" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="757" >
+<father id="764" num="0" />
+<cdparam x="1688" y="1151" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="758" >
+<father id="764" num="1" />
+<cdparam x="1748" y="1151" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="759" >
+<father id="764" num="2" />
+<cdparam x="1733" y="1186" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="301" id="736" >
-<cdparam x="10" y="30" />
-<sizeparam width="92" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="768" >
+<cdparam x="1524" y="1254" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="0: closed
-1: Listen
-2: SYN rcvd
-3: SYN sent
-4: Estab
-5: Fin wait1
-6: Fin wait2
-7: closing
-8: Time wait
-9: close wait
-10:last ack
-" />
-<TGConnectingPoint num="0" id="720" />
-<TGConnectingPoint num="1" id="721" />
-<TGConnectingPoint num="2" id="722" />
-<TGConnectingPoint num="3" id="723" />
-<TGConnectingPoint num="4" id="724" />
-<TGConnectingPoint num="5" id="725" />
-<TGConnectingPoint num="6" id="726" />
-<TGConnectingPoint num="7" id="727" />
-<TGConnectingPoint num="8" id="728" />
-<TGConnectingPoint num="9" id="729" />
-<TGConnectingPoint num="10" id="730" />
-<TGConnectingPoint num="11" id="731" />
-<TGConnectingPoint num="12" id="732" />
-<TGConnectingPoint num="13" id="733" />
-<TGConnectingPoint num="14" id="734" />
-<TGConnectingPoint num="15" id="735" />
-<extraparam>
-<Line value="0: closed" />
-<Line value="1: Listen" />
-<Line value="2: SYN rcvd" />
-<Line value="3: SYN sent" />
-<Line value="4: Estab" />
-<Line value="5: Fin wait1" />
-<Line value="6: Fin wait2" />
-<Line value="7: closing" />
-<Line value="8: Time wait" />
-<Line value="9: close wait" />
-<Line value="10:last ack" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="766" />
+<TGConnectingPoint num="1" id="767" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="765" >
+<father id="768" num="0" />
+<cdparam x="1539" y="1274" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1011" id="739" >
-<cdparam x="98" y="549" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="772" >
+<cdparam x="1524" y="1064" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="737" />
-<TGConnectingPoint num="1" id="738" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="770" />
+<TGConnectingPoint num="1" id="771" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="769" >
+<father id="772" num="0" />
+<cdparam x="1538" y="1088" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="741" >
-<cdparam x="138" y="615" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="780" >
+<cdparam x="1592" y="1006" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="740" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="776" />
+<TGConnectingPoint num="1" id="777" />
+<TGConnectingPoint num="2" id="778" />
+<TGConnectingPoint num="3" id="779" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="773" >
+<father id="780" num="0" />
+<cdparam x="1542" y="1016" />
+<sizeparam width="135" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.state == 4 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="774" >
+<father id="780" num="1" />
+<cdparam x="1627" y="1016" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="775" >
+<father id="780" num="2" />
+<cdparam x="1612" y="1051" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1009" id="744" >
-<cdparam x="967" y="585" />
-<sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="788" >
+<cdparam x="1713" y="875" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="fromPtoT(1) " />
-<TGConnectingPoint num="0" id="742" />
-<TGConnectingPoint num="1" id="743" />
-<extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="784" />
+<TGConnectingPoint num="1" id="785" />
+<TGConnectingPoint num="2" id="786" />
+<TGConnectingPoint num="3" id="787" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="781" >
+<father id="788" num="0" />
+<cdparam x="1688" y="885" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="782" >
+<father id="788" num="1" />
+<cdparam x="1748" y="885" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="783" >
+<father id="788" num="2" />
+<cdparam x="1733" y="920" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1014" id="748" >
-<cdparam x="150" y="85" />
-<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="792" >
+<cdparam x="1636" y="1235" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="for loop" value="for(i=0;(tcpctrl.a==0);i = i)" />
-<TGConnectingPoint num="0" id="745" />
-<TGConnectingPoint num="1" id="746" />
-<TGConnectingPoint num="2" id="747" />
-<extraparam>
-<Data init="i=0" condition="(tcpctrl.a==0)" increment="i = i" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="790" />
+<TGConnectingPoint num="1" id="791" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="789" >
+<father id="792" num="0" />
+<cdparam x="1655" y="1254" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="750" >
-<cdparam x="225" y="207" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="796" >
+<cdparam x="2232" y="1059" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="749" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="794" />
+<TGConnectingPoint num="1" id="795" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="793" >
+<father id="796" num="0" />
+<cdparam x="2219" y="1083" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1011" id="753" >
-<cdparam x="187" y="144" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="800" >
+<cdparam x="2312" y="1024" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state=0" />
-<TGConnectingPoint num="0" id="751" />
-<TGConnectingPoint num="1" id="752" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="798" />
+<TGConnectingPoint num="1" id="799" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="797" >
+<father id="800" num="0" />
+<cdparam x="2288" y="1044" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1017" id="756" >
-<cdparam x="316" y="133" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="808" >
+<cdparam x="1193" y="1020" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="notified event" value="tcpctrl.a=?abort()" />
-<TGConnectingPoint num="0" id="754" />
-<TGConnectingPoint num="1" id="755" />
-<extraparam>
-<Data eventName="abort" variable="tcpctrl.a" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="804" />
+<TGConnectingPoint num="1" id="805" />
+<TGConnectingPoint num="2" id="806" />
+<TGConnectingPoint num="3" id="807" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="801" >
+<father id="808" num="0" />
+<cdparam x="1168" y="1030" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="802" >
+<father id="808" num="1" />
+<cdparam x="1228" y="1030" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="803" >
+<father id="808" num="2" />
+<cdparam x="1213" y="1065" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ tcpctrl.state ==6 ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1009" id="759" >
-<cdparam x="692" y="589" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="812" >
+<cdparam x="1203" y="1107" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="757" />
-<TGConnectingPoint num="1" id="758" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="810" />
+<TGConnectingPoint num="1" id="811" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="809" >
+<father id="812" num="0" />
+<cdparam x="1218" y="1127" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1010" id="762" >
-<cdparam x="689" y="534" />
-<sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="820" >
+<cdparam x="557" y="712" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="timeOut() " />
-<TGConnectingPoint num="0" id="760" />
-<TGConnectingPoint num="1" id="761" />
-<extraparam>
-<Data eventName="timeOut" nbOfParams="5" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="816" />
+<TGConnectingPoint num="1" id="817" />
+<TGConnectingPoint num="2" id="818" />
+<TGConnectingPoint num="3" id="819" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="813" >
+<father id="820" num="0" />
+<cdparam x="482" y="747" />
+<sizeparam width="131" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.state == 1 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="814" >
+<father id="820" num="1" />
+<cdparam x="592" y="722" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="815" >
+<father id="820" num="2" />
+<cdparam x="577" y="757" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1010" id="765" >
-<cdparam x="977" y="528" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="824" >
+<cdparam x="717" y="694" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="receive() " />
-<TGConnectingPoint num="0" id="763" />
-<TGConnectingPoint num="1" id="764" />
-<extraparam>
-<Data eventName="receive" nbOfParams="5" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="822" />
+<TGConnectingPoint num="1" id="823" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="821" >
+<father id="824" num="0" />
+<cdparam x="732" y="714" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1010" id="768" >
-<cdparam x="439" y="492" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="828" >
+<cdparam x="938" y="1025" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="close() " />
-<TGConnectingPoint num="0" id="766" />
-<TGConnectingPoint num="1" id="767" />
-<extraparam>
-<Data eventName="close" nbOfParams="5" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="826" />
+<TGConnectingPoint num="1" id="827" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="825" >
+<father id="828" num="0" />
+<cdparam x="953" y="1045" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1010" id="771" >
-<cdparam x="250" y="468" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="836" >
+<cdparam x="1034" y="939" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="send_TCP() " />
-<TGConnectingPoint num="0" id="769" />
-<TGConnectingPoint num="1" id="770" />
-<extraparam>
-<Data eventName="send_TCP" nbOfParams="5" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="832" />
+<TGConnectingPoint num="1" id="833" />
+<TGConnectingPoint num="2" id="834" />
+<TGConnectingPoint num="3" id="835" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="829" >
+<father id="836" num="0" />
+<cdparam x="959" y="974" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="830" >
+<father id="836" num="1" />
+<cdparam x="1070" y="949" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="831" >
+<father id="836" num="2" />
+<cdparam x="1054" y="984" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ tcpctrl.state == 5]" />
+</SUBCOMPONENT>
-<COMPONENT type="1010" id="774" >
-<cdparam x="163" y="383" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="840" >
+<cdparam x="795" y="1009" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="open() " />
-<TGConnectingPoint num="0" id="772" />
-<TGConnectingPoint num="1" id="773" />
-<breakpoint />
-<extraparam>
-<Data eventName="open" nbOfParams="5" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="838" />
+<TGConnectingPoint num="1" id="839" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="837" >
+<father id="840" num="0" />
+<cdparam x="818" y="1031" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1018" id="785" >
-<cdparam x="449" y="267" />
+<COMPONENT type="1012" id="848" >
+<cdparam x="828" y="869" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="775" />
-<TGConnectingPoint num="1" id="776" />
-<TGConnectingPoint num="2" id="777" />
-<TGConnectingPoint num="3" id="778" />
-<TGConnectingPoint num="4" id="779" />
-<TGConnectingPoint num="5" id="780" />
-<TGConnectingPoint num="6" id="781" />
-<TGConnectingPoint num="7" id="782" />
-<TGConnectingPoint num="8" id="783" />
-<TGConnectingPoint num="9" id="784" />
-<breakpoint />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="844" />
+<TGConnectingPoint num="1" id="845" />
+<TGConnectingPoint num="2" id="846" />
+<TGConnectingPoint num="3" id="847" />
</COMPONENT>
-
-<COMPONENT type="1001" id="787" >
-<cdparam x="218" y="529" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="841" >
+<father id="848" num="0" />
+<cdparam x="753" y="885" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="786" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="789" >
-<cdparam x="319" y="614" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.state ==0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="842" >
+<father id="848" num="1" />
+<cdparam x="863" y="879" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="788" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="792" >
-<cdparam x="275" y="228" />
-<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="843" >
+<father id="848" num="2" />
+<cdparam x="848" y="914" />
+<sizeparam width="123" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="abort() " />
-<TGConnectingPoint num="0" id="790" />
-<TGConnectingPoint num="1" id="791" />
-<extraparam>
-<Data eventName="abort" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ tcpctrl.state==0 ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="794" >
-<cdparam x="291" y="290" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="852" >
+<cdparam x="341" y="764" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="793" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="850" />
+<TGConnectingPoint num="1" id="851" />
</COMPONENT>
-
-<COMPONENT type="301" id="811" >
-<cdparam x="602" y="86" />
-<sizeparam width="360" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="849" >
+<father id="852" num="0" />
+<cdparam x="354" y="785" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="b est le nombre d'instructions necessaires pour paquetiser
-ou depaquitiser un paquet TCP
-
-On prend b=1 comme exemple
-" />
-<TGConnectingPoint num="0" id="795" />
-<TGConnectingPoint num="1" id="796" />
-<TGConnectingPoint num="2" id="797" />
-<TGConnectingPoint num="3" id="798" />
-<TGConnectingPoint num="4" id="799" />
-<TGConnectingPoint num="5" id="800" />
-<TGConnectingPoint num="6" id="801" />
-<TGConnectingPoint num="7" id="802" />
-<TGConnectingPoint num="8" id="803" />
-<TGConnectingPoint num="9" id="804" />
-<TGConnectingPoint num="10" id="805" />
-<TGConnectingPoint num="11" id="806" />
-<TGConnectingPoint num="12" id="807" />
-<TGConnectingPoint num="13" id="808" />
-<TGConnectingPoint num="14" id="809" />
-<TGConnectingPoint num="15" id="810" />
-<extraparam>
-<Line value="b est le nombre d'instructions necessaires pour paquetiser" />
-<Line value="ou depaquitiser un paquet TCP" />
-<Line value="" />
-<Line value="On prend b=1 comme exemple" />
-</extraparam>
-</COMPONENT>
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1009" id="814" >
-<cdparam x="188" y="808" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="856" >
+<cdparam x="127" y="794" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="fromAtoT(1) " />
-<TGConnectingPoint num="0" id="812" />
-<TGConnectingPoint num="1" id="813" />
-<extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="854" />
+<TGConnectingPoint num="1" id="855" />
</COMPONENT>
-
-<COMPONENT type="1006" id="817" >
-<cdparam x="191" y="1002" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="853" >
+<father id="856" num="0" />
+<cdparam x="146" y="818" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="815" />
-<TGConnectingPoint num="1" id="816" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="819" >
-<cdparam x="220" y="1237" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="864" >
+<cdparam x="993" y="780" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="818" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="860" />
+<TGConnectingPoint num="1" id="861" />
+<TGConnectingPoint num="2" id="862" />
+<TGConnectingPoint num="3" id="863" />
</COMPONENT>
-
-<COMPONENT type="1011" id="822" >
-<cdparam x="414" y="1032" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="857" >
+<father id="864" num="0" />
+<cdparam x="949" y="793" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =5" />
-<TGConnectingPoint num="0" id="820" />
-<TGConnectingPoint num="1" id="821" />
-</COMPONENT>
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="858" >
+<father id="864" num="1" />
+<cdparam x="1028" y="790" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="859" >
+<father id="864" num="2" />
+<cdparam x="1013" y="825" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="824" >
-<cdparam x="454" y="1213" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="868" >
+<cdparam x="1003" y="701" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="823" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="866" />
+<TGConnectingPoint num="1" id="867" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="865" >
+<father id="868" num="0" />
+<cdparam x="1018" y="721" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1011" id="827" >
-<cdparam x="84" y="1041" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="872" >
+<cdparam x="459" y="783" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state=3" />
-<TGConnectingPoint num="0" id="825" />
-<TGConnectingPoint num="1" id="826" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="870" />
+<TGConnectingPoint num="1" id="871" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="869" >
+<father id="872" num="0" />
+<cdparam x="474" y="802" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1006" id="830" >
-<cdparam x="93" y="938" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="876" >
+<cdparam x="225" y="863" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="828" />
-<TGConnectingPoint num="1" id="829" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="874" />
+<TGConnectingPoint num="1" id="875" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="873" >
+<father id="876" num="0" />
+<cdparam x="245" y="885" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1011" id="833" >
-<cdparam x="292" y="1026" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1013" id="880" >
+<cdparam x="1044" y="1057" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =10" />
-<TGConnectingPoint num="0" id="831" />
-<TGConnectingPoint num="1" id="832" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="1" id="879" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="877" >
+<father id="880" num="0" />
+<cdparam x="1059" y="1077" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="b" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="835" >
-<cdparam x="336" y="1229" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="888" >
+<cdparam x="173" y="486" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="834" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="884" />
+<TGConnectingPoint num="1" id="885" />
+<TGConnectingPoint num="2" id="886" />
+<TGConnectingPoint num="3" id="887" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="881" >
+<father id="888" num="0" />
+<cdparam x="98" y="496" />
+<sizeparam width="123" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.state==0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="882" >
+<father id="888" num="1" />
+<cdparam x="208" y="496" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="883" >
+<father id="888" num="2" />
+<cdparam x="193" y="531" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1006" id="838" >
-<cdparam x="425" y="941" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="896" >
+<cdparam x="359" y="192" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="836" />
-<TGConnectingPoint num="1" id="837" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="892" />
+<TGConnectingPoint num="1" id="893" />
+<TGConnectingPoint num="2" id="894" />
+<TGConnectingPoint num="3" id="895" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="889" >
+<father id="896" num="0" />
+<cdparam x="317" y="202" />
+<sizeparam width="88" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.a>0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="890" >
+<father id="896" num="1" />
+<cdparam x="394" y="202" />
+<sizeparam width="98" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ tcpctrl.a==0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="891" >
+<father id="896" num="2" />
+<cdparam x="379" y="237" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1006" id="841" >
-<cdparam x="307" y="900" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="904" >
+<cdparam x="449" y="582" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="839" />
-<TGConnectingPoint num="1" id="840" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="900" />
+<TGConnectingPoint num="1" id="901" />
+<TGConnectingPoint num="2" id="902" />
+<TGConnectingPoint num="3" id="903" />
</COMPONENT>
-
-<COMPONENT type="1001" id="843" >
-<cdparam x="790" y="1270" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="897" >
+<father id="904" num="0" />
+<cdparam x="404" y="592" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="842" />
-</COMPONENT>
-
-<COMPONENT type="301" id="860" >
-<cdparam x="998" y="850" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.state ==9 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="898" >
+<father id="904" num="1" />
+<cdparam x="500" y="599" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Final
-" />
-<TGConnectingPoint num="0" id="844" />
-<TGConnectingPoint num="1" id="845" />
-<TGConnectingPoint num="2" id="846" />
-<TGConnectingPoint num="3" id="847" />
-<TGConnectingPoint num="4" id="848" />
-<TGConnectingPoint num="5" id="849" />
-<TGConnectingPoint num="6" id="850" />
-<TGConnectingPoint num="7" id="851" />
-<TGConnectingPoint num="8" id="852" />
-<TGConnectingPoint num="9" id="853" />
-<TGConnectingPoint num="10" id="854" />
-<TGConnectingPoint num="11" id="855" />
-<TGConnectingPoint num="12" id="856" />
-<TGConnectingPoint num="13" id="857" />
-<TGConnectingPoint num="14" id="858" />
-<TGConnectingPoint num="15" id="859" />
-<extraparam>
-<Line value="Final" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="863" >
-<cdparam x="678" y="965" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="899" >
+<father id="904" num="2" />
+<cdparam x="469" y="627" />
+<sizeparam width="277" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="861" />
-<TGConnectingPoint num="1" id="862" />
-</COMPONENT>
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ (tcpctrl.state ==2) or (tcpctrl.state ==4) ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="865" >
-<cdparam x="718" y="1032" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1012" id="912" >
+<cdparam x="274" y="564" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="864" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="908" />
+<TGConnectingPoint num="1" id="909" />
+<TGConnectingPoint num="2" id="910" />
+<TGConnectingPoint num="3" id="911" />
</COMPONENT>
-
-<COMPONENT type="1006" id="868" >
-<cdparam x="761" y="1086" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="905" >
+<father id="912" num="0" />
+<cdparam x="228" y="574" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="866" />
-<TGConnectingPoint num="1" id="867" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ tcpctrl.state == 1]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="906" >
+<father id="912" num="1" />
+<cdparam x="317" y="584" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ else ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="907" >
+<father id="912" num="2" />
+<cdparam x="306" y="616" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ tcpctrl.state ==4 ]" />
+</SUBCOMPONENT>
-<COMPONENT type="301" id="885" >
-<cdparam x="781" y="950" />
-<sizeparam width="89" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="914" >
+<cdparam x="227" y="27" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Active Open
-" />
-<TGConnectingPoint num="0" id="869" />
-<TGConnectingPoint num="1" id="870" />
-<TGConnectingPoint num="2" id="871" />
-<TGConnectingPoint num="3" id="872" />
-<TGConnectingPoint num="4" id="873" />
-<TGConnectingPoint num="5" id="874" />
-<TGConnectingPoint num="6" id="875" />
-<TGConnectingPoint num="7" id="876" />
-<TGConnectingPoint num="8" id="877" />
-<TGConnectingPoint num="9" id="878" />
-<TGConnectingPoint num="10" id="879" />
-<TGConnectingPoint num="11" id="880" />
-<TGConnectingPoint num="12" id="881" />
-<TGConnectingPoint num="13" id="882" />
-<TGConnectingPoint num="14" id="883" />
-<TGConnectingPoint num="15" id="884" />
-<extraparam>
-<Line value="Active Open" />
-</extraparam>
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="913" />
</COMPONENT>
-<COMPONENT type="301" id="902" >
-<cdparam x="715" y="907" />
-<sizeparam width="97" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="931" >
+<cdparam x="10" y="30" />
+<sizeparam width="98" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Passive Open
+<infoparam name="UML Note" value="0: closed
+1: Listen
+2: SYN rcvd
+3: SYN sent
+4: Estab
+5: Fin wait1
+6: Fin wait2
+7: closing
+8: Time wait
+9: close wait
+10:last ack
" />
-<TGConnectingPoint num="0" id="886" />
-<TGConnectingPoint num="1" id="887" />
-<TGConnectingPoint num="2" id="888" />
-<TGConnectingPoint num="3" id="889" />
-<TGConnectingPoint num="4" id="890" />
-<TGConnectingPoint num="5" id="891" />
-<TGConnectingPoint num="6" id="892" />
-<TGConnectingPoint num="7" id="893" />
-<TGConnectingPoint num="8" id="894" />
-<TGConnectingPoint num="9" id="895" />
-<TGConnectingPoint num="10" id="896" />
-<TGConnectingPoint num="11" id="897" />
-<TGConnectingPoint num="12" id="898" />
-<TGConnectingPoint num="13" id="899" />
-<TGConnectingPoint num="14" id="900" />
-<TGConnectingPoint num="15" id="901" />
+<TGConnectingPoint num="0" id="915" />
+<TGConnectingPoint num="1" id="916" />
+<TGConnectingPoint num="2" id="917" />
+<TGConnectingPoint num="3" id="918" />
+<TGConnectingPoint num="4" id="919" />
+<TGConnectingPoint num="5" id="920" />
+<TGConnectingPoint num="6" id="921" />
+<TGConnectingPoint num="7" id="922" />
+<TGConnectingPoint num="8" id="923" />
+<TGConnectingPoint num="9" id="924" />
+<TGConnectingPoint num="10" id="925" />
+<TGConnectingPoint num="11" id="926" />
+<TGConnectingPoint num="12" id="927" />
+<TGConnectingPoint num="13" id="928" />
+<TGConnectingPoint num="14" id="929" />
+<TGConnectingPoint num="15" id="930" />
<extraparam>
-<Line value="Passive Open" />
+<Line value="0: closed" />
+<Line value="1: Listen" />
+<Line value="2: SYN rcvd" />
+<Line value="3: SYN sent" />
+<Line value="4: Estab" />
+<Line value="5: Fin wait1" />
+<Line value="6: Fin wait2" />
+<Line value="7: closing" />
+<Line value="8: Time wait" />
+<Line value="9: close wait" />
+<Line value="10:last ack" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="905" >
-<cdparam x="750" y="1193" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =3" />
-<TGConnectingPoint num="0" id="903" />
-<TGConnectingPoint num="1" id="904" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="908" >
-<cdparam x="446" y="768" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="934" >
+<cdparam x="94" y="549" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="906" />
-<TGConnectingPoint num="1" id="907" />
+<infoparam name="action state" value="tcpctrl.state =1" />
+<TGConnectingPoint num="0" id="932" />
+<TGConnectingPoint num="1" id="933" />
</COMPONENT>
-<COMPONENT type="1001" id="910" >
-<cdparam x="486" y="830" />
+<COMPONENT type="1001" id="936" >
+<cdparam x="138" y="615" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="909" />
+<TGConnectingPoint num="0" id="935" />
</COMPONENT>
-<COMPONENT type="1006" id="913" >
-<cdparam x="904" y="1123" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="939" >
+<cdparam x="964" y="585" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="911" />
-<TGConnectingPoint num="1" id="912" />
+<infoparam name="read channel" value="fromPtoT(1) " />
+<TGConnectingPoint num="0" id="937" />
+<TGConnectingPoint num="1" id="938" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="930" >
-<cdparam x="884" y="1068" />
-<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1014" id="943" >
+<cdparam x="145" y="85" />
+<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of Fin
-" />
-<TGConnectingPoint num="0" id="914" />
-<TGConnectingPoint num="1" id="915" />
-<TGConnectingPoint num="2" id="916" />
-<TGConnectingPoint num="3" id="917" />
-<TGConnectingPoint num="4" id="918" />
-<TGConnectingPoint num="5" id="919" />
-<TGConnectingPoint num="6" id="920" />
-<TGConnectingPoint num="7" id="921" />
-<TGConnectingPoint num="8" id="922" />
-<TGConnectingPoint num="9" id="923" />
-<TGConnectingPoint num="10" id="924" />
-<TGConnectingPoint num="11" id="925" />
-<TGConnectingPoint num="12" id="926" />
-<TGConnectingPoint num="13" id="927" />
-<TGConnectingPoint num="14" id="928" />
-<TGConnectingPoint num="15" id="929" />
+<infoparam name="for loop" value="for(i=0;(tcpctrl.a==0);i = i)" />
+<TGConnectingPoint num="0" id="940" />
+<TGConnectingPoint num="1" id="941" />
+<TGConnectingPoint num="2" id="942" />
<extraparam>
-<Line value="send Ack of Fin" />
+<Data init="i=0" condition="(tcpctrl.a==0)" increment="i = i" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="933" >
-<cdparam x="893" y="1234" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="945" >
+<cdparam x="225" y="207" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =9" />
-<TGConnectingPoint num="0" id="931" />
-<TGConnectingPoint num="1" id="932" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="944" />
</COMPONENT>
-<COMPONENT type="1001" id="935" >
-<cdparam x="933" y="1311" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="948" >
+<cdparam x="183" y="144" />
+<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="934" />
+<infoparam name="action state" value="tcpctrl.state=0" />
+<TGConnectingPoint num="0" id="946" />
+<TGConnectingPoint num="1" id="947" />
</COMPONENT>
-<COMPONENT type="1006" id="938" >
-<cdparam x="1010" y="1155" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1017" id="951" >
+<cdparam x="311" y="133" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="936" />
-<TGConnectingPoint num="1" id="937" />
+<infoparam name="notified event" value="tcpctrl.a=?abort()" />
+<TGConnectingPoint num="0" id="949" />
+<TGConnectingPoint num="1" id="950" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data eventName="abort" variable="tcpctrl.a" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="955" >
-<cdparam x="1000" y="1094" />
-<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="954" >
+<cdparam x="690" y="589" />
+<sizeparam width="64" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of Fin
-" />
-<TGConnectingPoint num="0" id="939" />
-<TGConnectingPoint num="1" id="940" />
-<TGConnectingPoint num="2" id="941" />
-<TGConnectingPoint num="3" id="942" />
-<TGConnectingPoint num="4" id="943" />
-<TGConnectingPoint num="5" id="944" />
-<TGConnectingPoint num="6" id="945" />
-<TGConnectingPoint num="7" id="946" />
-<TGConnectingPoint num="8" id="947" />
-<TGConnectingPoint num="9" id="948" />
-<TGConnectingPoint num="10" id="949" />
-<TGConnectingPoint num="11" id="950" />
-<TGConnectingPoint num="12" id="951" />
-<TGConnectingPoint num="13" id="952" />
-<TGConnectingPoint num="14" id="953" />
-<TGConnectingPoint num="15" id="954" />
+<infoparam name="read channel" value="temp(1) " />
+<TGConnectingPoint num="0" id="952" />
+<TGConnectingPoint num="1" id="953" />
<extraparam>
-<Line value="send Ack of Fin" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="958" >
-<cdparam x="999" y="1266" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="957" >
+<cdparam x="686" y="534" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =7" />
-<TGConnectingPoint num="0" id="956" />
-<TGConnectingPoint num="1" id="957" />
+<infoparam name="wait event" value="timeOut() " />
+<TGConnectingPoint num="0" id="955" />
+<TGConnectingPoint num="1" id="956" />
+<extraparam>
+<Data eventName="timeOut" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="960" >
-<cdparam x="1039" y="1341" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="960" >
+<cdparam x="974" y="528" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="959" />
+<infoparam name="wait event" value="receive() " />
+<TGConnectingPoint num="0" id="958" />
+<TGConnectingPoint num="1" id="959" />
+<extraparam>
+<Data eventName="receive" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="963" >
-<cdparam x="683" y="758" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="963" >
+<cdparam x="436" y="492" />
+<sizeparam width="57" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
+<infoparam name="wait event" value="close() " />
<TGConnectingPoint num="0" id="961" />
<TGConnectingPoint num="1" id="962" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data eventName="close" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="965" >
-<cdparam x="712" y="865" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="966" >
+<cdparam x="247" y="468" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
+<infoparam name="wait event" value="send_TCP() " />
<TGConnectingPoint num="0" id="964" />
+<TGConnectingPoint num="1" id="965" />
+<extraparam>
+<Data eventName="send_TCP" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="968" >
-<cdparam x="93" y="1100" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="969" >
+<cdparam x="160" y="383" />
+<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="966" />
-<TGConnectingPoint num="1" id="967" />
+<infoparam name="wait event" value="open() " />
+<TGConnectingPoint num="0" id="967" />
+<TGConnectingPoint num="1" id="968" />
+<breakpoint />
<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
+<Data eventName="open" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="971" >
-<cdparam x="104" y="1167" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1018" id="980" >
+<cdparam x="449" y="267" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="969" />
-<TGConnectingPoint num="1" id="970" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="select" value="null" />
+<TGConnectingPoint num="0" id="970" />
+<TGConnectingPoint num="1" id="971" />
+<TGConnectingPoint num="2" id="972" />
+<TGConnectingPoint num="3" id="973" />
+<TGConnectingPoint num="4" id="974" />
+<TGConnectingPoint num="5" id="975" />
+<TGConnectingPoint num="6" id="976" />
+<TGConnectingPoint num="7" id="977" />
+<TGConnectingPoint num="8" id="978" />
+<TGConnectingPoint num="9" id="979" />
+<breakpoint />
</COMPONENT>
-<COMPONENT type="1001" id="973" >
-<cdparam x="122" y="1236" />
+<COMPONENT type="1001" id="982" >
+<cdparam x="218" y="529" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="972" />
+<TGConnectingPoint num="0" id="981" />
</COMPONENT>
-<COMPONENT type="1007" id="976" >
-<cdparam x="191" y="1102" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="984" >
+<cdparam x="319" y="614" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="974" />
-<TGConnectingPoint num="1" id="975" />
-<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="983" />
</COMPONENT>
-<COMPONENT type="1006" id="979" >
-<cdparam x="202" y="1169" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="987" >
+<cdparam x="272" y="228" />
+<sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="977" />
-<TGConnectingPoint num="1" id="978" />
+<infoparam name="wait event" value="abort() " />
+<TGConnectingPoint num="0" id="985" />
+<TGConnectingPoint num="1" id="986" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data eventName="abort" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="982" >
-<cdparam x="307" y="1106" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="989" >
+<cdparam x="291" y="290" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="980" />
-<TGConnectingPoint num="1" id="981" />
-<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="988" />
</COMPONENT>
-<COMPONENT type="1006" id="985" >
-<cdparam x="318" y="1173" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1006" >
+<cdparam x="602" y="86" />
+<sizeparam width="393" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="983" />
-<TGConnectingPoint num="1" id="984" />
+<infoparam name="UML Note" value="b est le nombre d'instructions necessaires pour paquetiser
+ou depaquitiser un paquet TCP
+
+On prend b=1 comme exemple
+" />
+<TGConnectingPoint num="0" id="990" />
+<TGConnectingPoint num="1" id="991" />
+<TGConnectingPoint num="2" id="992" />
+<TGConnectingPoint num="3" id="993" />
+<TGConnectingPoint num="4" id="994" />
+<TGConnectingPoint num="5" id="995" />
+<TGConnectingPoint num="6" id="996" />
+<TGConnectingPoint num="7" id="997" />
+<TGConnectingPoint num="8" id="998" />
+<TGConnectingPoint num="9" id="999" />
+<TGConnectingPoint num="10" id="1000" />
+<TGConnectingPoint num="11" id="1001" />
+<TGConnectingPoint num="12" id="1002" />
+<TGConnectingPoint num="13" id="1003" />
+<TGConnectingPoint num="14" id="1004" />
+<TGConnectingPoint num="15" id="1005" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Line value="b est le nombre d'instructions necessaires pour paquetiser" />
+<Line value="ou depaquitiser un paquet TCP" />
+<Line value="" />
+<Line value="On prend b=1 comme exemple" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="988" >
-<cdparam x="425" y="1090" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="1009" >
+<cdparam x="186" y="808" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="986" />
-<TGConnectingPoint num="1" id="987" />
+<infoparam name="read channel" value="fromAtoT(1) " />
+<TGConnectingPoint num="0" id="1007" />
+<TGConnectingPoint num="1" id="1008" />
<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
+<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="991" >
-<cdparam x="436" y="1159" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1012" >
+<cdparam x="188" y="1002" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="989" />
-<TGConnectingPoint num="1" id="990" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1010" />
+<TGConnectingPoint num="1" id="1011" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="994" >
-<cdparam x="56" y="861" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1014" >
+<cdparam x="220" y="1237" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="992" />
-<TGConnectingPoint num="1" id="993" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1013" />
</COMPONENT>
-<COMPONENT type="1011" id="997" >
-<cdparam x="154" y="940" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1017" >
+<cdparam x="410" y="1032" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="995" />
-<TGConnectingPoint num="1" id="996" />
+<infoparam name="action state" value="tcpctrl.state =5" />
+<TGConnectingPoint num="0" id="1015" />
+<TGConnectingPoint num="1" id="1016" />
</COMPONENT>
-<COMPONENT type="1011" id="1000" >
-<cdparam x="388" y="865" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1019" >
+<cdparam x="454" y="1213" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="998" />
-<TGConnectingPoint num="1" id="999" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1018" />
</COMPONENT>
-<COMPONENT type="1011" id="1003" >
-<cdparam x="270" y="831" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1022" >
+<cdparam x="80" y="1041" />
+<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1001" />
-<TGConnectingPoint num="1" id="1002" />
+<infoparam name="action state" value="tcpctrl.state=3" />
+<TGConnectingPoint num="0" id="1020" />
+<TGConnectingPoint num="1" id="1021" />
</COMPONENT>
-<COMPONENT type="1008" id="1006" >
-<cdparam x="207" y="1052" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1025" >
+<cdparam x="90" y="938" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1004" />
-<TGConnectingPoint num="1" id="1005" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1023" />
+<TGConnectingPoint num="1" id="1024" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1009" >
-<cdparam x="323" y="962" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1028" >
+<cdparam x="288" y="1026" />
+<sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1007" />
-<TGConnectingPoint num="1" id="1008" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
+<infoparam name="action state" value="tcpctrl.state =10" />
+<TGConnectingPoint num="0" id="1026" />
+<TGConnectingPoint num="1" id="1027" />
</COMPONENT>
-<COMPONENT type="1008" id="1012" >
-<cdparam x="441" y="983" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1030" >
+<cdparam x="336" y="1229" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1010" />
-<TGConnectingPoint num="1" id="1011" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1029" />
</COMPONENT>
-<COMPONENT type="1008" id="1015" >
-<cdparam x="109" y="986" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1033" >
+<cdparam x="422" y="941" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1013" />
-<TGConnectingPoint num="1" id="1014" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1031" />
+<TGConnectingPoint num="1" id="1032" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1018" >
-<cdparam x="699" y="813" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1036" >
+<cdparam x="304" y="900" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1016" />
-<TGConnectingPoint num="1" id="1017" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1034" />
+<TGConnectingPoint num="1" id="1035" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1021" >
-<cdparam x="777" y="1141" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1038" >
+<cdparam x="790" y="1270" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1019" />
-<TGConnectingPoint num="1" id="1020" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1037" />
</COMPONENT>
-<COMPONENT type="1008" id="1024" >
-<cdparam x="920" y="1178" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1055" >
+<cdparam x="998" y="850" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1022" />
-<TGConnectingPoint num="1" id="1023" />
+<infoparam name="UML Note" value="Final
+" />
+<TGConnectingPoint num="0" id="1039" />
+<TGConnectingPoint num="1" id="1040" />
+<TGConnectingPoint num="2" id="1041" />
+<TGConnectingPoint num="3" id="1042" />
+<TGConnectingPoint num="4" id="1043" />
+<TGConnectingPoint num="5" id="1044" />
+<TGConnectingPoint num="6" id="1045" />
+<TGConnectingPoint num="7" id="1046" />
+<TGConnectingPoint num="8" id="1047" />
+<TGConnectingPoint num="9" id="1048" />
+<TGConnectingPoint num="10" id="1049" />
+<TGConnectingPoint num="11" id="1050" />
+<TGConnectingPoint num="12" id="1051" />
+<TGConnectingPoint num="13" id="1052" />
+<TGConnectingPoint num="14" id="1053" />
+<TGConnectingPoint num="15" id="1054" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<Line value="Final" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1027" >
-<cdparam x="1026" y="1211" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1058" >
+<cdparam x="674" y="965" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1025" />
-<TGConnectingPoint num="1" id="1026" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
+<infoparam name="action state" value="tcpctrl.state =1" />
+<TGConnectingPoint num="0" id="1056" />
+<TGConnectingPoint num="1" id="1057" />
</COMPONENT>
-<COMPONENT type="1001" id="1029" >
-<cdparam x="602" y="762" />
+<COMPONENT type="1001" id="1060" >
+<cdparam x="718" y="1032" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1028" />
+<TGConnectingPoint num="0" id="1059" />
</COMPONENT>
-<COMPONENT type="1001" id="1031" >
-<cdparam x="873" y="922" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1063" >
+<cdparam x="758" y="1086" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1030" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1061" />
+<TGConnectingPoint num="1" id="1062" />
+<extraparam>
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1034" >
-<cdparam x="1169" y="1214" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1080" >
+<cdparam x="781" y="950" />
+<sizeparam width="94" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1032" />
-<TGConnectingPoint num="1" id="1033" />
+<infoparam name="UML Note" value="Active Open
+" />
+<TGConnectingPoint num="0" id="1064" />
+<TGConnectingPoint num="1" id="1065" />
+<TGConnectingPoint num="2" id="1066" />
+<TGConnectingPoint num="3" id="1067" />
+<TGConnectingPoint num="4" id="1068" />
+<TGConnectingPoint num="5" id="1069" />
+<TGConnectingPoint num="6" id="1070" />
+<TGConnectingPoint num="7" id="1071" />
+<TGConnectingPoint num="8" id="1072" />
+<TGConnectingPoint num="9" id="1073" />
+<TGConnectingPoint num="10" id="1074" />
+<TGConnectingPoint num="11" id="1075" />
+<TGConnectingPoint num="12" id="1076" />
+<TGConnectingPoint num="13" id="1077" />
+<TGConnectingPoint num="14" id="1078" />
+<TGConnectingPoint num="15" id="1079" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Line value="Active Open" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1051" >
-<cdparam x="1159" y="1153" />
-<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1097" >
+<cdparam x="715" y="907" />
+<sizeparam width="104" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of Fin
+<infoparam name="UML Note" value="Passive Open
" />
-<TGConnectingPoint num="0" id="1035" />
-<TGConnectingPoint num="1" id="1036" />
-<TGConnectingPoint num="2" id="1037" />
-<TGConnectingPoint num="3" id="1038" />
-<TGConnectingPoint num="4" id="1039" />
-<TGConnectingPoint num="5" id="1040" />
-<TGConnectingPoint num="6" id="1041" />
-<TGConnectingPoint num="7" id="1042" />
-<TGConnectingPoint num="8" id="1043" />
-<TGConnectingPoint num="9" id="1044" />
-<TGConnectingPoint num="10" id="1045" />
-<TGConnectingPoint num="11" id="1046" />
-<TGConnectingPoint num="12" id="1047" />
-<TGConnectingPoint num="13" id="1048" />
-<TGConnectingPoint num="14" id="1049" />
-<TGConnectingPoint num="15" id="1050" />
+<TGConnectingPoint num="0" id="1081" />
+<TGConnectingPoint num="1" id="1082" />
+<TGConnectingPoint num="2" id="1083" />
+<TGConnectingPoint num="3" id="1084" />
+<TGConnectingPoint num="4" id="1085" />
+<TGConnectingPoint num="5" id="1086" />
+<TGConnectingPoint num="6" id="1087" />
+<TGConnectingPoint num="7" id="1088" />
+<TGConnectingPoint num="8" id="1089" />
+<TGConnectingPoint num="9" id="1090" />
+<TGConnectingPoint num="10" id="1091" />
+<TGConnectingPoint num="11" id="1092" />
+<TGConnectingPoint num="12" id="1093" />
+<TGConnectingPoint num="13" id="1094" />
+<TGConnectingPoint num="14" id="1095" />
+<TGConnectingPoint num="15" id="1096" />
<extraparam>
-<Line value="send Ack of Fin" />
+<Line value="Passive Open" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1054" >
-<cdparam x="1158" y="1295" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1100" >
+<cdparam x="746" y="1193" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="1052" />
-<TGConnectingPoint num="1" id="1053" />
+<infoparam name="action state" value="tcpctrl.state =3" />
+<TGConnectingPoint num="0" id="1098" />
+<TGConnectingPoint num="1" id="1099" />
</COMPONENT>
-<COMPONENT type="1001" id="1056" >
-<cdparam x="1198" y="1471" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1103" >
+<cdparam x="442" y="768" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1055" />
+<infoparam name="action state" value="tcpctrl.state =0" />
+<TGConnectingPoint num="0" id="1101" />
+<TGConnectingPoint num="1" id="1102" />
</COMPONENT>
-<COMPONENT type="1011" id="1059" >
-<cdparam x="1158" y="1402" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1105" >
+<cdparam x="486" y="830" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1057" />
-<TGConnectingPoint num="1" id="1058" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1104" />
</COMPONENT>
-<COMPONENT type="1008" id="1062" >
-<cdparam x="1185" y="1351" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1108" >
+<cdparam x="901" y="1123" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1060" />
-<TGConnectingPoint num="1" id="1061" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1106" />
+<TGConnectingPoint num="1" id="1107" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1064" >
-<cdparam x="1277" y="1070" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1125" >
+<cdparam x="884" y="1068" />
+<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1063" />
+<infoparam name="UML Note" value="send Ack of Fin
+" />
+<TGConnectingPoint num="0" id="1109" />
+<TGConnectingPoint num="1" id="1110" />
+<TGConnectingPoint num="2" id="1111" />
+<TGConnectingPoint num="3" id="1112" />
+<TGConnectingPoint num="4" id="1113" />
+<TGConnectingPoint num="5" id="1114" />
+<TGConnectingPoint num="6" id="1115" />
+<TGConnectingPoint num="7" id="1116" />
+<TGConnectingPoint num="8" id="1117" />
+<TGConnectingPoint num="9" id="1118" />
+<TGConnectingPoint num="10" id="1119" />
+<TGConnectingPoint num="11" id="1120" />
+<TGConnectingPoint num="12" id="1121" />
+<TGConnectingPoint num="13" id="1122" />
+<TGConnectingPoint num="14" id="1123" />
+<TGConnectingPoint num="15" id="1124" />
+<extraparam>
+<Line value="send Ack of Fin" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1066" >
-<cdparam x="1519" y="1457" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1128" >
+<cdparam x="889" y="1234" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1065" />
+<infoparam name="action state" value="tcpctrl.state =9" />
+<TGConnectingPoint num="0" id="1126" />
+<TGConnectingPoint num="1" id="1127" />
</COMPONENT>
-<COMPONENT type="1006" id="1069" >
-<cdparam x="1489" y="1132" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1130" >
+<cdparam x="933" y="1311" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoA(1)" />
-<TGConnectingPoint num="0" id="1067" />
-<TGConnectingPoint num="1" id="1068" />
-<extraparam>
-<Data channelName="fromTtoA" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1129" />
</COMPONENT>
-<COMPONENT type="1006" id="1072" >
-<cdparam x="1490" y="1348" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1133" >
+<cdparam x="1007" y="1155" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1070" />
-<TGConnectingPoint num="1" id="1071" />
+<TGConnectingPoint num="0" id="1131" />
+<TGConnectingPoint num="1" id="1132" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1075" >
-<cdparam x="1707" y="1026" />
-<sizeparam width="43" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1150" >
+<cdparam x="1000" y="1094" />
+<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="stop()" />
-<TGConnectingPoint num="0" id="1073" />
-<TGConnectingPoint num="1" id="1074" />
+<infoparam name="UML Note" value="send Ack of Fin
+" />
+<TGConnectingPoint num="0" id="1134" />
+<TGConnectingPoint num="1" id="1135" />
+<TGConnectingPoint num="2" id="1136" />
+<TGConnectingPoint num="3" id="1137" />
+<TGConnectingPoint num="4" id="1138" />
+<TGConnectingPoint num="5" id="1139" />
+<TGConnectingPoint num="6" id="1140" />
+<TGConnectingPoint num="7" id="1141" />
+<TGConnectingPoint num="8" id="1142" />
+<TGConnectingPoint num="9" id="1143" />
+<TGConnectingPoint num="10" id="1144" />
+<TGConnectingPoint num="11" id="1145" />
+<TGConnectingPoint num="12" id="1146" />
+<TGConnectingPoint num="13" id="1147" />
+<TGConnectingPoint num="14" id="1148" />
+<TGConnectingPoint num="15" id="1149" />
<extraparam>
-<Data eventName="stop" nbOfParams="5" />
+<Line value="send Ack of Fin" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1092" >
-<cdparam x="1759" y="1192" />
-<sizeparam width="86" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1153" >
+<cdparam x="995" y="1266" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Correct ack
-" />
-<TGConnectingPoint num="0" id="1076" />
-<TGConnectingPoint num="1" id="1077" />
-<TGConnectingPoint num="2" id="1078" />
-<TGConnectingPoint num="3" id="1079" />
-<TGConnectingPoint num="4" id="1080" />
-<TGConnectingPoint num="5" id="1081" />
-<TGConnectingPoint num="6" id="1082" />
-<TGConnectingPoint num="7" id="1083" />
-<TGConnectingPoint num="8" id="1084" />
-<TGConnectingPoint num="9" id="1085" />
-<TGConnectingPoint num="10" id="1086" />
-<TGConnectingPoint num="11" id="1087" />
-<TGConnectingPoint num="12" id="1088" />
-<TGConnectingPoint num="13" id="1089" />
-<TGConnectingPoint num="14" id="1090" />
-<TGConnectingPoint num="15" id="1091" />
-<extraparam>
-<Line value="Correct ack" />
-</extraparam>
+<infoparam name="action state" value="tcpctrl.state =7" />
+<TGConnectingPoint num="0" id="1151" />
+<TGConnectingPoint num="1" id="1152" />
</COMPONENT>
-<COMPONENT type="301" id="1109" >
-<cdparam x="1635" y="1168" />
-<sizeparam width="71" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1155" >
+<cdparam x="1039" y="1341" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="false ack
-" />
-<TGConnectingPoint num="0" id="1093" />
-<TGConnectingPoint num="1" id="1094" />
-<TGConnectingPoint num="2" id="1095" />
-<TGConnectingPoint num="3" id="1096" />
-<TGConnectingPoint num="4" id="1097" />
-<TGConnectingPoint num="5" id="1098" />
-<TGConnectingPoint num="6" id="1099" />
-<TGConnectingPoint num="7" id="1100" />
-<TGConnectingPoint num="8" id="1101" />
-<TGConnectingPoint num="9" id="1102" />
-<TGConnectingPoint num="10" id="1103" />
-<TGConnectingPoint num="11" id="1104" />
-<TGConnectingPoint num="12" id="1105" />
-<TGConnectingPoint num="13" id="1106" />
-<TGConnectingPoint num="14" id="1107" />
-<TGConnectingPoint num="15" id="1108" />
-<extraparam>
-<Line value="false ack" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1154" />
</COMPONENT>
-<COMPONENT type="1006" id="1112" >
-<cdparam x="1602" y="1299" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1158" >
+<cdparam x="680" y="758" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1110" />
-<TGConnectingPoint num="1" id="1111" />
+<TGConnectingPoint num="0" id="1156" />
+<TGConnectingPoint num="1" id="1157" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1114" >
-<cdparam x="1631" y="1468" />
+<COMPONENT type="1001" id="1160" >
+<cdparam x="712" y="865" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1113" />
+<TGConnectingPoint num="0" id="1159" />
</COMPONENT>
-<COMPONENT type="301" id="1131" >
-<cdparam x="1469" y="1295" />
-<sizeparam width="127" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1163" >
+<cdparam x="92" y="1100" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="return acknowldge
-" />
-<TGConnectingPoint num="0" id="1115" />
-<TGConnectingPoint num="1" id="1116" />
-<TGConnectingPoint num="2" id="1117" />
-<TGConnectingPoint num="3" id="1118" />
-<TGConnectingPoint num="4" id="1119" />
-<TGConnectingPoint num="5" id="1120" />
-<TGConnectingPoint num="6" id="1121" />
-<TGConnectingPoint num="7" id="1122" />
-<TGConnectingPoint num="8" id="1123" />
-<TGConnectingPoint num="9" id="1124" />
-<TGConnectingPoint num="10" id="1125" />
-<TGConnectingPoint num="11" id="1126" />
-<TGConnectingPoint num="12" id="1127" />
-<TGConnectingPoint num="13" id="1128" />
-<TGConnectingPoint num="14" id="1129" />
-<TGConnectingPoint num="15" id="1130" />
+<infoparam name="send request" value="req_Timer()" />
+<TGConnectingPoint num="0" id="1161" />
+<TGConnectingPoint num="1" id="1162" />
<extraparam>
-<Line value="return acknowldge" />
+<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1148" >
-<cdparam x="1620" y="927" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1166" >
+<cdparam x="102" y="1167" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="data
-" />
-<TGConnectingPoint num="0" id="1132" />
-<TGConnectingPoint num="1" id="1133" />
-<TGConnectingPoint num="2" id="1134" />
-<TGConnectingPoint num="3" id="1135" />
-<TGConnectingPoint num="4" id="1136" />
-<TGConnectingPoint num="5" id="1137" />
-<TGConnectingPoint num="6" id="1138" />
-<TGConnectingPoint num="7" id="1139" />
-<TGConnectingPoint num="8" id="1140" />
-<TGConnectingPoint num="9" id="1141" />
-<TGConnectingPoint num="10" id="1142" />
-<TGConnectingPoint num="11" id="1143" />
-<TGConnectingPoint num="12" id="1144" />
-<TGConnectingPoint num="13" id="1145" />
-<TGConnectingPoint num="14" id="1146" />
-<TGConnectingPoint num="15" id="1147" />
+<infoparam name="write channel" value="temp(1)" />
+<TGConnectingPoint num="0" id="1164" />
+<TGConnectingPoint num="1" id="1165" />
<extraparam>
-<Line value="data" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1151" >
-<cdparam x="1506" y="1405" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1168" >
+<cdparam x="122" y="1236" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1149" />
-<TGConnectingPoint num="1" id="1150" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1167" />
</COMPONENT>
-<COMPONENT type="1008" id="1154" >
-<cdparam x="1618" y="1348" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1171" >
+<cdparam x="190" y="1102" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1152" />
-<TGConnectingPoint num="1" id="1153" />
+<infoparam name="send request" value="req_Timer()" />
+<TGConnectingPoint num="0" id="1169" />
+<TGConnectingPoint num="1" id="1170" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1157" >
-<cdparam x="1613" y="1404" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1174" >
+<cdparam x="200" y="1169" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1155" />
-<TGConnectingPoint num="1" id="1156" />
+<TGConnectingPoint num="0" id="1172" />
+<TGConnectingPoint num="1" id="1173" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1159" >
-<cdparam x="1730" y="1335" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1158" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="1162" >
-<cdparam x="1776" y="1349" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =4" />
-<TGConnectingPoint num="0" id="1160" />
-<TGConnectingPoint num="1" id="1161" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="1164" >
-<cdparam x="1816" y="1457" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1177" >
+<cdparam x="306" y="1106" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1163" />
+<infoparam name="send request" value="req_Timer()" />
+<TGConnectingPoint num="0" id="1175" />
+<TGConnectingPoint num="1" id="1176" />
+<extraparam>
+<Data requestName="req_Timer" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1167" >
-<cdparam x="1870" y="1411" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1180" >
+<cdparam x="316" y="1173" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =6" />
-<TGConnectingPoint num="0" id="1165" />
-<TGConnectingPoint num="1" id="1166" />
+<infoparam name="write channel" value="temp(1)" />
+<TGConnectingPoint num="0" id="1178" />
+<TGConnectingPoint num="1" id="1179" />
+<extraparam>
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1169" >
-<cdparam x="1910" y="1481" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1183" >
+<cdparam x="424" y="1090" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1168" />
+<infoparam name="send request" value="req_Timer()" />
+<TGConnectingPoint num="0" id="1181" />
+<TGConnectingPoint num="1" id="1182" />
+<extraparam>
+<Data requestName="req_Timer" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1171" >
-<cdparam x="1986" y="1543" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1186" >
+<cdparam x="434" y="1159" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1170" />
+<infoparam name="write channel" value="temp(1)" />
+<TGConnectingPoint num="0" id="1184" />
+<TGConnectingPoint num="1" id="1185" />
+<extraparam>
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1174" >
-<cdparam x="2051" y="1466" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1189" >
+<cdparam x="52" y="861" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1172" />
-<TGConnectingPoint num="1" id="1173" />
+<infoparam name="action state" value="seqNum=seqNum+wind" />
+<TGConnectingPoint num="0" id="1187" />
+<TGConnectingPoint num="1" id="1188" />
</COMPONENT>
-<COMPONENT type="1001" id="1176" >
-<cdparam x="2091" y="1537" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1192" >
+<cdparam x="150" y="940" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1175" />
+<infoparam name="action state" value="seqNum=seqNum+wind" />
+<TGConnectingPoint num="0" id="1190" />
+<TGConnectingPoint num="1" id="1191" />
</COMPONENT>
-<COMPONENT type="1011" id="1179" >
-<cdparam x="1946" y="1493" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1195" >
+<cdparam x="384" y="865" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1177" />
-<TGConnectingPoint num="1" id="1178" />
+<infoparam name="action state" value="seqNum=seqNum+wind" />
+<TGConnectingPoint num="0" id="1193" />
+<TGConnectingPoint num="1" id="1194" />
</COMPONENT>
-<COMPONENT type="1011" id="1182" >
-<cdparam x="1946" y="1434" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1198" >
+<cdparam x="266" y="831" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="1180" />
-<TGConnectingPoint num="1" id="1181" />
+<infoparam name="action state" value="seqNum=seqNum+wind" />
+<TGConnectingPoint num="0" id="1196" />
+<TGConnectingPoint num="1" id="1197" />
</COMPONENT>
-<COMPONENT type="301" id="1199" >
-<cdparam x="1825" y="889" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1201" >
+<cdparam x="205" y="1052" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Syn
-" />
-<TGConnectingPoint num="0" id="1183" />
-<TGConnectingPoint num="1" id="1184" />
-<TGConnectingPoint num="2" id="1185" />
-<TGConnectingPoint num="3" id="1186" />
-<TGConnectingPoint num="4" id="1187" />
-<TGConnectingPoint num="5" id="1188" />
-<TGConnectingPoint num="6" id="1189" />
-<TGConnectingPoint num="7" id="1190" />
-<TGConnectingPoint num="8" id="1191" />
-<TGConnectingPoint num="9" id="1192" />
-<TGConnectingPoint num="10" id="1193" />
-<TGConnectingPoint num="11" id="1194" />
-<TGConnectingPoint num="12" id="1195" />
-<TGConnectingPoint num="13" id="1196" />
-<TGConnectingPoint num="14" id="1197" />
-<TGConnectingPoint num="15" id="1198" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1199" />
+<TGConnectingPoint num="1" id="1200" />
<extraparam>
-<Line value="Syn" />
+<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1216" >
-<cdparam x="1707" y="945" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1204" >
+<cdparam x="321" y="962" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="ack
-" />
-<TGConnectingPoint num="0" id="1200" />
-<TGConnectingPoint num="1" id="1201" />
-<TGConnectingPoint num="2" id="1202" />
-<TGConnectingPoint num="3" id="1203" />
-<TGConnectingPoint num="4" id="1204" />
-<TGConnectingPoint num="5" id="1205" />
-<TGConnectingPoint num="6" id="1206" />
-<TGConnectingPoint num="7" id="1207" />
-<TGConnectingPoint num="8" id="1208" />
-<TGConnectingPoint num="9" id="1209" />
-<TGConnectingPoint num="10" id="1210" />
-<TGConnectingPoint num="11" id="1211" />
-<TGConnectingPoint num="12" id="1212" />
-<TGConnectingPoint num="13" id="1213" />
-<TGConnectingPoint num="14" id="1214" />
-<TGConnectingPoint num="15" id="1215" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1202" />
+<TGConnectingPoint num="1" id="1203" />
<extraparam>
-<Line value="ack" />
+<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1219" >
-<cdparam x="2198" y="1198" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1207" >
+<cdparam x="439" y="983" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1217" />
-<TGConnectingPoint num="1" id="1218" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1205" />
+<TGConnectingPoint num="1" id="1206" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1221" >
-<cdparam x="2227" y="1483" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1210" >
+<cdparam x="107" y="986" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1220" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1208" />
+<TGConnectingPoint num="1" id="1209" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="1224" >
-<cdparam x="2198" y="1298" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1213" >
+<cdparam x="697" y="813" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1222" />
-<TGConnectingPoint num="1" id="1223" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1211" />
+<TGConnectingPoint num="1" id="1212" />
<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
+<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1227" >
-<cdparam x="2209" y="1365" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1216" >
+<cdparam x="775" y="1141" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1225" />
-<TGConnectingPoint num="1" id="1226" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1214" />
+<TGConnectingPoint num="1" id="1215" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1230" >
-<cdparam x="2161" y="1136" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1219" >
+<cdparam x="918" y="1178" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1228" />
-<TGConnectingPoint num="1" id="1229" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1217" />
+<TGConnectingPoint num="1" id="1218" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1233" >
-<cdparam x="2214" y="1248" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1222" >
+<cdparam x="1024" y="1211" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1231" />
-<TGConnectingPoint num="1" id="1232" />
+<TGConnectingPoint num="0" id="1220" />
+<TGConnectingPoint num="1" id="1221" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1236" >
-<cdparam x="2187" y="1424" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1224" >
+<cdparam x="602" y="762" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1234" />
-<TGConnectingPoint num="1" id="1235" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1223" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1226" >
+<cdparam x="873" y="922" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1225" />
</COMPONENT>
-<COMPONENT type="1006" id="1239" >
-<cdparam x="2278" y="1122" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1229" >
+<cdparam x="1166" y="1214" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1237" />
-<TGConnectingPoint num="1" id="1238" />
+<TGConnectingPoint num="0" id="1227" />
+<TGConnectingPoint num="1" id="1228" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1256" >
-<cdparam x="2283" y="1065" />
-<sizeparam width="114" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1246" >
+<cdparam x="1159" y="1153" />
+<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of SYN
+<infoparam name="UML Note" value="send Ack of Fin
" />
-<TGConnectingPoint num="0" id="1240" />
-<TGConnectingPoint num="1" id="1241" />
-<TGConnectingPoint num="2" id="1242" />
-<TGConnectingPoint num="3" id="1243" />
-<TGConnectingPoint num="4" id="1244" />
-<TGConnectingPoint num="5" id="1245" />
-<TGConnectingPoint num="6" id="1246" />
-<TGConnectingPoint num="7" id="1247" />
-<TGConnectingPoint num="8" id="1248" />
-<TGConnectingPoint num="9" id="1249" />
-<TGConnectingPoint num="10" id="1250" />
-<TGConnectingPoint num="11" id="1251" />
-<TGConnectingPoint num="12" id="1252" />
-<TGConnectingPoint num="13" id="1253" />
-<TGConnectingPoint num="14" id="1254" />
-<TGConnectingPoint num="15" id="1255" />
+<TGConnectingPoint num="0" id="1230" />
+<TGConnectingPoint num="1" id="1231" />
+<TGConnectingPoint num="2" id="1232" />
+<TGConnectingPoint num="3" id="1233" />
+<TGConnectingPoint num="4" id="1234" />
+<TGConnectingPoint num="5" id="1235" />
+<TGConnectingPoint num="6" id="1236" />
+<TGConnectingPoint num="7" id="1237" />
+<TGConnectingPoint num="8" id="1238" />
+<TGConnectingPoint num="9" id="1239" />
+<TGConnectingPoint num="10" id="1240" />
+<TGConnectingPoint num="11" id="1241" />
+<TGConnectingPoint num="12" id="1242" />
+<TGConnectingPoint num="13" id="1243" />
+<TGConnectingPoint num="14" id="1244" />
+<TGConnectingPoint num="15" id="1245" />
<extraparam>
-<Line value="send Ack of SYN" />
+<Line value="send Ack of Fin" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1259" >
-<cdparam x="2267" y="1267" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="1249" >
+<cdparam x="1154" y="1295" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1257" />
-<TGConnectingPoint num="1" id="1258" />
+<infoparam name="action state" value="tcpctrl.state =8" />
+<TGConnectingPoint num="0" id="1247" />
+<TGConnectingPoint num="1" id="1248" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1251" >
+<cdparam x="1198" y="1471" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1250" />
+</COMPONENT>
+
+<COMPONENT type="1011" id="1254" >
+<cdparam x="1154" y="1402" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =0" />
+<TGConnectingPoint num="0" id="1252" />
+<TGConnectingPoint num="1" id="1253" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="1257" >
+<cdparam x="1183" y="1351" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1255" />
+<TGConnectingPoint num="1" id="1256" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1259" >
+<cdparam x="1277" y="1070" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1258" />
</COMPONENT>
<COMPONENT type="1001" id="1261" >
-<cdparam x="2307" y="1324" />
+<cdparam x="1519" y="1457" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4612,3560 +5064,4764 @@ On prend b=1 comme exemple
<TGConnectingPoint num="0" id="1260" />
</COMPONENT>
-<COMPONENT type="1008" id="1264" >
-<cdparam x="2294" y="1199" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1264" >
+<cdparam x="1487" y="1132" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
+<infoparam name="write channel" value="fromTtoA(1)" />
<TGConnectingPoint num="0" id="1262" />
<TGConnectingPoint num="1" id="1263" />
<extraparam>
+<Data channelName="fromTtoA" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="1267" >
+<cdparam x="1487" y="1348" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1265" />
+<TGConnectingPoint num="1" id="1266" />
+<extraparam>
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="1270" >
+<cdparam x="1704" y="1026" />
+<sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="stop()" />
+<TGConnectingPoint num="0" id="1268" />
+<TGConnectingPoint num="1" id="1269" />
+<extraparam>
+<Data eventName="stop" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="1287" >
+<cdparam x="1759" y="1192" />
+<sizeparam width="92" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="UML Note" value="Correct ack
+" />
+<TGConnectingPoint num="0" id="1271" />
+<TGConnectingPoint num="1" id="1272" />
+<TGConnectingPoint num="2" id="1273" />
+<TGConnectingPoint num="3" id="1274" />
+<TGConnectingPoint num="4" id="1275" />
+<TGConnectingPoint num="5" id="1276" />
+<TGConnectingPoint num="6" id="1277" />
+<TGConnectingPoint num="7" id="1278" />
+<TGConnectingPoint num="8" id="1279" />
+<TGConnectingPoint num="9" id="1280" />
+<TGConnectingPoint num="10" id="1281" />
+<TGConnectingPoint num="11" id="1282" />
+<TGConnectingPoint num="12" id="1283" />
+<TGConnectingPoint num="13" id="1284" />
+<TGConnectingPoint num="14" id="1285" />
+<TGConnectingPoint num="15" id="1286" />
+<extraparam>
+<Line value="Correct ack" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="1304" >
+<cdparam x="1635" y="1168" />
+<sizeparam width="76" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="UML Note" value="false ack
+" />
+<TGConnectingPoint num="0" id="1288" />
+<TGConnectingPoint num="1" id="1289" />
+<TGConnectingPoint num="2" id="1290" />
+<TGConnectingPoint num="3" id="1291" />
+<TGConnectingPoint num="4" id="1292" />
+<TGConnectingPoint num="5" id="1293" />
+<TGConnectingPoint num="6" id="1294" />
+<TGConnectingPoint num="7" id="1295" />
+<TGConnectingPoint num="8" id="1296" />
+<TGConnectingPoint num="9" id="1297" />
+<TGConnectingPoint num="10" id="1298" />
+<TGConnectingPoint num="11" id="1299" />
+<TGConnectingPoint num="12" id="1300" />
+<TGConnectingPoint num="13" id="1301" />
+<TGConnectingPoint num="14" id="1302" />
+<TGConnectingPoint num="15" id="1303" />
+<extraparam>
+<Line value="false ack" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="1307" >
+<cdparam x="1599" y="1299" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1305" />
+<TGConnectingPoint num="1" id="1306" />
+<extraparam>
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1309" >
+<cdparam x="1631" y="1468" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1308" />
+</COMPONENT>
+
+<COMPONENT type="301" id="1326" >
+<cdparam x="1469" y="1295" />
+<sizeparam width="137" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="UML Note" value="return acknowldge
+" />
+<TGConnectingPoint num="0" id="1310" />
+<TGConnectingPoint num="1" id="1311" />
+<TGConnectingPoint num="2" id="1312" />
+<TGConnectingPoint num="3" id="1313" />
+<TGConnectingPoint num="4" id="1314" />
+<TGConnectingPoint num="5" id="1315" />
+<TGConnectingPoint num="6" id="1316" />
+<TGConnectingPoint num="7" id="1317" />
+<TGConnectingPoint num="8" id="1318" />
+<TGConnectingPoint num="9" id="1319" />
+<TGConnectingPoint num="10" id="1320" />
+<TGConnectingPoint num="11" id="1321" />
+<TGConnectingPoint num="12" id="1322" />
+<TGConnectingPoint num="13" id="1323" />
+<TGConnectingPoint num="14" id="1324" />
+<TGConnectingPoint num="15" id="1325" />
+<extraparam>
+<Line value="return acknowldge" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="1343" >
+<cdparam x="1620" y="927" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="UML Note" value="data
+" />
+<TGConnectingPoint num="0" id="1327" />
+<TGConnectingPoint num="1" id="1328" />
+<TGConnectingPoint num="2" id="1329" />
+<TGConnectingPoint num="3" id="1330" />
+<TGConnectingPoint num="4" id="1331" />
+<TGConnectingPoint num="5" id="1332" />
+<TGConnectingPoint num="6" id="1333" />
+<TGConnectingPoint num="7" id="1334" />
+<TGConnectingPoint num="8" id="1335" />
+<TGConnectingPoint num="9" id="1336" />
+<TGConnectingPoint num="10" id="1337" />
+<TGConnectingPoint num="11" id="1338" />
+<TGConnectingPoint num="12" id="1339" />
+<TGConnectingPoint num="13" id="1340" />
+<TGConnectingPoint num="14" id="1341" />
+<TGConnectingPoint num="15" id="1342" />
+<extraparam>
+<Line value="data" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="1346" >
+<cdparam x="1504" y="1405" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1344" />
+<TGConnectingPoint num="1" id="1345" />
+<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1266" >
-<cdparam x="1637" y="1057" />
+<COMPONENT type="1008" id="1349" >
+<cdparam x="1616" y="1348" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1347" />
+<TGConnectingPoint num="1" id="1348" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="1352" >
+<cdparam x="1611" y="1404" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="write channel" value="temp(1)" />
+<TGConnectingPoint num="0" id="1350" />
+<TGConnectingPoint num="1" id="1351" />
+<extraparam>
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1354" >
+<cdparam x="1730" y="1335" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1265" />
+<TGConnectingPoint num="0" id="1353" />
</COMPONENT>
-<COMPONENT type="1001" id="1268" >
-<cdparam x="2168" y="1421" />
+<COMPONENT type="1011" id="1357" >
+<cdparam x="1772" y="1349" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =4" />
+<TGConnectingPoint num="0" id="1355" />
+<TGConnectingPoint num="1" id="1356" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1359" >
+<cdparam x="1816" y="1457" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1267" />
+<TGConnectingPoint num="0" id="1358" />
</COMPONENT>
-<COMPONENT type="1001" id="1270" >
-<cdparam x="2267" y="1039" />
+<COMPONENT type="1011" id="1362" >
+<cdparam x="1866" y="1411" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =6" />
+<TGConnectingPoint num="0" id="1360" />
+<TGConnectingPoint num="1" id="1361" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1364" >
+<cdparam x="1910" y="1481" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1269" />
+<TGConnectingPoint num="0" id="1363" />
</COMPONENT>
-<COMPONENT type="1008" id="1273" >
-<cdparam x="1465" y="1192" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1366" >
+<cdparam x="1986" y="1543" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="receive_Application()" />
-<TGConnectingPoint num="0" id="1271" />
-<TGConnectingPoint num="1" id="1272" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1365" />
+</COMPONENT>
+
+<COMPONENT type="1011" id="1369" >
+<cdparam x="2047" y="1466" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =0" />
+<TGConnectingPoint num="0" id="1367" />
+<TGConnectingPoint num="1" id="1368" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1371" >
+<cdparam x="2091" y="1537" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1370" />
+</COMPONENT>
+
+<COMPONENT type="1011" id="1374" >
+<cdparam x="1942" y="1493" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =0" />
+<TGConnectingPoint num="0" id="1372" />
+<TGConnectingPoint num="1" id="1373" />
+</COMPONENT>
+
+<COMPONENT type="1011" id="1377" >
+<cdparam x="1942" y="1434" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =8" />
+<TGConnectingPoint num="0" id="1375" />
+<TGConnectingPoint num="1" id="1376" />
+</COMPONENT>
+
+<COMPONENT type="301" id="1394" >
+<cdparam x="1825" y="889" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="UML Note" value="Syn
+" />
+<TGConnectingPoint num="0" id="1378" />
+<TGConnectingPoint num="1" id="1379" />
+<TGConnectingPoint num="2" id="1380" />
+<TGConnectingPoint num="3" id="1381" />
+<TGConnectingPoint num="4" id="1382" />
+<TGConnectingPoint num="5" id="1383" />
+<TGConnectingPoint num="6" id="1384" />
+<TGConnectingPoint num="7" id="1385" />
+<TGConnectingPoint num="8" id="1386" />
+<TGConnectingPoint num="9" id="1387" />
+<TGConnectingPoint num="10" id="1388" />
+<TGConnectingPoint num="11" id="1389" />
+<TGConnectingPoint num="12" id="1390" />
+<TGConnectingPoint num="13" id="1391" />
+<TGConnectingPoint num="14" id="1392" />
+<TGConnectingPoint num="15" id="1393" />
<extraparam>
-<Data eventName="receive_Application" nbOfParams="5" />
+<Line value="Syn" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="1411" >
+<cdparam x="1707" y="945" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="UML Note" value="ack
+" />
+<TGConnectingPoint num="0" id="1395" />
+<TGConnectingPoint num="1" id="1396" />
+<TGConnectingPoint num="2" id="1397" />
+<TGConnectingPoint num="3" id="1398" />
+<TGConnectingPoint num="4" id="1399" />
+<TGConnectingPoint num="5" id="1400" />
+<TGConnectingPoint num="6" id="1401" />
+<TGConnectingPoint num="7" id="1402" />
+<TGConnectingPoint num="8" id="1403" />
+<TGConnectingPoint num="9" id="1404" />
+<TGConnectingPoint num="10" id="1405" />
+<TGConnectingPoint num="11" id="1406" />
+<TGConnectingPoint num="12" id="1407" />
+<TGConnectingPoint num="13" id="1408" />
+<TGConnectingPoint num="14" id="1409" />
+<TGConnectingPoint num="15" id="1410" />
+<extraparam>
+<Line value="ack" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="1414" >
+<cdparam x="2195" y="1198" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1412" />
+<TGConnectingPoint num="1" id="1413" />
+<extraparam>
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1416" >
+<cdparam x="2227" y="1483" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1415" />
+</COMPONENT>
+
+<COMPONENT type="1007" id="1419" >
+<cdparam x="2197" y="1298" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send request" value="req_Timer()" />
+<TGConnectingPoint num="0" id="1417" />
+<TGConnectingPoint num="1" id="1418" />
+<extraparam>
+<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="1276" >
-<cdparam x="1698" y="1086" />
+<COMPONENT type="1006" id="1422" >
+<cdparam x="2207" y="1365" />
<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="1274" />
-<TGConnectingPoint num="1" id="1275" />
+<infoparam name="write channel" value="temp(1)" />
+<TGConnectingPoint num="0" id="1420" />
+<TGConnectingPoint num="1" id="1421" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="1277" >
-<cdparam x="192" y="445" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="190" y="449" id="528" />
-<P2 x="188" y="476" id="689" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1278" >
-<cdparam x="1048" y="795" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1048" y="795" id="667" />
-<P2 x="1728" y="865" id="589" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1279" >
-<cdparam x="1048" y="795" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1089" y="954" id="639" />
-<P2 x="1208" y="1010" id="609" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1280" >
-<cdparam x="1008" y="610" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="1008" y="610" id="743" />
-<P2 x="1008" y="696" id="671" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1281" >
-<cdparam x="722" y="614" />
+<COMPONENT type="1011" id="1425" >
+<cdparam x="2157" y="1136" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="seqNum=seqNum+wind" />
+<TGConnectingPoint num="0" id="1423" />
+<TGConnectingPoint num="1" id="1424" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="1428" >
+<cdparam x="2212" y="1248" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1426" />
+<TGConnectingPoint num="1" id="1427" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1011" id="1431" >
+<cdparam x="2183" y="1424" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =2" />
+<TGConnectingPoint num="0" id="1429" />
+<TGConnectingPoint num="1" id="1430" />
+</COMPONENT>
+
+<COMPONENT type="1006" id="1434" >
+<cdparam x="2275" y="1122" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="write channel" value="fromTtoP(1)" />
+<TGConnectingPoint num="0" id="1432" />
+<TGConnectingPoint num="1" id="1433" />
+<extraparam>
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="1451" >
+<cdparam x="2283" y="1065" />
+<sizeparam width="121" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="UML Note" value="send Ack of SYN
+" />
+<TGConnectingPoint num="0" id="1435" />
+<TGConnectingPoint num="1" id="1436" />
+<TGConnectingPoint num="2" id="1437" />
+<TGConnectingPoint num="3" id="1438" />
+<TGConnectingPoint num="4" id="1439" />
+<TGConnectingPoint num="5" id="1440" />
+<TGConnectingPoint num="6" id="1441" />
+<TGConnectingPoint num="7" id="1442" />
+<TGConnectingPoint num="8" id="1443" />
+<TGConnectingPoint num="9" id="1444" />
+<TGConnectingPoint num="10" id="1445" />
+<TGConnectingPoint num="11" id="1446" />
+<TGConnectingPoint num="12" id="1447" />
+<TGConnectingPoint num="13" id="1448" />
+<TGConnectingPoint num="14" id="1449" />
+<TGConnectingPoint num="15" id="1450" />
+<extraparam>
+<Line value="send Ack of SYN" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1011" id="1454" >
+<cdparam x="2263" y="1267" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="action state" value="tcpctrl.state =2" />
+<TGConnectingPoint num="0" id="1452" />
+<TGConnectingPoint num="1" id="1453" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1456" >
+<cdparam x="2307" y="1324" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1455" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="1459" >
+<cdparam x="2292" y="1199" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="send()" />
+<TGConnectingPoint num="0" id="1457" />
+<TGConnectingPoint num="1" id="1458" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1461" >
+<cdparam x="1637" y="1057" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1460" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1463" >
+<cdparam x="2168" y="1421" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1462" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="1465" >
+<cdparam x="2267" y="1039" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1464" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="1468" >
+<cdparam x="1459" y="1192" />
+<sizeparam width="140" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="send event" value="receive_Application()" />
+<TGConnectingPoint num="0" id="1466" />
+<TGConnectingPoint num="1" id="1467" />
+<extraparam>
+<Data eventName="receive_Application" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1009" id="1471" >
+<cdparam x="1696" y="1086" />
+<sizeparam width="64" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
+<infoparam name="read channel" value="temp(1) " />
+<TGConnectingPoint num="0" id="1469" />
+<TGConnectingPoint num="1" id="1470" />
+<extraparam>
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="115" id="1472" >
+<cdparam x="192" y="445" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="190" y="449" id="723" />
+<P2 x="188" y="476" id="884" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1473" >
+<cdparam x="1048" y="795" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to choice" value="null" />
+<P1 x="1048" y="795" id="862" />
+<P2 x="1728" y="865" id="784" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1474" >
+<cdparam x="1048" y="795" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to choice" value="null" />
+<P1 x="1089" y="954" id="834" />
+<P2 x="1208" y="1010" id="804" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1475" >
+<cdparam x="1008" y="610" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to execI" value="null" />
+<P1 x="1008" y="610" id="938" />
+<P2 x="1008" y="696" id="866" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1476" >
+<cdparam x="722" y="614" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="722" y="614" id="758" />
-<P2 x="722" y="689" id="627" />
+<P1 x="722" y="614" id="953" />
+<P2 x="722" y="689" id="822" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1282" >
+<CONNECTOR type="115" id="1477" >
<cdparam x="504" y="597" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="504" y="597" id="707" />
-<P2 x="572" y="702" id="621" />
+<P1 x="504" y="597" id="902" />
+<P2 x="572" y="702" id="816" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1283" >
+<CONNECTOR type="115" id="1478" >
<cdparam x="464" y="637" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="464" y="637" id="708" />
-<P2 x="464" y="778" id="675" />
+<P1 x="464" y="637" id="903" />
+<P2 x="464" y="778" id="870" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1284" >
+<CONNECTOR type="115" id="1479" >
<cdparam x="424" y="597" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="424" y="597" id="706" />
-<P2 x="346" y="759" id="655" />
+<P1 x="424" y="597" id="901" />
+<P2 x="346" y="759" id="850" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1285" >
+<CONNECTOR type="115" id="1480" >
<cdparam x="289" y="619" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to read channel" value="null" />
-<P1 x="289" y="619" id="716" />
-<P2 x="230" y="803" id="812" />
+<P1 x="289" y="619" id="911" />
+<P2 x="230" y="803" id="1007" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1286" >
+<CONNECTOR type="115" id="1481" >
<cdparam x="249" y="579" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="249" y="579" id="714" />
-<P2 x="132" y="789" id="659" />
+<P1 x="249" y="579" id="909" />
+<P2 x="132" y="789" id="854" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1287" >
+<CONNECTOR type="115" id="1482" >
<cdparam x="371" y="93" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to notified event" value="null" />
-<P1 x="320" y="99" id="746" />
-<P2 x="374" y="128" id="754" />
+<P1 x="325" y="99" id="941" />
+<P2 x="374" y="128" id="949" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1288" >
+<CONNECTOR type="115" id="1483" >
<cdparam x="234" y="169" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="235" y="169" id="752" />
-<P2 x="235" y="202" id="749" />
+<P1 x="235" y="169" id="947" />
+<P2 x="235" y="202" id="944" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1289" >
+<CONNECTOR type="115" id="1484" >
<cdparam x="234" y="104" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to action state" value="null" />
-<P1 x="235" y="110" id="747" />
-<P2 x="235" y="139" id="751" />
+<P1 x="235" y="110" id="942" />
+<P2 x="235" y="139" id="946" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1290" >
+<CONNECTOR type="115" id="1485" >
<cdparam x="234" y="47" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for loop" value="null" />
-<P1 x="234" y="47" id="718" />
-<P2 x="235" y="80" id="745" />
+<P1 x="234" y="47" id="913" />
+<P2 x="235" y="80" id="940" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1291" >
+<CONNECTOR type="115" id="1486" >
<cdparam x="425" y="162" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from notified event to choice" value="null" />
-<P1 x="374" y="158" id="755" />
-<P2 x="374" y="182" id="697" />
+<P1 x="374" y="158" id="950" />
+<P2 x="374" y="182" id="892" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1292" >
+<CONNECTOR type="115" id="1487" >
<cdparam x="564" y="482" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="464" y="322" id="781" />
-<P2 x="722" y="529" id="760" />
+<P1 x="464" y="322" id="976" />
+<P2 x="722" y="529" id="955" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1293" >
+<CONNECTOR type="115" id="1488" >
<cdparam x="722" y="559" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="722" y="559" id="761" />
-<P2 x="722" y="584" id="757" />
+<P1 x="722" y="559" id="956" />
+<P2 x="722" y="584" id="952" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1294" >
+<CONNECTOR type="115" id="1489" >
<cdparam x="604" y="442" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="504" y="282" id="777" />
-<P2 x="1008" y="523" id="763" />
+<P1 x="504" y="282" id="972" />
+<P2 x="1008" y="523" id="958" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1295" >
+<CONNECTOR type="115" id="1490" >
<cdparam x="1007" y="553" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="1008" y="553" id="764" />
-<P2 x="1008" y="580" id="742" />
+<P1 x="1008" y="553" id="959" />
+<P2 x="1008" y="580" id="937" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1296" >
+<CONNECTOR type="115" id="1491" >
<cdparam x="524" y="442" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="464" y="322" id="778" />
-<P2 x="464" y="487" id="766" />
+<P1 x="464" y="322" id="973" />
+<P2 x="464" y="487" id="961" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1297" >
+<CONNECTOR type="115" id="1492" >
<cdparam x="330" y="428" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="424" y="282" id="779" />
-<P2 x="289" y="463" id="769" />
+<P1 x="424" y="282" id="974" />
+<P2 x="289" y="463" id="964" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1298" >
+<CONNECTOR type="115" id="1493" >
<cdparam x="318" y="520" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="289" y="493" id="770" />
-<P2 x="289" y="554" id="713" />
+<P1 x="289" y="493" id="965" />
+<P2 x="289" y="554" id="908" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1299" >
+<CONNECTOR type="115" id="1494" >
<cdparam x="160" y="481" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="148" y="501" id="690" />
-<P2 x="148" y="544" id="737" />
+<P1 x="148" y="501" id="885" />
+<P2 x="148" y="544" id="932" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1300" >
+<CONNECTOR type="115" id="1495" >
<cdparam x="290" y="388" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="424" y="282" id="776" />
-<P2 x="188" y="378" id="772" />
+<P1 x="424" y="282" id="971" />
+<P2 x="188" y="378" id="967" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1301" >
+<CONNECTOR type="115" id="1496" >
<cdparam x="229" y="467" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="188" y="408" id="773" />
-<P2 x="190" y="419" id="527" />
+<P1 x="188" y="408" id="968" />
+<P2 x="190" y="419" id="722" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1302" >
+<CONNECTOR type="115" id="1497" >
<cdparam x="228" y="501" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="228" y="501" id="691" />
-<P2 x="228" y="524" id="786" />
+<P1 x="228" y="501" id="886" />
+<P2 x="228" y="524" id="981" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1303" >
+<CONNECTOR type="115" id="1498" >
<cdparam x="334" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="334" y="207" id="698" />
-<P2 x="301" y="223" id="790" />
+<P1 x="334" y="207" id="893" />
+<P2 x="301" y="223" id="985" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1304" >
+<CONNECTOR type="115" id="1499" >
<cdparam x="301" y="253" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to stop state" value="null" />
-<P1 x="301" y="253" id="791" />
-<P2 x="301" y="285" id="793" />
+<P1 x="301" y="253" id="986" />
+<P2 x="301" y="285" id="988" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1305" >
+<CONNECTOR type="115" id="1500" >
<cdparam x="464" y="517" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="464" y="517" id="767" />
-<P2 x="464" y="572" id="705" />
+<P1 x="464" y="517" id="962" />
+<P2 x="464" y="572" id="900" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1306" >
+<CONNECTOR type="115" id="1501" >
<cdparam x="329" y="579" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="329" y="579" id="715" />
-<P2 x="329" y="609" id="788" />
+<P1 x="329" y="579" id="910" />
+<P2 x="329" y="609" id="983" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1307" >
+<CONNECTOR type="115" id="1502" >
<cdparam x="126" y="574" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="148" y="574" id="738" />
-<P2 x="148" y="610" id="740" />
+<P1 x="148" y="574" id="933" />
+<P2 x="148" y="610" id="935" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1308" >
+<CONNECTOR type="115" id="1503" >
<cdparam x="414" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to select" value="null" />
-<P1 x="414" y="207" id="699" />
-<P2 x="464" y="257" id="775" />
+<P1 x="414" y="207" id="894" />
+<P2 x="464" y="257" id="970" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1309" >
+<CONNECTOR type="115" id="1504" >
<cdparam x="230" y="833" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="230" y="833" id="813" />
-<P2 x="230" y="858" id="679" />
+<P1 x="230" y="833" id="1008" />
+<P2 x="230" y="858" id="874" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1310" >
+<CONNECTOR type="115" id="1505" >
<cdparam x="716" y="749" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="968" y="795" id="666" />
-<P2 x="843" y="859" id="649" />
+<P1 x="968" y="795" id="861" />
+<P2 x="843" y="859" id="844" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1311" >
+<CONNECTOR type="115" id="1506" >
<cdparam x="720" y="1074" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="728" y="990" id="862" />
-<P2 x="728" y="1027" id="864" />
+<P1 x="728" y="990" id="1057" />
+<P2 x="728" y="1027" id="1059" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1312" >
+<CONNECTOR type="115" id="1507" >
<cdparam x="733" y="899" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="803" y="884" id="650" />
-<P2 x="728" y="960" id="861" />
+<P1 x="803" y="884" id="845" />
+<P2 x="728" y="960" id="1056" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1313" >
+<CONNECTOR type="115" id="1508" >
<cdparam x="800" y="938" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="843" y="924" id="652" />
-<P2 x="800" y="1004" id="643" />
+<P1 x="843" y="924" id="847" />
+<P2 x="800" y="1004" id="838" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1314" >
+<CONNECTOR type="115" id="1509" >
<cdparam x="800" y="1057" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="800" y="1044" id="644" />
-<P2 x="800" y="1081" id="866" />
+<P1 x="800" y="1044" id="839" />
+<P2 x="800" y="1081" id="1061" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1315" >
+<CONNECTOR type="115" id="1510" >
<cdparam x="132" y="886" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="132" y="886" id="993" />
-<P2 x="132" y="933" id="828" />
+<P1 x="132" y="886" id="1188" />
+<P2 x="132" y="933" id="1023" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1316" >
+<CONNECTOR type="115" id="1511" >
<cdparam x="943" y="1061" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="943" y="1060" id="632" />
-<P2 x="943" y="1118" id="911" />
+<P1 x="943" y="1060" id="827" />
+<P2 x="943" y="1118" id="1106" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1317" >
+<CONNECTOR type="115" id="1512" >
<cdparam x="1049" y="1093" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1049" y="1092" id="684" />
-<P2 x="1049" y="1150" id="936" />
+<P1 x="1049" y="1092" id="879" />
+<P2 x="1049" y="1150" id="1131" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1318" >
+<CONNECTOR type="115" id="1513" >
<cdparam x="1049" y="994" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1049" y="994" id="640" />
-<P2 x="1049" y="1052" id="683" />
+<P1 x="1049" y="994" id="835" />
+<P2 x="1049" y="1052" id="878" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1319" >
+<CONNECTOR type="115" id="1514" >
<cdparam x="696" y="742" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="722" y="729" id="628" />
-<P2 x="722" y="753" id="961" />
+<P1 x="722" y="729" id="823" />
+<P2 x="722" y="753" id="1156" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1320" >
+<CONNECTOR type="115" id="1515" >
<cdparam x="132" y="1125" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="132" y="1125" id="967" />
-<P2 x="132" y="1162" id="969" />
+<P1 x="132" y="1125" id="1162" />
+<P2 x="132" y="1162" id="1164" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1321" >
+<CONNECTOR type="115" id="1516" >
<cdparam x="132" y="1192" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="132" y="1192" id="970" />
-<P2 x="132" y="1231" id="972" />
+<P1 x="132" y="1192" id="1165" />
+<P2 x="132" y="1231" id="1167" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1322" >
+<CONNECTOR type="115" id="1517" >
<cdparam x="132" y="1066" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send request" value="null" />
-<P1 x="132" y="1066" id="826" />
-<P2 x="132" y="1095" id="966" />
+<P1 x="132" y="1066" id="1021" />
+<P2 x="132" y="1095" id="1161" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1323" >
+<CONNECTOR type="115" id="1518" >
<cdparam x="229" y="1127" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="230" y="1127" id="975" />
-<P2 x="230" y="1164" id="977" />
+<P1 x="230" y="1127" id="1170" />
+<P2 x="230" y="1164" id="1172" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1324" >
+<CONNECTOR type="115" id="1519" >
<cdparam x="346" y="1131" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="346" y="1131" id="981" />
-<P2 x="346" y="1168" id="983" />
+<P1 x="346" y="1131" id="1176" />
+<P2 x="346" y="1168" id="1178" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1325" >
+<CONNECTOR type="115" id="1520" >
<cdparam x="346" y="1051" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send request" value="null" />
-<P1 x="346" y="1051" id="832" />
-<P2 x="346" y="1101" id="980" />
+<P1 x="346" y="1051" id="1027" />
+<P2 x="346" y="1101" id="1175" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1326" >
+<CONNECTOR type="115" id="1521" >
<cdparam x="437" y="1118" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="464" y="1115" id="987" />
-<P2 x="464" y="1154" id="989" />
+<P1 x="464" y="1115" id="1182" />
+<P2 x="464" y="1154" id="1184" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1327" >
+<CONNECTOR type="115" id="1522" >
<cdparam x="438" y="1057" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send request" value="null" />
-<P1 x="464" y="1057" id="821" />
-<P2 x="464" y="1085" id="986" />
+<P1 x="464" y="1057" id="1016" />
+<P2 x="464" y="1085" id="1181" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1328" >
+<CONNECTOR type="115" id="1523" >
<cdparam x="132" y="808" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="132" y="829" id="660" />
-<P2 x="132" y="856" id="992" />
+<P1 x="132" y="829" id="855" />
+<P2 x="132" y="856" id="1187" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1329" >
+<CONNECTOR type="115" id="1524" >
<cdparam x="230" y="898" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="230" y="898" id="680" />
-<P2 x="230" y="935" id="995" />
+<P1 x="230" y="898" id="875" />
+<P2 x="230" y="935" id="1190" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1330" >
+<CONNECTOR type="115" id="1525" >
<cdparam x="230" y="965" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="230" y="965" id="996" />
-<P2 x="230" y="997" id="815" />
+<P1 x="230" y="965" id="1191" />
+<P2 x="230" y="997" id="1010" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1331" >
+<CONNECTOR type="115" id="1526" >
<cdparam x="346" y="799" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="346" y="799" id="656" />
-<P2 x="346" y="826" id="1001" />
+<P1 x="346" y="799" id="851" />
+<P2 x="346" y="826" id="1196" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1332" >
+<CONNECTOR type="115" id="1527" >
<cdparam x="346" y="856" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="346" y="856" id="1002" />
-<P2 x="346" y="895" id="839" />
+<P1 x="346" y="856" id="1197" />
+<P2 x="346" y="895" id="1034" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1333" >
+<CONNECTOR type="115" id="1528" >
<cdparam x="439" y="818" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="464" y="818" id="676" />
-<P2 x="464" y="860" id="998" />
+<P1 x="464" y="818" id="871" />
+<P2 x="464" y="860" id="1193" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1334" >
+<CONNECTOR type="115" id="1529" >
<cdparam x="439" y="890" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="464" y="890" id="999" />
-<P2 x="464" y="936" id="836" />
+<P1 x="464" y="890" id="1194" />
+<P2 x="464" y="936" id="1031" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1335" >
+<CONNECTOR type="115" id="1530" >
<cdparam x="132" y="963" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="132" y="963" id="829" />
-<P2 x="132" y="981" id="1013" />
+<P1 x="132" y="963" id="1024" />
+<P2 x="132" y="981" id="1208" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1336" >
+<CONNECTOR type="115" id="1531" >
<cdparam x="132" y="1011" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="132" y="1011" id="1014" />
-<P2 x="132" y="1036" id="825" />
+<P1 x="132" y="1011" id="1209" />
+<P2 x="132" y="1036" id="1020" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1337" >
+<CONNECTOR type="115" id="1532" >
<cdparam x="230" y="1027" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="230" y="1027" id="816" />
-<P2 x="230" y="1047" id="1004" />
+<P1 x="230" y="1027" id="1011" />
+<P2 x="230" y="1047" id="1199" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1338" >
+<CONNECTOR type="115" id="1533" >
<cdparam x="228" y="1088" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to send request" value="null" />
-<P1 x="230" y="1077" id="1005" />
-<P2 x="230" y="1097" id="974" />
+<P1 x="230" y="1077" id="1200" />
+<P2 x="230" y="1097" id="1169" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1339" >
+<CONNECTOR type="115" id="1534" >
<cdparam x="346" y="925" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="346" y="925" id="840" />
-<P2 x="346" y="957" id="1007" />
+<P1 x="346" y="925" id="1035" />
+<P2 x="346" y="957" id="1202" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1340" >
+<CONNECTOR type="115" id="1535" >
<cdparam x="348" y="987" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="346" y="987" id="1008" />
-<P2 x="346" y="1021" id="831" />
+<P1 x="346" y="987" id="1203" />
+<P2 x="346" y="1021" id="1026" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1341" >
+<CONNECTOR type="115" id="1536" >
<cdparam x="439" y="966" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="464" y="966" id="837" />
-<P2 x="464" y="978" id="1010" />
+<P1 x="464" y="966" id="1032" />
+<P2 x="464" y="978" id="1205" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1342" >
+<CONNECTOR type="115" id="1537" >
<cdparam x="438" y="1008" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="464" y="1008" id="1011" />
-<P2 x="464" y="1027" id="820" />
+<P1 x="464" y="1008" id="1206" />
+<P2 x="464" y="1027" id="1015" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1343" >
+<CONNECTOR type="115" id="1538" >
<cdparam x="722" y="783" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="722" y="783" id="962" />
-<P2 x="722" y="808" id="1016" />
+<P1 x="722" y="783" id="1157" />
+<P2 x="722" y="808" id="1211" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1344" >
+<CONNECTOR type="115" id="1539" >
<cdparam x="722" y="838" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="722" y="838" id="1017" />
-<P2 x="722" y="860" id="964" />
+<P1 x="722" y="838" id="1212" />
+<P2 x="722" y="860" id="1159" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1345" >
+<CONNECTOR type="115" id="1540" >
<cdparam x="800" y="1111" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="800" y="1111" id="867" />
-<P2 x="800" y="1136" id="1019" />
+<P1 x="800" y="1111" id="1062" />
+<P2 x="800" y="1136" id="1214" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1346" >
+<CONNECTOR type="115" id="1541" >
<cdparam x="798" y="1166" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="800" y="1166" id="1020" />
-<P2 x="800" y="1188" id="903" />
+<P1 x="800" y="1166" id="1215" />
+<P2 x="800" y="1188" id="1098" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1347" >
+<CONNECTOR type="115" id="1542" >
<cdparam x="943" y="1148" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="943" y="1148" id="912" />
-<P2 x="943" y="1173" id="1022" />
+<P1 x="943" y="1148" id="1107" />
+<P2 x="943" y="1173" id="1217" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1348" >
+<CONNECTOR type="115" id="1543" >
<cdparam x="950" y="1201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="943" y="1203" id="1023" />
-<P2 x="943" y="1229" id="931" />
+<P1 x="943" y="1203" id="1218" />
+<P2 x="943" y="1229" id="1126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1349" >
+<CONNECTOR type="115" id="1544" >
<cdparam x="1049" y="1180" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1049" y="1180" id="937" />
-<P2 x="1049" y="1206" id="1025" />
+<P1 x="1049" y="1180" id="1132" />
+<P2 x="1049" y="1206" id="1220" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1350" >
+<CONNECTOR type="115" id="1545" >
<cdparam x="1049" y="1223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="1049" y="1236" id="1026" />
-<P2 x="1049" y="1261" id="956" />
+<P1 x="1049" y="1236" id="1221" />
+<P2 x="1049" y="1261" id="1151" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1351" >
+<CONNECTOR type="115" id="1546" >
<cdparam x="883" y="884" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="883" y="884" id="651" />
-<P2 x="883" y="917" id="1030" />
+<P1 x="883" y="884" id="846" />
+<P2 x="883" y="917" id="1225" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1352" >
+<CONNECTOR type="115" id="1547" >
<cdparam x="612" y="727" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="612" y="727" id="623" />
-<P2 x="612" y="757" id="1028" />
+<P1 x="612" y="727" id="818" />
+<P2 x="612" y="757" id="1223" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1353" >
+<CONNECTOR type="115" id="1548" >
<cdparam x="532" y="727" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="532" y="727" id="622" />
-<P2 x="496" y="763" id="906" />
+<P1 x="532" y="727" id="817" />
+<P2 x="496" y="763" id="1101" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1354" >
+<CONNECTOR type="115" id="1549" >
<cdparam x="799" y="1218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="800" y="1218" id="904" />
-<P2 x="800" y="1265" id="842" />
+<P1 x="800" y="1218" id="1099" />
+<P2 x="800" y="1265" id="1037" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1355" >
+<CONNECTOR type="115" id="1550" >
<cdparam x="1009" y="954" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1009" y="954" id="638" />
-<P2 x="943" y="1020" id="631" />
+<P1 x="1009" y="954" id="833" />
+<P2 x="943" y="1020" id="826" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1356" >
+<CONNECTOR type="115" id="1551" >
<cdparam x="229" y="1194" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="230" y="1194" id="978" />
-<P2 x="230" y="1232" id="818" />
+<P1 x="230" y="1194" id="1173" />
+<P2 x="230" y="1232" id="1013" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1357" >
+<CONNECTOR type="115" id="1552" >
<cdparam x="346" y="1198" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="346" y="1198" id="984" />
-<P2 x="346" y="1224" id="834" />
+<P1 x="346" y="1198" id="1179" />
+<P2 x="346" y="1224" id="1029" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1358" >
+<CONNECTOR type="115" id="1553" >
<cdparam x="438" y="1184" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="464" y="1184" id="990" />
-<P2 x="464" y="1208" id="823" />
+<P1 x="464" y="1184" id="1185" />
+<P2 x="464" y="1208" id="1018" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1359" >
+<CONNECTOR type="115" id="1554" >
<cdparam x="496" y="793" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="496" y="793" id="907" />
-<P2 x="496" y="825" id="909" />
+<P1 x="496" y="793" id="1102" />
+<P2 x="496" y="825" id="1104" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1360" >
+<CONNECTOR type="115" id="1555" >
<cdparam x="943" y="1259" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="943" y="1259" id="932" />
-<P2 x="943" y="1306" id="934" />
+<P1 x="943" y="1259" id="1127" />
+<P2 x="943" y="1306" id="1129" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1361" >
+<CONNECTOR type="115" id="1556" >
<cdparam x="1008" y="736" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to choice" value="null" />
-<P1 x="1008" y="736" id="672" />
-<P2 x="1008" y="770" id="665" />
+<P1 x="1008" y="736" id="867" />
+<P2 x="1008" y="770" id="860" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1362" >
+<CONNECTOR type="115" id="1557" >
<cdparam x="1008" y="835" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1008" y="835" id="668" />
-<P2 x="1049" y="929" id="637" />
+<P1 x="1008" y="835" id="863" />
+<P2 x="1049" y="929" id="832" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1363" >
+<CONNECTOR type="115" id="1558" >
<cdparam x="1049" y="1291" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1049" y="1291" id="957" />
-<P2 x="1049" y="1336" id="959" />
+<P1 x="1049" y="1291" id="1152" />
+<P2 x="1049" y="1336" id="1154" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1364" >
+<CONNECTOR type="115" id="1559" >
<cdparam x="1208" y="1152" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1208" y="1142" id="616" />
-<P2 x="1208" y="1209" id="1032" />
+<P1 x="1208" y="1142" id="811" />
+<P2 x="1208" y="1209" id="1227" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1365" >
+<CONNECTOR type="115" id="1560" >
<cdparam x="1208" y="1239" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to action state" value="null" />
-<P1 x="1208" y="1239" id="1033" />
-<P2 x="1208" y="1290" id="1052" />
+<P1 x="1208" y="1239" id="1228" />
+<P2 x="1208" y="1290" id="1247" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1366" >
+<CONNECTOR type="115" id="1561" >
<cdparam x="1208" y="1320" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="1208" y="1320" id="1053" />
-<P2 x="1208" y="1346" id="1060" />
+<P1 x="1208" y="1320" id="1248" />
+<P2 x="1208" y="1346" id="1255" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1367" >
+<CONNECTOR type="115" id="1562" >
<cdparam x="1206" y="1385" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="1208" y="1376" id="1061" />
-<P2 x="1208" y="1397" id="1057" />
+<P1 x="1208" y="1376" id="1256" />
+<P2 x="1208" y="1397" id="1252" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1368" >
+<CONNECTOR type="115" id="1563" >
<cdparam x="1206" y="1088" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1208" y="1075" id="612" />
-<P2 x="1208" y="1102" id="615" />
+<P1 x="1208" y="1075" id="807" />
+<P2 x="1208" y="1102" id="810" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1369" >
+<CONNECTOR type="115" id="1564" >
<cdparam x="1248" y="1035" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1248" y="1035" id="611" />
-<P2 x="1287" y="1065" id="1063" />
+<P1 x="1248" y="1035" id="806" />
+<P2 x="1287" y="1065" id="1258" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1370" >
+<CONNECTOR type="115" id="1565" >
<cdparam x="1207" y="1427" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1208" y="1427" id="1058" />
-<P2 x="1208" y="1466" id="1055" />
+<P1 x="1208" y="1427" id="1253" />
+<P2 x="1208" y="1466" id="1250" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1371" >
+<CONNECTOR type="115" id="1566" >
<cdparam x="1553" y="1019" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1567" y="1021" id="582" />
-<P2 x="1529" y="1059" id="575" />
+<P1 x="1567" y="1021" id="777" />
+<P2 x="1529" y="1059" id="770" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1372" >
+<CONNECTOR type="115" id="1567" >
<cdparam x="1529" y="1324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1529" y="1289" id="572" />
-<P2 x="1529" y="1343" id="1070" />
+<P1 x="1529" y="1289" id="767" />
+<P2 x="1529" y="1343" id="1265" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1373" >
+<CONNECTOR type="115" id="1568" >
<cdparam x="1684" y="929" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to send event" value="null" />
-<P1 x="1728" y="930" id="592" />
-<P2 x="1728" y="1021" id="1073" />
+<P1 x="1728" y="930" id="787" />
+<P2 x="1728" y="1021" id="1268" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1374" >
+<CONNECTOR type="115" id="1569" >
<cdparam x="1615" y="1283" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1641" y="1270" id="596" />
-<P2 x="1641" y="1294" id="1110" />
+<P1 x="1641" y="1270" id="791" />
+<P2 x="1641" y="1294" id="1305" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1375" >
+<CONNECTOR type="115" id="1570" >
<cdparam x="1641" y="1324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1641" y="1324" id="1111" />
-<P2 x="1641" y="1343" id="1152" />
+<P1 x="1641" y="1324" id="1306" />
+<P2 x="1641" y="1343" id="1347" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1376" >
+<CONNECTOR type="115" id="1571" >
<cdparam x="1529" y="1373" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1529" y="1373" id="1071" />
-<P2 x="1529" y="1400" id="1149" />
+<P1 x="1529" y="1373" id="1266" />
+<P2 x="1529" y="1400" id="1344" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1377" >
+<CONNECTOR type="115" id="1572" >
<cdparam x="1529" y="1422" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="1529" y="1430" id="1150" />
-<P2 x="1529" y="1452" id="1065" />
+<P1 x="1529" y="1430" id="1345" />
+<P2 x="1529" y="1452" id="1260" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1378" >
+<CONNECTOR type="115" id="1573" >
<cdparam x="1642" y="1373" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="1641" y="1373" id="1153" />
-<P2 x="1641" y="1399" id="1155" />
+<P1 x="1641" y="1373" id="1348" />
+<P2 x="1641" y="1399" id="1350" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1379" >
+<CONNECTOR type="115" id="1574" >
<cdparam x="1956" y="1361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1956" y="1361" id="550" />
-<P2 x="1920" y="1406" id="1165" />
+<P1 x="1956" y="1361" id="745" />
+<P2 x="1920" y="1406" id="1360" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1380" >
+<CONNECTOR type="115" id="1575" >
<cdparam x="2100" y="1490" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2101" y="1491" id="1173" />
-<P2 x="2101" y="1532" id="1175" />
+<P1 x="2101" y="1491" id="1368" />
+<P2 x="2101" y="1532" id="1370" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1381" >
+<CONNECTOR type="115" id="1576" >
<cdparam x="1996" y="1401" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1996" y="1401" id="552" />
-<P2 x="1996" y="1429" id="1180" />
+<P1 x="1996" y="1401" id="747" />
+<P2 x="1996" y="1429" id="1375" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1382" >
+<CONNECTOR type="115" id="1577" >
<cdparam x="1996" y="1459" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to action state" value="null" />
-<P1 x="1996" y="1459" id="1181" />
-<P2 x="1996" y="1488" id="1177" />
+<P1 x="1996" y="1459" id="1376" />
+<P2 x="1996" y="1488" id="1372" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1383" >
+<CONNECTOR type="115" id="1578" >
<cdparam x="2021" y="1038" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="2237" y="966" id="542" />
-<P2 x="2237" y="1054" id="599" />
+<P1 x="2237" y="966" id="737" />
+<P2 x="2237" y="1054" id="794" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1384" >
+<CONNECTOR type="115" id="1579" >
<cdparam x="2217" y="1323" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="2237" y="1323" id="1223" />
-<P2 x="2237" y="1360" id="1225" />
+<P1 x="2237" y="1323" id="1418" />
+<P2 x="2237" y="1360" id="1420" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1385" >
+<CONNECTOR type="115" id="1580" >
<cdparam x="2218" y="1094" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="2237" y="1094" id="600" />
-<P2 x="2237" y="1131" id="1228" />
+<P1 x="2237" y="1094" id="795" />
+<P2 x="2237" y="1131" id="1423" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1386" >
+<CONNECTOR type="115" id="1581" >
<cdparam x="2218" y="1161" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="2237" y="1161" id="1229" />
-<P2 x="2237" y="1193" id="1217" />
+<P1 x="2237" y="1161" id="1424" />
+<P2 x="2237" y="1193" id="1412" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1387" >
+<CONNECTOR type="115" id="1582" >
<cdparam x="2218" y="1223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="2237" y="1223" id="1218" />
-<P2 x="2237" y="1243" id="1231" />
+<P1 x="2237" y="1223" id="1413" />
+<P2 x="2237" y="1243" id="1426" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1388" >
+<CONNECTOR type="115" id="1583" >
<cdparam x="2216" y="1284" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to send request" value="null" />
-<P1 x="2237" y="1273" id="1232" />
-<P2 x="2237" y="1293" id="1222" />
+<P1 x="2237" y="1273" id="1427" />
+<P2 x="2237" y="1293" id="1417" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1389" >
+<CONNECTOR type="115" id="1584" >
<cdparam x="2217" y="1390" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to action state" value="null" />
-<P1 x="2237" y="1390" id="1226" />
-<P2 x="2237" y="1419" id="1234" />
+<P1 x="2237" y="1390" id="1421" />
+<P2 x="2237" y="1419" id="1429" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1390" >
+<CONNECTOR type="115" id="1585" >
<cdparam x="2341" y="1060" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="2317" y="1059" id="604" />
-<P2 x="2317" y="1117" id="1237" />
+<P1 x="2317" y="1059" id="799" />
+<P2 x="2317" y="1117" id="1432" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1391" >
+<CONNECTOR type="115" id="1586" >
<cdparam x="1529" y="1099" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1529" y="1099" id="576" />
-<P2 x="1529" y="1127" id="1067" />
+<P1 x="1529" y="1099" id="771" />
+<P2 x="1529" y="1127" id="1262" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1392" >
+<CONNECTOR type="115" id="1587" >
<cdparam x="2101" y="1433" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="2101" y="1433" id="536" />
-<P2 x="2101" y="1461" id="1172" />
+<P1 x="2101" y="1433" id="731" />
+<P2 x="2101" y="1461" id="1367" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1393" >
+<CONNECTOR type="115" id="1588" >
<cdparam x="2158" y="1460" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="2141" y="1393" id="535" />
-<P2 x="2178" y="1416" id="1267" />
+<P1 x="2141" y="1393" id="730" />
+<P2 x="2178" y="1416" id="1462" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1394" >
+<CONNECTOR type="115" id="1589" >
<cdparam x="1688" y="890" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1688" y="890" id="590" />
-<P2 x="1607" y="996" id="581" />
+<P1 x="1688" y="890" id="785" />
+<P2 x="1607" y="996" id="776" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1395" >
+<CONNECTOR type="115" id="1590" >
<cdparam x="1768" y="890" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1768" y="890" id="591" />
-<P2 x="2277" y="941" id="541" />
+<P1 x="1768" y="890" id="786" />
+<P2 x="2277" y="941" id="736" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1396" >
+<CONNECTOR type="115" id="1591" >
<cdparam x="2317" y="966" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="2317" y="966" id="543" />
-<P2 x="2317" y="1019" id="603" />
+<P1 x="2317" y="966" id="738" />
+<P2 x="2317" y="1019" id="798" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1397" >
+<CONNECTOR type="115" id="1592" >
<cdparam x="2341" y="1147" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="2317" y="1147" id="1238" />
-<P2 x="2317" y="1194" id="1262" />
+<P1 x="2317" y="1147" id="1433" />
+<P2 x="2317" y="1194" id="1457" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1398" >
+<CONNECTOR type="115" id="1593" >
<cdparam x="2341" y="1224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to send event" value="null" />
-<P1 x="2317" y="1224" id="1263" />
-<P2 x="2317" y="1262" id="1257" />
+<P1 x="2317" y="1224" id="1458" />
+<P2 x="2317" y="1262" id="1452" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1399" >
+<CONNECTOR type="115" id="1594" >
<cdparam x="1731" y="1051" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to choice" value="null" />
-<P1 x="1728" y="1051" id="1074" />
-<P2 x="1728" y="1081" id="1274" />
+<P1 x="1728" y="1051" id="1269" />
+<P2 x="1728" y="1081" id="1469" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1400" >
+<CONNECTOR type="115" id="1595" >
<cdparam x="1647" y="1021" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1647" y="1021" id="583" />
-<P2 x="1647" y="1052" id="1265" />
+<P1 x="1647" y="1021" id="778" />
+<P2 x="1647" y="1052" id="1460" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1401" >
+<CONNECTOR type="115" id="1596" >
<cdparam x="1826" y="1324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1826" y="1324" id="560" />
-<P2 x="1826" y="1344" id="1160" />
+<P1 x="1826" y="1324" id="755" />
+<P2 x="1826" y="1344" id="1355" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1402" >
+<CONNECTOR type="115" id="1597" >
<cdparam x="1826" y="1374" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1826" y="1374" id="1161" />
-<P2 x="1826" y="1452" id="1163" />
+<P1 x="1826" y="1374" id="1356" />
+<P2 x="1826" y="1452" id="1358" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1403" >
+<CONNECTOR type="115" id="1598" >
<cdparam x="1786" y="1284" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1786" y="1284" id="558" />
-<P2 x="1740" y="1330" id="1158" />
+<P1 x="1786" y="1284" id="753" />
+<P2 x="1740" y="1330" id="1353" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1404" >
+<CONNECTOR type="115" id="1599" >
<cdparam x="1920" y="1436" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1920" y="1436" id="1166" />
-<P2 x="1920" y="1476" id="1168" />
+<P1 x="1920" y="1436" id="1361" />
+<P2 x="1920" y="1476" id="1363" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1405" >
+<CONNECTOR type="115" id="1600" >
<cdparam x="1996" y="1518" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1996" y="1518" id="1178" />
-<P2 x="1996" y="1538" id="1170" />
+<P1 x="1996" y="1518" id="1373" />
+<P2 x="1996" y="1538" id="1365" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1406" >
+<CONNECTOR type="115" id="1601" >
<cdparam x="2036" y="1361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="2036" y="1361" id="551" />
-<P2 x="2101" y="1368" id="533" />
+<P1 x="2036" y="1361" id="746" />
+<P2 x="2101" y="1368" id="728" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1407" >
+<CONNECTOR type="115" id="1602" >
<cdparam x="1866" y="1284" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1866" y="1284" id="559" />
-<P2 x="1996" y="1336" id="549" />
+<P1 x="1866" y="1284" id="754" />
+<P2 x="1996" y="1336" id="744" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1408" >
+<CONNECTOR type="115" id="1603" >
<cdparam x="2341" y="1292" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2317" y="1292" id="1258" />
-<P2 x="2317" y="1319" id="1260" />
+<P1 x="2317" y="1292" id="1453" />
+<P2 x="2317" y="1319" id="1455" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1409" >
+<CONNECTOR type="115" id="1604" >
<cdparam x="2217" y="1449" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2237" y="1449" id="1235" />
-<P2 x="2237" y="1478" id="1220" />
+<P1 x="2237" y="1449" id="1430" />
+<P2 x="2237" y="1478" id="1415" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1410" >
+<CONNECTOR type="115" id="1605" >
<cdparam x="2277" y="1006" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="2277" y="1006" id="544" />
-<P2 x="2277" y="1034" id="1269" />
+<P1 x="2277" y="1006" id="739" />
+<P2 x="2277" y="1034" id="1464" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1411" >
+<CONNECTOR type="115" id="1606" >
<cdparam x="1642" y="1429" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="1641" y="1429" id="1156" />
-<P2 x="1641" y="1463" id="1113" />
+<P1 x="1641" y="1429" id="1351" />
+<P2 x="1641" y="1463" id="1308" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1412" >
+<CONNECTOR type="115" id="1607" >
<cdparam x="1529" y="1157" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1529" y="1157" id="1068" />
-<P2 x="1529" y="1187" id="1271" />
+<P1 x="1529" y="1157" id="1263" />
+<P2 x="1529" y="1187" id="1466" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1413" >
+<CONNECTOR type="115" id="1608" >
<cdparam x="1529" y="1217" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to execI" value="null" />
-<P1 x="1529" y="1217" id="1272" />
-<P2 x="1529" y="1249" id="571" />
+<P1 x="1529" y="1217" id="1467" />
+<P2 x="1529" y="1249" id="766" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1414" >
+<CONNECTOR type="115" id="1609" >
<cdparam x="1691" y="1156" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1688" y="1156" id="566" />
-<P2 x="1641" y="1230" id="595" />
+<P1 x="1688" y="1156" id="761" />
+<P2 x="1641" y="1230" id="790" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1415" >
+<CONNECTOR type="115" id="1610" >
<cdparam x="1771" y="1156" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1768" y="1156" id="567" />
-<P2 x="1826" y="1259" id="557" />
+<P1 x="1768" y="1156" id="762" />
+<P2 x="1826" y="1259" id="752" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1416" >
+<CONNECTOR type="115" id="1611" >
<cdparam x="1731" y="1111" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to choice" value="null" />
-<P1 x="1728" y="1111" id="1275" />
-<P2 x="1728" y="1131" id="565" />
+<P1 x="1728" y="1111" id="1470" />
+<P2 x="1728" y="1131" id="760" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1012" id="1424" >
-<cdparam x="509" y="222" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1420" />
-<TGConnectingPoint num="1" id="1421" />
-<TGConnectingPoint num="2" id="1422" />
-<TGConnectingPoint num="3" id="1423" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1417" >
-<father id="1424" num="0" />
-<cdparam x="464" y="232" />
-<sizeparam width="51" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ x==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1418" >
-<father id="1424" num="1" />
-<cdparam x="544" y="234" />
-<sizeparam width="41" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ x>0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1419" >
-<father id="1424" num="2" />
-<cdparam x="529" y="267" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
+</Modeling>
-<COMPONENT type="1000" id="1426" >
-<cdparam x="489" y="26" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1425" />
-</COMPONENT>
-<COMPONENT type="1001" id="1428" >
-<cdparam x="417" y="407" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1427" />
-</COMPONENT>
-<COMPONENT type="1008" id="1431" >
-<cdparam x="396" y="339" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="timeOut()" />
-<TGConnectingPoint num="0" id="1429" />
-<TGConnectingPoint num="1" id="1430" />
-<extraparam>
-<Data eventName="timeOut" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-<COMPONENT type="1010" id="1434" >
-<cdparam x="599" y="300" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<Modeling type="TML Architecture" nameTab="Mapping1" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
+<COMPONENT type="1102" id="1636" >
+<cdparam x="612" y="450" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="stop() " />
-<TGConnectingPoint num="0" id="1432" />
-<TGConnectingPoint num="1" id="1433" />
+<infoparam name="Bus0" value="name" />
+<TGConnectingPoint num="0" id="1612" />
+<TGConnectingPoint num="1" id="1613" />
+<TGConnectingPoint num="2" id="1614" />
+<TGConnectingPoint num="3" id="1615" />
+<TGConnectingPoint num="4" id="1616" />
+<TGConnectingPoint num="5" id="1617" />
+<TGConnectingPoint num="6" id="1618" />
+<TGConnectingPoint num="7" id="1619" />
+<TGConnectingPoint num="8" id="1620" />
+<TGConnectingPoint num="9" id="1621" />
+<TGConnectingPoint num="10" id="1622" />
+<TGConnectingPoint num="11" id="1623" />
+<TGConnectingPoint num="12" id="1624" />
+<TGConnectingPoint num="13" id="1625" />
+<TGConnectingPoint num="14" id="1626" />
+<TGConnectingPoint num="15" id="1627" />
+<TGConnectingPoint num="16" id="1628" />
+<TGConnectingPoint num="17" id="1629" />
+<TGConnectingPoint num="18" id="1630" />
+<TGConnectingPoint num="19" id="1631" />
+<TGConnectingPoint num="20" id="1632" />
+<TGConnectingPoint num="21" id="1633" />
+<TGConnectingPoint num="22" id="1634" />
+<TGConnectingPoint num="23" id="1635" />
<extraparam>
-<Data eventName="stop" nbOfParams="5" />
+<info stereotype="BUS-RR" nodeName="Bus0" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1436" >
-<cdparam x="612" y="365" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1435" />
-</COMPONENT>
-
-<COMPONENT type="1017" id="1439" >
-<cdparam x="491" y="157" />
-<sizeparam width="70" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="1661" >
+<cdparam x="797" y="120" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="notified event" value="x=?stop()" />
-<TGConnectingPoint num="0" id="1437" />
-<TGConnectingPoint num="1" id="1438" />
-<extraparam>
-<Data eventName="stop" variable="x" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="115" id="1440" >
-<cdparam x="496" y="46" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="496" y="46" id="1425" />
-<P2 x="526" y="152" id="1437" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1441" >
-<cdparam x="484" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="484" y="237" id="1421" />
-<P2 x="427" y="334" id="1429" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1442" >
-<cdparam x="427" y="364" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="427" y="364" id="1430" />
-<P2 x="427" y="402" id="1427" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1443" >
-<cdparam x="622" y="325" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to stop state" value="null" />
-<P1 x="622" y="325" id="1433" />
-<P2 x="622" y="360" id="1435" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1444" >
-<cdparam x="524" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from notified event to choice" value="null" />
-<P1 x="526" y="182" id="1438" />
-<P2 x="524" y="212" id="1420" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1445" >
-<cdparam x="564" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="564" y="237" id="1422" />
-<P2 x="622" y="295" id="1432" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1447" >
-<cdparam x="430" y="408" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1446" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="1450" >
-<cdparam x="418" y="364" />
-<sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="end() " />
-<TGConnectingPoint num="0" id="1448" />
-<TGConnectingPoint num="1" id="1449" />
+<infoparam name="Memory0" value="name" />
+<TGConnectingPoint num="0" id="1637" />
+<TGConnectingPoint num="1" id="1638" />
+<TGConnectingPoint num="2" id="1639" />
+<TGConnectingPoint num="3" id="1640" />
+<TGConnectingPoint num="4" id="1641" />
+<TGConnectingPoint num="5" id="1642" />
+<TGConnectingPoint num="6" id="1643" />
+<TGConnectingPoint num="7" id="1644" />
+<TGConnectingPoint num="8" id="1645" />
+<TGConnectingPoint num="9" id="1646" />
+<TGConnectingPoint num="10" id="1647" />
+<TGConnectingPoint num="11" id="1648" />
+<TGConnectingPoint num="12" id="1649" />
+<TGConnectingPoint num="13" id="1650" />
+<TGConnectingPoint num="14" id="1651" />
+<TGConnectingPoint num="15" id="1652" />
+<TGConnectingPoint num="16" id="1653" />
+<TGConnectingPoint num="17" id="1654" />
+<TGConnectingPoint num="18" id="1655" />
+<TGConnectingPoint num="19" id="1656" />
+<TGConnectingPoint num="20" id="1657" />
+<TGConnectingPoint num="21" id="1658" />
+<TGConnectingPoint num="22" id="1659" />
+<TGConnectingPoint num="23" id="1660" />
<extraparam>
-<Data eventName="end" nbOfParams="5" />
+<info stereotype="MEMORY" nodeName="Memory0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1453" >
-<cdparam x="238" y="201" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1100" id="1731" >
+<cdparam x="51" y="90" />
+<sizeparam width="459" height="321" minWidth="150" minHeight="150" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="connectionOpened() " />
-<TGConnectingPoint num="0" id="1451" />
-<TGConnectingPoint num="1" id="1452" />
+<infoparam name="cpu0" value="name" />
+<TGConnectingPoint num="0" id="1707" />
+<TGConnectingPoint num="1" id="1708" />
+<TGConnectingPoint num="2" id="1709" />
+<TGConnectingPoint num="3" id="1710" />
+<TGConnectingPoint num="4" id="1711" />
+<TGConnectingPoint num="5" id="1712" />
+<TGConnectingPoint num="6" id="1713" />
+<TGConnectingPoint num="7" id="1714" />
+<TGConnectingPoint num="8" id="1715" />
+<TGConnectingPoint num="9" id="1716" />
+<TGConnectingPoint num="10" id="1717" />
+<TGConnectingPoint num="11" id="1718" />
+<TGConnectingPoint num="12" id="1719" />
+<TGConnectingPoint num="13" id="1720" />
+<TGConnectingPoint num="14" id="1721" />
+<TGConnectingPoint num="15" id="1722" />
+<TGConnectingPoint num="16" id="1723" />
+<TGConnectingPoint num="17" id="1724" />
+<TGConnectingPoint num="18" id="1725" />
+<TGConnectingPoint num="19" id="1726" />
+<TGConnectingPoint num="20" id="1727" />
+<TGConnectingPoint num="21" id="1728" />
+<TGConnectingPoint num="22" id="1729" />
+<TGConnectingPoint num="23" id="1730" />
<extraparam>
-<Data eventName="connectionOpened" nbOfParams="5" />
+<info stereotype="CPURRPB" nodeName="cpu0" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="99" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-
-<COMPONENT type="1000" id="1455" >
-<cdparam x="159" y="66" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1454" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="1458" >
-<cdparam x="141" y="129" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1670" >
+<father id="1731" num="0" />
+<cdparam x="92" y="154" />
+<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="reset() " />
-<TGConnectingPoint num="0" id="1456" />
-<TGConnectingPoint num="1" id="1457" />
+<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
+<TGConnectingPoint num="0" id="1662" />
+<TGConnectingPoint num="1" id="1663" />
+<TGConnectingPoint num="2" id="1664" />
+<TGConnectingPoint num="3" id="1665" />
+<TGConnectingPoint num="4" id="1666" />
+<TGConnectingPoint num="5" id="1667" />
+<TGConnectingPoint num="6" id="1668" />
+<TGConnectingPoint num="7" id="1669" />
<extraparam>
-<Data eventName="reset" nbOfParams="5" />
+<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="1461" >
-<cdparam x="113" y="182" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="1679" >
+<father id="1731" num="1" />
+<cdparam x="291" y="153" />
+<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="answerToReset()" />
-<TGConnectingPoint num="0" id="1459" />
-<TGConnectingPoint num="1" id="1460" />
+<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
+<TGConnectingPoint num="0" id="1671" />
+<TGConnectingPoint num="1" id="1672" />
+<TGConnectingPoint num="2" id="1673" />
+<TGConnectingPoint num="3" id="1674" />
+<TGConnectingPoint num="4" id="1675" />
+<TGConnectingPoint num="5" id="1676" />
+<TGConnectingPoint num="6" id="1677" />
+<TGConnectingPoint num="7" id="1678" />
<extraparam>
-<Data eventName="answerToReset" nbOfParams="5" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="1464" >
-<cdparam x="144" y="237" />
-<sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="1688" >
+<father id="1731" num="2" />
+<cdparam x="96" y="246" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="pTS() " />
-<TGConnectingPoint num="0" id="1462" />
-<TGConnectingPoint num="1" id="1463" />
+<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
+<TGConnectingPoint num="0" id="1680" />
+<TGConnectingPoint num="1" id="1681" />
+<TGConnectingPoint num="2" id="1682" />
+<TGConnectingPoint num="3" id="1683" />
+<TGConnectingPoint num="4" id="1684" />
+<TGConnectingPoint num="5" id="1685" />
+<TGConnectingPoint num="6" id="1686" />
+<TGConnectingPoint num="7" id="1687" />
<extraparam>
-<Data eventName="pTS" nbOfParams="5" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="1467" >
-<cdparam x="124" y="308" />
-<sizeparam width="85" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="1697" >
+<father id="1731" num="3" />
+<cdparam x="290" y="234" />
+<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="pTSConfirm()" />
-<TGConnectingPoint num="0" id="1465" />
-<TGConnectingPoint num="1" id="1466" />
+<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Application" />
+<TGConnectingPoint num="0" id="1689" />
+<TGConnectingPoint num="1" id="1690" />
+<TGConnectingPoint num="2" id="1691" />
+<TGConnectingPoint num="3" id="1692" />
+<TGConnectingPoint num="4" id="1693" />
+<TGConnectingPoint num="5" id="1694" />
+<TGConnectingPoint num="6" id="1695" />
+<TGConnectingPoint num="7" id="1696" />
<extraparam>
-<Data eventName="pTSConfirm" nbOfParams="5" />
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="1484" >
-<cdparam x="376" y="98" />
-<sizeparam width="233" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="1706" >
+<father id="1731" num="4" />
+<cdparam x="226" y="304" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="The first two layers of the OSI model
-are used to communicate between
-the smart card and the terminal
-" />
-<TGConnectingPoint num="0" id="1468" />
-<TGConnectingPoint num="1" id="1469" />
-<TGConnectingPoint num="2" id="1470" />
-<TGConnectingPoint num="3" id="1471" />
-<TGConnectingPoint num="4" id="1472" />
-<TGConnectingPoint num="5" id="1473" />
-<TGConnectingPoint num="6" id="1474" />
-<TGConnectingPoint num="7" id="1475" />
-<TGConnectingPoint num="8" id="1476" />
-<TGConnectingPoint num="9" id="1477" />
-<TGConnectingPoint num="10" id="1478" />
-<TGConnectingPoint num="11" id="1479" />
-<TGConnectingPoint num="12" id="1480" />
-<TGConnectingPoint num="13" id="1481" />
-<TGConnectingPoint num="14" id="1482" />
-<TGConnectingPoint num="15" id="1483" />
+<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Timer" />
+<TGConnectingPoint num="0" id="1698" />
+<TGConnectingPoint num="1" id="1699" />
+<TGConnectingPoint num="2" id="1700" />
+<TGConnectingPoint num="3" id="1701" />
+<TGConnectingPoint num="4" id="1702" />
+<TGConnectingPoint num="5" id="1703" />
+<TGConnectingPoint num="6" id="1704" />
+<TGConnectingPoint num="7" id="1705" />
<extraparam>
-<Line value="The first two layers of the OSI model " />
-<Line value="are used to communicate between " />
-<Line value="the smart card and the terminal" />
+<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1007" id="1487" >
-<cdparam x="254" y="97" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_TCP_IP()" />
-<TGConnectingPoint num="0" id="1485" />
-<TGConnectingPoint num="1" id="1486" />
+<CONNECTOR type="125" id="1732" >
+<cdparam x="800" y="322" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="847" y="320" id="1651" />
+<P2 x="799" y="450" id="1621" />
+<AutomaticDrawing data="true" />
<extraparam>
-<Data requestName="start_TCP_IP" nbOfParams="5" />
+<info priority="0" />
+<spy value="false" />
</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1007" id="1490" >
-<cdparam x="241" y="148" />
-<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_Application()" />
-<TGConnectingPoint num="0" id="1488" />
-<TGConnectingPoint num="1" id="1489" />
-<breakpoint />
+</CONNECTOR>
+<CONNECTOR type="125" id="1733" >
+<cdparam x="510" y="411" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="510" y="411" id="1714" />
+<P2 x="612" y="462" id="1622" />
+<AutomaticDrawing data="true" />
<extraparam>
-<Data requestName="start_Application" nbOfParams="5" />
+<info priority="0" />
+<spy value="false" />
</extraparam>
-</COMPONENT>
+</CONNECTOR>
-<COMPONENT type="1001" id="1492" >
-<cdparam x="581" y="550" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1491" />
-</COMPONENT>
+</TMLArchiDiagramPanel>
+
+</Modeling>
-<COMPONENT type="1008" id="1495" >
-<cdparam x="240" y="471" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="data_Ready_SC()" />
-<TGConnectingPoint num="0" id="1493" />
-<TGConnectingPoint num="1" id="1494" />
-<extraparam>
-<Data eventName="data_Ready_SC" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-<COMPONENT type="1001" id="1497" >
-<cdparam x="283" y="547" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1496" />
-</COMPONENT>
-<COMPONENT type="1009" id="1500" >
-<cdparam x="252" y="429" />
-<sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<Modeling type="TML Architecture" nameTab="Mapping2" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
+<COMPONENT type="1105" id="1758" >
+<cdparam x="309" y="358" />
+<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromTtoP(1) " />
-<TGConnectingPoint num="0" id="1498" />
-<TGConnectingPoint num="1" id="1499" />
+<infoparam name="Memory0" value="name" />
+<TGConnectingPoint num="0" id="1734" />
+<TGConnectingPoint num="1" id="1735" />
+<TGConnectingPoint num="2" id="1736" />
+<TGConnectingPoint num="3" id="1737" />
+<TGConnectingPoint num="4" id="1738" />
+<TGConnectingPoint num="5" id="1739" />
+<TGConnectingPoint num="6" id="1740" />
+<TGConnectingPoint num="7" id="1741" />
+<TGConnectingPoint num="8" id="1742" />
+<TGConnectingPoint num="9" id="1743" />
+<TGConnectingPoint num="10" id="1744" />
+<TGConnectingPoint num="11" id="1745" />
+<TGConnectingPoint num="12" id="1746" />
+<TGConnectingPoint num="13" id="1747" />
+<TGConnectingPoint num="14" id="1748" />
+<TGConnectingPoint num="15" id="1749" />
+<TGConnectingPoint num="16" id="1750" />
+<TGConnectingPoint num="17" id="1751" />
+<TGConnectingPoint num="18" id="1752" />
+<TGConnectingPoint num="19" id="1753" />
+<TGConnectingPoint num="20" id="1754" />
+<TGConnectingPoint num="21" id="1755" />
+<TGConnectingPoint num="22" id="1756" />
+<TGConnectingPoint num="23" id="1757" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<info stereotype="MEMORY" nodeName="Memory0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1503" >
-<cdparam x="268" y="385" />
-<sizeparam width="50" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1102" id="1783" >
+<cdparam x="277" y="270" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="send() " />
-<TGConnectingPoint num="0" id="1501" />
-<TGConnectingPoint num="1" id="1502" />
+<infoparam name="Bus0" value="name" />
+<TGConnectingPoint num="0" id="1759" />
+<TGConnectingPoint num="1" id="1760" />
+<TGConnectingPoint num="2" id="1761" />
+<TGConnectingPoint num="3" id="1762" />
+<TGConnectingPoint num="4" id="1763" />
+<TGConnectingPoint num="5" id="1764" />
+<TGConnectingPoint num="6" id="1765" />
+<TGConnectingPoint num="7" id="1766" />
+<TGConnectingPoint num="8" id="1767" />
+<TGConnectingPoint num="9" id="1768" />
+<TGConnectingPoint num="10" id="1769" />
+<TGConnectingPoint num="11" id="1770" />
+<TGConnectingPoint num="12" id="1771" />
+<TGConnectingPoint num="13" id="1772" />
+<TGConnectingPoint num="14" id="1773" />
+<TGConnectingPoint num="15" id="1774" />
+<TGConnectingPoint num="16" id="1775" />
+<TGConnectingPoint num="17" id="1776" />
+<TGConnectingPoint num="18" id="1777" />
+<TGConnectingPoint num="19" id="1778" />
+<TGConnectingPoint num="20" id="1779" />
+<TGConnectingPoint num="21" id="1780" />
+<TGConnectingPoint num="22" id="1781" />
+<TGConnectingPoint num="23" id="1782" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<info stereotype="BUS-RR" nodeName="Bus0" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" referenceAttack="ReadDataFromBus" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1506" >
-<cdparam x="250" y="513" />
-<sizeparam width="87" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1100" id="1817" >
+<cdparam x="574" y="227" />
+<sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromSCtoD(1)" />
-<TGConnectingPoint num="0" id="1504" />
-<TGConnectingPoint num="1" id="1505" />
+<infoparam name="CPU2" value="name" />
+<TGConnectingPoint num="0" id="1793" />
+<TGConnectingPoint num="1" id="1794" />
+<TGConnectingPoint num="2" id="1795" />
+<TGConnectingPoint num="3" id="1796" />
+<TGConnectingPoint num="4" id="1797" />
+<TGConnectingPoint num="5" id="1798" />
+<TGConnectingPoint num="6" id="1799" />
+<TGConnectingPoint num="7" id="1800" />
+<TGConnectingPoint num="8" id="1801" />
+<TGConnectingPoint num="9" id="1802" />
+<TGConnectingPoint num="10" id="1803" />
+<TGConnectingPoint num="11" id="1804" />
+<TGConnectingPoint num="12" id="1805" />
+<TGConnectingPoint num="13" id="1806" />
+<TGConnectingPoint num="14" id="1807" />
+<TGConnectingPoint num="15" id="1808" />
+<TGConnectingPoint num="16" id="1809" />
+<TGConnectingPoint num="17" id="1810" />
+<TGConnectingPoint num="18" id="1811" />
+<TGConnectingPoint num="19" id="1812" />
+<TGConnectingPoint num="20" id="1813" />
+<TGConnectingPoint num="21" id="1814" />
+<TGConnectingPoint num="22" id="1815" />
+<TGConnectingPoint num="23" id="1816" />
<extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
+<info stereotype="CPURR" nodeName="CPU2" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-
-<COMPONENT type="1008" id="1509" >
-<cdparam x="562" y="472" />
-<sizeparam width="59" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1792" >
+<father id="1817" num="0" />
+<cdparam x="604" y="279" />
+<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="receive()" />
-<TGConnectingPoint num="0" id="1507" />
-<TGConnectingPoint num="1" id="1508" />
+<cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
+<infoparam name="TGComponent" value="AppC::Timer" />
+<TGConnectingPoint num="0" id="1784" />
+<TGConnectingPoint num="1" id="1785" />
+<TGConnectingPoint num="2" id="1786" />
+<TGConnectingPoint num="3" id="1787" />
+<TGConnectingPoint num="4" id="1788" />
+<TGConnectingPoint num="5" id="1789" />
+<TGConnectingPoint num="6" id="1790" />
+<TGConnectingPoint num="7" id="1791" />
<extraparam>
-<Data eventName="receive" nbOfParams="5" />
+<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1009" id="1512" >
-<cdparam x="546" y="433" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1100" id="1851" >
+<cdparam x="56" y="231" />
+<sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromDtoSC(1) " />
-<TGConnectingPoint num="0" id="1510" />
-<TGConnectingPoint num="1" id="1511" />
+<infoparam name="CPU1" value="name" />
+<TGConnectingPoint num="0" id="1827" />
+<TGConnectingPoint num="1" id="1828" />
+<TGConnectingPoint num="2" id="1829" />
+<TGConnectingPoint num="3" id="1830" />
+<TGConnectingPoint num="4" id="1831" />
+<TGConnectingPoint num="5" id="1832" />
+<TGConnectingPoint num="6" id="1833" />
+<TGConnectingPoint num="7" id="1834" />
+<TGConnectingPoint num="8" id="1835" />
+<TGConnectingPoint num="9" id="1836" />
+<TGConnectingPoint num="10" id="1837" />
+<TGConnectingPoint num="11" id="1838" />
+<TGConnectingPoint num="12" id="1839" />
+<TGConnectingPoint num="13" id="1840" />
+<TGConnectingPoint num="14" id="1841" />
+<TGConnectingPoint num="15" id="1842" />
+<TGConnectingPoint num="16" id="1843" />
+<TGConnectingPoint num="17" id="1844" />
+<TGConnectingPoint num="18" id="1845" />
+<TGConnectingPoint num="19" id="1846" />
+<TGConnectingPoint num="20" id="1847" />
+<TGConnectingPoint num="21" id="1848" />
+<TGConnectingPoint num="22" id="1849" />
+<TGConnectingPoint num="23" id="1850" />
<extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
+<info stereotype="CPURR" nodeName="CPU1" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-
-<COMPONENT type="1006" id="1515" >
-<cdparam x="552" y="509" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1826" >
+<father id="1851" num="0" />
+<cdparam x="49" y="276" />
+<sizeparam width="172" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromPtoT(1)" />
-<TGConnectingPoint num="0" id="1513" />
-<TGConnectingPoint num="1" id="1514" />
+<cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
+<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
+<TGConnectingPoint num="0" id="1818" />
+<TGConnectingPoint num="1" id="1819" />
+<TGConnectingPoint num="2" id="1820" />
+<TGConnectingPoint num="3" id="1821" />
+<TGConnectingPoint num="4" id="1822" />
+<TGConnectingPoint num="5" id="1823" />
+<TGConnectingPoint num="6" id="1824" />
+<TGConnectingPoint num="7" id="1825" />
<extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
+<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1010" id="1518" >
-<cdparam x="536" y="390" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1100" id="1903" >
+<cdparam x="267" y="59" />
+<sizeparam width="272" height="167" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="data_Ready(t, b) " />
-<TGConnectingPoint num="0" id="1516" />
-<TGConnectingPoint num="1" id="1517" />
-<breakpoint />
+<infoparam name="CPU0" value="name" />
+<TGConnectingPoint num="0" id="1879" />
+<TGConnectingPoint num="1" id="1880" />
+<TGConnectingPoint num="2" id="1881" />
+<TGConnectingPoint num="3" id="1882" />
+<TGConnectingPoint num="4" id="1883" />
+<TGConnectingPoint num="5" id="1884" />
+<TGConnectingPoint num="6" id="1885" />
+<TGConnectingPoint num="7" id="1886" />
+<TGConnectingPoint num="8" id="1887" />
+<TGConnectingPoint num="9" id="1888" />
+<TGConnectingPoint num="10" id="1889" />
+<TGConnectingPoint num="11" id="1890" />
+<TGConnectingPoint num="12" id="1891" />
+<TGConnectingPoint num="13" id="1892" />
+<TGConnectingPoint num="14" id="1893" />
+<TGConnectingPoint num="15" id="1894" />
+<TGConnectingPoint num="16" id="1895" />
+<TGConnectingPoint num="17" id="1896" />
+<TGConnectingPoint num="18" id="1897" />
+<TGConnectingPoint num="19" id="1898" />
+<TGConnectingPoint num="20" id="1899" />
+<TGConnectingPoint num="21" id="1900" />
+<TGConnectingPoint num="22" id="1901" />
+<TGConnectingPoint num="23" id="1902" />
<extraparam>
-<Data eventName="data_Ready" nbOfParams="5" />
-<Param index="0" value="t" />
-<Param index="1" value="b" />
+<info stereotype="CPURR" nodeName="CPU0" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-
-<COMPONENT type="1014" id="1522" >
-<cdparam x="236" y="261" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1860" >
+<father id="1903" num="0" />
+<cdparam x="277" y="90" />
+<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="for loop" value="for(j=0;x==0;j = j)" />
-<TGConnectingPoint num="0" id="1519" />
-<TGConnectingPoint num="1" id="1520" />
-<TGConnectingPoint num="2" id="1521" />
+<cdrectangleparam minX="0" maxX="163" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
+<TGConnectingPoint num="0" id="1852" />
+<TGConnectingPoint num="1" id="1853" />
+<TGConnectingPoint num="2" id="1854" />
+<TGConnectingPoint num="3" id="1855" />
+<TGConnectingPoint num="4" id="1856" />
+<TGConnectingPoint num="5" id="1857" />
+<TGConnectingPoint num="6" id="1858" />
+<TGConnectingPoint num="7" id="1859" />
<extraparam>
-<Data init="j=0" condition="x==0" increment="j = j" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="1524" >
-<cdparam x="275" y="309" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="1869" >
+<father id="1903" num="1" />
+<cdparam x="293" y="165" />
+<sizeparam width="144" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1523" />
-</COMPONENT>
-
-<COMPONENT type="1018" id="1535" >
-<cdparam x="424" y="285" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1525" />
-<TGConnectingPoint num="1" id="1526" />
-<TGConnectingPoint num="2" id="1527" />
-<TGConnectingPoint num="3" id="1528" />
-<TGConnectingPoint num="4" id="1529" />
-<TGConnectingPoint num="5" id="1530" />
-<TGConnectingPoint num="6" id="1531" />
-<TGConnectingPoint num="7" id="1532" />
-<TGConnectingPoint num="8" id="1533" />
-<TGConnectingPoint num="9" id="1534" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="1536" >
-<cdparam x="302" y="227" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="302" y="226" id="1452" />
-<P2 x="298" y="256" id="1519" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1541" >
-<cdparam x="111" y="331" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to send request" value="null" />
-<P1 x="166" y="333" id="1466" />
-<P2 x="298" y="92" id="1485" />
-<Point x="166" y="353" />
-<Point x="225" y="353" />
-<Point x="225" y="72" />
-<Point x="278" y="72" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1537" >
-<father id="1541" num="0" />
-<cdparam x="166" y="353" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1538" >
-<father id="1541" num="1" />
-<cdparam x="225" y="353" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1539" >
-<father id="1541" num="2" />
-<cdparam x="225" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
+<cdrectangleparam minX="0" maxX="128" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="AppC::Application" />
+<TGConnectingPoint num="0" id="1861" />
+<TGConnectingPoint num="1" id="1862" />
+<TGConnectingPoint num="2" id="1863" />
+<TGConnectingPoint num="3" id="1864" />
+<TGConnectingPoint num="4" id="1865" />
+<TGConnectingPoint num="5" id="1866" />
+<TGConnectingPoint num="6" id="1867" />
+<TGConnectingPoint num="7" id="1868" />
+<extraparam>
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1540" >
-<father id="1541" num="3" />
-<cdparam x="278" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1878" >
+<father id="1903" num="2" />
+<cdparam x="392" y="119" />
+<sizeparam width="141" height="37" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
+<cdrectangleparam minX="0" maxX="131" minY="0" maxY="130" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
+<TGConnectingPoint num="0" id="1870" />
+<TGConnectingPoint num="1" id="1871" />
+<TGConnectingPoint num="2" id="1872" />
+<TGConnectingPoint num="3" id="1873" />
+<TGConnectingPoint num="4" id="1874" />
+<TGConnectingPoint num="5" id="1875" />
+<TGConnectingPoint num="6" id="1876" />
+<TGConnectingPoint num="7" id="1877" />
+<extraparam>
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1542" >
-<cdparam x="166" y="64" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to wait event" value="null" />
-<P1 x="166" y="86" id="1454" />
-<P2 x="166" y="124" id="1456" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1543" >
-<cdparam x="166" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="166" y="154" id="1457" />
-<P2 x="166" y="177" id="1459" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1544" >
-<cdparam x="312" y="133" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to send request" value="null" />
-<P1 x="298" y="122" id="1486" />
-<P2 x="298" y="143" id="1488" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1545" >
-<cdparam x="286" y="421" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="293" y="410" id="1502" />
-<P2 x="293" y="424" id="1498" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1546" >
-<cdparam x="286" y="486" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="293" y="454" id="1499" />
-<P2 x="293" y="466" id="1493" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1547" >
-<cdparam x="286" y="538" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="293" y="496" id="1494" />
-<P2 x="293" y="508" id="1504" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1548" >
-<cdparam x="286" y="594" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="293" y="538" id="1505" />
-<P2 x="293" y="542" id="1496" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1549" >
-<cdparam x="607" y="480" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="591" y="458" id="1511" />
-<P2 x="591" y="467" id="1507" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1550" >
-<cdparam x="606" y="524" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="591" y="497" id="1508" />
-<P2 x="591" y="504" id="1513" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1551" >
-<cdparam x="609" y="427" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="591" y="415" id="1517" />
-<P2 x="591" y="428" id="1510" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1552" >
-<cdparam x="606" y="586" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="591" y="534" id="1514" />
-<P2 x="591" y="545" id="1491" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1553" >
-<cdparam x="298" y="173" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to for loop" value="null" />
-<P1 x="298" y="173" id="1489" />
-<P2 x="302" y="196" id="1451" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1554" >
-<cdparam x="328" y="291" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to stop state" value="null" />
-<P1 x="298" y="286" id="1521" />
-<P2 x="285" y="304" id="1523" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1555" >
-<cdparam x="385" y="404" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1 x="399" y="300" id="1526" />
-<P2 x="293" y="380" id="1501" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1556" >
-<cdparam x="533" y="462" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1 x="479" y="300" id="1527" />
-<P2 x="591" y="385" id="1516" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1557" >
-<cdparam x="391" y="341" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to select" value="null" />
-<P1 x="361" y="275" id="1520" />
-<P2 x="439" y="275" id="1525" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1558" >
-<cdparam x="164" y="262" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="166" y="262" id="1463" />
-<P2 x="166" y="303" id="1465" />
+<CONNECTOR type="125" id="1904" >
+<cdparam x="402" y="367" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Memory0 to Bus0" value="{info}" />
+<P1 x="403" y="358" id="1735" />
+<P2 x="402" y="320" id="1765" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1559" >
-<cdparam x="166" y="207" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="166" y="207" id="1460" />
-<P2 x="166" y="232" id="1462" />
+<CONNECTOR type="125" id="1905" >
+<cdparam x="190" y="300" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from CPU1 to Bus0" value="{info}" />
+<P1 x="221" y="294" id="1831" />
+<P2 x="277" y="295" id="1762" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1560" >
-<cdparam x="439" y="340" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="439" y="340" id="1528" />
-<P2 x="440" y="359" id="1448" />
+<CONNECTOR type="125" id="1906" >
+<cdparam x="662" y="310" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from CPU2 to Bus0" value="{info}" />
+<P1 x="574" y="294" id="1796" />
+<P2 x="527" y="295" id="1763" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1561" >
-<cdparam x="440" y="389" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="440" y="389" id="1449" />
-<P2 x="440" y="403" id="1446" />
+<CONNECTOR type="125" id="1907" >
+<cdparam x="388" y="162" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from CPU0 to Bus0" value="{info}" />
+<P1 x="403" y="226" id="1885" />
+<P2 x="402" y="270" id="1760" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-</TMLActivityDiagramPanel>
+</TMLArchiDiagramPanel>
-<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="1565" >
-<cdparam x="505" y="259" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1563" />
-<TGConnectingPoint num="1" id="1564" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1562" >
-<father id="1565" num="0" />
-<cdparam x="520" y="279" />
-<sizeparam width="16" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="10" />
-</SUBCOMPONENT>
+</Modeling>
-<COMPONENT type="1010" id="1568" >
-<cdparam x="479" y="129" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="opened() " />
-<TGConnectingPoint num="0" id="1566" />
-<TGConnectingPoint num="1" id="1567" />
-<extraparam>
-<Data eventName="opened" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-<COMPONENT type="1008" id="1571" >
-<cdparam x="449" y="192" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+
+<Modeling type="TML Architecture" nameTab="Mapping2_Sec" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
+<COMPONENT type="1102" id="1932" >
+<cdparam x="17" y="403" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="connectionOpened()" />
-<TGConnectingPoint num="0" id="1569" />
-<TGConnectingPoint num="1" id="1570" />
-<extraparam>
-<Data eventName="connectionOpened" nbOfParams="5" />
+<infoparam name="SecureBus1" value="name" />
+<TGConnectingPoint num="0" id="1908" />
+<TGConnectingPoint num="1" id="1909" />
+<TGConnectingPoint num="2" id="1910" />
+<TGConnectingPoint num="3" id="1911" />
+<TGConnectingPoint num="4" id="1912" />
+<TGConnectingPoint num="5" id="1913" />
+<TGConnectingPoint num="6" id="1914" />
+<TGConnectingPoint num="7" id="1915" />
+<TGConnectingPoint num="8" id="1916" />
+<TGConnectingPoint num="9" id="1917" />
+<TGConnectingPoint num="10" id="1918" />
+<TGConnectingPoint num="11" id="1919" />
+<TGConnectingPoint num="12" id="1920" />
+<TGConnectingPoint num="13" id="1921" />
+<TGConnectingPoint num="14" id="1922" />
+<TGConnectingPoint num="15" id="1923" />
+<TGConnectingPoint num="16" id="1924" />
+<TGConnectingPoint num="17" id="1925" />
+<TGConnectingPoint num="18" id="1926" />
+<TGConnectingPoint num="19" id="1927" />
+<TGConnectingPoint num="20" id="1928" />
+<TGConnectingPoint num="21" id="1929" />
+<TGConnectingPoint num="22" id="1930" />
+<TGConnectingPoint num="23" id="1931" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="SecureBus1" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataFromBus" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="1579" >
-<cdparam x="495" y="514" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1575" />
-<TGConnectingPoint num="1" id="1576" />
-<TGConnectingPoint num="2" id="1577" />
-<TGConnectingPoint num="3" id="1578" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1572" >
-<father id="1579" num="0" />
-<cdparam x="470" y="524" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1573" >
-<father id="1579" num="1" />
-<cdparam x="530" y="524" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1574" >
-<father id="1579" num="2" />
-<cdparam x="515" y="559" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1000" id="1581" >
-<cdparam x="498" y="33" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1580" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="1584" >
-<cdparam x="482" y="71" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="1957" >
+<cdparam x="55" y="511" />
+<sizeparam width="176" height="106" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="open()" />
-<TGConnectingPoint num="0" id="1582" />
-<TGConnectingPoint num="1" id="1583" />
+<infoparam name="secureMem1" value="name" />
+<TGConnectingPoint num="0" id="1933" />
+<TGConnectingPoint num="1" id="1934" />
+<TGConnectingPoint num="2" id="1935" />
+<TGConnectingPoint num="3" id="1936" />
+<TGConnectingPoint num="4" id="1937" />
+<TGConnectingPoint num="5" id="1938" />
+<TGConnectingPoint num="6" id="1939" />
+<TGConnectingPoint num="7" id="1940" />
+<TGConnectingPoint num="8" id="1941" />
+<TGConnectingPoint num="9" id="1942" />
+<TGConnectingPoint num="10" id="1943" />
+<TGConnectingPoint num="11" id="1944" />
+<TGConnectingPoint num="12" id="1945" />
+<TGConnectingPoint num="13" id="1946" />
+<TGConnectingPoint num="14" id="1947" />
+<TGConnectingPoint num="15" id="1948" />
+<TGConnectingPoint num="16" id="1949" />
+<TGConnectingPoint num="17" id="1950" />
+<TGConnectingPoint num="18" id="1951" />
+<TGConnectingPoint num="19" id="1952" />
+<TGConnectingPoint num="20" id="1953" />
+<TGConnectingPoint num="21" id="1954" />
+<TGConnectingPoint num="22" id="1955" />
+<TGConnectingPoint num="23" id="1956" />
<extraparam>
-<Data eventName="open" nbOfParams="5" />
+<info stereotype="MEMORY" nodeName="secureMem1" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1587" >
-<cdparam x="469" y="353" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="1982" >
+<cdparam x="309" y="358" />
+<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromAtoT(1)" />
-<TGConnectingPoint num="0" id="1585" />
-<TGConnectingPoint num="1" id="1586" />
+<infoparam name="Memory0" value="name" />
+<TGConnectingPoint num="0" id="1958" />
+<TGConnectingPoint num="1" id="1959" />
+<TGConnectingPoint num="2" id="1960" />
+<TGConnectingPoint num="3" id="1961" />
+<TGConnectingPoint num="4" id="1962" />
+<TGConnectingPoint num="5" id="1963" />
+<TGConnectingPoint num="6" id="1964" />
+<TGConnectingPoint num="7" id="1965" />
+<TGConnectingPoint num="8" id="1966" />
+<TGConnectingPoint num="9" id="1967" />
+<TGConnectingPoint num="10" id="1968" />
+<TGConnectingPoint num="11" id="1969" />
+<TGConnectingPoint num="12" id="1970" />
+<TGConnectingPoint num="13" id="1971" />
+<TGConnectingPoint num="14" id="1972" />
+<TGConnectingPoint num="15" id="1973" />
+<TGConnectingPoint num="16" id="1974" />
+<TGConnectingPoint num="17" id="1975" />
+<TGConnectingPoint num="18" id="1976" />
+<TGConnectingPoint num="19" id="1977" />
+<TGConnectingPoint num="20" id="1978" />
+<TGConnectingPoint num="21" id="1979" />
+<TGConnectingPoint num="22" id="1980" />
+<TGConnectingPoint num="23" id="1981" />
<extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
+<info stereotype="MEMORY" nodeName="Memory0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1590" >
-<cdparam x="471" y="399" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1102" id="2007" >
+<cdparam x="278" y="269" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="send_TCP()" />
-<TGConnectingPoint num="0" id="1588" />
-<TGConnectingPoint num="1" id="1589" />
-<accessibility />
+<infoparam name="Bus0" value="name" />
+<TGConnectingPoint num="0" id="1983" />
+<TGConnectingPoint num="1" id="1984" />
+<TGConnectingPoint num="2" id="1985" />
+<TGConnectingPoint num="3" id="1986" />
+<TGConnectingPoint num="4" id="1987" />
+<TGConnectingPoint num="5" id="1988" />
+<TGConnectingPoint num="6" id="1989" />
+<TGConnectingPoint num="7" id="1990" />
+<TGConnectingPoint num="8" id="1991" />
+<TGConnectingPoint num="9" id="1992" />
+<TGConnectingPoint num="10" id="1993" />
+<TGConnectingPoint num="11" id="1994" />
+<TGConnectingPoint num="12" id="1995" />
+<TGConnectingPoint num="13" id="1996" />
+<TGConnectingPoint num="14" id="1997" />
+<TGConnectingPoint num="15" id="1998" />
+<TGConnectingPoint num="16" id="1999" />
+<TGConnectingPoint num="17" id="2000" />
+<TGConnectingPoint num="18" id="2001" />
+<TGConnectingPoint num="19" id="2002" />
+<TGConnectingPoint num="20" id="2003" />
+<TGConnectingPoint num="21" id="2004" />
+<TGConnectingPoint num="22" id="2005" />
+<TGConnectingPoint num="23" id="2006" />
<extraparam>
-<Data eventName="send_TCP" nbOfParams="5" />
+<info stereotype="BUS-RR" nodeName="Bus0" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" referenceAttack="ReadDataFromBus" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1592" >
-<cdparam x="577" y="648" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1100" id="2041" >
+<cdparam x="574" y="227" />
+<sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1591" />
+<infoparam name="CPU2" value="name" />
+<TGConnectingPoint num="0" id="2017" />
+<TGConnectingPoint num="1" id="2018" />
+<TGConnectingPoint num="2" id="2019" />
+<TGConnectingPoint num="3" id="2020" />
+<TGConnectingPoint num="4" id="2021" />
+<TGConnectingPoint num="5" id="2022" />
+<TGConnectingPoint num="6" id="2023" />
+<TGConnectingPoint num="7" id="2024" />
+<TGConnectingPoint num="8" id="2025" />
+<TGConnectingPoint num="9" id="2026" />
+<TGConnectingPoint num="10" id="2027" />
+<TGConnectingPoint num="11" id="2028" />
+<TGConnectingPoint num="12" id="2029" />
+<TGConnectingPoint num="13" id="2030" />
+<TGConnectingPoint num="14" id="2031" />
+<TGConnectingPoint num="15" id="2032" />
+<TGConnectingPoint num="16" id="2033" />
+<TGConnectingPoint num="17" id="2034" />
+<TGConnectingPoint num="18" id="2035" />
+<TGConnectingPoint num="19" id="2036" />
+<TGConnectingPoint num="20" id="2037" />
+<TGConnectingPoint num="21" id="2038" />
+<TGConnectingPoint num="22" id="2039" />
+<TGConnectingPoint num="23" id="2040" />
+<extraparam>
+<info stereotype="CPURR" nodeName="CPU2" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
+</extraparam>
</COMPONENT>
-
-<COMPONENT type="1008" id="1595" >
-<cdparam x="563" y="589" />
-<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="2016" >
+<father id="2041" num="0" />
+<cdparam x="604" y="279" />
+<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="abort()" />
-<TGConnectingPoint num="0" id="1593" />
-<TGConnectingPoint num="1" id="1594" />
+<cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
+<infoparam name="TGComponent" value="AppC::Timer" />
+<TGConnectingPoint num="0" id="2008" />
+<TGConnectingPoint num="1" id="2009" />
+<TGConnectingPoint num="2" id="2010" />
+<TGConnectingPoint num="3" id="2011" />
+<TGConnectingPoint num="4" id="2012" />
+<TGConnectingPoint num="5" id="2013" />
+<TGConnectingPoint num="6" id="2014" />
+<TGConnectingPoint num="7" id="2015" />
<extraparam>
-<Data eventName="abort" nbOfParams="5" />
+<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1008" id="1598" >
-<cdparam x="410" y="597" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1100" id="2075" >
+<cdparam x="56" y="231" />
+<sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="close()" />
-<TGConnectingPoint num="0" id="1596" />
-<TGConnectingPoint num="1" id="1597" />
+<infoparam name="CPU1" value="name" />
+<TGConnectingPoint num="0" id="2051" />
+<TGConnectingPoint num="1" id="2052" />
+<TGConnectingPoint num="2" id="2053" />
+<TGConnectingPoint num="3" id="2054" />
+<TGConnectingPoint num="4" id="2055" />
+<TGConnectingPoint num="5" id="2056" />
+<TGConnectingPoint num="6" id="2057" />
+<TGConnectingPoint num="7" id="2058" />
+<TGConnectingPoint num="8" id="2059" />
+<TGConnectingPoint num="9" id="2060" />
+<TGConnectingPoint num="10" id="2061" />
+<TGConnectingPoint num="11" id="2062" />
+<TGConnectingPoint num="12" id="2063" />
+<TGConnectingPoint num="13" id="2064" />
+<TGConnectingPoint num="14" id="2065" />
+<TGConnectingPoint num="15" id="2066" />
+<TGConnectingPoint num="16" id="2067" />
+<TGConnectingPoint num="17" id="2068" />
+<TGConnectingPoint num="18" id="2069" />
+<TGConnectingPoint num="19" id="2070" />
+<TGConnectingPoint num="20" id="2071" />
+<TGConnectingPoint num="21" id="2072" />
+<TGConnectingPoint num="22" id="2073" />
+<TGConnectingPoint num="23" id="2074" />
<extraparam>
-<Data eventName="close" nbOfParams="5" />
+<info stereotype="CPURR" nodeName="CPU1" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-
-<COMPONENT type="1001" id="1600" >
-<cdparam x="423" y="646" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="2050" >
+<father id="2075" num="0" />
+<cdparam x="49" y="276" />
+<sizeparam width="172" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1599" />
-</COMPONENT>
+<cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
+<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
+<TGConnectingPoint num="0" id="2042" />
+<TGConnectingPoint num="1" id="2043" />
+<TGConnectingPoint num="2" id="2044" />
+<TGConnectingPoint num="3" id="2045" />
+<TGConnectingPoint num="4" id="2046" />
+<TGConnectingPoint num="5" id="2047" />
+<TGConnectingPoint num="6" id="2048" />
+<TGConnectingPoint num="7" id="2049" />
+<extraparam>
+<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
-<CONNECTOR type="115" id="1601" >
-<cdparam x="510" y="294" />
+<COMPONENT type="1100" id="2127" >
+<cdparam x="267" y="59" />
+<sizeparam width="272" height="167" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="CPU0" value="name" />
+<TGConnectingPoint num="0" id="2103" />
+<TGConnectingPoint num="1" id="2104" />
+<TGConnectingPoint num="2" id="2105" />
+<TGConnectingPoint num="3" id="2106" />
+<TGConnectingPoint num="4" id="2107" />
+<TGConnectingPoint num="5" id="2108" />
+<TGConnectingPoint num="6" id="2109" />
+<TGConnectingPoint num="7" id="2110" />
+<TGConnectingPoint num="8" id="2111" />
+<TGConnectingPoint num="9" id="2112" />
+<TGConnectingPoint num="10" id="2113" />
+<TGConnectingPoint num="11" id="2114" />
+<TGConnectingPoint num="12" id="2115" />
+<TGConnectingPoint num="13" id="2116" />
+<TGConnectingPoint num="14" id="2117" />
+<TGConnectingPoint num="15" id="2118" />
+<TGConnectingPoint num="16" id="2119" />
+<TGConnectingPoint num="17" id="2120" />
+<TGConnectingPoint num="18" id="2121" />
+<TGConnectingPoint num="19" id="2122" />
+<TGConnectingPoint num="20" id="2123" />
+<TGConnectingPoint num="21" id="2124" />
+<TGConnectingPoint num="22" id="2125" />
+<TGConnectingPoint num="23" id="2126" />
+<extraparam>
+<info stereotype="CPURR" nodeName="CPU0" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1101" id="2084" >
+<father id="2127" num="0" />
+<cdparam x="392" y="119" />
+<sizeparam width="141" height="37" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="131" minY="0" maxY="130" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
+<TGConnectingPoint num="0" id="2076" />
+<TGConnectingPoint num="1" id="2077" />
+<TGConnectingPoint num="2" id="2078" />
+<TGConnectingPoint num="3" id="2079" />
+<TGConnectingPoint num="4" id="2080" />
+<TGConnectingPoint num="5" id="2081" />
+<TGConnectingPoint num="6" id="2082" />
+<TGConnectingPoint num="7" id="2083" />
+<extraparam>
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="2093" >
+<father id="2127" num="1" />
+<cdparam x="293" y="165" />
+<sizeparam width="144" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="128" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="AppC::Application" />
+<TGConnectingPoint num="0" id="2085" />
+<TGConnectingPoint num="1" id="2086" />
+<TGConnectingPoint num="2" id="2087" />
+<TGConnectingPoint num="3" id="2088" />
+<TGConnectingPoint num="4" id="2089" />
+<TGConnectingPoint num="5" id="2090" />
+<TGConnectingPoint num="6" id="2091" />
+<TGConnectingPoint num="7" id="2092" />
+<extraparam>
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="2102" >
+<father id="2127" num="2" />
+<cdparam x="277" y="90" />
+<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="163" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
+<TGConnectingPoint num="0" id="2094" />
+<TGConnectingPoint num="1" id="2095" />
+<TGConnectingPoint num="2" id="2096" />
+<TGConnectingPoint num="3" id="2097" />
+<TGConnectingPoint num="4" id="2098" />
+<TGConnectingPoint num="5" id="2099" />
+<TGConnectingPoint num="6" id="2100" />
+<TGConnectingPoint num="7" id="2101" />
+<extraparam>
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1102" id="2152" >
+<cdparam x="630" y="38" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="SecureBus2" value="name" />
+<TGConnectingPoint num="0" id="2128" />
+<TGConnectingPoint num="1" id="2129" />
+<TGConnectingPoint num="2" id="2130" />
+<TGConnectingPoint num="3" id="2131" />
+<TGConnectingPoint num="4" id="2132" />
+<TGConnectingPoint num="5" id="2133" />
+<TGConnectingPoint num="6" id="2134" />
+<TGConnectingPoint num="7" id="2135" />
+<TGConnectingPoint num="8" id="2136" />
+<TGConnectingPoint num="9" id="2137" />
+<TGConnectingPoint num="10" id="2138" />
+<TGConnectingPoint num="11" id="2139" />
+<TGConnectingPoint num="12" id="2140" />
+<TGConnectingPoint num="13" id="2141" />
+<TGConnectingPoint num="14" id="2142" />
+<TGConnectingPoint num="15" id="2143" />
+<TGConnectingPoint num="16" id="2144" />
+<TGConnectingPoint num="17" id="2145" />
+<TGConnectingPoint num="18" id="2146" />
+<TGConnectingPoint num="19" id="2147" />
+<TGConnectingPoint num="20" id="2148" />
+<TGConnectingPoint num="21" id="2149" />
+<TGConnectingPoint num="22" id="2150" />
+<TGConnectingPoint num="23" id="2151" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="SecureBus2" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataFromBus" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1105" id="2177" >
+<cdparam x="780" y="123" />
+<sizeparam width="176" height="106" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="secureMem2" value="name" />
+<TGConnectingPoint num="0" id="2153" />
+<TGConnectingPoint num="1" id="2154" />
+<TGConnectingPoint num="2" id="2155" />
+<TGConnectingPoint num="3" id="2156" />
+<TGConnectingPoint num="4" id="2157" />
+<TGConnectingPoint num="5" id="2158" />
+<TGConnectingPoint num="6" id="2159" />
+<TGConnectingPoint num="7" id="2160" />
+<TGConnectingPoint num="8" id="2161" />
+<TGConnectingPoint num="9" id="2162" />
+<TGConnectingPoint num="10" id="2163" />
+<TGConnectingPoint num="11" id="2164" />
+<TGConnectingPoint num="12" id="2165" />
+<TGConnectingPoint num="13" id="2166" />
+<TGConnectingPoint num="14" id="2167" />
+<TGConnectingPoint num="15" id="2168" />
+<TGConnectingPoint num="16" id="2169" />
+<TGConnectingPoint num="17" id="2170" />
+<TGConnectingPoint num="18" id="2171" />
+<TGConnectingPoint num="19" id="2172" />
+<TGConnectingPoint num="20" id="2173" />
+<TGConnectingPoint num="21" id="2174" />
+<TGConnectingPoint num="22" id="2175" />
+<TGConnectingPoint num="23" id="2176" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="secureMem2" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="125" id="2178" >
+<cdparam x="539" y="100" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="510" y="294" id="1564" />
-<P2 x="509" y="348" id="1585" />
+<infoparam name="connector" value="{info}" />
+<P1 x="539" y="100" id="2114" />
+<P2 x="630" y="63" id="2131" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1602" >
-<cdparam x="508" y="424" />
+<CONNECTOR type="125" id="2179" >
+<cdparam x="143" y="511" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="508" y="424" id="1589" />
-<P2 x="510" y="504" id="1575" />
+<infoparam name="connector" value="{info}" />
+<P1 x="143" y="511" id="1934" />
+<P2 x="142" y="453" id="1914" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1603" >
-<cdparam x="512" y="154" />
+<CONNECTOR type="125" id="2180" >
+<cdparam x="138" y="357" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="512" y="154" id="1567" />
-<P2 x="511" y="187" id="1569" />
+<infoparam name="connector" value="{info}" />
+<P1 x="138" y="357" id="2057" />
+<P2 x="142" y="403" id="1909" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1604" >
-<cdparam x="594" y="221" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="511" y="217" id="1570" />
-<P2 x="510" y="254" id="1563" />
+<CONNECTOR type="125" id="2181" >
+<cdparam x="402" y="367" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Memory0 to Bus0" value="{info}" />
+<P1 x="403" y="358" id="1959" />
+<P2 x="403" y="319" id="1989" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1605" >
-<cdparam x="506" y="36" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to send event" value="null" />
-<P1 x="505" y="53" id="1580" />
-<P2 x="505" y="66" id="1582" />
+<CONNECTOR type="125" id="2182" >
+<cdparam x="190" y="300" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from CPU1 to Bus0" value="{info}" />
+<P1 x="221" y="294" id="2055" />
+<P2 x="278" y="294" id="1986" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1606" >
-<cdparam x="508" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="505" y="96" id="1583" />
-<P2 x="512" y="124" id="1566" />
+<CONNECTOR type="125" id="2183" >
+<cdparam x="662" y="310" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from CPU2 to Bus0" value="{info}" />
+<P1 x="574" y="294" id="2020" />
+<P2 x="528" y="294" id="1987" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1607" >
-<cdparam x="509" y="397" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="509" y="378" id="1586" />
-<P2 x="508" y="394" id="1588" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1608" >
-<cdparam x="587" y="614" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="587" y="614" id="1594" />
-<P2 x="587" y="643" id="1591" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1609" >
-<cdparam x="471" y="608" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="470" y="529" id="1576" />
-<P2 x="433" y="592" id="1596" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1610" >
-<cdparam x="433" y="622" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="433" y="622" id="1597" />
-<P2 x="433" y="641" id="1599" />
+<CONNECTOR type="125" id="2184" >
+<cdparam x="388" y="162" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from CPU0 to Bus0" value="{info}" />
+<P1 x="403" y="226" id="2109" />
+<P2 x="403" y="269" id="1984" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-<CONNECTOR type="115" id="1611" >
-<cdparam x="551" y="608" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="550" y="529" id="1577" />
-<P2 x="587" y="584" id="1593" />
+<CONNECTOR type="125" id="2185" >
+<cdparam x="812" y="190" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="868" y="123" id="2154" />
+<P2 x="755" y="88" id="2134" />
<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
</CONNECTOR>
-</TMLActivityDiagramPanel>
+</TMLArchiDiagramPanel>
</Modeling>
-<Modeling type="TML Architecture" nameTab="Mapping1" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1102" id="1636" >
-<cdparam x="612" y="450" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<Modeling type="AVATAR Design" nameTab="BasicSecurityProtocol" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+<CONNECTOR type="5002" id="2191" >
+<cdparam x="568" y="220" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block0 to Block0" value="" />
+<TGConnectingPoint num="0" id="2188" />
+<TGConnectingPoint num="1" id="2189" />
+<TGConnectingPoint num="2" id="2190" />
+<P1 x="459" y="199" id="2288" />
+<P2 x="459" y="254" id="2281" />
+<Point x="490" y="199" />
+<Point x="490" y="254" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<iso value="in chin(Message msg)" />
+<osd value="out chout(Message msg)" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR><SUBCOMPONENT type="-1" id="2186" >
+<father id="2191" num="0" />
+<cdparam x="490" y="199" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1612" />
-<TGConnectingPoint num="1" id="1613" />
-<TGConnectingPoint num="2" id="1614" />
-<TGConnectingPoint num="3" id="1615" />
-<TGConnectingPoint num="4" id="1616" />
-<TGConnectingPoint num="5" id="1617" />
-<TGConnectingPoint num="6" id="1618" />
-<TGConnectingPoint num="7" id="1619" />
-<TGConnectingPoint num="8" id="1620" />
-<TGConnectingPoint num="9" id="1621" />
-<TGConnectingPoint num="10" id="1622" />
-<TGConnectingPoint num="11" id="1623" />
-<TGConnectingPoint num="12" id="1624" />
-<TGConnectingPoint num="13" id="1625" />
-<TGConnectingPoint num="14" id="1626" />
-<TGConnectingPoint num="15" id="1627" />
-<TGConnectingPoint num="16" id="1628" />
-<TGConnectingPoint num="17" id="1629" />
-<TGConnectingPoint num="18" id="1630" />
-<TGConnectingPoint num="19" id="1631" />
-<TGConnectingPoint num="20" id="1632" />
-<TGConnectingPoint num="21" id="1633" />
-<TGConnectingPoint num="22" id="1634" />
-<TGConnectingPoint num="23" id="1635" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2187" >
+<father id="2191" num="1" />
+<cdparam x="490" y="254" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<COMPONENT type="302" id="2208" >
+<cdparam x="519" y="154" />
+<sizeparam width="520" height="97" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Proverif Pragma" value="#InitialSystemKnowledge InterfaceDevice.sk SmartCard.sk
+
+#Confidentiality InterfaceDevice.secretData
+#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m
+" />
+<TGConnectingPoint num="0" id="2192" />
+<TGConnectingPoint num="1" id="2193" />
+<TGConnectingPoint num="2" id="2194" />
+<TGConnectingPoint num="3" id="2195" />
+<TGConnectingPoint num="4" id="2196" />
+<TGConnectingPoint num="5" id="2197" />
+<TGConnectingPoint num="6" id="2198" />
+<TGConnectingPoint num="7" id="2199" />
+<TGConnectingPoint num="8" id="2200" />
+<TGConnectingPoint num="9" id="2201" />
+<TGConnectingPoint num="10" id="2202" />
+<TGConnectingPoint num="11" id="2203" />
+<TGConnectingPoint num="12" id="2204" />
+<TGConnectingPoint num="13" id="2205" />
+<TGConnectingPoint num="14" id="2206" />
+<TGConnectingPoint num="15" id="2207" />
<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
+<Line value="#InitialSystemKnowledge InterfaceDevice.sk SmartCard.sk" />
+<Line value="" />
+<Line value="#Confidentiality InterfaceDevice.secretData" />
+<Line value="#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="1661" >
-<cdparam x="797" y="120" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="2217" >
+<cdparam x="260" y="373" />
+<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1637" />
-<TGConnectingPoint num="1" id="1638" />
-<TGConnectingPoint num="2" id="1639" />
-<TGConnectingPoint num="3" id="1640" />
-<TGConnectingPoint num="4" id="1641" />
-<TGConnectingPoint num="5" id="1642" />
-<TGConnectingPoint num="6" id="1643" />
-<TGConnectingPoint num="7" id="1644" />
-<TGConnectingPoint num="8" id="1645" />
-<TGConnectingPoint num="9" id="1646" />
-<TGConnectingPoint num="10" id="1647" />
-<TGConnectingPoint num="11" id="1648" />
-<TGConnectingPoint num="12" id="1649" />
-<TGConnectingPoint num="13" id="1650" />
-<TGConnectingPoint num="14" id="1651" />
-<TGConnectingPoint num="15" id="1652" />
-<TGConnectingPoint num="16" id="1653" />
-<TGConnectingPoint num="17" id="1654" />
-<TGConnectingPoint num="18" id="1655" />
-<TGConnectingPoint num="19" id="1656" />
-<TGConnectingPoint num="20" id="1657" />
-<TGConnectingPoint num="21" id="1658" />
-<TGConnectingPoint num="22" id="1659" />
-<TGConnectingPoint num="23" id="1660" />
+<infoparam name="DataType0" value="Message" />
+<TGConnectingPoint num="0" id="2209" />
+<TGConnectingPoint num="1" id="2210" />
+<TGConnectingPoint num="2" id="2211" />
+<TGConnectingPoint num="3" id="2212" />
+<TGConnectingPoint num="4" id="2213" />
+<TGConnectingPoint num="5" id="2214" />
+<TGConnectingPoint num="6" id="2215" />
+<TGConnectingPoint num="7" id="2216" />
<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="1731" >
-<cdparam x="51" y="90" />
-<sizeparam width="459" height="321" minWidth="150" minHeight="150" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="2226" >
+<cdparam x="68" y="372" />
+<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="cpu0" value="name" />
-<TGConnectingPoint num="0" id="1707" />
-<TGConnectingPoint num="1" id="1708" />
-<TGConnectingPoint num="2" id="1709" />
-<TGConnectingPoint num="3" id="1710" />
-<TGConnectingPoint num="4" id="1711" />
-<TGConnectingPoint num="5" id="1712" />
-<TGConnectingPoint num="6" id="1713" />
-<TGConnectingPoint num="7" id="1714" />
-<TGConnectingPoint num="8" id="1715" />
-<TGConnectingPoint num="9" id="1716" />
-<TGConnectingPoint num="10" id="1717" />
-<TGConnectingPoint num="11" id="1718" />
-<TGConnectingPoint num="12" id="1719" />
-<TGConnectingPoint num="13" id="1720" />
-<TGConnectingPoint num="14" id="1721" />
-<TGConnectingPoint num="15" id="1722" />
-<TGConnectingPoint num="16" id="1723" />
-<TGConnectingPoint num="17" id="1724" />
-<TGConnectingPoint num="18" id="1725" />
-<TGConnectingPoint num="19" id="1726" />
-<TGConnectingPoint num="20" id="1727" />
-<TGConnectingPoint num="21" id="1728" />
-<TGConnectingPoint num="22" id="1729" />
-<TGConnectingPoint num="23" id="1730" />
+<infoparam name="DataType0" value="Key" />
+<TGConnectingPoint num="0" id="2218" />
+<TGConnectingPoint num="1" id="2219" />
+<TGConnectingPoint num="2" id="2220" />
+<TGConnectingPoint num="3" id="2221" />
+<TGConnectingPoint num="4" id="2222" />
+<TGConnectingPoint num="5" id="2223" />
+<TGConnectingPoint num="6" id="2224" />
+<TGConnectingPoint num="7" id="2225" />
<extraparam>
-<info stereotype="CPURRPB" nodeName="cpu0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="99" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
+<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1670" >
-<father id="1731" num="0" />
-<cdparam x="226" y="304" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="5000" id="2301" >
+<cdparam x="21" y="145" />
+<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1662" />
-<TGConnectingPoint num="1" id="1663" />
-<TGConnectingPoint num="2" id="1664" />
-<TGConnectingPoint num="3" id="1665" />
-<TGConnectingPoint num="4" id="1666" />
-<TGConnectingPoint num="5" id="1667" />
-<TGConnectingPoint num="6" id="1668" />
-<TGConnectingPoint num="7" id="1669" />
-<extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1679" >
-<father id="1731" num="1" />
-<cdparam x="290" y="234" />
-<sizeparam width="139" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1671" />
-<TGConnectingPoint num="1" id="1672" />
-<TGConnectingPoint num="2" id="1673" />
-<TGConnectingPoint num="3" id="1674" />
-<TGConnectingPoint num="4" id="1675" />
-<TGConnectingPoint num="5" id="1676" />
-<TGConnectingPoint num="6" id="1677" />
-<TGConnectingPoint num="7" id="1678" />
-<extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1688" >
-<father id="1731" num="2" />
-<cdparam x="96" y="246" />
-<sizeparam width="108" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="351" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1680" />
-<TGConnectingPoint num="1" id="1681" />
-<TGConnectingPoint num="2" id="1682" />
-<TGConnectingPoint num="3" id="1683" />
-<TGConnectingPoint num="4" id="1684" />
-<TGConnectingPoint num="5" id="1685" />
-<TGConnectingPoint num="6" id="1686" />
-<TGConnectingPoint num="7" id="1687" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="System" />
+<TGConnectingPoint num="0" id="2277" />
+<TGConnectingPoint num="1" id="2278" />
+<TGConnectingPoint num="2" id="2279" />
+<TGConnectingPoint num="3" id="2280" />
+<TGConnectingPoint num="4" id="2281" />
+<TGConnectingPoint num="5" id="2282" />
+<TGConnectingPoint num="6" id="2283" />
+<TGConnectingPoint num="7" id="2284" />
+<TGConnectingPoint num="8" id="2285" />
+<TGConnectingPoint num="9" id="2286" />
+<TGConnectingPoint num="10" id="2287" />
+<TGConnectingPoint num="11" id="2288" />
+<TGConnectingPoint num="12" id="2289" />
+<TGConnectingPoint num="13" id="2290" />
+<TGConnectingPoint num="14" id="2291" />
+<TGConnectingPoint num="15" id="2292" />
+<TGConnectingPoint num="16" id="2293" />
+<TGConnectingPoint num="17" id="2294" />
+<TGConnectingPoint num="18" id="2295" />
+<TGConnectingPoint num="19" id="2296" />
+<TGConnectingPoint num="20" id="2297" />
+<TGConnectingPoint num="21" id="2298" />
+<TGConnectingPoint num="22" id="2299" />
+<TGConnectingPoint num="23" id="2300" />
<extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Signal value="in chin(Message msg)" attached="true" />
+<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1697" >
-<father id="1731" num="3" />
-<cdparam x="291" y="153" />
-<sizeparam width="136" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</COMPONENT>
+<SUBCOMPONENT type="5000" id="2251" >
+<father id="2301" num="0" />
+<cdparam x="263" y="233" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1689" />
-<TGConnectingPoint num="1" id="1690" />
-<TGConnectingPoint num="2" id="1691" />
-<TGConnectingPoint num="3" id="1692" />
-<TGConnectingPoint num="4" id="1693" />
-<TGConnectingPoint num="5" id="1694" />
-<TGConnectingPoint num="6" id="1695" />
-<TGConnectingPoint num="7" id="1696" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="SmartCard" />
+<TGConnectingPoint num="0" id="2227" />
+<TGConnectingPoint num="1" id="2228" />
+<TGConnectingPoint num="2" id="2229" />
+<TGConnectingPoint num="3" id="2230" />
+<TGConnectingPoint num="4" id="2231" />
+<TGConnectingPoint num="5" id="2232" />
+<TGConnectingPoint num="6" id="2233" />
+<TGConnectingPoint num="7" id="2234" />
+<TGConnectingPoint num="8" id="2235" />
+<TGConnectingPoint num="9" id="2236" />
+<TGConnectingPoint num="10" id="2237" />
+<TGConnectingPoint num="11" id="2238" />
+<TGConnectingPoint num="12" id="2239" />
+<TGConnectingPoint num="13" id="2240" />
+<TGConnectingPoint num="14" id="2241" />
+<TGConnectingPoint num="15" id="2242" />
+<TGConnectingPoint num="16" id="2243" />
+<TGConnectingPoint num="17" id="2244" />
+<TGConnectingPoint num="18" id="2245" />
+<TGConnectingPoint num="19" id="2246" />
+<TGConnectingPoint num="20" id="2247" />
+<TGConnectingPoint num="21" id="2248" />
+<TGConnectingPoint num="22" id="2249" />
+<TGConnectingPoint num="23" id="2250" />
<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<blockType data="cryptoblock" color="-4072719" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1706" >
-<father id="1731" num="4" />
-<cdparam x="92" y="154" />
-<sizeparam width="163" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="2276" >
+<father id="2301" num="1" />
+<cdparam x="36" y="233" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1698" />
-<TGConnectingPoint num="1" id="1699" />
-<TGConnectingPoint num="2" id="1700" />
-<TGConnectingPoint num="3" id="1701" />
-<TGConnectingPoint num="4" id="1702" />
-<TGConnectingPoint num="5" id="1703" />
-<TGConnectingPoint num="6" id="1704" />
-<TGConnectingPoint num="7" id="1705" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="InterfaceDevice" />
+<TGConnectingPoint num="0" id="2252" />
+<TGConnectingPoint num="1" id="2253" />
+<TGConnectingPoint num="2" id="2254" />
+<TGConnectingPoint num="3" id="2255" />
+<TGConnectingPoint num="4" id="2256" />
+<TGConnectingPoint num="5" id="2257" />
+<TGConnectingPoint num="6" id="2258" />
+<TGConnectingPoint num="7" id="2259" />
+<TGConnectingPoint num="8" id="2260" />
+<TGConnectingPoint num="9" id="2261" />
+<TGConnectingPoint num="10" id="2262" />
+<TGConnectingPoint num="11" id="2263" />
+<TGConnectingPoint num="12" id="2264" />
+<TGConnectingPoint num="13" id="2265" />
+<TGConnectingPoint num="14" id="2266" />
+<TGConnectingPoint num="15" id="2267" />
+<TGConnectingPoint num="16" id="2268" />
+<TGConnectingPoint num="17" id="2269" />
+<TGConnectingPoint num="18" id="2270" />
+<TGConnectingPoint num="19" id="2271" />
+<TGConnectingPoint num="20" id="2272" />
+<TGConnectingPoint num="21" id="2273" />
+<TGConnectingPoint num="22" id="2274" />
+<TGConnectingPoint num="23" id="2275" />
<extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<blockType data="cryptoblock" color="-4072719" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1732" >
-<cdparam x="800" y="322" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="847" y="320" id="1651" />
-<P2 x="799" y="450" id="1621" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1733" >
-<cdparam x="510" y="411" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="510" y="411" id="1714" />
-<P2 x="612" y="462" id="1622" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-</Modeling>
+</AVATARBlockDiagramPanel>
+<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5100" id="2303" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2302" />
+</COMPONENT>
+</AVATARStateMachineDiagramPanel>
-<Modeling type="TML Architecture" nameTab="Mapping2" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="1758" >
-<cdparam x="309" y="358" />
-<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="2310" >
+<cdparam x="407" y="310" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2309" />
+<P1 x="407" y="310" id="2381" />
+<P2 x="416" y="356" id="2340" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2308" >
+<father id="2310" num="0" />
+<cdparam x="449" y="353" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1734" />
-<TGConnectingPoint num="1" id="1735" />
-<TGConnectingPoint num="2" id="1736" />
-<TGConnectingPoint num="3" id="1737" />
-<TGConnectingPoint num="4" id="1738" />
-<TGConnectingPoint num="5" id="1739" />
-<TGConnectingPoint num="6" id="1740" />
-<TGConnectingPoint num="7" id="1741" />
-<TGConnectingPoint num="8" id="1742" />
-<TGConnectingPoint num="9" id="1743" />
-<TGConnectingPoint num="10" id="1744" />
-<TGConnectingPoint num="11" id="1745" />
-<TGConnectingPoint num="12" id="1746" />
-<TGConnectingPoint num="13" id="1747" />
-<TGConnectingPoint num="14" id="1748" />
-<TGConnectingPoint num="15" id="1749" />
-<TGConnectingPoint num="16" id="1750" />
-<TGConnectingPoint num="17" id="1751" />
-<TGConnectingPoint num="18" id="1752" />
-<TGConnectingPoint num="19" id="1753" />
-<TGConnectingPoint num="20" id="1754" />
-<TGConnectingPoint num="21" id="1755" />
-<TGConnectingPoint num="22" id="1756" />
-<TGConnectingPoint num="23" id="1757" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2304" />
+<TGConnectingPoint num="1" id="2305" />
+<TGConnectingPoint num="2" id="2306" />
+<TGConnectingPoint num="3" id="2307" />
<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1102" id="1783" >
-<cdparam x="277" y="270" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2317" >
+<cdparam x="492" y="446" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2316" />
+<P1 x="416" y="406" id="2345" />
+<P2 x="434" y="446" id="2391" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2315" >
+<father id="2317" num="0" />
+<cdparam x="449" y="440" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1759" />
-<TGConnectingPoint num="1" id="1760" />
-<TGConnectingPoint num="2" id="1761" />
-<TGConnectingPoint num="3" id="1762" />
-<TGConnectingPoint num="4" id="1763" />
-<TGConnectingPoint num="5" id="1764" />
-<TGConnectingPoint num="6" id="1765" />
-<TGConnectingPoint num="7" id="1766" />
-<TGConnectingPoint num="8" id="1767" />
-<TGConnectingPoint num="9" id="1768" />
-<TGConnectingPoint num="10" id="1769" />
-<TGConnectingPoint num="11" id="1770" />
-<TGConnectingPoint num="12" id="1771" />
-<TGConnectingPoint num="13" id="1772" />
-<TGConnectingPoint num="14" id="1773" />
-<TGConnectingPoint num="15" id="1774" />
-<TGConnectingPoint num="16" id="1775" />
-<TGConnectingPoint num="17" id="1776" />
-<TGConnectingPoint num="18" id="1777" />
-<TGConnectingPoint num="19" id="1778" />
-<TGConnectingPoint num="20" id="1779" />
-<TGConnectingPoint num="21" id="1780" />
-<TGConnectingPoint num="22" id="1781" />
-<TGConnectingPoint num="23" id="1782" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2311" />
+<TGConnectingPoint num="1" id="2312" />
+<TGConnectingPoint num="2" id="2313" />
+<TGConnectingPoint num="3" id="2314" />
<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" referenceAttack="ReadDataFromBus" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1100" id="1817" >
-<cdparam x="574" y="227" />
-<sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2324" >
+<cdparam x="407" y="251" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="2323" />
+<P1 x="407" y="251" id="2399" />
+<P2 x="407" y="280" id="2380" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2322" >
+<father id="2324" num="0" />
+<cdparam x="407" y="291" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="1793" />
-<TGConnectingPoint num="1" id="1794" />
-<TGConnectingPoint num="2" id="1795" />
-<TGConnectingPoint num="3" id="1796" />
-<TGConnectingPoint num="4" id="1797" />
-<TGConnectingPoint num="5" id="1798" />
-<TGConnectingPoint num="6" id="1799" />
-<TGConnectingPoint num="7" id="1800" />
-<TGConnectingPoint num="8" id="1801" />
-<TGConnectingPoint num="9" id="1802" />
-<TGConnectingPoint num="10" id="1803" />
-<TGConnectingPoint num="11" id="1804" />
-<TGConnectingPoint num="12" id="1805" />
-<TGConnectingPoint num="13" id="1806" />
-<TGConnectingPoint num="14" id="1807" />
-<TGConnectingPoint num="15" id="1808" />
-<TGConnectingPoint num="16" id="1809" />
-<TGConnectingPoint num="17" id="1810" />
-<TGConnectingPoint num="18" id="1811" />
-<TGConnectingPoint num="19" id="1812" />
-<TGConnectingPoint num="20" id="1813" />
-<TGConnectingPoint num="21" id="1814" />
-<TGConnectingPoint num="22" id="1815" />
-<TGConnectingPoint num="23" id="1816" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU2" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="1792" >
-<father id="1817" num="0" />
-<cdparam x="604" y="279" />
-<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
-<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1784" />
-<TGConnectingPoint num="1" id="1785" />
-<TGConnectingPoint num="2" id="1786" />
-<TGConnectingPoint num="3" id="1787" />
-<TGConnectingPoint num="4" id="1788" />
-<TGConnectingPoint num="5" id="1789" />
-<TGConnectingPoint num="6" id="1790" />
-<TGConnectingPoint num="7" id="1791" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2318" />
+<TGConnectingPoint num="1" id="2319" />
+<TGConnectingPoint num="2" id="2320" />
+<TGConnectingPoint num="3" id="2321" />
<extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1851" >
-<cdparam x="56" y="231" />
-<sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2331" >
+<cdparam x="407" y="132" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2330" />
+<P1 x="407" y="132" id="2440" />
+<P2 x="407" y="211" id="2394" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2329" >
+<father id="2331" num="0" />
+<cdparam x="414" y="162" />
+<sizeparam width="126" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="1827" />
-<TGConnectingPoint num="1" id="1828" />
-<TGConnectingPoint num="2" id="1829" />
-<TGConnectingPoint num="3" id="1830" />
-<TGConnectingPoint num="4" id="1831" />
-<TGConnectingPoint num="5" id="1832" />
-<TGConnectingPoint num="6" id="1833" />
-<TGConnectingPoint num="7" id="1834" />
-<TGConnectingPoint num="8" id="1835" />
-<TGConnectingPoint num="9" id="1836" />
-<TGConnectingPoint num="10" id="1837" />
-<TGConnectingPoint num="11" id="1838" />
-<TGConnectingPoint num="12" id="1839" />
-<TGConnectingPoint num="13" id="1840" />
-<TGConnectingPoint num="14" id="1841" />
-<TGConnectingPoint num="15" id="1842" />
-<TGConnectingPoint num="16" id="1843" />
-<TGConnectingPoint num="17" id="1844" />
-<TGConnectingPoint num="18" id="1845" />
-<TGConnectingPoint num="19" id="1846" />
-<TGConnectingPoint num="20" id="1847" />
-<TGConnectingPoint num="21" id="1848" />
-<TGConnectingPoint num="22" id="1849" />
-<TGConnectingPoint num="23" id="1850" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2325" />
+<TGConnectingPoint num="1" id="2326" />
+<TGConnectingPoint num="2" id="2327" />
+<TGConnectingPoint num="3" id="2328" />
<extraparam>
-<info stereotype="CPURR" nodeName="CPU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="m.data = secretData" />
+<actions value="m1 = sencrypt(m, sk)" />
</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="1826" >
-<father id="1851" num="0" />
-<cdparam x="56" y="276" />
-<sizeparam width="163" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2338" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="2337" />
+<P1 x="407" y="70" id="2475" />
+<P2 x="407" y="92" id="2435" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2336" >
+<father id="2338" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="2" minY="0" maxY="86" />
-<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1818" />
-<TGConnectingPoint num="1" id="1819" />
-<TGConnectingPoint num="2" id="1820" />
-<TGConnectingPoint num="3" id="1821" />
-<TGConnectingPoint num="4" id="1822" />
-<TGConnectingPoint num="5" id="1823" />
-<TGConnectingPoint num="6" id="1824" />
-<TGConnectingPoint num="7" id="1825" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2332" />
+<TGConnectingPoint num="1" id="2333" />
+<TGConnectingPoint num="2" id="2334" />
+<TGConnectingPoint num="3" id="2335" />
<extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1903" >
-<cdparam x="267" y="59" />
-<sizeparam width="272" height="167" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2379" >
+<cdparam x="366" y="356" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="1879" />
-<TGConnectingPoint num="1" id="1880" />
-<TGConnectingPoint num="2" id="1881" />
-<TGConnectingPoint num="3" id="1882" />
-<TGConnectingPoint num="4" id="1883" />
-<TGConnectingPoint num="5" id="1884" />
-<TGConnectingPoint num="6" id="1885" />
-<TGConnectingPoint num="7" id="1886" />
-<TGConnectingPoint num="8" id="1887" />
-<TGConnectingPoint num="9" id="1888" />
-<TGConnectingPoint num="10" id="1889" />
-<TGConnectingPoint num="11" id="1890" />
-<TGConnectingPoint num="12" id="1891" />
-<TGConnectingPoint num="13" id="1892" />
-<TGConnectingPoint num="14" id="1893" />
-<TGConnectingPoint num="15" id="1894" />
-<TGConnectingPoint num="16" id="1895" />
-<TGConnectingPoint num="17" id="1896" />
-<TGConnectingPoint num="18" id="1897" />
-<TGConnectingPoint num="19" id="1898" />
-<TGConnectingPoint num="20" id="1899" />
-<TGConnectingPoint num="21" id="1900" />
-<TGConnectingPoint num="22" id="1901" />
-<TGConnectingPoint num="23" id="1902" />
+<infoparam name="State" value="beforeFinish" />
+<TGConnectingPoint num="0" id="2339" />
+<TGConnectingPoint num="1" id="2340" />
+<TGConnectingPoint num="2" id="2341" />
+<TGConnectingPoint num="3" id="2342" />
+<TGConnectingPoint num="4" id="2343" />
+<TGConnectingPoint num="5" id="2344" />
+<TGConnectingPoint num="6" id="2345" />
+<TGConnectingPoint num="7" id="2346" />
+<TGConnectingPoint num="8" id="2347" />
+<TGConnectingPoint num="9" id="2348" />
+<TGConnectingPoint num="10" id="2349" />
+<TGConnectingPoint num="11" id="2350" />
+<TGConnectingPoint num="12" id="2351" />
+<TGConnectingPoint num="13" id="2352" />
+<TGConnectingPoint num="14" id="2353" />
+<TGConnectingPoint num="15" id="2354" />
+<TGConnectingPoint num="16" id="2355" />
+<TGConnectingPoint num="17" id="2356" />
+<TGConnectingPoint num="18" id="2357" />
+<TGConnectingPoint num="19" id="2358" />
+<TGConnectingPoint num="20" id="2359" />
+<TGConnectingPoint num="21" id="2360" />
+<TGConnectingPoint num="22" id="2361" />
+<TGConnectingPoint num="23" id="2362" />
+<TGConnectingPoint num="24" id="2363" />
+<TGConnectingPoint num="25" id="2364" />
+<TGConnectingPoint num="26" id="2365" />
+<TGConnectingPoint num="27" id="2366" />
+<TGConnectingPoint num="28" id="2367" />
+<TGConnectingPoint num="29" id="2368" />
+<TGConnectingPoint num="30" id="2369" />
+<TGConnectingPoint num="31" id="2370" />
+<TGConnectingPoint num="32" id="2371" />
+<TGConnectingPoint num="33" id="2372" />
+<TGConnectingPoint num="34" id="2373" />
+<TGConnectingPoint num="35" id="2374" />
+<TGConnectingPoint num="36" id="2375" />
+<TGConnectingPoint num="37" id="2376" />
+<TGConnectingPoint num="38" id="2377" />
+<TGConnectingPoint num="39" id="2378" />
<extraparam>
-<info stereotype="CPURR" nodeName="CPU0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1860" >
-<father id="1903" num="0" />
-<cdparam x="392" y="119" />
-<sizeparam width="136" height="37" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="5103" id="2390" >
+<cdparam x="373" y="285" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="136" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1852" />
-<TGConnectingPoint num="1" id="1853" />
-<TGConnectingPoint num="2" id="1854" />
-<TGConnectingPoint num="3" id="1855" />
-<TGConnectingPoint num="4" id="1856" />
-<TGConnectingPoint num="5" id="1857" />
-<TGConnectingPoint num="6" id="1858" />
-<TGConnectingPoint num="7" id="1859" />
-<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1869" >
-<father id="1903" num="1" />
-<cdparam x="293" y="165" />
-<sizeparam width="139" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chout(m1)" />
+<TGConnectingPoint num="0" id="2380" />
+<TGConnectingPoint num="1" id="2381" />
+<TGConnectingPoint num="2" id="2382" />
+<TGConnectingPoint num="3" id="2383" />
+<TGConnectingPoint num="4" id="2384" />
+<TGConnectingPoint num="5" id="2385" />
+<TGConnectingPoint num="6" id="2386" />
+<TGConnectingPoint num="7" id="2387" />
+<TGConnectingPoint num="8" id="2388" />
+<TGConnectingPoint num="9" id="2389" />
+</COMPONENT>
+
+<COMPONENT type="5101" id="2392" >
+<cdparam x="424" y="451" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="133" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1861" />
-<TGConnectingPoint num="1" id="1862" />
-<TGConnectingPoint num="2" id="1863" />
-<TGConnectingPoint num="3" id="1864" />
-<TGConnectingPoint num="4" id="1865" />
-<TGConnectingPoint num="5" id="1866" />
-<TGConnectingPoint num="6" id="1867" />
-<TGConnectingPoint num="7" id="1868" />
-<extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1878" >
-<father id="1903" num="2" />
-<cdparam x="277" y="90" />
-<sizeparam width="108" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="2391" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2433" >
+<cdparam x="336" y="211" />
+<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="164" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1870" />
-<TGConnectingPoint num="1" id="1871" />
-<TGConnectingPoint num="2" id="1872" />
-<TGConnectingPoint num="3" id="1873" />
-<TGConnectingPoint num="4" id="1874" />
-<TGConnectingPoint num="5" id="1875" />
-<TGConnectingPoint num="6" id="1876" />
-<TGConnectingPoint num="7" id="1877" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="sendingMessage" />
+<TGConnectingPoint num="0" id="2393" />
+<TGConnectingPoint num="1" id="2394" />
+<TGConnectingPoint num="2" id="2395" />
+<TGConnectingPoint num="3" id="2396" />
+<TGConnectingPoint num="4" id="2397" />
+<TGConnectingPoint num="5" id="2398" />
+<TGConnectingPoint num="6" id="2399" />
+<TGConnectingPoint num="7" id="2400" />
+<TGConnectingPoint num="8" id="2401" />
+<TGConnectingPoint num="9" id="2402" />
+<TGConnectingPoint num="10" id="2403" />
+<TGConnectingPoint num="11" id="2404" />
+<TGConnectingPoint num="12" id="2405" />
+<TGConnectingPoint num="13" id="2406" />
+<TGConnectingPoint num="14" id="2407" />
+<TGConnectingPoint num="15" id="2408" />
+<TGConnectingPoint num="16" id="2409" />
+<TGConnectingPoint num="17" id="2410" />
+<TGConnectingPoint num="18" id="2411" />
+<TGConnectingPoint num="19" id="2412" />
+<TGConnectingPoint num="20" id="2413" />
+<TGConnectingPoint num="21" id="2414" />
+<TGConnectingPoint num="22" id="2415" />
+<TGConnectingPoint num="23" id="2416" />
+<TGConnectingPoint num="24" id="2417" />
+<TGConnectingPoint num="25" id="2418" />
+<TGConnectingPoint num="26" id="2419" />
+<TGConnectingPoint num="27" id="2420" />
+<TGConnectingPoint num="28" id="2421" />
+<TGConnectingPoint num="29" id="2422" />
+<TGConnectingPoint num="30" id="2423" />
+<TGConnectingPoint num="31" id="2424" />
+<TGConnectingPoint num="32" id="2425" />
+<TGConnectingPoint num="33" id="2426" />
+<TGConnectingPoint num="34" id="2427" />
+<TGConnectingPoint num="35" id="2428" />
+<TGConnectingPoint num="36" id="2429" />
+<TGConnectingPoint num="37" id="2430" />
+<TGConnectingPoint num="38" id="2431" />
+<TGConnectingPoint num="39" id="2432" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2474" >
+<cdparam x="340" y="92" />
+<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="makingMessage" />
+<TGConnectingPoint num="0" id="2434" />
+<TGConnectingPoint num="1" id="2435" />
+<TGConnectingPoint num="2" id="2436" />
+<TGConnectingPoint num="3" id="2437" />
+<TGConnectingPoint num="4" id="2438" />
+<TGConnectingPoint num="5" id="2439" />
+<TGConnectingPoint num="6" id="2440" />
+<TGConnectingPoint num="7" id="2441" />
+<TGConnectingPoint num="8" id="2442" />
+<TGConnectingPoint num="9" id="2443" />
+<TGConnectingPoint num="10" id="2444" />
+<TGConnectingPoint num="11" id="2445" />
+<TGConnectingPoint num="12" id="2446" />
+<TGConnectingPoint num="13" id="2447" />
+<TGConnectingPoint num="14" id="2448" />
+<TGConnectingPoint num="15" id="2449" />
+<TGConnectingPoint num="16" id="2450" />
+<TGConnectingPoint num="17" id="2451" />
+<TGConnectingPoint num="18" id="2452" />
+<TGConnectingPoint num="19" id="2453" />
+<TGConnectingPoint num="20" id="2454" />
+<TGConnectingPoint num="21" id="2455" />
+<TGConnectingPoint num="22" id="2456" />
+<TGConnectingPoint num="23" id="2457" />
+<TGConnectingPoint num="24" id="2458" />
+<TGConnectingPoint num="25" id="2459" />
+<TGConnectingPoint num="26" id="2460" />
+<TGConnectingPoint num="27" id="2461" />
+<TGConnectingPoint num="28" id="2462" />
+<TGConnectingPoint num="29" id="2463" />
+<TGConnectingPoint num="30" id="2464" />
+<TGConnectingPoint num="31" id="2465" />
+<TGConnectingPoint num="32" id="2466" />
+<TGConnectingPoint num="33" id="2467" />
+<TGConnectingPoint num="34" id="2468" />
+<TGConnectingPoint num="35" id="2469" />
+<TGConnectingPoint num="36" id="2470" />
+<TGConnectingPoint num="37" id="2471" />
+<TGConnectingPoint num="38" id="2472" />
+<TGConnectingPoint num="39" id="2473" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="2476" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2475" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="2483" >
+<cdparam x="416" y="379" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2482" />
+<P1 x="416" y="379" id="2518" />
+<P2 x="420" y="424" id="2554" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2481" >
+<father id="2483" num="0" />
+<cdparam x="431" y="403" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2477" />
+<TGConnectingPoint num="1" id="2478" />
+<TGConnectingPoint num="2" id="2479" />
+<TGConnectingPoint num="3" id="2480" />
<extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="receivedData = m.data" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1904" >
-<cdparam x="402" y="367" />
+<CONNECTOR type="5102" id="2490" >
+<cdparam x="407" y="273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="403" y="358" id="1735" />
-<P2 x="402" y="320" id="1765" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2489" />
+<P1 x="407" y="273" id="2600" />
+<P2 x="416" y="339" id="2513" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2488" >
+<father id="2490" num="0" />
+<cdparam x="419" y="312" />
+<sizeparam width="127" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2484" />
+<TGConnectingPoint num="1" id="2485" />
+<TGConnectingPoint num="2" id="2486" />
+<TGConnectingPoint num="3" id="2487" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="m = sdecrypt(m2, sk)" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1905" >
-<cdparam x="190" y="300" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2497" >
+<cdparam x="406" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1 x="221" y="294" id="1831" />
-<P2 x="277" y="295" id="1762" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2496" />
+<P1 x="406" y="201" id="2636" />
+<P2 x="407" y="233" id="2595" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2495" >
+<father id="2497" num="0" />
+<cdparam x="406" y="241" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2491" />
+<TGConnectingPoint num="1" id="2492" />
+<TGConnectingPoint num="2" id="2493" />
+<TGConnectingPoint num="3" id="2494" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1906" >
-<cdparam x="662" y="310" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2504" >
+<cdparam x="406" y="141" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1 x="574" y="294" id="1796" />
-<P2 x="527" y="295" id="1763" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2503" />
+<P1 x="406" y="141" id="2652" />
+<P2 x="406" y="171" id="2635" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2502" >
+<father id="2504" num="0" />
+<cdparam x="406" y="181" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2498" />
+<TGConnectingPoint num="1" id="2499" />
+<TGConnectingPoint num="2" id="2500" />
+<TGConnectingPoint num="3" id="2501" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1907" >
-<cdparam x="388" y="162" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2511" >
+<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1 x="403" y="226" id="1885" />
-<P2 x="402" y="270" id="1760" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="2510" />
+<P1 x="407" y="70" id="2687" />
+<P2 x="406" y="101" id="2647" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2509" >
+<father id="2511" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2505" />
+<TGConnectingPoint num="1" id="2506" />
+<TGConnectingPoint num="2" id="2507" />
+<TGConnectingPoint num="3" id="2508" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</CONNECTOR>
+</SUBCOMPONENT>
-</TMLArchiDiagramPanel>
+<COMPONENT type="5106" id="2552" >
+<cdparam x="327" y="339" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="messageDecrypted" />
+<TGConnectingPoint num="0" id="2512" />
+<TGConnectingPoint num="1" id="2513" />
+<TGConnectingPoint num="2" id="2514" />
+<TGConnectingPoint num="3" id="2515" />
+<TGConnectingPoint num="4" id="2516" />
+<TGConnectingPoint num="5" id="2517" />
+<TGConnectingPoint num="6" id="2518" />
+<TGConnectingPoint num="7" id="2519" />
+<TGConnectingPoint num="8" id="2520" />
+<TGConnectingPoint num="9" id="2521" />
+<TGConnectingPoint num="10" id="2522" />
+<TGConnectingPoint num="11" id="2523" />
+<TGConnectingPoint num="12" id="2524" />
+<TGConnectingPoint num="13" id="2525" />
+<TGConnectingPoint num="14" id="2526" />
+<TGConnectingPoint num="15" id="2527" />
+<TGConnectingPoint num="16" id="2528" />
+<TGConnectingPoint num="17" id="2529" />
+<TGConnectingPoint num="18" id="2530" />
+<TGConnectingPoint num="19" id="2531" />
+<TGConnectingPoint num="20" id="2532" />
+<TGConnectingPoint num="21" id="2533" />
+<TGConnectingPoint num="22" id="2534" />
+<TGConnectingPoint num="23" id="2535" />
+<TGConnectingPoint num="24" id="2536" />
+<TGConnectingPoint num="25" id="2537" />
+<TGConnectingPoint num="26" id="2538" />
+<TGConnectingPoint num="27" id="2539" />
+<TGConnectingPoint num="28" id="2540" />
+<TGConnectingPoint num="29" id="2541" />
+<TGConnectingPoint num="30" id="2542" />
+<TGConnectingPoint num="31" id="2543" />
+<TGConnectingPoint num="32" id="2544" />
+<TGConnectingPoint num="33" id="2545" />
+<TGConnectingPoint num="34" id="2546" />
+<TGConnectingPoint num="35" id="2547" />
+<TGConnectingPoint num="36" id="2548" />
+<TGConnectingPoint num="37" id="2549" />
+<TGConnectingPoint num="38" id="2550" />
+<TGConnectingPoint num="39" id="2551" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2593" >
+<cdparam x="350" y="424" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="2553" />
+<TGConnectingPoint num="1" id="2554" />
+<TGConnectingPoint num="2" id="2555" />
+<TGConnectingPoint num="3" id="2556" />
+<TGConnectingPoint num="4" id="2557" />
+<TGConnectingPoint num="5" id="2558" />
+<TGConnectingPoint num="6" id="2559" />
+<TGConnectingPoint num="7" id="2560" />
+<TGConnectingPoint num="8" id="2561" />
+<TGConnectingPoint num="9" id="2562" />
+<TGConnectingPoint num="10" id="2563" />
+<TGConnectingPoint num="11" id="2564" />
+<TGConnectingPoint num="12" id="2565" />
+<TGConnectingPoint num="13" id="2566" />
+<TGConnectingPoint num="14" id="2567" />
+<TGConnectingPoint num="15" id="2568" />
+<TGConnectingPoint num="16" id="2569" />
+<TGConnectingPoint num="17" id="2570" />
+<TGConnectingPoint num="18" id="2571" />
+<TGConnectingPoint num="19" id="2572" />
+<TGConnectingPoint num="20" id="2573" />
+<TGConnectingPoint num="21" id="2574" />
+<TGConnectingPoint num="22" id="2575" />
+<TGConnectingPoint num="23" id="2576" />
+<TGConnectingPoint num="24" id="2577" />
+<TGConnectingPoint num="25" id="2578" />
+<TGConnectingPoint num="26" id="2579" />
+<TGConnectingPoint num="27" id="2580" />
+<TGConnectingPoint num="28" id="2581" />
+<TGConnectingPoint num="29" id="2582" />
+<TGConnectingPoint num="30" id="2583" />
+<TGConnectingPoint num="31" id="2584" />
+<TGConnectingPoint num="32" id="2585" />
+<TGConnectingPoint num="33" id="2586" />
+<TGConnectingPoint num="34" id="2587" />
+<TGConnectingPoint num="35" id="2588" />
+<TGConnectingPoint num="36" id="2589" />
+<TGConnectingPoint num="37" id="2590" />
+<TGConnectingPoint num="38" id="2591" />
+<TGConnectingPoint num="39" id="2592" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2634" >
+<cdparam x="336" y="233" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="2594" />
+<TGConnectingPoint num="1" id="2595" />
+<TGConnectingPoint num="2" id="2596" />
+<TGConnectingPoint num="3" id="2597" />
+<TGConnectingPoint num="4" id="2598" />
+<TGConnectingPoint num="5" id="2599" />
+<TGConnectingPoint num="6" id="2600" />
+<TGConnectingPoint num="7" id="2601" />
+<TGConnectingPoint num="8" id="2602" />
+<TGConnectingPoint num="9" id="2603" />
+<TGConnectingPoint num="10" id="2604" />
+<TGConnectingPoint num="11" id="2605" />
+<TGConnectingPoint num="12" id="2606" />
+<TGConnectingPoint num="13" id="2607" />
+<TGConnectingPoint num="14" id="2608" />
+<TGConnectingPoint num="15" id="2609" />
+<TGConnectingPoint num="16" id="2610" />
+<TGConnectingPoint num="17" id="2611" />
+<TGConnectingPoint num="18" id="2612" />
+<TGConnectingPoint num="19" id="2613" />
+<TGConnectingPoint num="20" id="2614" />
+<TGConnectingPoint num="21" id="2615" />
+<TGConnectingPoint num="22" id="2616" />
+<TGConnectingPoint num="23" id="2617" />
+<TGConnectingPoint num="24" id="2618" />
+<TGConnectingPoint num="25" id="2619" />
+<TGConnectingPoint num="26" id="2620" />
+<TGConnectingPoint num="27" id="2621" />
+<TGConnectingPoint num="28" id="2622" />
+<TGConnectingPoint num="29" id="2623" />
+<TGConnectingPoint num="30" id="2624" />
+<TGConnectingPoint num="31" id="2625" />
+<TGConnectingPoint num="32" id="2626" />
+<TGConnectingPoint num="33" id="2627" />
+<TGConnectingPoint num="34" id="2628" />
+<TGConnectingPoint num="35" id="2629" />
+<TGConnectingPoint num="36" id="2630" />
+<TGConnectingPoint num="37" id="2631" />
+<TGConnectingPoint num="38" id="2632" />
+<TGConnectingPoint num="39" id="2633" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="2645" >
+<cdparam x="372" y="176" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="2635" />
+<TGConnectingPoint num="1" id="2636" />
+<TGConnectingPoint num="2" id="2637" />
+<TGConnectingPoint num="3" id="2638" />
+<TGConnectingPoint num="4" id="2639" />
+<TGConnectingPoint num="5" id="2640" />
+<TGConnectingPoint num="6" id="2641" />
+<TGConnectingPoint num="7" id="2642" />
+<TGConnectingPoint num="8" id="2643" />
+<TGConnectingPoint num="9" id="2644" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2686" >
+<cdparam x="340" y="101" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="waitingForMessage" />
+<TGConnectingPoint num="0" id="2646" />
+<TGConnectingPoint num="1" id="2647" />
+<TGConnectingPoint num="2" id="2648" />
+<TGConnectingPoint num="3" id="2649" />
+<TGConnectingPoint num="4" id="2650" />
+<TGConnectingPoint num="5" id="2651" />
+<TGConnectingPoint num="6" id="2652" />
+<TGConnectingPoint num="7" id="2653" />
+<TGConnectingPoint num="8" id="2654" />
+<TGConnectingPoint num="9" id="2655" />
+<TGConnectingPoint num="10" id="2656" />
+<TGConnectingPoint num="11" id="2657" />
+<TGConnectingPoint num="12" id="2658" />
+<TGConnectingPoint num="13" id="2659" />
+<TGConnectingPoint num="14" id="2660" />
+<TGConnectingPoint num="15" id="2661" />
+<TGConnectingPoint num="16" id="2662" />
+<TGConnectingPoint num="17" id="2663" />
+<TGConnectingPoint num="18" id="2664" />
+<TGConnectingPoint num="19" id="2665" />
+<TGConnectingPoint num="20" id="2666" />
+<TGConnectingPoint num="21" id="2667" />
+<TGConnectingPoint num="22" id="2668" />
+<TGConnectingPoint num="23" id="2669" />
+<TGConnectingPoint num="24" id="2670" />
+<TGConnectingPoint num="25" id="2671" />
+<TGConnectingPoint num="26" id="2672" />
+<TGConnectingPoint num="27" id="2673" />
+<TGConnectingPoint num="28" id="2674" />
+<TGConnectingPoint num="29" id="2675" />
+<TGConnectingPoint num="30" id="2676" />
+<TGConnectingPoint num="31" id="2677" />
+<TGConnectingPoint num="32" id="2678" />
+<TGConnectingPoint num="33" id="2679" />
+<TGConnectingPoint num="34" id="2680" />
+<TGConnectingPoint num="35" id="2681" />
+<TGConnectingPoint num="36" id="2682" />
+<TGConnectingPoint num="37" id="2683" />
+<TGConnectingPoint num="38" id="2684" />
+<TGConnectingPoint num="39" id="2685" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="2688" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2687" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
</Modeling>
-<Modeling type="TML Architecture" nameTab="Mapping2_Sec" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1102" id="1932" >
-<cdparam x="17" y="403" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<Modeling type="AVATAR Design" nameTab="DHSecurityProtocol" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+<CONNECTOR type="5002" id="2694" >
+<cdparam x="568" y="220" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block0 to Block0" value="" />
+<TGConnectingPoint num="0" id="2691" />
+<TGConnectingPoint num="1" id="2692" />
+<TGConnectingPoint num="2" id="2693" />
+<P1 x="459" y="199" id="2791" />
+<P2 x="459" y="254" id="2784" />
+<Point x="490" y="199" />
+<Point x="490" y="254" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<iso value="in chin(Message msg)" />
+<osd value="out chout(Message msg)" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR><SUBCOMPONENT type="-1" id="2689" >
+<father id="2694" num="0" />
+<cdparam x="490" y="199" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="SecureBus1" value="name" />
-<TGConnectingPoint num="0" id="1908" />
-<TGConnectingPoint num="1" id="1909" />
-<TGConnectingPoint num="2" id="1910" />
-<TGConnectingPoint num="3" id="1911" />
-<TGConnectingPoint num="4" id="1912" />
-<TGConnectingPoint num="5" id="1913" />
-<TGConnectingPoint num="6" id="1914" />
-<TGConnectingPoint num="7" id="1915" />
-<TGConnectingPoint num="8" id="1916" />
-<TGConnectingPoint num="9" id="1917" />
-<TGConnectingPoint num="10" id="1918" />
-<TGConnectingPoint num="11" id="1919" />
-<TGConnectingPoint num="12" id="1920" />
-<TGConnectingPoint num="13" id="1921" />
-<TGConnectingPoint num="14" id="1922" />
-<TGConnectingPoint num="15" id="1923" />
-<TGConnectingPoint num="16" id="1924" />
-<TGConnectingPoint num="17" id="1925" />
-<TGConnectingPoint num="18" id="1926" />
-<TGConnectingPoint num="19" id="1927" />
-<TGConnectingPoint num="20" id="1928" />
-<TGConnectingPoint num="21" id="1929" />
-<TGConnectingPoint num="22" id="1930" />
-<TGConnectingPoint num="23" id="1931" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2690" >
+<father id="2694" num="1" />
+<cdparam x="490" y="254" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<COMPONENT type="302" id="2711" >
+<cdparam x="517" y="154" />
+<sizeparam width="520" height="110" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Proverif Pragma" value="#PrivatePublicKeys InterfaceDevice privK pubK
+#PrivatePublicKeys SmartCard privK pubK
+
+#Confidentiality InterfaceDevice.secretData
+#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m
+" />
+<TGConnectingPoint num="0" id="2695" />
+<TGConnectingPoint num="1" id="2696" />
+<TGConnectingPoint num="2" id="2697" />
+<TGConnectingPoint num="3" id="2698" />
+<TGConnectingPoint num="4" id="2699" />
+<TGConnectingPoint num="5" id="2700" />
+<TGConnectingPoint num="6" id="2701" />
+<TGConnectingPoint num="7" id="2702" />
+<TGConnectingPoint num="8" id="2703" />
+<TGConnectingPoint num="9" id="2704" />
+<TGConnectingPoint num="10" id="2705" />
+<TGConnectingPoint num="11" id="2706" />
+<TGConnectingPoint num="12" id="2707" />
+<TGConnectingPoint num="13" id="2708" />
+<TGConnectingPoint num="14" id="2709" />
+<TGConnectingPoint num="15" id="2710" />
<extraparam>
-<info stereotype="BUS-RR" nodeName="SecureBus1" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataFromBus" />
+<Line value="#PrivatePublicKeys InterfaceDevice privK pubK" />
+<Line value="#PrivatePublicKeys SmartCard privK pubK" />
+<Line value="" />
+<Line value="#Confidentiality InterfaceDevice.secretData" />
+<Line value="#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="1957" >
-<cdparam x="55" y="511" />
-<sizeparam width="176" height="106" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="2720" >
+<cdparam x="260" y="373" />
+<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="secureMem1" value="name" />
-<TGConnectingPoint num="0" id="1933" />
-<TGConnectingPoint num="1" id="1934" />
-<TGConnectingPoint num="2" id="1935" />
-<TGConnectingPoint num="3" id="1936" />
-<TGConnectingPoint num="4" id="1937" />
-<TGConnectingPoint num="5" id="1938" />
-<TGConnectingPoint num="6" id="1939" />
-<TGConnectingPoint num="7" id="1940" />
-<TGConnectingPoint num="8" id="1941" />
-<TGConnectingPoint num="9" id="1942" />
-<TGConnectingPoint num="10" id="1943" />
-<TGConnectingPoint num="11" id="1944" />
-<TGConnectingPoint num="12" id="1945" />
-<TGConnectingPoint num="13" id="1946" />
-<TGConnectingPoint num="14" id="1947" />
-<TGConnectingPoint num="15" id="1948" />
-<TGConnectingPoint num="16" id="1949" />
-<TGConnectingPoint num="17" id="1950" />
-<TGConnectingPoint num="18" id="1951" />
-<TGConnectingPoint num="19" id="1952" />
-<TGConnectingPoint num="20" id="1953" />
-<TGConnectingPoint num="21" id="1954" />
-<TGConnectingPoint num="22" id="1955" />
-<TGConnectingPoint num="23" id="1956" />
+<infoparam name="DataType0" value="Message" />
+<TGConnectingPoint num="0" id="2712" />
+<TGConnectingPoint num="1" id="2713" />
+<TGConnectingPoint num="2" id="2714" />
+<TGConnectingPoint num="3" id="2715" />
+<TGConnectingPoint num="4" id="2716" />
+<TGConnectingPoint num="5" id="2717" />
+<TGConnectingPoint num="6" id="2718" />
+<TGConnectingPoint num="7" id="2719" />
<extraparam>
-<info stereotype="MEMORY" nodeName="secureMem1" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="1982" >
-<cdparam x="309" y="358" />
-<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="2729" >
+<cdparam x="68" y="372" />
+<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1958" />
-<TGConnectingPoint num="1" id="1959" />
-<TGConnectingPoint num="2" id="1960" />
-<TGConnectingPoint num="3" id="1961" />
-<TGConnectingPoint num="4" id="1962" />
-<TGConnectingPoint num="5" id="1963" />
-<TGConnectingPoint num="6" id="1964" />
-<TGConnectingPoint num="7" id="1965" />
-<TGConnectingPoint num="8" id="1966" />
-<TGConnectingPoint num="9" id="1967" />
-<TGConnectingPoint num="10" id="1968" />
-<TGConnectingPoint num="11" id="1969" />
-<TGConnectingPoint num="12" id="1970" />
-<TGConnectingPoint num="13" id="1971" />
-<TGConnectingPoint num="14" id="1972" />
-<TGConnectingPoint num="15" id="1973" />
-<TGConnectingPoint num="16" id="1974" />
-<TGConnectingPoint num="17" id="1975" />
-<TGConnectingPoint num="18" id="1976" />
-<TGConnectingPoint num="19" id="1977" />
-<TGConnectingPoint num="20" id="1978" />
-<TGConnectingPoint num="21" id="1979" />
-<TGConnectingPoint num="22" id="1980" />
-<TGConnectingPoint num="23" id="1981" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="2007" >
-<cdparam x="278" y="269" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1983" />
-<TGConnectingPoint num="1" id="1984" />
-<TGConnectingPoint num="2" id="1985" />
-<TGConnectingPoint num="3" id="1986" />
-<TGConnectingPoint num="4" id="1987" />
-<TGConnectingPoint num="5" id="1988" />
-<TGConnectingPoint num="6" id="1989" />
-<TGConnectingPoint num="7" id="1990" />
-<TGConnectingPoint num="8" id="1991" />
-<TGConnectingPoint num="9" id="1992" />
-<TGConnectingPoint num="10" id="1993" />
-<TGConnectingPoint num="11" id="1994" />
-<TGConnectingPoint num="12" id="1995" />
-<TGConnectingPoint num="13" id="1996" />
-<TGConnectingPoint num="14" id="1997" />
-<TGConnectingPoint num="15" id="1998" />
-<TGConnectingPoint num="16" id="1999" />
-<TGConnectingPoint num="17" id="2000" />
-<TGConnectingPoint num="18" id="2001" />
-<TGConnectingPoint num="19" id="2002" />
-<TGConnectingPoint num="20" id="2003" />
-<TGConnectingPoint num="21" id="2004" />
-<TGConnectingPoint num="22" id="2005" />
-<TGConnectingPoint num="23" id="2006" />
+<infoparam name="DataType0" value="Key" />
+<TGConnectingPoint num="0" id="2721" />
+<TGConnectingPoint num="1" id="2722" />
+<TGConnectingPoint num="2" id="2723" />
+<TGConnectingPoint num="3" id="2724" />
+<TGConnectingPoint num="4" id="2725" />
+<TGConnectingPoint num="5" id="2726" />
+<TGConnectingPoint num="6" id="2727" />
+<TGConnectingPoint num="7" id="2728" />
<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" referenceAttack="ReadDataFromBus" />
+<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="2041" >
-<cdparam x="574" y="227" />
-<sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5000" id="2804" >
+<cdparam x="21" y="145" />
+<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="2017" />
-<TGConnectingPoint num="1" id="2018" />
-<TGConnectingPoint num="2" id="2019" />
-<TGConnectingPoint num="3" id="2020" />
-<TGConnectingPoint num="4" id="2021" />
-<TGConnectingPoint num="5" id="2022" />
-<TGConnectingPoint num="6" id="2023" />
-<TGConnectingPoint num="7" id="2024" />
-<TGConnectingPoint num="8" id="2025" />
-<TGConnectingPoint num="9" id="2026" />
-<TGConnectingPoint num="10" id="2027" />
-<TGConnectingPoint num="11" id="2028" />
-<TGConnectingPoint num="12" id="2029" />
-<TGConnectingPoint num="13" id="2030" />
-<TGConnectingPoint num="14" id="2031" />
-<TGConnectingPoint num="15" id="2032" />
-<TGConnectingPoint num="16" id="2033" />
-<TGConnectingPoint num="17" id="2034" />
-<TGConnectingPoint num="18" id="2035" />
-<TGConnectingPoint num="19" id="2036" />
-<TGConnectingPoint num="20" id="2037" />
-<TGConnectingPoint num="21" id="2038" />
-<TGConnectingPoint num="22" id="2039" />
-<TGConnectingPoint num="23" id="2040" />
+<infoparam name="Block0" value="System" />
+<TGConnectingPoint num="0" id="2780" />
+<TGConnectingPoint num="1" id="2781" />
+<TGConnectingPoint num="2" id="2782" />
+<TGConnectingPoint num="3" id="2783" />
+<TGConnectingPoint num="4" id="2784" />
+<TGConnectingPoint num="5" id="2785" />
+<TGConnectingPoint num="6" id="2786" />
+<TGConnectingPoint num="7" id="2787" />
+<TGConnectingPoint num="8" id="2788" />
+<TGConnectingPoint num="9" id="2789" />
+<TGConnectingPoint num="10" id="2790" />
+<TGConnectingPoint num="11" id="2791" />
+<TGConnectingPoint num="12" id="2792" />
+<TGConnectingPoint num="13" id="2793" />
+<TGConnectingPoint num="14" id="2794" />
+<TGConnectingPoint num="15" id="2795" />
+<TGConnectingPoint num="16" id="2796" />
+<TGConnectingPoint num="17" id="2797" />
+<TGConnectingPoint num="18" id="2798" />
+<TGConnectingPoint num="19" id="2799" />
+<TGConnectingPoint num="20" id="2800" />
+<TGConnectingPoint num="21" id="2801" />
+<TGConnectingPoint num="22" id="2802" />
+<TGConnectingPoint num="23" id="2803" />
<extraparam>
-<info stereotype="CPURR" nodeName="CPU2" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Signal value="in chin(Message msg)" attached="true" />
+<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="2016" >
-<father id="2041" num="0" />
-<cdparam x="604" y="279" />
-<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="2754" >
+<father id="2804" num="0" />
+<cdparam x="36" y="233" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
-<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="2008" />
-<TGConnectingPoint num="1" id="2009" />
-<TGConnectingPoint num="2" id="2010" />
-<TGConnectingPoint num="3" id="2011" />
-<TGConnectingPoint num="4" id="2012" />
-<TGConnectingPoint num="5" id="2013" />
-<TGConnectingPoint num="6" id="2014" />
-<TGConnectingPoint num="7" id="2015" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="InterfaceDevice" />
+<TGConnectingPoint num="0" id="2730" />
+<TGConnectingPoint num="1" id="2731" />
+<TGConnectingPoint num="2" id="2732" />
+<TGConnectingPoint num="3" id="2733" />
+<TGConnectingPoint num="4" id="2734" />
+<TGConnectingPoint num="5" id="2735" />
+<TGConnectingPoint num="6" id="2736" />
+<TGConnectingPoint num="7" id="2737" />
+<TGConnectingPoint num="8" id="2738" />
+<TGConnectingPoint num="9" id="2739" />
+<TGConnectingPoint num="10" id="2740" />
+<TGConnectingPoint num="11" id="2741" />
+<TGConnectingPoint num="12" id="2742" />
+<TGConnectingPoint num="13" id="2743" />
+<TGConnectingPoint num="14" id="2744" />
+<TGConnectingPoint num="15" id="2745" />
+<TGConnectingPoint num="16" id="2746" />
+<TGConnectingPoint num="17" id="2747" />
+<TGConnectingPoint num="18" id="2748" />
+<TGConnectingPoint num="19" id="2749" />
+<TGConnectingPoint num="20" id="2750" />
+<TGConnectingPoint num="21" id="2751" />
+<TGConnectingPoint num="22" id="2752" />
+<TGConnectingPoint num="23" id="2753" />
<extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<blockType data="cryptoblock" color="-4072719" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="2075" >
-<cdparam x="56" y="231" />
-<sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="2051" />
-<TGConnectingPoint num="1" id="2052" />
-<TGConnectingPoint num="2" id="2053" />
-<TGConnectingPoint num="3" id="2054" />
-<TGConnectingPoint num="4" id="2055" />
-<TGConnectingPoint num="5" id="2056" />
-<TGConnectingPoint num="6" id="2057" />
-<TGConnectingPoint num="7" id="2058" />
-<TGConnectingPoint num="8" id="2059" />
-<TGConnectingPoint num="9" id="2060" />
-<TGConnectingPoint num="10" id="2061" />
-<TGConnectingPoint num="11" id="2062" />
-<TGConnectingPoint num="12" id="2063" />
-<TGConnectingPoint num="13" id="2064" />
-<TGConnectingPoint num="14" id="2065" />
-<TGConnectingPoint num="15" id="2066" />
-<TGConnectingPoint num="16" id="2067" />
-<TGConnectingPoint num="17" id="2068" />
-<TGConnectingPoint num="18" id="2069" />
-<TGConnectingPoint num="19" id="2070" />
-<TGConnectingPoint num="20" id="2071" />
-<TGConnectingPoint num="21" id="2072" />
-<TGConnectingPoint num="22" id="2073" />
-<TGConnectingPoint num="23" id="2074" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="2050" >
-<father id="2075" num="0" />
-<cdparam x="56" y="276" />
-<sizeparam width="163" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="2779" >
+<father id="2804" num="1" />
+<cdparam x="263" y="233" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="2" minY="0" maxY="86" />
-<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="2042" />
-<TGConnectingPoint num="1" id="2043" />
-<TGConnectingPoint num="2" id="2044" />
-<TGConnectingPoint num="3" id="2045" />
-<TGConnectingPoint num="4" id="2046" />
-<TGConnectingPoint num="5" id="2047" />
-<TGConnectingPoint num="6" id="2048" />
-<TGConnectingPoint num="7" id="2049" />
-<extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="2127" >
-<cdparam x="267" y="59" />
-<sizeparam width="272" height="167" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="SmartCard" />
+<TGConnectingPoint num="0" id="2755" />
+<TGConnectingPoint num="1" id="2756" />
+<TGConnectingPoint num="2" id="2757" />
+<TGConnectingPoint num="3" id="2758" />
+<TGConnectingPoint num="4" id="2759" />
+<TGConnectingPoint num="5" id="2760" />
+<TGConnectingPoint num="6" id="2761" />
+<TGConnectingPoint num="7" id="2762" />
+<TGConnectingPoint num="8" id="2763" />
+<TGConnectingPoint num="9" id="2764" />
+<TGConnectingPoint num="10" id="2765" />
+<TGConnectingPoint num="11" id="2766" />
+<TGConnectingPoint num="12" id="2767" />
+<TGConnectingPoint num="13" id="2768" />
+<TGConnectingPoint num="14" id="2769" />
+<TGConnectingPoint num="15" id="2770" />
+<TGConnectingPoint num="16" id="2771" />
+<TGConnectingPoint num="17" id="2772" />
+<TGConnectingPoint num="18" id="2773" />
+<TGConnectingPoint num="19" id="2774" />
+<TGConnectingPoint num="20" id="2775" />
+<TGConnectingPoint num="21" id="2776" />
+<TGConnectingPoint num="22" id="2777" />
+<TGConnectingPoint num="23" id="2778" />
+<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
+<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5100" id="2806" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="2103" />
-<TGConnectingPoint num="1" id="2104" />
-<TGConnectingPoint num="2" id="2105" />
-<TGConnectingPoint num="3" id="2106" />
-<TGConnectingPoint num="4" id="2107" />
-<TGConnectingPoint num="5" id="2108" />
-<TGConnectingPoint num="6" id="2109" />
-<TGConnectingPoint num="7" id="2110" />
-<TGConnectingPoint num="8" id="2111" />
-<TGConnectingPoint num="9" id="2112" />
-<TGConnectingPoint num="10" id="2113" />
-<TGConnectingPoint num="11" id="2114" />
-<TGConnectingPoint num="12" id="2115" />
-<TGConnectingPoint num="13" id="2116" />
-<TGConnectingPoint num="14" id="2117" />
-<TGConnectingPoint num="15" id="2118" />
-<TGConnectingPoint num="16" id="2119" />
-<TGConnectingPoint num="17" id="2120" />
-<TGConnectingPoint num="18" id="2121" />
-<TGConnectingPoint num="19" id="2122" />
-<TGConnectingPoint num="20" id="2123" />
-<TGConnectingPoint num="21" id="2124" />
-<TGConnectingPoint num="22" id="2125" />
-<TGConnectingPoint num="23" id="2126" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2805" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="2813" >
+<cdparam x="418" y="632" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2812" />
+<P1 x="418" y="632" id="2980" />
+<P2 x="422" y="677" id="3016" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2811" >
+<father id="2813" num="0" />
+<cdparam x="433" y="656" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2807" />
+<TGConnectingPoint num="1" id="2808" />
+<TGConnectingPoint num="2" id="2809" />
+<TGConnectingPoint num="3" id="2810" />
<extraparam>
-<info stereotype="CPURR" nodeName="CPU0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="receivedData = m.data" />
</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="2084" >
-<father id="2127" num="0" />
-<cdparam x="277" y="90" />
-<sizeparam width="108" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2820" >
+<cdparam x="409" y="526" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2819" />
+<P1 x="409" y="526" id="3062" />
+<P2 x="418" y="592" id="2975" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2818" >
+<father id="2820" num="0" />
+<cdparam x="431" y="551" />
+<sizeparam width="151" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="164" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="2076" />
-<TGConnectingPoint num="1" id="2077" />
-<TGConnectingPoint num="2" id="2078" />
-<TGConnectingPoint num="3" id="2079" />
-<TGConnectingPoint num="4" id="2080" />
-<TGConnectingPoint num="5" id="2081" />
-<TGConnectingPoint num="6" id="2082" />
-<TGConnectingPoint num="7" id="2083" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2814" />
+<TGConnectingPoint num="1" id="2815" />
+<TGConnectingPoint num="2" id="2816" />
+<TGConnectingPoint num="3" id="2817" />
<extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="sk = DH(alicePubK, privK)" />
+<actions value="m = sdecrypt(m2, sk)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="2093" >
-<father id="2127" num="1" />
-<cdparam x="293" y="165" />
-<sizeparam width="139" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<CONNECTOR type="5102" id="2827" >
+<cdparam x="408" y="454" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2826" />
+<P1 x="408" y="454" id="3098" />
+<P2 x="409" y="486" id="3057" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2825" >
+<father id="2827" num="0" />
+<cdparam x="408" y="494" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="133" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="2085" />
-<TGConnectingPoint num="1" id="2086" />
-<TGConnectingPoint num="2" id="2087" />
-<TGConnectingPoint num="3" id="2088" />
-<TGConnectingPoint num="4" id="2089" />
-<TGConnectingPoint num="5" id="2090" />
-<TGConnectingPoint num="6" id="2091" />
-<TGConnectingPoint num="7" id="2092" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2821" />
+<TGConnectingPoint num="1" id="2822" />
+<TGConnectingPoint num="2" id="2823" />
+<TGConnectingPoint num="3" id="2824" />
<extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="2102" >
-<father id="2127" num="2" />
-<cdparam x="392" y="119" />
-<sizeparam width="136" height="37" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<CONNECTOR type="5102" id="2834" >
+<cdparam x="408" y="394" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2833" />
+<P1 x="408" y="394" id="3114" />
+<P2 x="408" y="424" id="3097" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2832" >
+<father id="2834" num="0" />
+<cdparam x="408" y="434" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="136" minY="0" maxY="130" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="2094" />
-<TGConnectingPoint num="1" id="2095" />
-<TGConnectingPoint num="2" id="2096" />
-<TGConnectingPoint num="3" id="2097" />
-<TGConnectingPoint num="4" id="2098" />
-<TGConnectingPoint num="5" id="2099" />
-<TGConnectingPoint num="6" id="2100" />
-<TGConnectingPoint num="7" id="2101" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2828" />
+<TGConnectingPoint num="1" id="2829" />
+<TGConnectingPoint num="2" id="2830" />
+<TGConnectingPoint num="3" id="2831" />
<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="2152" >
-<cdparam x="630" y="38" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2841" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="2840" />
+<P1 x="407" y="70" id="3149" />
+<P2 x="407" y="95" id="2934" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2839" >
+<father id="2841" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="SecureBus2" value="name" />
-<TGConnectingPoint num="0" id="2128" />
-<TGConnectingPoint num="1" id="2129" />
-<TGConnectingPoint num="2" id="2130" />
-<TGConnectingPoint num="3" id="2131" />
-<TGConnectingPoint num="4" id="2132" />
-<TGConnectingPoint num="5" id="2133" />
-<TGConnectingPoint num="6" id="2134" />
-<TGConnectingPoint num="7" id="2135" />
-<TGConnectingPoint num="8" id="2136" />
-<TGConnectingPoint num="9" id="2137" />
-<TGConnectingPoint num="10" id="2138" />
-<TGConnectingPoint num="11" id="2139" />
-<TGConnectingPoint num="12" id="2140" />
-<TGConnectingPoint num="13" id="2141" />
-<TGConnectingPoint num="14" id="2142" />
-<TGConnectingPoint num="15" id="2143" />
-<TGConnectingPoint num="16" id="2144" />
-<TGConnectingPoint num="17" id="2145" />
-<TGConnectingPoint num="18" id="2146" />
-<TGConnectingPoint num="19" id="2147" />
-<TGConnectingPoint num="20" id="2148" />
-<TGConnectingPoint num="21" id="2149" />
-<TGConnectingPoint num="22" id="2150" />
-<TGConnectingPoint num="23" id="2151" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2835" />
+<TGConnectingPoint num="1" id="2836" />
+<TGConnectingPoint num="2" id="2837" />
+<TGConnectingPoint num="3" id="2838" />
<extraparam>
-<info stereotype="BUS-RR" nodeName="SecureBus2" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataFromBus" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1105" id="2177" >
-<cdparam x="780" y="123" />
-<sizeparam width="176" height="106" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2848" >
+<cdparam x="407" y="127" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2847" />
+<P1 x="407" y="127" id="2939" />
+<P2 x="407" y="153" id="2922" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2846" >
+<father id="2848" num="0" />
+<cdparam x="428" y="145" />
+<sizeparam width="120" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="secureMem2" value="name" />
-<TGConnectingPoint num="0" id="2153" />
-<TGConnectingPoint num="1" id="2154" />
-<TGConnectingPoint num="2" id="2155" />
-<TGConnectingPoint num="3" id="2156" />
-<TGConnectingPoint num="4" id="2157" />
-<TGConnectingPoint num="5" id="2158" />
-<TGConnectingPoint num="6" id="2159" />
-<TGConnectingPoint num="7" id="2160" />
-<TGConnectingPoint num="8" id="2161" />
-<TGConnectingPoint num="9" id="2162" />
-<TGConnectingPoint num="10" id="2163" />
-<TGConnectingPoint num="11" id="2164" />
-<TGConnectingPoint num="12" id="2165" />
-<TGConnectingPoint num="13" id="2166" />
-<TGConnectingPoint num="14" id="2167" />
-<TGConnectingPoint num="15" id="2168" />
-<TGConnectingPoint num="16" id="2169" />
-<TGConnectingPoint num="17" id="2170" />
-<TGConnectingPoint num="18" id="2171" />
-<TGConnectingPoint num="19" id="2172" />
-<TGConnectingPoint num="20" id="2173" />
-<TGConnectingPoint num="21" id="2174" />
-<TGConnectingPoint num="22" id="2175" />
-<TGConnectingPoint num="23" id="2176" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2842" />
+<TGConnectingPoint num="1" id="2843" />
+<TGConnectingPoint num="2" id="2844" />
+<TGConnectingPoint num="3" id="2845" />
<extraparam>
-<info stereotype="MEMORY" nodeName="secureMem2" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="m.data = pubK.data" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<CONNECTOR type="125" id="2178" >
-<cdparam x="539" y="100" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="539" y="100" id="2114" />
-<P2 x="630" y="63" id="2131" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="2179" >
-<cdparam x="143" y="511" />
+<CONNECTOR type="5102" id="2855" >
+<cdparam x="407" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="143" y="511" id="1934" />
-<P2 x="142" y="453" id="1914" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2854" />
+<P1 x="407" y="183" id="2923" />
+<P2 x="408" y="213" id="2882" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2853" >
+<father id="2855" num="0" />
+<cdparam x="408" y="199" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2849" />
+<TGConnectingPoint num="1" id="2850" />
+<TGConnectingPoint num="2" id="2851" />
+<TGConnectingPoint num="3" id="2852" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="2180" >
-<cdparam x="138" y="357" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2862" >
+<cdparam x="409" y="265" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="138" y="357" id="2057" />
-<P2 x="142" y="403" id="1909" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="2181" >
-<cdparam x="402" y="367" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="403" y="358" id="1959" />
-<P2 x="403" y="319" id="1989" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="2182" >
-<cdparam x="190" y="300" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1 x="221" y="294" id="2055" />
-<P2 x="278" y="294" id="1986" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="2183" >
-<cdparam x="662" y="310" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1 x="574" y="294" id="2020" />
-<P2 x="528" y="294" id="1987" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="2184" >
-<cdparam x="388" y="162" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1 x="403" y="226" id="2109" />
-<P2 x="403" y="269" id="1984" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2861" />
+<P1 x="408" y="251" id="2887" />
+<P2 x="406" y="285" id="2870" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2860" >
+<father id="2862" num="0" />
+<cdparam x="409" y="281" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2856" />
+<TGConnectingPoint num="1" id="2857" />
+<TGConnectingPoint num="2" id="2858" />
+<TGConnectingPoint num="3" id="2859" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="2185" >
-<cdparam x="812" y="190" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2869" >
+<cdparam x="410" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="868" y="123" id="2154" />
-<P2 x="755" y="88" id="2134" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2868" />
+<P1 x="406" y="315" id="2871" />
+<P2 x="408" y="354" id="3109" />
<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2867" >
+<father id="2869" num="0" />
+<cdparam x="426" y="337" />
+<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2863" />
+<TGConnectingPoint num="1" id="2864" />
+<TGConnectingPoint num="2" id="2865" />
+<TGConnectingPoint num="3" id="2866" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="alicePubK.data = m.data" />
</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
+</SUBCOMPONENT>
-<Modeling type="AVATAR Design" nameTab="BasicSecurityProtocol" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<MainCode value="void __user_init() {"/>
-<MainCode value="}"/>
-<Optimized value="true" />
-<Validated value="" />
-<Ignored value="" />
-
-<CONNECTOR type="5002" id="2191" >
-<cdparam x="568" y="220" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2188" />
-<TGConnectingPoint num="1" id="2189" />
-<TGConnectingPoint num="2" id="2190" />
-<P1 x="459" y="199" id="2288" />
-<P2 x="459" y="254" id="2281" />
-<Point x="490" y="199" />
-<Point x="490" y="254" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<iso value="in chin(Message msg)" />
-<osd value="out chout(Message msg)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
-</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2186" >
-<father id="2191" num="0" />
-<cdparam x="490" y="199" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2187" >
-<father id="2191" num="1" />
-<cdparam x="490" y="254" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2880" >
+<cdparam x="376" y="290" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
+<infoparam name="Receive signal" value="chin(m)" />
+<TGConnectingPoint num="0" id="2870" />
+<TGConnectingPoint num="1" id="2871" />
+<TGConnectingPoint num="2" id="2872" />
+<TGConnectingPoint num="3" id="2873" />
+<TGConnectingPoint num="4" id="2874" />
+<TGConnectingPoint num="5" id="2875" />
+<TGConnectingPoint num="6" id="2876" />
+<TGConnectingPoint num="7" id="2877" />
+<TGConnectingPoint num="8" id="2878" />
+<TGConnectingPoint num="9" id="2879" />
+</COMPONENT>
-<COMPONENT type="302" id="2208" >
-<cdparam x="519" y="154" />
-<sizeparam width="520" height="97" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2921" >
+<cdparam x="347" y="213" />
+<sizeparam width="123" height="38" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Proverif Pragma" value="#InitialSystemKnowledge InterfaceDevice.sk SmartCard.sk
-
-#Confidentiality InterfaceDevice.secretData
-#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m
-" />
-<TGConnectingPoint num="0" id="2192" />
-<TGConnectingPoint num="1" id="2193" />
-<TGConnectingPoint num="2" id="2194" />
-<TGConnectingPoint num="3" id="2195" />
-<TGConnectingPoint num="4" id="2196" />
-<TGConnectingPoint num="5" id="2197" />
-<TGConnectingPoint num="6" id="2198" />
-<TGConnectingPoint num="7" id="2199" />
-<TGConnectingPoint num="8" id="2200" />
-<TGConnectingPoint num="9" id="2201" />
-<TGConnectingPoint num="10" id="2202" />
-<TGConnectingPoint num="11" id="2203" />
-<TGConnectingPoint num="12" id="2204" />
-<TGConnectingPoint num="13" id="2205" />
-<TGConnectingPoint num="14" id="2206" />
-<TGConnectingPoint num="15" id="2207" />
+<infoparam name="State" value="receivingPubK" />
+<TGConnectingPoint num="0" id="2881" />
+<TGConnectingPoint num="1" id="2882" />
+<TGConnectingPoint num="2" id="2883" />
+<TGConnectingPoint num="3" id="2884" />
+<TGConnectingPoint num="4" id="2885" />
+<TGConnectingPoint num="5" id="2886" />
+<TGConnectingPoint num="6" id="2887" />
+<TGConnectingPoint num="7" id="2888" />
+<TGConnectingPoint num="8" id="2889" />
+<TGConnectingPoint num="9" id="2890" />
+<TGConnectingPoint num="10" id="2891" />
+<TGConnectingPoint num="11" id="2892" />
+<TGConnectingPoint num="12" id="2893" />
+<TGConnectingPoint num="13" id="2894" />
+<TGConnectingPoint num="14" id="2895" />
+<TGConnectingPoint num="15" id="2896" />
+<TGConnectingPoint num="16" id="2897" />
+<TGConnectingPoint num="17" id="2898" />
+<TGConnectingPoint num="18" id="2899" />
+<TGConnectingPoint num="19" id="2900" />
+<TGConnectingPoint num="20" id="2901" />
+<TGConnectingPoint num="21" id="2902" />
+<TGConnectingPoint num="22" id="2903" />
+<TGConnectingPoint num="23" id="2904" />
+<TGConnectingPoint num="24" id="2905" />
+<TGConnectingPoint num="25" id="2906" />
+<TGConnectingPoint num="26" id="2907" />
+<TGConnectingPoint num="27" id="2908" />
+<TGConnectingPoint num="28" id="2909" />
+<TGConnectingPoint num="29" id="2910" />
+<TGConnectingPoint num="30" id="2911" />
+<TGConnectingPoint num="31" id="2912" />
+<TGConnectingPoint num="32" id="2913" />
+<TGConnectingPoint num="33" id="2914" />
+<TGConnectingPoint num="34" id="2915" />
+<TGConnectingPoint num="35" id="2916" />
+<TGConnectingPoint num="36" id="2917" />
+<TGConnectingPoint num="37" id="2918" />
+<TGConnectingPoint num="38" id="2919" />
+<TGConnectingPoint num="39" id="2920" />
<extraparam>
-<Line value="#InitialSystemKnowledge InterfaceDevice.sk SmartCard.sk" />
-<Line value="" />
-<Line value="#Confidentiality InterfaceDevice.secretData" />
-<Line value="#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="2217" >
-<cdparam x="260" y="373" />
-<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="2932" >
+<cdparam x="377" y="158" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="2209" />
-<TGConnectingPoint num="1" id="2210" />
-<TGConnectingPoint num="2" id="2211" />
-<TGConnectingPoint num="3" id="2212" />
-<TGConnectingPoint num="4" id="2213" />
-<TGConnectingPoint num="5" id="2214" />
-<TGConnectingPoint num="6" id="2215" />
-<TGConnectingPoint num="7" id="2216" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
+<infoparam name="Send signal" value="chout(m)" />
+<TGConnectingPoint num="0" id="2922" />
+<TGConnectingPoint num="1" id="2923" />
+<TGConnectingPoint num="2" id="2924" />
+<TGConnectingPoint num="3" id="2925" />
+<TGConnectingPoint num="4" id="2926" />
+<TGConnectingPoint num="5" id="2927" />
+<TGConnectingPoint num="6" id="2928" />
+<TGConnectingPoint num="7" id="2929" />
+<TGConnectingPoint num="8" id="2930" />
+<TGConnectingPoint num="9" id="2931" />
</COMPONENT>
-<COMPONENT type="5003" id="2226" >
-<cdparam x="68" y="372" />
-<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2973" >
+<cdparam x="351" y="95" />
+<sizeparam width="113" height="32" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="2218" />
-<TGConnectingPoint num="1" id="2219" />
-<TGConnectingPoint num="2" id="2220" />
-<TGConnectingPoint num="3" id="2221" />
-<TGConnectingPoint num="4" id="2222" />
-<TGConnectingPoint num="5" id="2223" />
-<TGConnectingPoint num="6" id="2224" />
-<TGConnectingPoint num="7" id="2225" />
+<infoparam name="State" value="sendingPubK" />
+<TGConnectingPoint num="0" id="2933" />
+<TGConnectingPoint num="1" id="2934" />
+<TGConnectingPoint num="2" id="2935" />
+<TGConnectingPoint num="3" id="2936" />
+<TGConnectingPoint num="4" id="2937" />
+<TGConnectingPoint num="5" id="2938" />
+<TGConnectingPoint num="6" id="2939" />
+<TGConnectingPoint num="7" id="2940" />
+<TGConnectingPoint num="8" id="2941" />
+<TGConnectingPoint num="9" id="2942" />
+<TGConnectingPoint num="10" id="2943" />
+<TGConnectingPoint num="11" id="2944" />
+<TGConnectingPoint num="12" id="2945" />
+<TGConnectingPoint num="13" id="2946" />
+<TGConnectingPoint num="14" id="2947" />
+<TGConnectingPoint num="15" id="2948" />
+<TGConnectingPoint num="16" id="2949" />
+<TGConnectingPoint num="17" id="2950" />
+<TGConnectingPoint num="18" id="2951" />
+<TGConnectingPoint num="19" id="2952" />
+<TGConnectingPoint num="20" id="2953" />
+<TGConnectingPoint num="21" id="2954" />
+<TGConnectingPoint num="22" id="2955" />
+<TGConnectingPoint num="23" id="2956" />
+<TGConnectingPoint num="24" id="2957" />
+<TGConnectingPoint num="25" id="2958" />
+<TGConnectingPoint num="26" id="2959" />
+<TGConnectingPoint num="27" id="2960" />
+<TGConnectingPoint num="28" id="2961" />
+<TGConnectingPoint num="29" id="2962" />
+<TGConnectingPoint num="30" id="2963" />
+<TGConnectingPoint num="31" id="2964" />
+<TGConnectingPoint num="32" id="2965" />
+<TGConnectingPoint num="33" id="2966" />
+<TGConnectingPoint num="34" id="2967" />
+<TGConnectingPoint num="35" id="2968" />
+<TGConnectingPoint num="36" id="2969" />
+<TGConnectingPoint num="37" id="2970" />
+<TGConnectingPoint num="38" id="2971" />
+<TGConnectingPoint num="39" id="2972" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="2301" >
-<cdparam x="21" y="145" />
-<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3014" >
+<cdparam x="329" y="592" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="System" />
-<TGConnectingPoint num="0" id="2277" />
-<TGConnectingPoint num="1" id="2278" />
-<TGConnectingPoint num="2" id="2279" />
-<TGConnectingPoint num="3" id="2280" />
-<TGConnectingPoint num="4" id="2281" />
-<TGConnectingPoint num="5" id="2282" />
-<TGConnectingPoint num="6" id="2283" />
-<TGConnectingPoint num="7" id="2284" />
-<TGConnectingPoint num="8" id="2285" />
-<TGConnectingPoint num="9" id="2286" />
-<TGConnectingPoint num="10" id="2287" />
-<TGConnectingPoint num="11" id="2288" />
-<TGConnectingPoint num="12" id="2289" />
-<TGConnectingPoint num="13" id="2290" />
-<TGConnectingPoint num="14" id="2291" />
-<TGConnectingPoint num="15" id="2292" />
-<TGConnectingPoint num="16" id="2293" />
-<TGConnectingPoint num="17" id="2294" />
-<TGConnectingPoint num="18" id="2295" />
-<TGConnectingPoint num="19" id="2296" />
-<TGConnectingPoint num="20" id="2297" />
-<TGConnectingPoint num="21" id="2298" />
-<TGConnectingPoint num="22" id="2299" />
-<TGConnectingPoint num="23" id="2300" />
-<extraparam>
-<CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" attached="true" />
-<Signal value="out chout(Message msg)" attached="true" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5000" id="2251" >
-<father id="2301" num="0" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="InterfaceDevice" />
-<TGConnectingPoint num="0" id="2227" />
-<TGConnectingPoint num="1" id="2228" />
-<TGConnectingPoint num="2" id="2229" />
-<TGConnectingPoint num="3" id="2230" />
-<TGConnectingPoint num="4" id="2231" />
-<TGConnectingPoint num="5" id="2232" />
-<TGConnectingPoint num="6" id="2233" />
-<TGConnectingPoint num="7" id="2234" />
-<TGConnectingPoint num="8" id="2235" />
-<TGConnectingPoint num="9" id="2236" />
-<TGConnectingPoint num="10" id="2237" />
-<TGConnectingPoint num="11" id="2238" />
-<TGConnectingPoint num="12" id="2239" />
-<TGConnectingPoint num="13" id="2240" />
-<TGConnectingPoint num="14" id="2241" />
-<TGConnectingPoint num="15" id="2242" />
-<TGConnectingPoint num="16" id="2243" />
-<TGConnectingPoint num="17" id="2244" />
-<TGConnectingPoint num="18" id="2245" />
-<TGConnectingPoint num="19" id="2246" />
-<TGConnectingPoint num="20" id="2247" />
-<TGConnectingPoint num="21" id="2248" />
-<TGConnectingPoint num="22" id="2249" />
-<TGConnectingPoint num="23" id="2250" />
-<extraparam>
-<CryptoBlock value="true" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2276" >
-<father id="2301" num="1" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="SmartCard" />
-<TGConnectingPoint num="0" id="2252" />
-<TGConnectingPoint num="1" id="2253" />
-<TGConnectingPoint num="2" id="2254" />
-<TGConnectingPoint num="3" id="2255" />
-<TGConnectingPoint num="4" id="2256" />
-<TGConnectingPoint num="5" id="2257" />
-<TGConnectingPoint num="6" id="2258" />
-<TGConnectingPoint num="7" id="2259" />
-<TGConnectingPoint num="8" id="2260" />
-<TGConnectingPoint num="9" id="2261" />
-<TGConnectingPoint num="10" id="2262" />
-<TGConnectingPoint num="11" id="2263" />
-<TGConnectingPoint num="12" id="2264" />
-<TGConnectingPoint num="13" id="2265" />
-<TGConnectingPoint num="14" id="2266" />
-<TGConnectingPoint num="15" id="2267" />
-<TGConnectingPoint num="16" id="2268" />
-<TGConnectingPoint num="17" id="2269" />
-<TGConnectingPoint num="18" id="2270" />
-<TGConnectingPoint num="19" id="2271" />
-<TGConnectingPoint num="20" id="2272" />
-<TGConnectingPoint num="21" id="2273" />
-<TGConnectingPoint num="22" id="2274" />
-<TGConnectingPoint num="23" id="2275" />
+<infoparam name="state0" value="messageDecrypted" />
+<TGConnectingPoint num="0" id="2974" />
+<TGConnectingPoint num="1" id="2975" />
+<TGConnectingPoint num="2" id="2976" />
+<TGConnectingPoint num="3" id="2977" />
+<TGConnectingPoint num="4" id="2978" />
+<TGConnectingPoint num="5" id="2979" />
+<TGConnectingPoint num="6" id="2980" />
+<TGConnectingPoint num="7" id="2981" />
+<TGConnectingPoint num="8" id="2982" />
+<TGConnectingPoint num="9" id="2983" />
+<TGConnectingPoint num="10" id="2984" />
+<TGConnectingPoint num="11" id="2985" />
+<TGConnectingPoint num="12" id="2986" />
+<TGConnectingPoint num="13" id="2987" />
+<TGConnectingPoint num="14" id="2988" />
+<TGConnectingPoint num="15" id="2989" />
+<TGConnectingPoint num="16" id="2990" />
+<TGConnectingPoint num="17" id="2991" />
+<TGConnectingPoint num="18" id="2992" />
+<TGConnectingPoint num="19" id="2993" />
+<TGConnectingPoint num="20" id="2994" />
+<TGConnectingPoint num="21" id="2995" />
+<TGConnectingPoint num="22" id="2996" />
+<TGConnectingPoint num="23" id="2997" />
+<TGConnectingPoint num="24" id="2998" />
+<TGConnectingPoint num="25" id="2999" />
+<TGConnectingPoint num="26" id="3000" />
+<TGConnectingPoint num="27" id="3001" />
+<TGConnectingPoint num="28" id="3002" />
+<TGConnectingPoint num="29" id="3003" />
+<TGConnectingPoint num="30" id="3004" />
+<TGConnectingPoint num="31" id="3005" />
+<TGConnectingPoint num="32" id="3006" />
+<TGConnectingPoint num="33" id="3007" />
+<TGConnectingPoint num="34" id="3008" />
+<TGConnectingPoint num="35" id="3009" />
+<TGConnectingPoint num="36" id="3010" />
+<TGConnectingPoint num="37" id="3011" />
+<TGConnectingPoint num="38" id="3012" />
+<TGConnectingPoint num="39" id="3013" />
<extraparam>
-<CryptoBlock value="true" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
</extraparam>
-</SUBCOMPONENT>
-
-
-</AVATARBlockDiagramPanel>
+</COMPONENT>
-<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="2303" >
+<COMPONENT type="5106" id="3055" >
+<cdparam x="352" y="677" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="3015" />
+<TGConnectingPoint num="1" id="3016" />
+<TGConnectingPoint num="2" id="3017" />
+<TGConnectingPoint num="3" id="3018" />
+<TGConnectingPoint num="4" id="3019" />
+<TGConnectingPoint num="5" id="3020" />
+<TGConnectingPoint num="6" id="3021" />
+<TGConnectingPoint num="7" id="3022" />
+<TGConnectingPoint num="8" id="3023" />
+<TGConnectingPoint num="9" id="3024" />
+<TGConnectingPoint num="10" id="3025" />
+<TGConnectingPoint num="11" id="3026" />
+<TGConnectingPoint num="12" id="3027" />
+<TGConnectingPoint num="13" id="3028" />
+<TGConnectingPoint num="14" id="3029" />
+<TGConnectingPoint num="15" id="3030" />
+<TGConnectingPoint num="16" id="3031" />
+<TGConnectingPoint num="17" id="3032" />
+<TGConnectingPoint num="18" id="3033" />
+<TGConnectingPoint num="19" id="3034" />
+<TGConnectingPoint num="20" id="3035" />
+<TGConnectingPoint num="21" id="3036" />
+<TGConnectingPoint num="22" id="3037" />
+<TGConnectingPoint num="23" id="3038" />
+<TGConnectingPoint num="24" id="3039" />
+<TGConnectingPoint num="25" id="3040" />
+<TGConnectingPoint num="26" id="3041" />
+<TGConnectingPoint num="27" id="3042" />
+<TGConnectingPoint num="28" id="3043" />
+<TGConnectingPoint num="29" id="3044" />
+<TGConnectingPoint num="30" id="3045" />
+<TGConnectingPoint num="31" id="3046" />
+<TGConnectingPoint num="32" id="3047" />
+<TGConnectingPoint num="33" id="3048" />
+<TGConnectingPoint num="34" id="3049" />
+<TGConnectingPoint num="35" id="3050" />
+<TGConnectingPoint num="36" id="3051" />
+<TGConnectingPoint num="37" id="3052" />
+<TGConnectingPoint num="38" id="3053" />
+<TGConnectingPoint num="39" id="3054" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3096" >
+<cdparam x="338" y="486" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="3056" />
+<TGConnectingPoint num="1" id="3057" />
+<TGConnectingPoint num="2" id="3058" />
+<TGConnectingPoint num="3" id="3059" />
+<TGConnectingPoint num="4" id="3060" />
+<TGConnectingPoint num="5" id="3061" />
+<TGConnectingPoint num="6" id="3062" />
+<TGConnectingPoint num="7" id="3063" />
+<TGConnectingPoint num="8" id="3064" />
+<TGConnectingPoint num="9" id="3065" />
+<TGConnectingPoint num="10" id="3066" />
+<TGConnectingPoint num="11" id="3067" />
+<TGConnectingPoint num="12" id="3068" />
+<TGConnectingPoint num="13" id="3069" />
+<TGConnectingPoint num="14" id="3070" />
+<TGConnectingPoint num="15" id="3071" />
+<TGConnectingPoint num="16" id="3072" />
+<TGConnectingPoint num="17" id="3073" />
+<TGConnectingPoint num="18" id="3074" />
+<TGConnectingPoint num="19" id="3075" />
+<TGConnectingPoint num="20" id="3076" />
+<TGConnectingPoint num="21" id="3077" />
+<TGConnectingPoint num="22" id="3078" />
+<TGConnectingPoint num="23" id="3079" />
+<TGConnectingPoint num="24" id="3080" />
+<TGConnectingPoint num="25" id="3081" />
+<TGConnectingPoint num="26" id="3082" />
+<TGConnectingPoint num="27" id="3083" />
+<TGConnectingPoint num="28" id="3084" />
+<TGConnectingPoint num="29" id="3085" />
+<TGConnectingPoint num="30" id="3086" />
+<TGConnectingPoint num="31" id="3087" />
+<TGConnectingPoint num="32" id="3088" />
+<TGConnectingPoint num="33" id="3089" />
+<TGConnectingPoint num="34" id="3090" />
+<TGConnectingPoint num="35" id="3091" />
+<TGConnectingPoint num="36" id="3092" />
+<TGConnectingPoint num="37" id="3093" />
+<TGConnectingPoint num="38" id="3094" />
+<TGConnectingPoint num="39" id="3095" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="3107" >
+<cdparam x="374" y="429" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="3097" />
+<TGConnectingPoint num="1" id="3098" />
+<TGConnectingPoint num="2" id="3099" />
+<TGConnectingPoint num="3" id="3100" />
+<TGConnectingPoint num="4" id="3101" />
+<TGConnectingPoint num="5" id="3102" />
+<TGConnectingPoint num="6" id="3103" />
+<TGConnectingPoint num="7" id="3104" />
+<TGConnectingPoint num="8" id="3105" />
+<TGConnectingPoint num="9" id="3106" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3148" >
+<cdparam x="342" y="354" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="waitingForMessage" />
+<TGConnectingPoint num="0" id="3108" />
+<TGConnectingPoint num="1" id="3109" />
+<TGConnectingPoint num="2" id="3110" />
+<TGConnectingPoint num="3" id="3111" />
+<TGConnectingPoint num="4" id="3112" />
+<TGConnectingPoint num="5" id="3113" />
+<TGConnectingPoint num="6" id="3114" />
+<TGConnectingPoint num="7" id="3115" />
+<TGConnectingPoint num="8" id="3116" />
+<TGConnectingPoint num="9" id="3117" />
+<TGConnectingPoint num="10" id="3118" />
+<TGConnectingPoint num="11" id="3119" />
+<TGConnectingPoint num="12" id="3120" />
+<TGConnectingPoint num="13" id="3121" />
+<TGConnectingPoint num="14" id="3122" />
+<TGConnectingPoint num="15" id="3123" />
+<TGConnectingPoint num="16" id="3124" />
+<TGConnectingPoint num="17" id="3125" />
+<TGConnectingPoint num="18" id="3126" />
+<TGConnectingPoint num="19" id="3127" />
+<TGConnectingPoint num="20" id="3128" />
+<TGConnectingPoint num="21" id="3129" />
+<TGConnectingPoint num="22" id="3130" />
+<TGConnectingPoint num="23" id="3131" />
+<TGConnectingPoint num="24" id="3132" />
+<TGConnectingPoint num="25" id="3133" />
+<TGConnectingPoint num="26" id="3134" />
+<TGConnectingPoint num="27" id="3135" />
+<TGConnectingPoint num="28" id="3136" />
+<TGConnectingPoint num="29" id="3137" />
+<TGConnectingPoint num="30" id="3138" />
+<TGConnectingPoint num="31" id="3139" />
+<TGConnectingPoint num="32" id="3140" />
+<TGConnectingPoint num="33" id="3141" />
+<TGConnectingPoint num="34" id="3142" />
+<TGConnectingPoint num="35" id="3143" />
+<TGConnectingPoint num="36" id="3144" />
+<TGConnectingPoint num="37" id="3145" />
+<TGConnectingPoint num="38" id="3146" />
+<TGConnectingPoint num="39" id="3147" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3150" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2302" />
+<TGConnectingPoint num="0" id="3149" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2310" >
-<cdparam x="416" y="379" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2309" />
-<P1 x="416" y="379" id="2345" />
-<P2 x="420" y="424" id="2381" />
+<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3157" >
+<cdparam x="411" y="567" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3156" />
+<P1 x="411" y="567" id="3360" />
+<P2 x="420" y="613" id="3319" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2308" >
-<father id="2310" num="0" />
-<cdparam x="431" y="403" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3155" >
+<father id="3157" num="0" />
+<cdparam x="453" y="610" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2304" />
-<TGConnectingPoint num="1" id="2305" />
-<TGConnectingPoint num="2" id="2306" />
-<TGConnectingPoint num="3" id="2307" />
+<TGConnectingPoint num="0" id="3151" />
+<TGConnectingPoint num="1" id="3152" />
+<TGConnectingPoint num="2" id="3153" />
+<TGConnectingPoint num="3" id="3154" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8173,29 +9829,28 @@ the smart card and the terminal
<computeMin value="" />
<computeMax value="" />
<probability value="" />
-<actions value="receivedData = m.data" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2317" >
-<cdparam x="407" y="273" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2316" />
-<P1 x="407" y="273" id="2427" />
-<P2 x="416" y="339" id="2340" />
+<CONNECTOR type="5102" id="3164" >
+<cdparam x="496" y="703" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3163" />
+<P1 x="420" y="663" id="3324" />
+<P2 x="438" y="703" id="3370" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2315" >
-<father id="2317" num="0" />
-<cdparam x="419" y="312" />
-<sizeparam width="127" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3162" >
+<father id="3164" num="0" />
+<cdparam x="453" y="697" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2311" />
-<TGConnectingPoint num="1" id="2312" />
-<TGConnectingPoint num="2" id="2313" />
-<TGConnectingPoint num="3" id="2314" />
+<TGConnectingPoint num="0" id="3158" />
+<TGConnectingPoint num="1" id="3159" />
+<TGConnectingPoint num="2" id="3160" />
+<TGConnectingPoint num="3" id="3161" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8203,29 +9858,28 @@ the smart card and the terminal
<computeMin value="" />
<computeMax value="" />
<probability value="" />
-<actions value="m = sdecrypt(m2, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2324" >
-<cdparam x="406" y="201" />
+<CONNECTOR type="5102" id="3171" >
+<cdparam x="411" y="508" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2323" />
-<P1 x="406" y="201" id="2463" />
-<P2 x="407" y="233" id="2422" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="3170" />
+<P1 x="411" y="508" id="3378" />
+<P2 x="411" y="537" id="3359" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2322" >
-<father id="2324" num="0" />
-<cdparam x="406" y="241" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3169" >
+<father id="3171" num="0" />
+<cdparam x="411" y="548" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2318" />
-<TGConnectingPoint num="1" id="2319" />
-<TGConnectingPoint num="2" id="2320" />
-<TGConnectingPoint num="3" id="2321" />
+<TGConnectingPoint num="0" id="3165" />
+<TGConnectingPoint num="1" id="3166" />
+<TGConnectingPoint num="2" id="3167" />
+<TGConnectingPoint num="3" id="3168" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8236,25 +9890,25 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2331" >
-<cdparam x="406" y="141" />
+<CONNECTOR type="5102" id="3178" >
+<cdparam x="411" y="389" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2330" />
-<P1 x="406" y="141" id="2479" />
-<P2 x="406" y="171" id="2462" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3177" />
+<P1 x="411" y="389" id="3419" />
+<P2 x="411" y="468" id="3373" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2329" >
-<father id="2331" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3176" >
+<father id="3178" num="0" />
+<cdparam x="439" y="414" />
+<sizeparam width="148" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2325" />
-<TGConnectingPoint num="1" id="2326" />
-<TGConnectingPoint num="2" id="2327" />
-<TGConnectingPoint num="3" id="2328" />
+<TGConnectingPoint num="0" id="3172" />
+<TGConnectingPoint num="1" id="3173" />
+<TGConnectingPoint num="2" id="3174" />
+<TGConnectingPoint num="3" id="3175" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8262,28 +9916,31 @@ the smart card and the terminal
<computeMin value="" />
<computeMax value="" />
<probability value="" />
+<actions value="sk = DH(bobPubK, privK)" />
+<actions value="m.data = secretData" />
+<actions value="m1 = sencrypt(m, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2338" >
+<CONNECTOR type="5102" id="3185" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2337" />
-<P1 x="407" y="70" id="2514" />
-<P2 x="406" y="101" id="2474" />
+<TGConnectingPoint num="0" id="3184" />
+<P1 x="407" y="70" id="3454" />
+<P2 x="405" y="91" id="3278" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2336" >
-<father id="2338" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3183" >
+<father id="3185" num="0" />
<cdparam x="407" y="110" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2332" />
-<TGConnectingPoint num="1" id="2333" />
-<TGConnectingPoint num="2" id="2334" />
-<TGConnectingPoint num="3" id="2335" />
+<TGConnectingPoint num="0" id="3179" />
+<TGConnectingPoint num="1" id="3180" />
+<TGConnectingPoint num="2" id="3181" />
+<TGConnectingPoint num="3" id="3182" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8294,256 +9951,25 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="2379" >
-<cdparam x="327" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="2339" />
-<TGConnectingPoint num="1" id="2340" />
-<TGConnectingPoint num="2" id="2341" />
-<TGConnectingPoint num="3" id="2342" />
-<TGConnectingPoint num="4" id="2343" />
-<TGConnectingPoint num="5" id="2344" />
-<TGConnectingPoint num="6" id="2345" />
-<TGConnectingPoint num="7" id="2346" />
-<TGConnectingPoint num="8" id="2347" />
-<TGConnectingPoint num="9" id="2348" />
-<TGConnectingPoint num="10" id="2349" />
-<TGConnectingPoint num="11" id="2350" />
-<TGConnectingPoint num="12" id="2351" />
-<TGConnectingPoint num="13" id="2352" />
-<TGConnectingPoint num="14" id="2353" />
-<TGConnectingPoint num="15" id="2354" />
-<TGConnectingPoint num="16" id="2355" />
-<TGConnectingPoint num="17" id="2356" />
-<TGConnectingPoint num="18" id="2357" />
-<TGConnectingPoint num="19" id="2358" />
-<TGConnectingPoint num="20" id="2359" />
-<TGConnectingPoint num="21" id="2360" />
-<TGConnectingPoint num="22" id="2361" />
-<TGConnectingPoint num="23" id="2362" />
-<TGConnectingPoint num="24" id="2363" />
-<TGConnectingPoint num="25" id="2364" />
-<TGConnectingPoint num="26" id="2365" />
-<TGConnectingPoint num="27" id="2366" />
-<TGConnectingPoint num="28" id="2367" />
-<TGConnectingPoint num="29" id="2368" />
-<TGConnectingPoint num="30" id="2369" />
-<TGConnectingPoint num="31" id="2370" />
-<TGConnectingPoint num="32" id="2371" />
-<TGConnectingPoint num="33" id="2372" />
-<TGConnectingPoint num="34" id="2373" />
-<TGConnectingPoint num="35" id="2374" />
-<TGConnectingPoint num="36" id="2375" />
-<TGConnectingPoint num="37" id="2376" />
-<TGConnectingPoint num="38" id="2377" />
-<TGConnectingPoint num="39" id="2378" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2420" >
-<cdparam x="350" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="2380" />
-<TGConnectingPoint num="1" id="2381" />
-<TGConnectingPoint num="2" id="2382" />
-<TGConnectingPoint num="3" id="2383" />
-<TGConnectingPoint num="4" id="2384" />
-<TGConnectingPoint num="5" id="2385" />
-<TGConnectingPoint num="6" id="2386" />
-<TGConnectingPoint num="7" id="2387" />
-<TGConnectingPoint num="8" id="2388" />
-<TGConnectingPoint num="9" id="2389" />
-<TGConnectingPoint num="10" id="2390" />
-<TGConnectingPoint num="11" id="2391" />
-<TGConnectingPoint num="12" id="2392" />
-<TGConnectingPoint num="13" id="2393" />
-<TGConnectingPoint num="14" id="2394" />
-<TGConnectingPoint num="15" id="2395" />
-<TGConnectingPoint num="16" id="2396" />
-<TGConnectingPoint num="17" id="2397" />
-<TGConnectingPoint num="18" id="2398" />
-<TGConnectingPoint num="19" id="2399" />
-<TGConnectingPoint num="20" id="2400" />
-<TGConnectingPoint num="21" id="2401" />
-<TGConnectingPoint num="22" id="2402" />
-<TGConnectingPoint num="23" id="2403" />
-<TGConnectingPoint num="24" id="2404" />
-<TGConnectingPoint num="25" id="2405" />
-<TGConnectingPoint num="26" id="2406" />
-<TGConnectingPoint num="27" id="2407" />
-<TGConnectingPoint num="28" id="2408" />
-<TGConnectingPoint num="29" id="2409" />
-<TGConnectingPoint num="30" id="2410" />
-<TGConnectingPoint num="31" id="2411" />
-<TGConnectingPoint num="32" id="2412" />
-<TGConnectingPoint num="33" id="2413" />
-<TGConnectingPoint num="34" id="2414" />
-<TGConnectingPoint num="35" id="2415" />
-<TGConnectingPoint num="36" id="2416" />
-<TGConnectingPoint num="37" id="2417" />
-<TGConnectingPoint num="38" id="2418" />
-<TGConnectingPoint num="39" id="2419" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2461" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="2421" />
-<TGConnectingPoint num="1" id="2422" />
-<TGConnectingPoint num="2" id="2423" />
-<TGConnectingPoint num="3" id="2424" />
-<TGConnectingPoint num="4" id="2425" />
-<TGConnectingPoint num="5" id="2426" />
-<TGConnectingPoint num="6" id="2427" />
-<TGConnectingPoint num="7" id="2428" />
-<TGConnectingPoint num="8" id="2429" />
-<TGConnectingPoint num="9" id="2430" />
-<TGConnectingPoint num="10" id="2431" />
-<TGConnectingPoint num="11" id="2432" />
-<TGConnectingPoint num="12" id="2433" />
-<TGConnectingPoint num="13" id="2434" />
-<TGConnectingPoint num="14" id="2435" />
-<TGConnectingPoint num="15" id="2436" />
-<TGConnectingPoint num="16" id="2437" />
-<TGConnectingPoint num="17" id="2438" />
-<TGConnectingPoint num="18" id="2439" />
-<TGConnectingPoint num="19" id="2440" />
-<TGConnectingPoint num="20" id="2441" />
-<TGConnectingPoint num="21" id="2442" />
-<TGConnectingPoint num="22" id="2443" />
-<TGConnectingPoint num="23" id="2444" />
-<TGConnectingPoint num="24" id="2445" />
-<TGConnectingPoint num="25" id="2446" />
-<TGConnectingPoint num="26" id="2447" />
-<TGConnectingPoint num="27" id="2448" />
-<TGConnectingPoint num="28" id="2449" />
-<TGConnectingPoint num="29" id="2450" />
-<TGConnectingPoint num="30" id="2451" />
-<TGConnectingPoint num="31" id="2452" />
-<TGConnectingPoint num="32" id="2453" />
-<TGConnectingPoint num="33" id="2454" />
-<TGConnectingPoint num="34" id="2455" />
-<TGConnectingPoint num="35" id="2456" />
-<TGConnectingPoint num="36" id="2457" />
-<TGConnectingPoint num="37" id="2458" />
-<TGConnectingPoint num="38" id="2459" />
-<TGConnectingPoint num="39" id="2460" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="2472" >
-<cdparam x="372" y="176" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="2462" />
-<TGConnectingPoint num="1" id="2463" />
-<TGConnectingPoint num="2" id="2464" />
-<TGConnectingPoint num="3" id="2465" />
-<TGConnectingPoint num="4" id="2466" />
-<TGConnectingPoint num="5" id="2467" />
-<TGConnectingPoint num="6" id="2468" />
-<TGConnectingPoint num="7" id="2469" />
-<TGConnectingPoint num="8" id="2470" />
-<TGConnectingPoint num="9" id="2471" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2513" >
-<cdparam x="340" y="101" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="2473" />
-<TGConnectingPoint num="1" id="2474" />
-<TGConnectingPoint num="2" id="2475" />
-<TGConnectingPoint num="3" id="2476" />
-<TGConnectingPoint num="4" id="2477" />
-<TGConnectingPoint num="5" id="2478" />
-<TGConnectingPoint num="6" id="2479" />
-<TGConnectingPoint num="7" id="2480" />
-<TGConnectingPoint num="8" id="2481" />
-<TGConnectingPoint num="9" id="2482" />
-<TGConnectingPoint num="10" id="2483" />
-<TGConnectingPoint num="11" id="2484" />
-<TGConnectingPoint num="12" id="2485" />
-<TGConnectingPoint num="13" id="2486" />
-<TGConnectingPoint num="14" id="2487" />
-<TGConnectingPoint num="15" id="2488" />
-<TGConnectingPoint num="16" id="2489" />
-<TGConnectingPoint num="17" id="2490" />
-<TGConnectingPoint num="18" id="2491" />
-<TGConnectingPoint num="19" id="2492" />
-<TGConnectingPoint num="20" id="2493" />
-<TGConnectingPoint num="21" id="2494" />
-<TGConnectingPoint num="22" id="2495" />
-<TGConnectingPoint num="23" id="2496" />
-<TGConnectingPoint num="24" id="2497" />
-<TGConnectingPoint num="25" id="2498" />
-<TGConnectingPoint num="26" id="2499" />
-<TGConnectingPoint num="27" id="2500" />
-<TGConnectingPoint num="28" id="2501" />
-<TGConnectingPoint num="29" id="2502" />
-<TGConnectingPoint num="30" id="2503" />
-<TGConnectingPoint num="31" id="2504" />
-<TGConnectingPoint num="32" id="2505" />
-<TGConnectingPoint num="33" id="2506" />
-<TGConnectingPoint num="34" id="2507" />
-<TGConnectingPoint num="35" id="2508" />
-<TGConnectingPoint num="36" id="2509" />
-<TGConnectingPoint num="37" id="2510" />
-<TGConnectingPoint num="38" id="2511" />
-<TGConnectingPoint num="39" id="2512" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2515" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2514" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2522" >
-<cdparam x="407" y="310" />
+<CONNECTOR type="5102" id="3192" >
+<cdparam x="392" y="122" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2521" />
-<P1 x="407" y="310" id="2593" />
-<P2 x="416" y="356" id="2552" />
+<TGConnectingPoint num="0" id="3191" />
+<P1 x="392" y="122" id="3306" />
+<P2 x="392" y="150" id="3266" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2520" >
-<father id="2522" num="0" />
-<cdparam x="449" y="353" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3190" >
+<father id="3192" num="0" />
+<cdparam x="411" y="142" />
+<sizeparam width="120" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2516" />
-<TGConnectingPoint num="1" id="2517" />
-<TGConnectingPoint num="2" id="2518" />
-<TGConnectingPoint num="3" id="2519" />
+<TGConnectingPoint num="0" id="3186" />
+<TGConnectingPoint num="1" id="3187" />
+<TGConnectingPoint num="2" id="3188" />
+<TGConnectingPoint num="3" id="3189" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8551,28 +9977,29 @@ the smart card and the terminal
<computeMin value="" />
<computeMax value="" />
<probability value="" />
+<actions value="m.data = pubK.data" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2529" >
-<cdparam x="492" y="446" />
+<CONNECTOR type="5102" id="3199" >
+<cdparam x="391" y="166" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2528" />
-<P1 x="416" y="406" id="2557" />
-<P2 x="434" y="446" id="2603" />
+<TGConnectingPoint num="0" id="3198" />
+<P1 x="392" y="180" id="3267" />
+<P2 x="380" y="224" id="3242" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2527" >
-<father id="2529" num="0" />
-<cdparam x="449" y="440" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3197" >
+<father id="3199" num="0" />
+<cdparam x="390" y="188" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2523" />
-<TGConnectingPoint num="1" id="2524" />
-<TGConnectingPoint num="2" id="2525" />
-<TGConnectingPoint num="3" id="2526" />
+<TGConnectingPoint num="0" id="3193" />
+<TGConnectingPoint num="1" id="3194" />
+<TGConnectingPoint num="2" id="3195" />
+<TGConnectingPoint num="3" id="3196" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8583,25 +10010,25 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2536" >
-<cdparam x="407" y="251" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="2535" />
-<P1 x="407" y="251" id="2611" />
-<P2 x="407" y="280" id="2592" />
+<CONNECTOR type="5102" id="3206" >
+<cdparam x="380" y="258" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3205" />
+<P1 x="380" y="258" id="3254" />
+<P2 x="386" y="287" id="3214" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2534" >
-<father id="2536" num="0" />
-<cdparam x="407" y="291" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3204" >
+<father id="3206" num="0" />
+<cdparam x="377" y="267" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2530" />
-<TGConnectingPoint num="1" id="2531" />
-<TGConnectingPoint num="2" id="2532" />
-<TGConnectingPoint num="3" id="2533" />
+<TGConnectingPoint num="0" id="3200" />
+<TGConnectingPoint num="1" id="3201" />
+<TGConnectingPoint num="2" id="3202" />
+<TGConnectingPoint num="3" id="3203" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8612,25 +10039,25 @@ the smart card and the terminal
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2543" >
-<cdparam x="407" y="132" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2542" />
-<P1 x="407" y="132" id="2652" />
-<P2 x="407" y="211" id="2606" />
+<CONNECTOR type="5102" id="3213" >
+<cdparam x="375" y="306" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3212" />
+<P1 x="386" y="317" id="3215" />
+<P2 x="377" y="349" id="3421" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2541" >
-<father id="2543" num="0" />
-<cdparam x="414" y="162" />
-<sizeparam width="126" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3211" >
+<father id="3213" num="0" />
+<cdparam x="396" y="336" />
+<sizeparam width="142" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2537" />
-<TGConnectingPoint num="1" id="2538" />
-<TGConnectingPoint num="2" id="2539" />
-<TGConnectingPoint num="3" id="2540" />
+<TGConnectingPoint num="0" id="3207" />
+<TGConnectingPoint num="1" id="3208" />
+<TGConnectingPoint num="2" id="3209" />
+<TGConnectingPoint num="3" id="3210" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8638,418 +10065,576 @@ the smart card and the terminal
<computeMin value="" />
<computeMax value="" />
<probability value="" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
+<actions value="bobPubK.data = m.data" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2550" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2549" />
-<P1 x="407" y="70" id="2687" />
-<P2 x="407" y="92" id="2647" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2548" >
-<father id="2550" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="3224" >
+<cdparam x="356" y="292" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2544" />
-<TGConnectingPoint num="1" id="2545" />
-<TGConnectingPoint num="2" id="2546" />
-<TGConnectingPoint num="3" id="2547" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5106" id="2591" >
-<cdparam x="366" y="356" />
+<infoparam name="Receive signal" value="chin(m)" />
+<TGConnectingPoint num="0" id="3214" />
+<TGConnectingPoint num="1" id="3215" />
+<TGConnectingPoint num="2" id="3216" />
+<TGConnectingPoint num="3" id="3217" />
+<TGConnectingPoint num="4" id="3218" />
+<TGConnectingPoint num="5" id="3219" />
+<TGConnectingPoint num="6" id="3220" />
+<TGConnectingPoint num="7" id="3221" />
+<TGConnectingPoint num="8" id="3222" />
+<TGConnectingPoint num="9" id="3223" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3265" >
+<cdparam x="338" y="224" />
+<sizeparam width="114" height="34" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="State" value="receivingPubK" />
+<TGConnectingPoint num="0" id="3225" />
+<TGConnectingPoint num="1" id="3226" />
+<TGConnectingPoint num="2" id="3227" />
+<TGConnectingPoint num="3" id="3228" />
+<TGConnectingPoint num="4" id="3229" />
+<TGConnectingPoint num="5" id="3230" />
+<TGConnectingPoint num="6" id="3231" />
+<TGConnectingPoint num="7" id="3232" />
+<TGConnectingPoint num="8" id="3233" />
+<TGConnectingPoint num="9" id="3234" />
+<TGConnectingPoint num="10" id="3235" />
+<TGConnectingPoint num="11" id="3236" />
+<TGConnectingPoint num="12" id="3237" />
+<TGConnectingPoint num="13" id="3238" />
+<TGConnectingPoint num="14" id="3239" />
+<TGConnectingPoint num="15" id="3240" />
+<TGConnectingPoint num="16" id="3241" />
+<TGConnectingPoint num="17" id="3242" />
+<TGConnectingPoint num="18" id="3243" />
+<TGConnectingPoint num="19" id="3244" />
+<TGConnectingPoint num="20" id="3245" />
+<TGConnectingPoint num="21" id="3246" />
+<TGConnectingPoint num="22" id="3247" />
+<TGConnectingPoint num="23" id="3248" />
+<TGConnectingPoint num="24" id="3249" />
+<TGConnectingPoint num="25" id="3250" />
+<TGConnectingPoint num="26" id="3251" />
+<TGConnectingPoint num="27" id="3252" />
+<TGConnectingPoint num="28" id="3253" />
+<TGConnectingPoint num="29" id="3254" />
+<TGConnectingPoint num="30" id="3255" />
+<TGConnectingPoint num="31" id="3256" />
+<TGConnectingPoint num="32" id="3257" />
+<TGConnectingPoint num="33" id="3258" />
+<TGConnectingPoint num="34" id="3259" />
+<TGConnectingPoint num="35" id="3260" />
+<TGConnectingPoint num="36" id="3261" />
+<TGConnectingPoint num="37" id="3262" />
+<TGConnectingPoint num="38" id="3263" />
+<TGConnectingPoint num="39" id="3264" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3276" >
+<cdparam x="362" y="155" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chout(m)" />
+<TGConnectingPoint num="0" id="3266" />
+<TGConnectingPoint num="1" id="3267" />
+<TGConnectingPoint num="2" id="3268" />
+<TGConnectingPoint num="3" id="3269" />
+<TGConnectingPoint num="4" id="3270" />
+<TGConnectingPoint num="5" id="3271" />
+<TGConnectingPoint num="6" id="3272" />
+<TGConnectingPoint num="7" id="3273" />
+<TGConnectingPoint num="8" id="3274" />
+<TGConnectingPoint num="9" id="3275" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3317" >
+<cdparam x="355" y="91" />
+<sizeparam width="100" height="31" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="State" value="sendingPubK" />
+<TGConnectingPoint num="0" id="3277" />
+<TGConnectingPoint num="1" id="3278" />
+<TGConnectingPoint num="2" id="3279" />
+<TGConnectingPoint num="3" id="3280" />
+<TGConnectingPoint num="4" id="3281" />
+<TGConnectingPoint num="5" id="3282" />
+<TGConnectingPoint num="6" id="3283" />
+<TGConnectingPoint num="7" id="3284" />
+<TGConnectingPoint num="8" id="3285" />
+<TGConnectingPoint num="9" id="3286" />
+<TGConnectingPoint num="10" id="3287" />
+<TGConnectingPoint num="11" id="3288" />
+<TGConnectingPoint num="12" id="3289" />
+<TGConnectingPoint num="13" id="3290" />
+<TGConnectingPoint num="14" id="3291" />
+<TGConnectingPoint num="15" id="3292" />
+<TGConnectingPoint num="16" id="3293" />
+<TGConnectingPoint num="17" id="3294" />
+<TGConnectingPoint num="18" id="3295" />
+<TGConnectingPoint num="19" id="3296" />
+<TGConnectingPoint num="20" id="3297" />
+<TGConnectingPoint num="21" id="3298" />
+<TGConnectingPoint num="22" id="3299" />
+<TGConnectingPoint num="23" id="3300" />
+<TGConnectingPoint num="24" id="3301" />
+<TGConnectingPoint num="25" id="3302" />
+<TGConnectingPoint num="26" id="3303" />
+<TGConnectingPoint num="27" id="3304" />
+<TGConnectingPoint num="28" id="3305" />
+<TGConnectingPoint num="29" id="3306" />
+<TGConnectingPoint num="30" id="3307" />
+<TGConnectingPoint num="31" id="3308" />
+<TGConnectingPoint num="32" id="3309" />
+<TGConnectingPoint num="33" id="3310" />
+<TGConnectingPoint num="34" id="3311" />
+<TGConnectingPoint num="35" id="3312" />
+<TGConnectingPoint num="36" id="3313" />
+<TGConnectingPoint num="37" id="3314" />
+<TGConnectingPoint num="38" id="3315" />
+<TGConnectingPoint num="39" id="3316" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3358" >
+<cdparam x="370" y="613" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="beforeFinish" />
-<TGConnectingPoint num="0" id="2551" />
-<TGConnectingPoint num="1" id="2552" />
-<TGConnectingPoint num="2" id="2553" />
-<TGConnectingPoint num="3" id="2554" />
-<TGConnectingPoint num="4" id="2555" />
-<TGConnectingPoint num="5" id="2556" />
-<TGConnectingPoint num="6" id="2557" />
-<TGConnectingPoint num="7" id="2558" />
-<TGConnectingPoint num="8" id="2559" />
-<TGConnectingPoint num="9" id="2560" />
-<TGConnectingPoint num="10" id="2561" />
-<TGConnectingPoint num="11" id="2562" />
-<TGConnectingPoint num="12" id="2563" />
-<TGConnectingPoint num="13" id="2564" />
-<TGConnectingPoint num="14" id="2565" />
-<TGConnectingPoint num="15" id="2566" />
-<TGConnectingPoint num="16" id="2567" />
-<TGConnectingPoint num="17" id="2568" />
-<TGConnectingPoint num="18" id="2569" />
-<TGConnectingPoint num="19" id="2570" />
-<TGConnectingPoint num="20" id="2571" />
-<TGConnectingPoint num="21" id="2572" />
-<TGConnectingPoint num="22" id="2573" />
-<TGConnectingPoint num="23" id="2574" />
-<TGConnectingPoint num="24" id="2575" />
-<TGConnectingPoint num="25" id="2576" />
-<TGConnectingPoint num="26" id="2577" />
-<TGConnectingPoint num="27" id="2578" />
-<TGConnectingPoint num="28" id="2579" />
-<TGConnectingPoint num="29" id="2580" />
-<TGConnectingPoint num="30" id="2581" />
-<TGConnectingPoint num="31" id="2582" />
-<TGConnectingPoint num="32" id="2583" />
-<TGConnectingPoint num="33" id="2584" />
-<TGConnectingPoint num="34" id="2585" />
-<TGConnectingPoint num="35" id="2586" />
-<TGConnectingPoint num="36" id="2587" />
-<TGConnectingPoint num="37" id="2588" />
-<TGConnectingPoint num="38" id="2589" />
-<TGConnectingPoint num="39" id="2590" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="2602" >
-<cdparam x="373" y="285" />
+<TGConnectingPoint num="0" id="3318" />
+<TGConnectingPoint num="1" id="3319" />
+<TGConnectingPoint num="2" id="3320" />
+<TGConnectingPoint num="3" id="3321" />
+<TGConnectingPoint num="4" id="3322" />
+<TGConnectingPoint num="5" id="3323" />
+<TGConnectingPoint num="6" id="3324" />
+<TGConnectingPoint num="7" id="3325" />
+<TGConnectingPoint num="8" id="3326" />
+<TGConnectingPoint num="9" id="3327" />
+<TGConnectingPoint num="10" id="3328" />
+<TGConnectingPoint num="11" id="3329" />
+<TGConnectingPoint num="12" id="3330" />
+<TGConnectingPoint num="13" id="3331" />
+<TGConnectingPoint num="14" id="3332" />
+<TGConnectingPoint num="15" id="3333" />
+<TGConnectingPoint num="16" id="3334" />
+<TGConnectingPoint num="17" id="3335" />
+<TGConnectingPoint num="18" id="3336" />
+<TGConnectingPoint num="19" id="3337" />
+<TGConnectingPoint num="20" id="3338" />
+<TGConnectingPoint num="21" id="3339" />
+<TGConnectingPoint num="22" id="3340" />
+<TGConnectingPoint num="23" id="3341" />
+<TGConnectingPoint num="24" id="3342" />
+<TGConnectingPoint num="25" id="3343" />
+<TGConnectingPoint num="26" id="3344" />
+<TGConnectingPoint num="27" id="3345" />
+<TGConnectingPoint num="28" id="3346" />
+<TGConnectingPoint num="29" id="3347" />
+<TGConnectingPoint num="30" id="3348" />
+<TGConnectingPoint num="31" id="3349" />
+<TGConnectingPoint num="32" id="3350" />
+<TGConnectingPoint num="33" id="3351" />
+<TGConnectingPoint num="34" id="3352" />
+<TGConnectingPoint num="35" id="3353" />
+<TGConnectingPoint num="36" id="3354" />
+<TGConnectingPoint num="37" id="3355" />
+<TGConnectingPoint num="38" id="3356" />
+<TGConnectingPoint num="39" id="3357" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3369" >
+<cdparam x="377" y="542" />
<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="2592" />
-<TGConnectingPoint num="1" id="2593" />
-<TGConnectingPoint num="2" id="2594" />
-<TGConnectingPoint num="3" id="2595" />
-<TGConnectingPoint num="4" id="2596" />
-<TGConnectingPoint num="5" id="2597" />
-<TGConnectingPoint num="6" id="2598" />
-<TGConnectingPoint num="7" id="2599" />
-<TGConnectingPoint num="8" id="2600" />
-<TGConnectingPoint num="9" id="2601" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="2604" >
-<cdparam x="424" y="451" />
+<TGConnectingPoint num="0" id="3359" />
+<TGConnectingPoint num="1" id="3360" />
+<TGConnectingPoint num="2" id="3361" />
+<TGConnectingPoint num="3" id="3362" />
+<TGConnectingPoint num="4" id="3363" />
+<TGConnectingPoint num="5" id="3364" />
+<TGConnectingPoint num="6" id="3365" />
+<TGConnectingPoint num="7" id="3366" />
+<TGConnectingPoint num="8" id="3367" />
+<TGConnectingPoint num="9" id="3368" />
+</COMPONENT>
+
+<COMPONENT type="5101" id="3371" >
+<cdparam x="428" y="708" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2603" />
+<TGConnectingPoint num="0" id="3370" />
</COMPONENT>
-<COMPONENT type="5106" id="2645" >
-<cdparam x="336" y="211" />
+<COMPONENT type="5106" id="3412" >
+<cdparam x="340" y="468" />
<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="2605" />
-<TGConnectingPoint num="1" id="2606" />
-<TGConnectingPoint num="2" id="2607" />
-<TGConnectingPoint num="3" id="2608" />
-<TGConnectingPoint num="4" id="2609" />
-<TGConnectingPoint num="5" id="2610" />
-<TGConnectingPoint num="6" id="2611" />
-<TGConnectingPoint num="7" id="2612" />
-<TGConnectingPoint num="8" id="2613" />
-<TGConnectingPoint num="9" id="2614" />
-<TGConnectingPoint num="10" id="2615" />
-<TGConnectingPoint num="11" id="2616" />
-<TGConnectingPoint num="12" id="2617" />
-<TGConnectingPoint num="13" id="2618" />
-<TGConnectingPoint num="14" id="2619" />
-<TGConnectingPoint num="15" id="2620" />
-<TGConnectingPoint num="16" id="2621" />
-<TGConnectingPoint num="17" id="2622" />
-<TGConnectingPoint num="18" id="2623" />
-<TGConnectingPoint num="19" id="2624" />
-<TGConnectingPoint num="20" id="2625" />
-<TGConnectingPoint num="21" id="2626" />
-<TGConnectingPoint num="22" id="2627" />
-<TGConnectingPoint num="23" id="2628" />
-<TGConnectingPoint num="24" id="2629" />
-<TGConnectingPoint num="25" id="2630" />
-<TGConnectingPoint num="26" id="2631" />
-<TGConnectingPoint num="27" id="2632" />
-<TGConnectingPoint num="28" id="2633" />
-<TGConnectingPoint num="29" id="2634" />
-<TGConnectingPoint num="30" id="2635" />
-<TGConnectingPoint num="31" id="2636" />
-<TGConnectingPoint num="32" id="2637" />
-<TGConnectingPoint num="33" id="2638" />
-<TGConnectingPoint num="34" id="2639" />
-<TGConnectingPoint num="35" id="2640" />
-<TGConnectingPoint num="36" id="2641" />
-<TGConnectingPoint num="37" id="2642" />
-<TGConnectingPoint num="38" id="2643" />
-<TGConnectingPoint num="39" id="2644" />
+<TGConnectingPoint num="0" id="3372" />
+<TGConnectingPoint num="1" id="3373" />
+<TGConnectingPoint num="2" id="3374" />
+<TGConnectingPoint num="3" id="3375" />
+<TGConnectingPoint num="4" id="3376" />
+<TGConnectingPoint num="5" id="3377" />
+<TGConnectingPoint num="6" id="3378" />
+<TGConnectingPoint num="7" id="3379" />
+<TGConnectingPoint num="8" id="3380" />
+<TGConnectingPoint num="9" id="3381" />
+<TGConnectingPoint num="10" id="3382" />
+<TGConnectingPoint num="11" id="3383" />
+<TGConnectingPoint num="12" id="3384" />
+<TGConnectingPoint num="13" id="3385" />
+<TGConnectingPoint num="14" id="3386" />
+<TGConnectingPoint num="15" id="3387" />
+<TGConnectingPoint num="16" id="3388" />
+<TGConnectingPoint num="17" id="3389" />
+<TGConnectingPoint num="18" id="3390" />
+<TGConnectingPoint num="19" id="3391" />
+<TGConnectingPoint num="20" id="3392" />
+<TGConnectingPoint num="21" id="3393" />
+<TGConnectingPoint num="22" id="3394" />
+<TGConnectingPoint num="23" id="3395" />
+<TGConnectingPoint num="24" id="3396" />
+<TGConnectingPoint num="25" id="3397" />
+<TGConnectingPoint num="26" id="3398" />
+<TGConnectingPoint num="27" id="3399" />
+<TGConnectingPoint num="28" id="3400" />
+<TGConnectingPoint num="29" id="3401" />
+<TGConnectingPoint num="30" id="3402" />
+<TGConnectingPoint num="31" id="3403" />
+<TGConnectingPoint num="32" id="3404" />
+<TGConnectingPoint num="33" id="3405" />
+<TGConnectingPoint num="34" id="3406" />
+<TGConnectingPoint num="35" id="3407" />
+<TGConnectingPoint num="36" id="3408" />
+<TGConnectingPoint num="37" id="3409" />
+<TGConnectingPoint num="38" id="3410" />
+<TGConnectingPoint num="39" id="3411" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2686" >
-<cdparam x="340" y="92" />
+<COMPONENT type="5106" id="3453" >
+<cdparam x="344" y="349" />
<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="2646" />
-<TGConnectingPoint num="1" id="2647" />
-<TGConnectingPoint num="2" id="2648" />
-<TGConnectingPoint num="3" id="2649" />
-<TGConnectingPoint num="4" id="2650" />
-<TGConnectingPoint num="5" id="2651" />
-<TGConnectingPoint num="6" id="2652" />
-<TGConnectingPoint num="7" id="2653" />
-<TGConnectingPoint num="8" id="2654" />
-<TGConnectingPoint num="9" id="2655" />
-<TGConnectingPoint num="10" id="2656" />
-<TGConnectingPoint num="11" id="2657" />
-<TGConnectingPoint num="12" id="2658" />
-<TGConnectingPoint num="13" id="2659" />
-<TGConnectingPoint num="14" id="2660" />
-<TGConnectingPoint num="15" id="2661" />
-<TGConnectingPoint num="16" id="2662" />
-<TGConnectingPoint num="17" id="2663" />
-<TGConnectingPoint num="18" id="2664" />
-<TGConnectingPoint num="19" id="2665" />
-<TGConnectingPoint num="20" id="2666" />
-<TGConnectingPoint num="21" id="2667" />
-<TGConnectingPoint num="22" id="2668" />
-<TGConnectingPoint num="23" id="2669" />
-<TGConnectingPoint num="24" id="2670" />
-<TGConnectingPoint num="25" id="2671" />
-<TGConnectingPoint num="26" id="2672" />
-<TGConnectingPoint num="27" id="2673" />
-<TGConnectingPoint num="28" id="2674" />
-<TGConnectingPoint num="29" id="2675" />
-<TGConnectingPoint num="30" id="2676" />
-<TGConnectingPoint num="31" id="2677" />
-<TGConnectingPoint num="32" id="2678" />
-<TGConnectingPoint num="33" id="2679" />
-<TGConnectingPoint num="34" id="2680" />
-<TGConnectingPoint num="35" id="2681" />
-<TGConnectingPoint num="36" id="2682" />
-<TGConnectingPoint num="37" id="2683" />
-<TGConnectingPoint num="38" id="2684" />
-<TGConnectingPoint num="39" id="2685" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2688" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2687" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="AVATAR Design" nameTab="DHSecurityProtocol" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<MainCode value="void __user_init() {"/>
-<MainCode value="}"/>
-<Optimized value="true" />
-<Validated value="" />
-<Ignored value="" />
-
-<CONNECTOR type="5002" id="2694" >
+<TGConnectingPoint num="0" id="3413" />
+<TGConnectingPoint num="1" id="3414" />
+<TGConnectingPoint num="2" id="3415" />
+<TGConnectingPoint num="3" id="3416" />
+<TGConnectingPoint num="4" id="3417" />
+<TGConnectingPoint num="5" id="3418" />
+<TGConnectingPoint num="6" id="3419" />
+<TGConnectingPoint num="7" id="3420" />
+<TGConnectingPoint num="8" id="3421" />
+<TGConnectingPoint num="9" id="3422" />
+<TGConnectingPoint num="10" id="3423" />
+<TGConnectingPoint num="11" id="3424" />
+<TGConnectingPoint num="12" id="3425" />
+<TGConnectingPoint num="13" id="3426" />
+<TGConnectingPoint num="14" id="3427" />
+<TGConnectingPoint num="15" id="3428" />
+<TGConnectingPoint num="16" id="3429" />
+<TGConnectingPoint num="17" id="3430" />
+<TGConnectingPoint num="18" id="3431" />
+<TGConnectingPoint num="19" id="3432" />
+<TGConnectingPoint num="20" id="3433" />
+<TGConnectingPoint num="21" id="3434" />
+<TGConnectingPoint num="22" id="3435" />
+<TGConnectingPoint num="23" id="3436" />
+<TGConnectingPoint num="24" id="3437" />
+<TGConnectingPoint num="25" id="3438" />
+<TGConnectingPoint num="26" id="3439" />
+<TGConnectingPoint num="27" id="3440" />
+<TGConnectingPoint num="28" id="3441" />
+<TGConnectingPoint num="29" id="3442" />
+<TGConnectingPoint num="30" id="3443" />
+<TGConnectingPoint num="31" id="3444" />
+<TGConnectingPoint num="32" id="3445" />
+<TGConnectingPoint num="33" id="3446" />
+<TGConnectingPoint num="34" id="3447" />
+<TGConnectingPoint num="35" id="3448" />
+<TGConnectingPoint num="36" id="3449" />
+<TGConnectingPoint num="37" id="3450" />
+<TGConnectingPoint num="38" id="3451" />
+<TGConnectingPoint num="39" id="3452" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3455" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="3454" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="AVATAR Design" nameTab="DHWithCertificateSecurityProtocol" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+<CONNECTOR type="5002" id="3461" >
<cdparam x="568" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2691" />
-<TGConnectingPoint num="1" id="2692" />
-<TGConnectingPoint num="2" id="2693" />
-<P1 x="459" y="199" id="2791" />
-<P2 x="459" y="254" id="2784" />
-<Point x="490" y="199" />
-<Point x="490" y="254" />
+<TGConnectingPoint num="0" id="3458" />
+<TGConnectingPoint num="1" id="3459" />
+<TGConnectingPoint num="2" id="3460" />
+<P1 x="459" y="106" id="3601" />
+<P2 x="459" y="192" id="3594" />
+<Point x="492" y="119" />
+<Point x="492" y="174" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in chin(Message msg)" />
<osd value="out chout(Message msg)" />
<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2689" >
-<father id="2694" num="0" />
-<cdparam x="490" y="199" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3456" >
+<father id="3461" num="0" />
+<cdparam x="492" y="119" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2690" >
-<father id="2694" num="1" />
-<cdparam x="490" y="254" />
+<SUBCOMPONENT type="-1" id="3457" >
+<father id="3461" num="1" />
+<cdparam x="492" y="174" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<COMPONENT type="302" id="2711" >
-<cdparam x="517" y="154" />
-<sizeparam width="520" height="110" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="3470" >
+<cdparam x="450" y="340" />
+<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="DataType0" value="Key" />
+<TGConnectingPoint num="0" id="3462" />
+<TGConnectingPoint num="1" id="3463" />
+<TGConnectingPoint num="2" id="3464" />
+<TGConnectingPoint num="3" id="3465" />
+<TGConnectingPoint num="4" id="3466" />
+<TGConnectingPoint num="5" id="3467" />
+<TGConnectingPoint num="6" id="3468" />
+<TGConnectingPoint num="7" id="3469" />
+<extraparam>
+<Attribute access="2" id="data" value="0" type="8" typeOther="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5003" id="3479" >
+<cdparam x="50" y="340" />
+<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="DataType0" value="Message" />
+<TGConnectingPoint num="0" id="3471" />
+<TGConnectingPoint num="1" id="3472" />
+<TGConnectingPoint num="2" id="3473" />
+<TGConnectingPoint num="3" id="3474" />
+<TGConnectingPoint num="4" id="3475" />
+<TGConnectingPoint num="5" id="3476" />
+<TGConnectingPoint num="6" id="3477" />
+<TGConnectingPoint num="7" id="3478" />
+<extraparam>
+<Attribute access="2" id="data" value="0" type="8" typeOther="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="302" id="3496" >
+<cdparam x="566" y="97" />
+<sizeparam width="520" height="188" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Proverif Pragma" value="#PrivatePublicKeys InterfaceDevice privK pubK
#PrivatePublicKeys SmartCard privK pubK
+#PrivatePublicKeys CA privK pubK
+#InitialSystemKnowledge SmartCard.interfaceDeviceID CA.interfaceDeviceID
+#InitialSystemKnowledge InterfaceDevice.smartCardID CA.smartCardID
+#InitialSystemKnowledge InterfaceDevice.pubK CA.interfaceDevicePubK
+#InitialSystemKnowledge SmartCard.pubK CA.smartCardPubK
+#InitialSystemKnowledge CA.pubK SmartCard.CAPubK InterfaceDevice.CAPubK
#Confidentiality InterfaceDevice.secretData
#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m
" />
-<TGConnectingPoint num="0" id="2695" />
-<TGConnectingPoint num="1" id="2696" />
-<TGConnectingPoint num="2" id="2697" />
-<TGConnectingPoint num="3" id="2698" />
-<TGConnectingPoint num="4" id="2699" />
-<TGConnectingPoint num="5" id="2700" />
-<TGConnectingPoint num="6" id="2701" />
-<TGConnectingPoint num="7" id="2702" />
-<TGConnectingPoint num="8" id="2703" />
-<TGConnectingPoint num="9" id="2704" />
-<TGConnectingPoint num="10" id="2705" />
-<TGConnectingPoint num="11" id="2706" />
-<TGConnectingPoint num="12" id="2707" />
-<TGConnectingPoint num="13" id="2708" />
-<TGConnectingPoint num="14" id="2709" />
-<TGConnectingPoint num="15" id="2710" />
+<TGConnectingPoint num="0" id="3480" />
+<TGConnectingPoint num="1" id="3481" />
+<TGConnectingPoint num="2" id="3482" />
+<TGConnectingPoint num="3" id="3483" />
+<TGConnectingPoint num="4" id="3484" />
+<TGConnectingPoint num="5" id="3485" />
+<TGConnectingPoint num="6" id="3486" />
+<TGConnectingPoint num="7" id="3487" />
+<TGConnectingPoint num="8" id="3488" />
+<TGConnectingPoint num="9" id="3489" />
+<TGConnectingPoint num="10" id="3490" />
+<TGConnectingPoint num="11" id="3491" />
+<TGConnectingPoint num="12" id="3492" />
+<TGConnectingPoint num="13" id="3493" />
+<TGConnectingPoint num="14" id="3494" />
+<TGConnectingPoint num="15" id="3495" />
<extraparam>
<Line value="#PrivatePublicKeys InterfaceDevice privK pubK" />
<Line value="#PrivatePublicKeys SmartCard privK pubK" />
+<Line value="#PrivatePublicKeys CA privK pubK" />
+<Line value="#InitialSystemKnowledge SmartCard.interfaceDeviceID CA.interfaceDeviceID" />
+<Line value="#InitialSystemKnowledge InterfaceDevice.smartCardID CA.smartCardID" />
+<Line value="#InitialSystemKnowledge InterfaceDevice.pubK CA.interfaceDevicePubK" />
+<Line value="#InitialSystemKnowledge SmartCard.pubK CA.smartCardPubK" />
+<Line value="#InitialSystemKnowledge CA.pubK SmartCard.CAPubK InterfaceDevice.CAPubK" />
<Line value="" />
<Line value="#Confidentiality InterfaceDevice.secretData" />
<Line value="#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="2720" >
+<COMPONENT type="5003" id="3505" >
<cdparam x="260" y="373" />
<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="2712" />
-<TGConnectingPoint num="1" id="2713" />
-<TGConnectingPoint num="2" id="2714" />
-<TGConnectingPoint num="3" id="2715" />
-<TGConnectingPoint num="4" id="2716" />
-<TGConnectingPoint num="5" id="2717" />
-<TGConnectingPoint num="6" id="2718" />
-<TGConnectingPoint num="7" id="2719" />
+<TGConnectingPoint num="0" id="3497" />
+<TGConnectingPoint num="1" id="3498" />
+<TGConnectingPoint num="2" id="3499" />
+<TGConnectingPoint num="3" id="3500" />
+<TGConnectingPoint num="4" id="3501" />
+<TGConnectingPoint num="5" id="3502" />
+<TGConnectingPoint num="6" id="3503" />
+<TGConnectingPoint num="7" id="3504" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="2729" >
+<COMPONENT type="5003" id="3514" >
<cdparam x="68" y="372" />
<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="2721" />
-<TGConnectingPoint num="1" id="2722" />
-<TGConnectingPoint num="2" id="2723" />
-<TGConnectingPoint num="3" id="2724" />
-<TGConnectingPoint num="4" id="2725" />
-<TGConnectingPoint num="5" id="2726" />
-<TGConnectingPoint num="6" id="2727" />
-<TGConnectingPoint num="7" id="2728" />
+<TGConnectingPoint num="0" id="3506" />
+<TGConnectingPoint num="1" id="3507" />
+<TGConnectingPoint num="2" id="3508" />
+<TGConnectingPoint num="3" id="3509" />
+<TGConnectingPoint num="4" id="3510" />
+<TGConnectingPoint num="5" id="3511" />
+<TGConnectingPoint num="6" id="3512" />
+<TGConnectingPoint num="7" id="3513" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="2804" >
-<cdparam x="21" y="145" />
-<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5000" id="3614" >
+<cdparam x="21" y="20" />
+<sizeparam width="438" height="344" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block0" value="System" />
-<TGConnectingPoint num="0" id="2780" />
-<TGConnectingPoint num="1" id="2781" />
-<TGConnectingPoint num="2" id="2782" />
-<TGConnectingPoint num="3" id="2783" />
-<TGConnectingPoint num="4" id="2784" />
-<TGConnectingPoint num="5" id="2785" />
-<TGConnectingPoint num="6" id="2786" />
-<TGConnectingPoint num="7" id="2787" />
-<TGConnectingPoint num="8" id="2788" />
-<TGConnectingPoint num="9" id="2789" />
-<TGConnectingPoint num="10" id="2790" />
-<TGConnectingPoint num="11" id="2791" />
-<TGConnectingPoint num="12" id="2792" />
-<TGConnectingPoint num="13" id="2793" />
-<TGConnectingPoint num="14" id="2794" />
-<TGConnectingPoint num="15" id="2795" />
-<TGConnectingPoint num="16" id="2796" />
-<TGConnectingPoint num="17" id="2797" />
-<TGConnectingPoint num="18" id="2798" />
-<TGConnectingPoint num="19" id="2799" />
-<TGConnectingPoint num="20" id="2800" />
-<TGConnectingPoint num="21" id="2801" />
-<TGConnectingPoint num="22" id="2802" />
-<TGConnectingPoint num="23" id="2803" />
-<extraparam>
-<CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" attached="true" />
-<Signal value="out chout(Message msg)" attached="true" />
-</extraparam>
+<TGConnectingPoint num="0" id="3590" />
+<TGConnectingPoint num="1" id="3591" />
+<TGConnectingPoint num="2" id="3592" />
+<TGConnectingPoint num="3" id="3593" />
+<TGConnectingPoint num="4" id="3594" />
+<TGConnectingPoint num="5" id="3595" />
+<TGConnectingPoint num="6" id="3596" />
+<TGConnectingPoint num="7" id="3597" />
+<TGConnectingPoint num="8" id="3598" />
+<TGConnectingPoint num="9" id="3599" />
+<TGConnectingPoint num="10" id="3600" />
+<TGConnectingPoint num="11" id="3601" />
+<TGConnectingPoint num="12" id="3602" />
+<TGConnectingPoint num="13" id="3603" />
+<TGConnectingPoint num="14" id="3604" />
+<TGConnectingPoint num="15" id="3605" />
+<TGConnectingPoint num="16" id="3606" />
+<TGConnectingPoint num="17" id="3607" />
+<TGConnectingPoint num="18" id="3608" />
+<TGConnectingPoint num="19" id="3609" />
+<TGConnectingPoint num="20" id="3610" />
+<TGConnectingPoint num="21" id="3611" />
+<TGConnectingPoint num="22" id="3612" />
+<TGConnectingPoint num="23" id="3613" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Signal value="in chin(Message msg)" attached="true" />
+<Signal value="out chout(Message msg)" attached="true" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="2754" >
-<father id="2804" num="0" />
-<cdparam x="263" y="233" />
+<SUBCOMPONENT type="5000" id="3539" >
+<father id="3614" num="0" />
+<cdparam x="263" y="108" />
<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
<infoparam name="Block0" value="SmartCard" />
-<TGConnectingPoint num="0" id="2730" />
-<TGConnectingPoint num="1" id="2731" />
-<TGConnectingPoint num="2" id="2732" />
-<TGConnectingPoint num="3" id="2733" />
-<TGConnectingPoint num="4" id="2734" />
-<TGConnectingPoint num="5" id="2735" />
-<TGConnectingPoint num="6" id="2736" />
-<TGConnectingPoint num="7" id="2737" />
-<TGConnectingPoint num="8" id="2738" />
-<TGConnectingPoint num="9" id="2739" />
-<TGConnectingPoint num="10" id="2740" />
-<TGConnectingPoint num="11" id="2741" />
-<TGConnectingPoint num="12" id="2742" />
-<TGConnectingPoint num="13" id="2743" />
-<TGConnectingPoint num="14" id="2744" />
-<TGConnectingPoint num="15" id="2745" />
-<TGConnectingPoint num="16" id="2746" />
-<TGConnectingPoint num="17" id="2747" />
-<TGConnectingPoint num="18" id="2748" />
-<TGConnectingPoint num="19" id="2749" />
-<TGConnectingPoint num="20" id="2750" />
-<TGConnectingPoint num="21" id="2751" />
-<TGConnectingPoint num="22" id="2752" />
-<TGConnectingPoint num="23" id="2753" />
+<TGConnectingPoint num="0" id="3515" />
+<TGConnectingPoint num="1" id="3516" />
+<TGConnectingPoint num="2" id="3517" />
+<TGConnectingPoint num="3" id="3518" />
+<TGConnectingPoint num="4" id="3519" />
+<TGConnectingPoint num="5" id="3520" />
+<TGConnectingPoint num="6" id="3521" />
+<TGConnectingPoint num="7" id="3522" />
+<TGConnectingPoint num="8" id="3523" />
+<TGConnectingPoint num="9" id="3524" />
+<TGConnectingPoint num="10" id="3525" />
+<TGConnectingPoint num="11" id="3526" />
+<TGConnectingPoint num="12" id="3527" />
+<TGConnectingPoint num="13" id="3528" />
+<TGConnectingPoint num="14" id="3529" />
+<TGConnectingPoint num="15" id="3530" />
+<TGConnectingPoint num="16" id="3531" />
+<TGConnectingPoint num="17" id="3532" />
+<TGConnectingPoint num="18" id="3533" />
+<TGConnectingPoint num="19" id="3534" />
+<TGConnectingPoint num="20" id="3535" />
+<TGConnectingPoint num="21" id="3536" />
+<TGConnectingPoint num="22" id="3537" />
+<TGConnectingPoint num="23" id="3538" />
<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
@@ -9058,6 +10643,12 @@ the smart card and the terminal
<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="certOK" value="" type="4" typeOther="" />
+<Attribute access="0" id="interfaceDeviceID" value="" type="8" typeOther="" />
+<Attribute access="0" id="interfaceDevicePubK" value="" type="5" typeOther="Key" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -9082,38 +10673,39 @@ the smart card and the terminal
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2779" >
-<father id="2804" num="1" />
-<cdparam x="36" y="233" />
+<SUBCOMPONENT type="5000" id="3564" >
+<father id="3614" num="1" />
+<cdparam x="36" y="108" />
<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="218" />
<infoparam name="Block0" value="InterfaceDevice" />
-<TGConnectingPoint num="0" id="2755" />
-<TGConnectingPoint num="1" id="2756" />
-<TGConnectingPoint num="2" id="2757" />
-<TGConnectingPoint num="3" id="2758" />
-<TGConnectingPoint num="4" id="2759" />
-<TGConnectingPoint num="5" id="2760" />
-<TGConnectingPoint num="6" id="2761" />
-<TGConnectingPoint num="7" id="2762" />
-<TGConnectingPoint num="8" id="2763" />
-<TGConnectingPoint num="9" id="2764" />
-<TGConnectingPoint num="10" id="2765" />
-<TGConnectingPoint num="11" id="2766" />
-<TGConnectingPoint num="12" id="2767" />
-<TGConnectingPoint num="13" id="2768" />
-<TGConnectingPoint num="14" id="2769" />
-<TGConnectingPoint num="15" id="2770" />
-<TGConnectingPoint num="16" id="2771" />
-<TGConnectingPoint num="17" id="2772" />
-<TGConnectingPoint num="18" id="2773" />
-<TGConnectingPoint num="19" id="2774" />
-<TGConnectingPoint num="20" id="2775" />
-<TGConnectingPoint num="21" id="2776" />
-<TGConnectingPoint num="22" id="2777" />
-<TGConnectingPoint num="23" id="2778" />
+<TGConnectingPoint num="0" id="3540" />
+<TGConnectingPoint num="1" id="3541" />
+<TGConnectingPoint num="2" id="3542" />
+<TGConnectingPoint num="3" id="3543" />
+<TGConnectingPoint num="4" id="3544" />
+<TGConnectingPoint num="5" id="3545" />
+<TGConnectingPoint num="6" id="3546" />
+<TGConnectingPoint num="7" id="3547" />
+<TGConnectingPoint num="8" id="3548" />
+<TGConnectingPoint num="9" id="3549" />
+<TGConnectingPoint num="10" id="3550" />
+<TGConnectingPoint num="11" id="3551" />
+<TGConnectingPoint num="12" id="3552" />
+<TGConnectingPoint num="13" id="3553" />
+<TGConnectingPoint num="14" id="3554" />
+<TGConnectingPoint num="15" id="3555" />
+<TGConnectingPoint num="16" id="3556" />
+<TGConnectingPoint num="17" id="3557" />
+<TGConnectingPoint num="18" id="3558" />
+<TGConnectingPoint num="19" id="3559" />
+<TGConnectingPoint num="20" id="3560" />
+<TGConnectingPoint num="21" id="3561" />
+<TGConnectingPoint num="22" id="3562" />
+<TGConnectingPoint num="23" id="3563" />
<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
@@ -9121,7 +10713,12 @@ the smart card and the terminal
<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="certOK" value="" type="4" typeOther="" />
+<Attribute access="0" id="smartCardID" value="" type="8" typeOther="" />
+<Attribute access="0" id="smartCardPubK" value="" type="5" typeOther="Key" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -9146,9272 +10743,579 @@ the smart card and the terminal
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="3589" >
+<father id="3614" num="2" />
+<cdparam x="115" y="249" />
+<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
+<infoparam name="Block0" value="CA" />
+<TGConnectingPoint num="0" id="3565" />
+<TGConnectingPoint num="1" id="3566" />
+<TGConnectingPoint num="2" id="3567" />
+<TGConnectingPoint num="3" id="3568" />
+<TGConnectingPoint num="4" id="3569" />
+<TGConnectingPoint num="5" id="3570" />
+<TGConnectingPoint num="6" id="3571" />
+<TGConnectingPoint num="7" id="3572" />
+<TGConnectingPoint num="8" id="3573" />
+<TGConnectingPoint num="9" id="3574" />
+<TGConnectingPoint num="10" id="3575" />
+<TGConnectingPoint num="11" id="3576" />
+<TGConnectingPoint num="12" id="3577" />
+<TGConnectingPoint num="13" id="3578" />
+<TGConnectingPoint num="14" id="3579" />
+<TGConnectingPoint num="15" id="3580" />
+<TGConnectingPoint num="16" id="3581" />
+<TGConnectingPoint num="17" id="3582" />
+<TGConnectingPoint num="18" id="3583" />
+<TGConnectingPoint num="19" id="3584" />
+<TGConnectingPoint num="20" id="3585" />
+<TGConnectingPoint num="21" id="3586" />
+<TGConnectingPoint num="22" id="3587" />
+<TGConnectingPoint num="23" id="3588" />
+<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="newK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="newCert" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="newID" value="" type="8" typeOther="" />
+<Attribute access="0" id="interfaceDevicePubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="smartCardPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="interfaceDeviceID" value="" type="8" typeOther="" />
+<Attribute access="0" id="smartCardID" value="" type="8" typeOther="" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+</extraparam>
+</SUBCOMPONENT>
</AVATARBlockDiagramPanel>
-<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="2806" >
+<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="5100" id="3616" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2805" />
+<TGConnectingPoint num="0" id="3615" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2813" >
-<cdparam x="411" y="567" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2812" />
-<P1 x="411" y="567" id="3016" />
-<P2 x="420" y="613" id="2975" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2811" >
-<father id="2813" num="0" />
-<cdparam x="453" y="610" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<AVATARStateMachineDiagramPanel name="CA" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="5100" id="3618" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2807" />
-<TGConnectingPoint num="1" id="2808" />
-<TGConnectingPoint num="2" id="2809" />
-<TGConnectingPoint num="3" id="2810" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="3617" />
+</COMPONENT>
-<CONNECTOR type="5102" id="2820" >
-<cdparam x="496" y="703" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2819" />
-<P1 x="420" y="663" id="2980" />
-<P2 x="438" y="703" id="3026" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2818" >
-<father id="2820" num="0" />
-<cdparam x="453" y="697" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="5100" id="3620" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2814" />
-<TGConnectingPoint num="1" id="2815" />
-<TGConnectingPoint num="2" id="2816" />
-<TGConnectingPoint num="3" id="2817" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="3619" />
+</COMPONENT>
-<CONNECTOR type="5102" id="2827" >
-<cdparam x="411" y="508" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="2826" />
-<P1 x="411" y="508" id="3034" />
-<P2 x="411" y="537" id="3015" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2825" >
-<father id="2827" num="0" />
-<cdparam x="411" y="548" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="5100" id="3622" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2821" />
-<TGConnectingPoint num="1" id="2822" />
-<TGConnectingPoint num="2" id="2823" />
-<TGConnectingPoint num="3" id="2824" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="3621" />
+</COMPONENT>
-<CONNECTOR type="5102" id="2834" >
-<cdparam x="411" y="389" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2833" />
-<P1 x="411" y="389" id="3075" />
-<P2 x="411" y="468" id="3029" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2832" >
-<father id="2834" num="0" />
-<cdparam x="439" y="414" />
-<sizeparam width="148" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="Sysmlsec Methodology" nameTab="SysMLSec_Methodology" >
+<SysmlsecMethodologyDiagramPanel name="SysMLSec_Methodology" minX="10" maxX="2000" minY="10" maxY="1200" zoom="0.8000000000000002" >
+<COMPONENT type="5705" id="3627" >
+<cdparam x="520" y="400" />
+<sizeparam width="144" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2828" />
-<TGConnectingPoint num="1" id="2829" />
-<TGConnectingPoint num="2" id="2830" />
-<TGConnectingPoint num="3" id="2831" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="sk = DH(bobPubK, privK)" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Properties" />
+<TGConnectingPoint num="0" id="3623" />
+<TGConnectingPoint num="1" id="3624" />
+<TGConnectingPoint num="2" id="3625" />
+<TGConnectingPoint num="3" id="3626" />
+</COMPONENT>
-<CONNECTOR type="5102" id="2841" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2840" />
-<P1 x="407" y="70" id="3110" />
-<P2 x="405" y="91" id="2934" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2839" >
-<father id="2841" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5706" id="3632" >
+<cdparam x="880" y="480" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2835" />
-<TGConnectingPoint num="1" id="2836" />
-<TGConnectingPoint num="2" id="2837" />
-<TGConnectingPoint num="3" id="2838" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Prototyping" />
+<TGConnectingPoint num="0" id="3628" />
+<TGConnectingPoint num="1" id="3629" />
+<TGConnectingPoint num="2" id="3630" />
+<TGConnectingPoint num="3" id="3631" />
+</COMPONENT>
-<CONNECTOR type="5102" id="2848" >
-<cdparam x="392" y="122" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2847" />
-<P1 x="392" y="122" id="2962" />
-<P2 x="392" y="150" id="2922" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2846" >
-<father id="2848" num="0" />
-<cdparam x="411" y="142" />
-<sizeparam width="120" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5704" id="3641" >
+<cdparam x="800" y="400" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2842" />
-<TGConnectingPoint num="1" id="2843" />
-<TGConnectingPoint num="2" id="2844" />
-<TGConnectingPoint num="3" id="2845" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="m.data = pubK.data" />
-</extraparam>
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Design" />
+<TGConnectingPoint num="0" id="3636" />
+<TGConnectingPoint num="1" id="3637" />
+<TGConnectingPoint num="2" id="3638" />
+<TGConnectingPoint num="3" id="3639" />
+<TGConnectingPoint num="4" id="3640" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="3633" >
+<father id="3641" num="0" />
+<cdparam x="804" y="456" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="1005" maxX="1005" minY="570" maxY="570" />
+<infoparam name="value " value="DHWithCertificateSecurityProtocol" />
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="2855" >
-<cdparam x="391" y="166" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2854" />
-<P1 x="392" y="180" id="2923" />
-<P2 x="380" y="224" id="2898" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2853" >
-<father id="2855" num="0" />
-<cdparam x="390" y="188" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5707" id="3634" >
+<father id="3641" num="1" />
+<cdparam x="804" y="444" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2849" />
-<TGConnectingPoint num="1" id="2850" />
-<TGConnectingPoint num="2" id="2851" />
-<TGConnectingPoint num="3" id="2852" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<cdrectangleparam minX="1005" maxX="1005" minY="555" maxY="555" />
+<infoparam name="value " value="DHSecurityProtocol" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5707" id="3635" >
+<father id="3641" num="2" />
+<cdparam x="804" y="432" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="1005" maxX="1005" minY="540" maxY="540" />
+<infoparam name="value " value="BasicSecurityProtocol" />
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2862" >
-<cdparam x="380" y="258" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2861" />
-<P1 x="380" y="258" id="2910" />
-<P2 x="386" y="287" id="2870" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2860" >
-<father id="2862" num="0" />
-<cdparam x="377" y="267" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5703" id="3647" >
+<cdparam x="720" y="320" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2856" />
-<TGConnectingPoint num="1" id="2857" />
-<TGConnectingPoint num="2" id="2858" />
-<TGConnectingPoint num="3" id="2859" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Analysis" />
+<TGConnectingPoint num="0" id="3642" />
+<TGConnectingPoint num="1" id="3643" />
+<TGConnectingPoint num="2" id="3644" />
+<TGConnectingPoint num="3" id="3645" />
+<TGConnectingPoint num="4" id="3646" />
+</COMPONENT>
-<CONNECTOR type="5102" id="2869" >
-<cdparam x="375" y="306" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2868" />
-<P1 x="386" y="317" id="2871" />
-<P2 x="377" y="349" id="3077" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2867" >
-<father id="2869" num="0" />
-<cdparam x="396" y="336" />
-<sizeparam width="142" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5711" id="3652" >
+<cdparam x="709" y="80" />
+<sizeparam width="181" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2863" />
-<TGConnectingPoint num="1" id="2864" />
-<TGConnectingPoint num="2" id="2865" />
-<TGConnectingPoint num="3" id="2866" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="bobPubK.data = m.data" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Communication pattern" />
+<TGConnectingPoint num="0" id="3648" />
+<TGConnectingPoint num="1" id="3649" />
+<TGConnectingPoint num="2" id="3650" />
+<TGConnectingPoint num="3" id="3651" />
+</COMPONENT>
-<COMPONENT type="5104" id="2880" >
-<cdparam x="356" y="292" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5710" id="3659" >
+<cdparam x="720" y="180" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="chin(m)" />
-<TGConnectingPoint num="0" id="2870" />
-<TGConnectingPoint num="1" id="2871" />
-<TGConnectingPoint num="2" id="2872" />
-<TGConnectingPoint num="3" id="2873" />
-<TGConnectingPoint num="4" id="2874" />
-<TGConnectingPoint num="5" id="2875" />
-<TGConnectingPoint num="6" id="2876" />
-<TGConnectingPoint num="7" id="2877" />
-<TGConnectingPoint num="8" id="2878" />
-<TGConnectingPoint num="9" id="2879" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Mapping" />
+<TGConnectingPoint num="0" id="3653" />
+<TGConnectingPoint num="1" id="3654" />
+<TGConnectingPoint num="2" id="3655" />
+<TGConnectingPoint num="3" id="3656" />
+<TGConnectingPoint num="4" id="3657" />
+<TGConnectingPoint num="5" id="3658" />
</COMPONENT>
-<COMPONENT type="5106" id="2921" >
-<cdparam x="338" y="224" />
-<sizeparam width="114" height="34" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5709" id="3667" >
+<cdparam x="920" y="80" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="receivingPubK" />
-<TGConnectingPoint num="0" id="2881" />
-<TGConnectingPoint num="1" id="2882" />
-<TGConnectingPoint num="2" id="2883" />
-<TGConnectingPoint num="3" id="2884" />
-<TGConnectingPoint num="4" id="2885" />
-<TGConnectingPoint num="5" id="2886" />
-<TGConnectingPoint num="6" id="2887" />
-<TGConnectingPoint num="7" id="2888" />
-<TGConnectingPoint num="8" id="2889" />
-<TGConnectingPoint num="9" id="2890" />
-<TGConnectingPoint num="10" id="2891" />
-<TGConnectingPoint num="11" id="2892" />
-<TGConnectingPoint num="12" id="2893" />
-<TGConnectingPoint num="13" id="2894" />
-<TGConnectingPoint num="14" id="2895" />
-<TGConnectingPoint num="15" id="2896" />
-<TGConnectingPoint num="16" id="2897" />
-<TGConnectingPoint num="17" id="2898" />
-<TGConnectingPoint num="18" id="2899" />
-<TGConnectingPoint num="19" id="2900" />
-<TGConnectingPoint num="20" id="2901" />
-<TGConnectingPoint num="21" id="2902" />
-<TGConnectingPoint num="22" id="2903" />
-<TGConnectingPoint num="23" id="2904" />
-<TGConnectingPoint num="24" id="2905" />
-<TGConnectingPoint num="25" id="2906" />
-<TGConnectingPoint num="26" id="2907" />
-<TGConnectingPoint num="27" id="2908" />
-<TGConnectingPoint num="28" id="2909" />
-<TGConnectingPoint num="29" id="2910" />
-<TGConnectingPoint num="30" id="2911" />
-<TGConnectingPoint num="31" id="2912" />
-<TGConnectingPoint num="32" id="2913" />
-<TGConnectingPoint num="33" id="2914" />
-<TGConnectingPoint num="34" id="2915" />
-<TGConnectingPoint num="35" id="2916" />
-<TGConnectingPoint num="36" id="2917" />
-<TGConnectingPoint num="37" id="2918" />
-<TGConnectingPoint num="38" id="2919" />
-<TGConnectingPoint num="39" id="2920" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Architecture view" />
+<TGConnectingPoint num="0" id="3663" />
+<TGConnectingPoint num="1" id="3664" />
+<TGConnectingPoint num="2" id="3665" />
+<TGConnectingPoint num="3" id="3666" />
</COMPONENT>
+<SUBCOMPONENT type="5707" id="3660" >
+<father id="3667" num="0" />
+<cdparam x="924" y="136" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="1155" maxX="1155" minY="170" maxY="170" />
+<infoparam name="value " value="Mapping2_Sec" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5707" id="3661" >
+<father id="3667" num="1" />
+<cdparam x="924" y="124" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="1155" maxX="1155" minY="155" maxY="155" />
+<infoparam name="value " value="Mapping2" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5707" id="3662" >
+<father id="3667" num="2" />
+<cdparam x="924" y="112" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="1155" maxX="1155" minY="140" maxY="140" />
+<infoparam name="value " value="Mapping1" />
+</SUBCOMPONENT>
-<COMPONENT type="5103" id="2932" >
-<cdparam x="362" y="155" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5713" id="3673" >
+<cdparam x="520" y="80" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m)" />
-<TGConnectingPoint num="0" id="2922" />
-<TGConnectingPoint num="1" id="2923" />
-<TGConnectingPoint num="2" id="2924" />
-<TGConnectingPoint num="3" id="2925" />
-<TGConnectingPoint num="4" id="2926" />
-<TGConnectingPoint num="5" id="2927" />
-<TGConnectingPoint num="6" id="2928" />
-<TGConnectingPoint num="7" id="2929" />
-<TGConnectingPoint num="8" id="2930" />
-<TGConnectingPoint num="9" id="2931" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Functional view" />
+<TGConnectingPoint num="0" id="3669" />
+<TGConnectingPoint num="1" id="3670" />
+<TGConnectingPoint num="2" id="3671" />
+<TGConnectingPoint num="3" id="3672" />
</COMPONENT>
+<SUBCOMPONENT type="5707" id="3668" >
+<father id="3673" num="0" />
+<cdparam x="524" y="112" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
+<infoparam name="value " value="AppC" />
+</SUBCOMPONENT>
-<COMPONENT type="5106" id="2973" >
-<cdparam x="355" y="91" />
-<sizeparam width="100" height="31" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5719" id="3679" >
+<cdparam x="280" y="120" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="sendingPubK" />
-<TGConnectingPoint num="0" id="2933" />
-<TGConnectingPoint num="1" id="2934" />
-<TGConnectingPoint num="2" id="2935" />
-<TGConnectingPoint num="3" id="2936" />
-<TGConnectingPoint num="4" id="2937" />
-<TGConnectingPoint num="5" id="2938" />
-<TGConnectingPoint num="6" id="2939" />
-<TGConnectingPoint num="7" id="2940" />
-<TGConnectingPoint num="8" id="2941" />
-<TGConnectingPoint num="9" id="2942" />
-<TGConnectingPoint num="10" id="2943" />
-<TGConnectingPoint num="11" id="2944" />
-<TGConnectingPoint num="12" id="2945" />
-<TGConnectingPoint num="13" id="2946" />
-<TGConnectingPoint num="14" id="2947" />
-<TGConnectingPoint num="15" id="2948" />
-<TGConnectingPoint num="16" id="2949" />
-<TGConnectingPoint num="17" id="2950" />
-<TGConnectingPoint num="18" id="2951" />
-<TGConnectingPoint num="19" id="2952" />
-<TGConnectingPoint num="20" id="2953" />
-<TGConnectingPoint num="21" id="2954" />
-<TGConnectingPoint num="22" id="2955" />
-<TGConnectingPoint num="23" id="2956" />
-<TGConnectingPoint num="24" id="2957" />
-<TGConnectingPoint num="25" id="2958" />
-<TGConnectingPoint num="26" id="2959" />
-<TGConnectingPoint num="27" id="2960" />
-<TGConnectingPoint num="28" id="2961" />
-<TGConnectingPoint num="29" id="2962" />
-<TGConnectingPoint num="30" id="2963" />
-<TGConnectingPoint num="31" id="2964" />
-<TGConnectingPoint num="32" id="2965" />
-<TGConnectingPoint num="33" id="2966" />
-<TGConnectingPoint num="34" id="2967" />
-<TGConnectingPoint num="35" id="2968" />
-<TGConnectingPoint num="36" id="2969" />
-<TGConnectingPoint num="37" id="2970" />
-<TGConnectingPoint num="38" id="2971" />
-<TGConnectingPoint num="39" id="2972" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Faults" />
+<TGConnectingPoint num="0" id="3674" />
+<TGConnectingPoint num="1" id="3675" />
+<TGConnectingPoint num="2" id="3676" />
+<TGConnectingPoint num="3" id="3677" />
+<TGConnectingPoint num="4" id="3678" />
</COMPONENT>
-<COMPONENT type="5106" id="3014" >
-<cdparam x="370" y="613" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5712" id="3686" >
+<cdparam x="280" y="440" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="beforeFinish" />
-<TGConnectingPoint num="0" id="2974" />
-<TGConnectingPoint num="1" id="2975" />
-<TGConnectingPoint num="2" id="2976" />
-<TGConnectingPoint num="3" id="2977" />
-<TGConnectingPoint num="4" id="2978" />
-<TGConnectingPoint num="5" id="2979" />
-<TGConnectingPoint num="6" id="2980" />
-<TGConnectingPoint num="7" id="2981" />
-<TGConnectingPoint num="8" id="2982" />
-<TGConnectingPoint num="9" id="2983" />
-<TGConnectingPoint num="10" id="2984" />
-<TGConnectingPoint num="11" id="2985" />
-<TGConnectingPoint num="12" id="2986" />
-<TGConnectingPoint num="13" id="2987" />
-<TGConnectingPoint num="14" id="2988" />
-<TGConnectingPoint num="15" id="2989" />
-<TGConnectingPoint num="16" id="2990" />
-<TGConnectingPoint num="17" id="2991" />
-<TGConnectingPoint num="18" id="2992" />
-<TGConnectingPoint num="19" id="2993" />
-<TGConnectingPoint num="20" id="2994" />
-<TGConnectingPoint num="21" id="2995" />
-<TGConnectingPoint num="22" id="2996" />
-<TGConnectingPoint num="23" id="2997" />
-<TGConnectingPoint num="24" id="2998" />
-<TGConnectingPoint num="25" id="2999" />
-<TGConnectingPoint num="26" id="3000" />
-<TGConnectingPoint num="27" id="3001" />
-<TGConnectingPoint num="28" id="3002" />
-<TGConnectingPoint num="29" id="3003" />
-<TGConnectingPoint num="30" id="3004" />
-<TGConnectingPoint num="31" id="3005" />
-<TGConnectingPoint num="32" id="3006" />
-<TGConnectingPoint num="33" id="3007" />
-<TGConnectingPoint num="34" id="3008" />
-<TGConnectingPoint num="35" id="3009" />
-<TGConnectingPoint num="36" id="3010" />
-<TGConnectingPoint num="37" id="3011" />
-<TGConnectingPoint num="38" id="3012" />
-<TGConnectingPoint num="39" id="3013" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3025" >
-<cdparam x="377" y="542" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="3015" />
-<TGConnectingPoint num="1" id="3016" />
-<TGConnectingPoint num="2" id="3017" />
-<TGConnectingPoint num="3" id="3018" />
-<TGConnectingPoint num="4" id="3019" />
-<TGConnectingPoint num="5" id="3020" />
-<TGConnectingPoint num="6" id="3021" />
-<TGConnectingPoint num="7" id="3022" />
-<TGConnectingPoint num="8" id="3023" />
-<TGConnectingPoint num="9" id="3024" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="3027" >
-<cdparam x="428" y="708" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="3026" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3068" >
-<cdparam x="340" y="468" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="3028" />
-<TGConnectingPoint num="1" id="3029" />
-<TGConnectingPoint num="2" id="3030" />
-<TGConnectingPoint num="3" id="3031" />
-<TGConnectingPoint num="4" id="3032" />
-<TGConnectingPoint num="5" id="3033" />
-<TGConnectingPoint num="6" id="3034" />
-<TGConnectingPoint num="7" id="3035" />
-<TGConnectingPoint num="8" id="3036" />
-<TGConnectingPoint num="9" id="3037" />
-<TGConnectingPoint num="10" id="3038" />
-<TGConnectingPoint num="11" id="3039" />
-<TGConnectingPoint num="12" id="3040" />
-<TGConnectingPoint num="13" id="3041" />
-<TGConnectingPoint num="14" id="3042" />
-<TGConnectingPoint num="15" id="3043" />
-<TGConnectingPoint num="16" id="3044" />
-<TGConnectingPoint num="17" id="3045" />
-<TGConnectingPoint num="18" id="3046" />
-<TGConnectingPoint num="19" id="3047" />
-<TGConnectingPoint num="20" id="3048" />
-<TGConnectingPoint num="21" id="3049" />
-<TGConnectingPoint num="22" id="3050" />
-<TGConnectingPoint num="23" id="3051" />
-<TGConnectingPoint num="24" id="3052" />
-<TGConnectingPoint num="25" id="3053" />
-<TGConnectingPoint num="26" id="3054" />
-<TGConnectingPoint num="27" id="3055" />
-<TGConnectingPoint num="28" id="3056" />
-<TGConnectingPoint num="29" id="3057" />
-<TGConnectingPoint num="30" id="3058" />
-<TGConnectingPoint num="31" id="3059" />
-<TGConnectingPoint num="32" id="3060" />
-<TGConnectingPoint num="33" id="3061" />
-<TGConnectingPoint num="34" id="3062" />
-<TGConnectingPoint num="35" id="3063" />
-<TGConnectingPoint num="36" id="3064" />
-<TGConnectingPoint num="37" id="3065" />
-<TGConnectingPoint num="38" id="3066" />
-<TGConnectingPoint num="39" id="3067" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3109" >
-<cdparam x="344" y="349" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="3069" />
-<TGConnectingPoint num="1" id="3070" />
-<TGConnectingPoint num="2" id="3071" />
-<TGConnectingPoint num="3" id="3072" />
-<TGConnectingPoint num="4" id="3073" />
-<TGConnectingPoint num="5" id="3074" />
-<TGConnectingPoint num="6" id="3075" />
-<TGConnectingPoint num="7" id="3076" />
-<TGConnectingPoint num="8" id="3077" />
-<TGConnectingPoint num="9" id="3078" />
-<TGConnectingPoint num="10" id="3079" />
-<TGConnectingPoint num="11" id="3080" />
-<TGConnectingPoint num="12" id="3081" />
-<TGConnectingPoint num="13" id="3082" />
-<TGConnectingPoint num="14" id="3083" />
-<TGConnectingPoint num="15" id="3084" />
-<TGConnectingPoint num="16" id="3085" />
-<TGConnectingPoint num="17" id="3086" />
-<TGConnectingPoint num="18" id="3087" />
-<TGConnectingPoint num="19" id="3088" />
-<TGConnectingPoint num="20" id="3089" />
-<TGConnectingPoint num="21" id="3090" />
-<TGConnectingPoint num="22" id="3091" />
-<TGConnectingPoint num="23" id="3092" />
-<TGConnectingPoint num="24" id="3093" />
-<TGConnectingPoint num="25" id="3094" />
-<TGConnectingPoint num="26" id="3095" />
-<TGConnectingPoint num="27" id="3096" />
-<TGConnectingPoint num="28" id="3097" />
-<TGConnectingPoint num="29" id="3098" />
-<TGConnectingPoint num="30" id="3099" />
-<TGConnectingPoint num="31" id="3100" />
-<TGConnectingPoint num="32" id="3101" />
-<TGConnectingPoint num="33" id="3102" />
-<TGConnectingPoint num="34" id="3103" />
-<TGConnectingPoint num="35" id="3104" />
-<TGConnectingPoint num="36" id="3105" />
-<TGConnectingPoint num="37" id="3106" />
-<TGConnectingPoint num="38" id="3107" />
-<TGConnectingPoint num="39" id="3108" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3111" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3110" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Attacks" />
+<TGConnectingPoint num="0" id="3681" />
+<TGConnectingPoint num="1" id="3682" />
+<TGConnectingPoint num="2" id="3683" />
+<TGConnectingPoint num="3" id="3684" />
+<TGConnectingPoint num="4" id="3685" />
</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3118" >
-<cdparam x="418" y="632" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3117" />
-<P1 x="418" y="632" id="3285" />
-<P2 x="422" y="677" id="3321" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3116" >
-<father id="3118" num="0" />
-<cdparam x="433" y="656" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3112" />
-<TGConnectingPoint num="1" id="3113" />
-<TGConnectingPoint num="2" id="3114" />
-<TGConnectingPoint num="3" id="3115" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="receivedData = m.data" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3125" >
-<cdparam x="409" y="526" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3124" />
-<P1 x="409" y="526" id="3367" />
-<P2 x="418" y="592" id="3280" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3123" >
-<father id="3125" num="0" />
-<cdparam x="431" y="551" />
-<sizeparam width="151" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3119" />
-<TGConnectingPoint num="1" id="3120" />
-<TGConnectingPoint num="2" id="3121" />
-<TGConnectingPoint num="3" id="3122" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="sk = DH(alicePubK, privK)" />
-<actions value="m = sdecrypt(m2, sk)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3132" >
-<cdparam x="408" y="454" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3131" />
-<P1 x="408" y="454" id="3403" />
-<P2 x="409" y="486" id="3362" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3130" >
-<father id="3132" num="0" />
-<cdparam x="408" y="494" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3126" />
-<TGConnectingPoint num="1" id="3127" />
-<TGConnectingPoint num="2" id="3128" />
-<TGConnectingPoint num="3" id="3129" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3139" >
-<cdparam x="408" y="394" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3138" />
-<P1 x="408" y="394" id="3419" />
-<P2 x="408" y="424" id="3402" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3137" >
-<father id="3139" num="0" />
-<cdparam x="408" y="434" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3133" />
-<TGConnectingPoint num="1" id="3134" />
-<TGConnectingPoint num="2" id="3135" />
-<TGConnectingPoint num="3" id="3136" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3146" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3145" />
-<P1 x="407" y="70" id="3454" />
-<P2 x="407" y="95" id="3239" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3144" >
-<father id="3146" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3140" />
-<TGConnectingPoint num="1" id="3141" />
-<TGConnectingPoint num="2" id="3142" />
-<TGConnectingPoint num="3" id="3143" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3153" >
-<cdparam x="407" y="127" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3152" />
-<P1 x="407" y="127" id="3244" />
-<P2 x="407" y="153" id="3227" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3151" >
-<father id="3153" num="0" />
-<cdparam x="428" y="145" />
-<sizeparam width="120" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3147" />
-<TGConnectingPoint num="1" id="3148" />
-<TGConnectingPoint num="2" id="3149" />
-<TGConnectingPoint num="3" id="3150" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="m.data = pubK.data" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3160" >
-<cdparam x="407" y="183" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3159" />
-<P1 x="407" y="183" id="3228" />
-<P2 x="408" y="213" id="3187" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3158" >
-<father id="3160" num="0" />
-<cdparam x="408" y="199" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3154" />
-<TGConnectingPoint num="1" id="3155" />
-<TGConnectingPoint num="2" id="3156" />
-<TGConnectingPoint num="3" id="3157" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3167" >
-<cdparam x="409" y="265" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3166" />
-<P1 x="408" y="251" id="3192" />
-<P2 x="406" y="285" id="3175" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3165" >
-<father id="3167" num="0" />
-<cdparam x="409" y="281" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3161" />
-<TGConnectingPoint num="1" id="3162" />
-<TGConnectingPoint num="2" id="3163" />
-<TGConnectingPoint num="3" id="3164" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3174" >
-<cdparam x="410" y="327" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3173" />
-<P1 x="406" y="315" id="3176" />
-<P2 x="408" y="354" id="3414" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3172" >
-<father id="3174" num="0" />
-<cdparam x="426" y="337" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5707" id="3680" >
+<father id="3686" num="0" />
+<cdparam x="284" y="472" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3168" />
-<TGConnectingPoint num="1" id="3169" />
-<TGConnectingPoint num="2" id="3170" />
-<TGConnectingPoint num="3" id="3171" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="alicePubK.data = m.data" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5104" id="3185" >
-<cdparam x="376" y="290" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="chin(m)" />
-<TGConnectingPoint num="0" id="3175" />
-<TGConnectingPoint num="1" id="3176" />
-<TGConnectingPoint num="2" id="3177" />
-<TGConnectingPoint num="3" id="3178" />
-<TGConnectingPoint num="4" id="3179" />
-<TGConnectingPoint num="5" id="3180" />
-<TGConnectingPoint num="6" id="3181" />
-<TGConnectingPoint num="7" id="3182" />
-<TGConnectingPoint num="8" id="3183" />
-<TGConnectingPoint num="9" id="3184" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3226" >
-<cdparam x="347" y="213" />
-<sizeparam width="123" height="38" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="receivingPubK" />
-<TGConnectingPoint num="0" id="3186" />
-<TGConnectingPoint num="1" id="3187" />
-<TGConnectingPoint num="2" id="3188" />
-<TGConnectingPoint num="3" id="3189" />
-<TGConnectingPoint num="4" id="3190" />
-<TGConnectingPoint num="5" id="3191" />
-<TGConnectingPoint num="6" id="3192" />
-<TGConnectingPoint num="7" id="3193" />
-<TGConnectingPoint num="8" id="3194" />
-<TGConnectingPoint num="9" id="3195" />
-<TGConnectingPoint num="10" id="3196" />
-<TGConnectingPoint num="11" id="3197" />
-<TGConnectingPoint num="12" id="3198" />
-<TGConnectingPoint num="13" id="3199" />
-<TGConnectingPoint num="14" id="3200" />
-<TGConnectingPoint num="15" id="3201" />
-<TGConnectingPoint num="16" id="3202" />
-<TGConnectingPoint num="17" id="3203" />
-<TGConnectingPoint num="18" id="3204" />
-<TGConnectingPoint num="19" id="3205" />
-<TGConnectingPoint num="20" id="3206" />
-<TGConnectingPoint num="21" id="3207" />
-<TGConnectingPoint num="22" id="3208" />
-<TGConnectingPoint num="23" id="3209" />
-<TGConnectingPoint num="24" id="3210" />
-<TGConnectingPoint num="25" id="3211" />
-<TGConnectingPoint num="26" id="3212" />
-<TGConnectingPoint num="27" id="3213" />
-<TGConnectingPoint num="28" id="3214" />
-<TGConnectingPoint num="29" id="3215" />
-<TGConnectingPoint num="30" id="3216" />
-<TGConnectingPoint num="31" id="3217" />
-<TGConnectingPoint num="32" id="3218" />
-<TGConnectingPoint num="33" id="3219" />
-<TGConnectingPoint num="34" id="3220" />
-<TGConnectingPoint num="35" id="3221" />
-<TGConnectingPoint num="36" id="3222" />
-<TGConnectingPoint num="37" id="3223" />
-<TGConnectingPoint num="38" id="3224" />
-<TGConnectingPoint num="39" id="3225" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3237" >
-<cdparam x="377" y="158" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m)" />
-<TGConnectingPoint num="0" id="3227" />
-<TGConnectingPoint num="1" id="3228" />
-<TGConnectingPoint num="2" id="3229" />
-<TGConnectingPoint num="3" id="3230" />
-<TGConnectingPoint num="4" id="3231" />
-<TGConnectingPoint num="5" id="3232" />
-<TGConnectingPoint num="6" id="3233" />
-<TGConnectingPoint num="7" id="3234" />
-<TGConnectingPoint num="8" id="3235" />
-<TGConnectingPoint num="9" id="3236" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3278" >
-<cdparam x="351" y="95" />
-<sizeparam width="113" height="32" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="sendingPubK" />
-<TGConnectingPoint num="0" id="3238" />
-<TGConnectingPoint num="1" id="3239" />
-<TGConnectingPoint num="2" id="3240" />
-<TGConnectingPoint num="3" id="3241" />
-<TGConnectingPoint num="4" id="3242" />
-<TGConnectingPoint num="5" id="3243" />
-<TGConnectingPoint num="6" id="3244" />
-<TGConnectingPoint num="7" id="3245" />
-<TGConnectingPoint num="8" id="3246" />
-<TGConnectingPoint num="9" id="3247" />
-<TGConnectingPoint num="10" id="3248" />
-<TGConnectingPoint num="11" id="3249" />
-<TGConnectingPoint num="12" id="3250" />
-<TGConnectingPoint num="13" id="3251" />
-<TGConnectingPoint num="14" id="3252" />
-<TGConnectingPoint num="15" id="3253" />
-<TGConnectingPoint num="16" id="3254" />
-<TGConnectingPoint num="17" id="3255" />
-<TGConnectingPoint num="18" id="3256" />
-<TGConnectingPoint num="19" id="3257" />
-<TGConnectingPoint num="20" id="3258" />
-<TGConnectingPoint num="21" id="3259" />
-<TGConnectingPoint num="22" id="3260" />
-<TGConnectingPoint num="23" id="3261" />
-<TGConnectingPoint num="24" id="3262" />
-<TGConnectingPoint num="25" id="3263" />
-<TGConnectingPoint num="26" id="3264" />
-<TGConnectingPoint num="27" id="3265" />
-<TGConnectingPoint num="28" id="3266" />
-<TGConnectingPoint num="29" id="3267" />
-<TGConnectingPoint num="30" id="3268" />
-<TGConnectingPoint num="31" id="3269" />
-<TGConnectingPoint num="32" id="3270" />
-<TGConnectingPoint num="33" id="3271" />
-<TGConnectingPoint num="34" id="3272" />
-<TGConnectingPoint num="35" id="3273" />
-<TGConnectingPoint num="36" id="3274" />
-<TGConnectingPoint num="37" id="3275" />
-<TGConnectingPoint num="38" id="3276" />
-<TGConnectingPoint num="39" id="3277" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3319" >
-<cdparam x="329" y="592" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="3279" />
-<TGConnectingPoint num="1" id="3280" />
-<TGConnectingPoint num="2" id="3281" />
-<TGConnectingPoint num="3" id="3282" />
-<TGConnectingPoint num="4" id="3283" />
-<TGConnectingPoint num="5" id="3284" />
-<TGConnectingPoint num="6" id="3285" />
-<TGConnectingPoint num="7" id="3286" />
-<TGConnectingPoint num="8" id="3287" />
-<TGConnectingPoint num="9" id="3288" />
-<TGConnectingPoint num="10" id="3289" />
-<TGConnectingPoint num="11" id="3290" />
-<TGConnectingPoint num="12" id="3291" />
-<TGConnectingPoint num="13" id="3292" />
-<TGConnectingPoint num="14" id="3293" />
-<TGConnectingPoint num="15" id="3294" />
-<TGConnectingPoint num="16" id="3295" />
-<TGConnectingPoint num="17" id="3296" />
-<TGConnectingPoint num="18" id="3297" />
-<TGConnectingPoint num="19" id="3298" />
-<TGConnectingPoint num="20" id="3299" />
-<TGConnectingPoint num="21" id="3300" />
-<TGConnectingPoint num="22" id="3301" />
-<TGConnectingPoint num="23" id="3302" />
-<TGConnectingPoint num="24" id="3303" />
-<TGConnectingPoint num="25" id="3304" />
-<TGConnectingPoint num="26" id="3305" />
-<TGConnectingPoint num="27" id="3306" />
-<TGConnectingPoint num="28" id="3307" />
-<TGConnectingPoint num="29" id="3308" />
-<TGConnectingPoint num="30" id="3309" />
-<TGConnectingPoint num="31" id="3310" />
-<TGConnectingPoint num="32" id="3311" />
-<TGConnectingPoint num="33" id="3312" />
-<TGConnectingPoint num="34" id="3313" />
-<TGConnectingPoint num="35" id="3314" />
-<TGConnectingPoint num="36" id="3315" />
-<TGConnectingPoint num="37" id="3316" />
-<TGConnectingPoint num="38" id="3317" />
-<TGConnectingPoint num="39" id="3318" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3360" >
-<cdparam x="352" y="677" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="3320" />
-<TGConnectingPoint num="1" id="3321" />
-<TGConnectingPoint num="2" id="3322" />
-<TGConnectingPoint num="3" id="3323" />
-<TGConnectingPoint num="4" id="3324" />
-<TGConnectingPoint num="5" id="3325" />
-<TGConnectingPoint num="6" id="3326" />
-<TGConnectingPoint num="7" id="3327" />
-<TGConnectingPoint num="8" id="3328" />
-<TGConnectingPoint num="9" id="3329" />
-<TGConnectingPoint num="10" id="3330" />
-<TGConnectingPoint num="11" id="3331" />
-<TGConnectingPoint num="12" id="3332" />
-<TGConnectingPoint num="13" id="3333" />
-<TGConnectingPoint num="14" id="3334" />
-<TGConnectingPoint num="15" id="3335" />
-<TGConnectingPoint num="16" id="3336" />
-<TGConnectingPoint num="17" id="3337" />
-<TGConnectingPoint num="18" id="3338" />
-<TGConnectingPoint num="19" id="3339" />
-<TGConnectingPoint num="20" id="3340" />
-<TGConnectingPoint num="21" id="3341" />
-<TGConnectingPoint num="22" id="3342" />
-<TGConnectingPoint num="23" id="3343" />
-<TGConnectingPoint num="24" id="3344" />
-<TGConnectingPoint num="25" id="3345" />
-<TGConnectingPoint num="26" id="3346" />
-<TGConnectingPoint num="27" id="3347" />
-<TGConnectingPoint num="28" id="3348" />
-<TGConnectingPoint num="29" id="3349" />
-<TGConnectingPoint num="30" id="3350" />
-<TGConnectingPoint num="31" id="3351" />
-<TGConnectingPoint num="32" id="3352" />
-<TGConnectingPoint num="33" id="3353" />
-<TGConnectingPoint num="34" id="3354" />
-<TGConnectingPoint num="35" id="3355" />
-<TGConnectingPoint num="36" id="3356" />
-<TGConnectingPoint num="37" id="3357" />
-<TGConnectingPoint num="38" id="3358" />
-<TGConnectingPoint num="39" id="3359" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3401" >
-<cdparam x="338" y="486" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="3361" />
-<TGConnectingPoint num="1" id="3362" />
-<TGConnectingPoint num="2" id="3363" />
-<TGConnectingPoint num="3" id="3364" />
-<TGConnectingPoint num="4" id="3365" />
-<TGConnectingPoint num="5" id="3366" />
-<TGConnectingPoint num="6" id="3367" />
-<TGConnectingPoint num="7" id="3368" />
-<TGConnectingPoint num="8" id="3369" />
-<TGConnectingPoint num="9" id="3370" />
-<TGConnectingPoint num="10" id="3371" />
-<TGConnectingPoint num="11" id="3372" />
-<TGConnectingPoint num="12" id="3373" />
-<TGConnectingPoint num="13" id="3374" />
-<TGConnectingPoint num="14" id="3375" />
-<TGConnectingPoint num="15" id="3376" />
-<TGConnectingPoint num="16" id="3377" />
-<TGConnectingPoint num="17" id="3378" />
-<TGConnectingPoint num="18" id="3379" />
-<TGConnectingPoint num="19" id="3380" />
-<TGConnectingPoint num="20" id="3381" />
-<TGConnectingPoint num="21" id="3382" />
-<TGConnectingPoint num="22" id="3383" />
-<TGConnectingPoint num="23" id="3384" />
-<TGConnectingPoint num="24" id="3385" />
-<TGConnectingPoint num="25" id="3386" />
-<TGConnectingPoint num="26" id="3387" />
-<TGConnectingPoint num="27" id="3388" />
-<TGConnectingPoint num="28" id="3389" />
-<TGConnectingPoint num="29" id="3390" />
-<TGConnectingPoint num="30" id="3391" />
-<TGConnectingPoint num="31" id="3392" />
-<TGConnectingPoint num="32" id="3393" />
-<TGConnectingPoint num="33" id="3394" />
-<TGConnectingPoint num="34" id="3395" />
-<TGConnectingPoint num="35" id="3396" />
-<TGConnectingPoint num="36" id="3397" />
-<TGConnectingPoint num="37" id="3398" />
-<TGConnectingPoint num="38" id="3399" />
-<TGConnectingPoint num="39" id="3400" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="3412" >
-<cdparam x="374" y="429" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="3402" />
-<TGConnectingPoint num="1" id="3403" />
-<TGConnectingPoint num="2" id="3404" />
-<TGConnectingPoint num="3" id="3405" />
-<TGConnectingPoint num="4" id="3406" />
-<TGConnectingPoint num="5" id="3407" />
-<TGConnectingPoint num="6" id="3408" />
-<TGConnectingPoint num="7" id="3409" />
-<TGConnectingPoint num="8" id="3410" />
-<TGConnectingPoint num="9" id="3411" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3453" >
-<cdparam x="342" y="354" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="3413" />
-<TGConnectingPoint num="1" id="3414" />
-<TGConnectingPoint num="2" id="3415" />
-<TGConnectingPoint num="3" id="3416" />
-<TGConnectingPoint num="4" id="3417" />
-<TGConnectingPoint num="5" id="3418" />
-<TGConnectingPoint num="6" id="3419" />
-<TGConnectingPoint num="7" id="3420" />
-<TGConnectingPoint num="8" id="3421" />
-<TGConnectingPoint num="9" id="3422" />
-<TGConnectingPoint num="10" id="3423" />
-<TGConnectingPoint num="11" id="3424" />
-<TGConnectingPoint num="12" id="3425" />
-<TGConnectingPoint num="13" id="3426" />
-<TGConnectingPoint num="14" id="3427" />
-<TGConnectingPoint num="15" id="3428" />
-<TGConnectingPoint num="16" id="3429" />
-<TGConnectingPoint num="17" id="3430" />
-<TGConnectingPoint num="18" id="3431" />
-<TGConnectingPoint num="19" id="3432" />
-<TGConnectingPoint num="20" id="3433" />
-<TGConnectingPoint num="21" id="3434" />
-<TGConnectingPoint num="22" id="3435" />
-<TGConnectingPoint num="23" id="3436" />
-<TGConnectingPoint num="24" id="3437" />
-<TGConnectingPoint num="25" id="3438" />
-<TGConnectingPoint num="26" id="3439" />
-<TGConnectingPoint num="27" id="3440" />
-<TGConnectingPoint num="28" id="3441" />
-<TGConnectingPoint num="29" id="3442" />
-<TGConnectingPoint num="30" id="3443" />
-<TGConnectingPoint num="31" id="3444" />
-<TGConnectingPoint num="32" id="3445" />
-<TGConnectingPoint num="33" id="3446" />
-<TGConnectingPoint num="34" id="3447" />
-<TGConnectingPoint num="35" id="3448" />
-<TGConnectingPoint num="36" id="3449" />
-<TGConnectingPoint num="37" id="3450" />
-<TGConnectingPoint num="38" id="3451" />
-<TGConnectingPoint num="39" id="3452" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3455" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3454" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="AVATAR Design" nameTab="DHWithCertificateSecurityProtocol" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<MainCode value="void __user_init() {"/>
-<MainCode value="}"/>
-<Optimized value="true" />
-<Validated value="" />
-<Ignored value="" />
-
-<CONNECTOR type="5002" id="3461" >
-<cdparam x="568" y="220" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="3458" />
-<TGConnectingPoint num="1" id="3459" />
-<TGConnectingPoint num="2" id="3460" />
-<P1 x="459" y="106" id="3601" />
-<P2 x="459" y="192" id="3594" />
-<Point x="492" y="119" />
-<Point x="492" y="174" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<iso value="in chin(Message msg)" />
-<osd value="out chout(Message msg)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
-</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="3456" >
-<father id="3461" num="0" />
-<cdparam x="492" y="119" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3457" >
-<father id="3461" num="1" />
-<cdparam x="492" y="174" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<COMPONENT type="5003" id="3470" >
-<cdparam x="450" y="340" />
-<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="3462" />
-<TGConnectingPoint num="1" id="3463" />
-<TGConnectingPoint num="2" id="3464" />
-<TGConnectingPoint num="3" id="3465" />
-<TGConnectingPoint num="4" id="3466" />
-<TGConnectingPoint num="5" id="3467" />
-<TGConnectingPoint num="6" id="3468" />
-<TGConnectingPoint num="7" id="3469" />
-<extraparam>
-<Attribute access="2" id="data" value="0" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="3479" >
-<cdparam x="50" y="340" />
-<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="3471" />
-<TGConnectingPoint num="1" id="3472" />
-<TGConnectingPoint num="2" id="3473" />
-<TGConnectingPoint num="3" id="3474" />
-<TGConnectingPoint num="4" id="3475" />
-<TGConnectingPoint num="5" id="3476" />
-<TGConnectingPoint num="6" id="3477" />
-<TGConnectingPoint num="7" id="3478" />
-<extraparam>
-<Attribute access="2" id="data" value="0" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="302" id="3496" >
-<cdparam x="566" y="97" />
-<sizeparam width="520" height="188" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Proverif Pragma" value="#PrivatePublicKeys InterfaceDevice privK pubK
-#PrivatePublicKeys SmartCard privK pubK
-#PrivatePublicKeys CA privK pubK
-#InitialSystemKnowledge SmartCard.interfaceDeviceID CA.interfaceDeviceID
-#InitialSystemKnowledge InterfaceDevice.smartCardID CA.smartCardID
-#InitialSystemKnowledge InterfaceDevice.pubK CA.interfaceDevicePubK
-#InitialSystemKnowledge SmartCard.pubK CA.smartCardPubK
-#InitialSystemKnowledge CA.pubK SmartCard.CAPubK InterfaceDevice.CAPubK
-
-#Confidentiality InterfaceDevice.secretData
-#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m
-" />
-<TGConnectingPoint num="0" id="3480" />
-<TGConnectingPoint num="1" id="3481" />
-<TGConnectingPoint num="2" id="3482" />
-<TGConnectingPoint num="3" id="3483" />
-<TGConnectingPoint num="4" id="3484" />
-<TGConnectingPoint num="5" id="3485" />
-<TGConnectingPoint num="6" id="3486" />
-<TGConnectingPoint num="7" id="3487" />
-<TGConnectingPoint num="8" id="3488" />
-<TGConnectingPoint num="9" id="3489" />
-<TGConnectingPoint num="10" id="3490" />
-<TGConnectingPoint num="11" id="3491" />
-<TGConnectingPoint num="12" id="3492" />
-<TGConnectingPoint num="13" id="3493" />
-<TGConnectingPoint num="14" id="3494" />
-<TGConnectingPoint num="15" id="3495" />
-<extraparam>
-<Line value="#PrivatePublicKeys InterfaceDevice privK pubK" />
-<Line value="#PrivatePublicKeys SmartCard privK pubK" />
-<Line value="#PrivatePublicKeys CA privK pubK" />
-<Line value="#InitialSystemKnowledge SmartCard.interfaceDeviceID CA.interfaceDeviceID" />
-<Line value="#InitialSystemKnowledge InterfaceDevice.smartCardID CA.smartCardID" />
-<Line value="#InitialSystemKnowledge InterfaceDevice.pubK CA.interfaceDevicePubK" />
-<Line value="#InitialSystemKnowledge SmartCard.pubK CA.smartCardPubK" />
-<Line value="#InitialSystemKnowledge CA.pubK SmartCard.CAPubK InterfaceDevice.CAPubK" />
-<Line value="" />
-<Line value="#Confidentiality InterfaceDevice.secretData" />
-<Line value="#Authenticity InterfaceDevice.sendingMessage.m SmartCard.messageDecrypted.m" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="3505" >
-<cdparam x="260" y="373" />
-<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="3497" />
-<TGConnectingPoint num="1" id="3498" />
-<TGConnectingPoint num="2" id="3499" />
-<TGConnectingPoint num="3" id="3500" />
-<TGConnectingPoint num="4" id="3501" />
-<TGConnectingPoint num="5" id="3502" />
-<TGConnectingPoint num="6" id="3503" />
-<TGConnectingPoint num="7" id="3504" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="3514" >
-<cdparam x="68" y="372" />
-<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="3506" />
-<TGConnectingPoint num="1" id="3507" />
-<TGConnectingPoint num="2" id="3508" />
-<TGConnectingPoint num="3" id="3509" />
-<TGConnectingPoint num="4" id="3510" />
-<TGConnectingPoint num="5" id="3511" />
-<TGConnectingPoint num="6" id="3512" />
-<TGConnectingPoint num="7" id="3513" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5000" id="3614" >
-<cdparam x="21" y="20" />
-<sizeparam width="438" height="344" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="System" />
-<TGConnectingPoint num="0" id="3590" />
-<TGConnectingPoint num="1" id="3591" />
-<TGConnectingPoint num="2" id="3592" />
-<TGConnectingPoint num="3" id="3593" />
-<TGConnectingPoint num="4" id="3594" />
-<TGConnectingPoint num="5" id="3595" />
-<TGConnectingPoint num="6" id="3596" />
-<TGConnectingPoint num="7" id="3597" />
-<TGConnectingPoint num="8" id="3598" />
-<TGConnectingPoint num="9" id="3599" />
-<TGConnectingPoint num="10" id="3600" />
-<TGConnectingPoint num="11" id="3601" />
-<TGConnectingPoint num="12" id="3602" />
-<TGConnectingPoint num="13" id="3603" />
-<TGConnectingPoint num="14" id="3604" />
-<TGConnectingPoint num="15" id="3605" />
-<TGConnectingPoint num="16" id="3606" />
-<TGConnectingPoint num="17" id="3607" />
-<TGConnectingPoint num="18" id="3608" />
-<TGConnectingPoint num="19" id="3609" />
-<TGConnectingPoint num="20" id="3610" />
-<TGConnectingPoint num="21" id="3611" />
-<TGConnectingPoint num="22" id="3612" />
-<TGConnectingPoint num="23" id="3613" />
-<extraparam>
-<CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" attached="true" />
-<Signal value="out chout(Message msg)" attached="true" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5000" id="3539" >
-<father id="3614" num="0" />
-<cdparam x="115" y="249" />
-<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
-<infoparam name="Block0" value="CA" />
-<TGConnectingPoint num="0" id="3515" />
-<TGConnectingPoint num="1" id="3516" />
-<TGConnectingPoint num="2" id="3517" />
-<TGConnectingPoint num="3" id="3518" />
-<TGConnectingPoint num="4" id="3519" />
-<TGConnectingPoint num="5" id="3520" />
-<TGConnectingPoint num="6" id="3521" />
-<TGConnectingPoint num="7" id="3522" />
-<TGConnectingPoint num="8" id="3523" />
-<TGConnectingPoint num="9" id="3524" />
-<TGConnectingPoint num="10" id="3525" />
-<TGConnectingPoint num="11" id="3526" />
-<TGConnectingPoint num="12" id="3527" />
-<TGConnectingPoint num="13" id="3528" />
-<TGConnectingPoint num="14" id="3529" />
-<TGConnectingPoint num="15" id="3530" />
-<TGConnectingPoint num="16" id="3531" />
-<TGConnectingPoint num="17" id="3532" />
-<TGConnectingPoint num="18" id="3533" />
-<TGConnectingPoint num="19" id="3534" />
-<TGConnectingPoint num="20" id="3535" />
-<TGConnectingPoint num="21" id="3536" />
-<TGConnectingPoint num="22" id="3537" />
-<TGConnectingPoint num="23" id="3538" />
-<extraparam>
-<CryptoBlock value="true" />
-<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="newK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="newCert" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="newID" value="" type="8" typeOther="" />
-<Attribute access="0" id="interfaceDevicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="smartCardPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="interfaceDeviceID" value="" type="8" typeOther="" />
-<Attribute access="0" id="smartCardID" value="" type="8" typeOther="" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="3564" >
-<father id="3614" num="1" />
-<cdparam x="36" y="108" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="218" />
-<infoparam name="Block0" value="InterfaceDevice" />
-<TGConnectingPoint num="0" id="3540" />
-<TGConnectingPoint num="1" id="3541" />
-<TGConnectingPoint num="2" id="3542" />
-<TGConnectingPoint num="3" id="3543" />
-<TGConnectingPoint num="4" id="3544" />
-<TGConnectingPoint num="5" id="3545" />
-<TGConnectingPoint num="6" id="3546" />
-<TGConnectingPoint num="7" id="3547" />
-<TGConnectingPoint num="8" id="3548" />
-<TGConnectingPoint num="9" id="3549" />
-<TGConnectingPoint num="10" id="3550" />
-<TGConnectingPoint num="11" id="3551" />
-<TGConnectingPoint num="12" id="3552" />
-<TGConnectingPoint num="13" id="3553" />
-<TGConnectingPoint num="14" id="3554" />
-<TGConnectingPoint num="15" id="3555" />
-<TGConnectingPoint num="16" id="3556" />
-<TGConnectingPoint num="17" id="3557" />
-<TGConnectingPoint num="18" id="3558" />
-<TGConnectingPoint num="19" id="3559" />
-<TGConnectingPoint num="20" id="3560" />
-<TGConnectingPoint num="21" id="3561" />
-<TGConnectingPoint num="22" id="3562" />
-<TGConnectingPoint num="23" id="3563" />
-<extraparam>
-<CryptoBlock value="true" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="certOK" value="" type="4" typeOther="" />
-<Attribute access="0" id="smartCardID" value="" type="8" typeOther="" />
-<Attribute access="0" id="smartCardPubK" value="" type="5" typeOther="Key" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="3589" >
-<father id="3614" num="2" />
-<cdparam x="263" y="108" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
-<infoparam name="Block0" value="SmartCard" />
-<TGConnectingPoint num="0" id="3565" />
-<TGConnectingPoint num="1" id="3566" />
-<TGConnectingPoint num="2" id="3567" />
-<TGConnectingPoint num="3" id="3568" />
-<TGConnectingPoint num="4" id="3569" />
-<TGConnectingPoint num="5" id="3570" />
-<TGConnectingPoint num="6" id="3571" />
-<TGConnectingPoint num="7" id="3572" />
-<TGConnectingPoint num="8" id="3573" />
-<TGConnectingPoint num="9" id="3574" />
-<TGConnectingPoint num="10" id="3575" />
-<TGConnectingPoint num="11" id="3576" />
-<TGConnectingPoint num="12" id="3577" />
-<TGConnectingPoint num="13" id="3578" />
-<TGConnectingPoint num="14" id="3579" />
-<TGConnectingPoint num="15" id="3580" />
-<TGConnectingPoint num="16" id="3581" />
-<TGConnectingPoint num="17" id="3582" />
-<TGConnectingPoint num="18" id="3583" />
-<TGConnectingPoint num="19" id="3584" />
-<TGConnectingPoint num="20" id="3585" />
-<TGConnectingPoint num="21" id="3586" />
-<TGConnectingPoint num="22" id="3587" />
-<TGConnectingPoint num="23" id="3588" />
-<extraparam>
-<CryptoBlock value="true" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
-<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="certOK" value="" type="4" typeOther="" />
-<Attribute access="0" id="interfaceDeviceID" value="" type="8" typeOther="" />
-<Attribute access="0" id="interfaceDevicePubK" value="" type="5" typeOther="Key" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</AVATARBlockDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3616" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3615" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="SmartCard" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3618" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3617" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="InterfaceDevice" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3620" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3619" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="CA" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="3622" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3621" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="Sysmlsec Methodology" nameTab="SysMLSec_Methodology" >
-<SysmlsecMethodologyDiagramPanel name="SysMLSec_Methodology" minX="10" maxX="2000" minY="10" maxY="1200" zoom="0.8000000000000002" >
-<COMPONENT type="5705" id="3627" >
-<cdparam x="520" y="400" />
-<sizeparam width="144" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Properties" />
-<TGConnectingPoint num="0" id="3623" />
-<TGConnectingPoint num="1" id="3624" />
-<TGConnectingPoint num="2" id="3625" />
-<TGConnectingPoint num="3" id="3626" />
-</COMPONENT>
-
-<COMPONENT type="5706" id="3632" >
-<cdparam x="880" y="480" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Prototyping" />
-<TGConnectingPoint num="0" id="3628" />
-<TGConnectingPoint num="1" id="3629" />
-<TGConnectingPoint num="2" id="3630" />
-<TGConnectingPoint num="3" id="3631" />
-</COMPONENT>
-
-<COMPONENT type="5704" id="3641" >
-<cdparam x="800" y="400" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Design" />
-<TGConnectingPoint num="0" id="3636" />
-<TGConnectingPoint num="1" id="3637" />
-<TGConnectingPoint num="2" id="3638" />
-<TGConnectingPoint num="3" id="3639" />
-<TGConnectingPoint num="4" id="3640" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3633" >
-<father id="3641" num="0" />
-<cdparam x="804" y="432" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="1005" maxX="1005" minY="540" maxY="540" />
-<infoparam name="value " value="BasicSecurityProtocol" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3634" >
-<father id="3641" num="1" />
-<cdparam x="804" y="444" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="1005" maxX="1005" minY="555" maxY="555" />
-<infoparam name="value " value="DHSecurityProtocol" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3635" >
-<father id="3641" num="2" />
-<cdparam x="804" y="456" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="1005" maxX="1005" minY="570" maxY="570" />
-<infoparam name="value " value="DHWithCertificateSecurityProtocol" />
-</SUBCOMPONENT>
-
-<COMPONENT type="5703" id="3647" >
-<cdparam x="720" y="320" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Analysis" />
-<TGConnectingPoint num="0" id="3642" />
-<TGConnectingPoint num="1" id="3643" />
-<TGConnectingPoint num="2" id="3644" />
-<TGConnectingPoint num="3" id="3645" />
-<TGConnectingPoint num="4" id="3646" />
-</COMPONENT>
-
-<COMPONENT type="5711" id="3652" >
-<cdparam x="709" y="80" />
-<sizeparam width="181" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Communication pattern" />
-<TGConnectingPoint num="0" id="3648" />
-<TGConnectingPoint num="1" id="3649" />
-<TGConnectingPoint num="2" id="3650" />
-<TGConnectingPoint num="3" id="3651" />
-</COMPONENT>
-
-<COMPONENT type="5710" id="3659" >
-<cdparam x="720" y="180" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="3653" />
-<TGConnectingPoint num="1" id="3654" />
-<TGConnectingPoint num="2" id="3655" />
-<TGConnectingPoint num="3" id="3656" />
-<TGConnectingPoint num="4" id="3657" />
-<TGConnectingPoint num="5" id="3658" />
-</COMPONENT>
-
-<COMPONENT type="5709" id="3667" >
-<cdparam x="920" y="80" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Architecture view" />
-<TGConnectingPoint num="0" id="3663" />
-<TGConnectingPoint num="1" id="3664" />
-<TGConnectingPoint num="2" id="3665" />
-<TGConnectingPoint num="3" id="3666" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3660" >
-<father id="3667" num="0" />
-<cdparam x="924" y="112" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="1155" maxX="1155" minY="140" maxY="140" />
-<infoparam name="value " value="Mapping1" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3661" >
-<father id="3667" num="1" />
-<cdparam x="924" y="124" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="1155" maxX="1155" minY="155" maxY="155" />
-<infoparam name="value " value="Mapping2" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="3662" >
-<father id="3667" num="2" />
-<cdparam x="924" y="136" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="1155" maxX="1155" minY="170" maxY="170" />
-<infoparam name="value " value="Mapping2_Sec" />
-</SUBCOMPONENT>
-
-<COMPONENT type="5713" id="3673" >
-<cdparam x="520" y="80" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Functional view" />
-<TGConnectingPoint num="0" id="3669" />
-<TGConnectingPoint num="1" id="3670" />
-<TGConnectingPoint num="2" id="3671" />
-<TGConnectingPoint num="3" id="3672" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3668" >
-<father id="3673" num="0" />
-<cdparam x="524" y="112" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
-<infoparam name="value " value="AppC" />
-</SUBCOMPONENT>
-
-<COMPONENT type="5719" id="3679" >
-<cdparam x="280" y="120" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Faults" />
-<TGConnectingPoint num="0" id="3674" />
-<TGConnectingPoint num="1" id="3675" />
-<TGConnectingPoint num="2" id="3676" />
-<TGConnectingPoint num="3" id="3677" />
-<TGConnectingPoint num="4" id="3678" />
-</COMPONENT>
-
-<COMPONENT type="5712" id="3686" >
-<cdparam x="280" y="440" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Attacks" />
-<TGConnectingPoint num="0" id="3681" />
-<TGConnectingPoint num="1" id="3682" />
-<TGConnectingPoint num="2" id="3683" />
-<TGConnectingPoint num="3" id="3684" />
-<TGConnectingPoint num="4" id="3685" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3680" >
-<father id="3686" num="0" />
-<cdparam x="284" y="472" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="355" maxX="355" minY="590" maxY="590" />
-<infoparam name="value " value="Attack Trees" />
-</SUBCOMPONENT>
-
-<COMPONENT type="5702" id="3696" >
-<cdparam x="280" y="280" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="3688" />
-<TGConnectingPoint num="1" id="3689" />
-<TGConnectingPoint num="2" id="3690" />
-<TGConnectingPoint num="3" id="3691" />
-<TGConnectingPoint num="4" id="3692" />
-<TGConnectingPoint num="5" id="3693" />
-<TGConnectingPoint num="6" id="3694" />
-<TGConnectingPoint num="7" id="3695" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="3687" >
-<father id="3696" num="0" />
-<cdparam x="284" y="312" />
-<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="355" maxX="355" minY="390" maxY="390" />
-<infoparam name="value " value="Requirements" />
-</SUBCOMPONENT>
-
-<COMPONENT type="5701" id="3701" >
-<cdparam x="40" y="280" />
-<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="Assumptions" />
-<TGConnectingPoint num="0" id="3697" />
-<TGConnectingPoint num="1" id="3698" />
-<TGConnectingPoint num="2" id="3699" />
-<TGConnectingPoint num="3" id="3700" />
-</COMPONENT>
-
-<COMPONENT type="304" id="3718" >
-<cdparam x="504" y="52" />
-<sizeparam width="600" height="200" minWidth="16" minHeight="16" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Info" value="SW/HW Partitioning" />
-<TGConnectingPoint num="0" id="3702" />
-<TGConnectingPoint num="1" id="3703" />
-<TGConnectingPoint num="2" id="3704" />
-<TGConnectingPoint num="3" id="3705" />
-<TGConnectingPoint num="4" id="3706" />
-<TGConnectingPoint num="5" id="3707" />
-<TGConnectingPoint num="6" id="3708" />
-<TGConnectingPoint num="7" id="3709" />
-<TGConnectingPoint num="8" id="3710" />
-<TGConnectingPoint num="9" id="3711" />
-<TGConnectingPoint num="10" id="3712" />
-<TGConnectingPoint num="11" id="3713" />
-<TGConnectingPoint num="12" id="3714" />
-<TGConnectingPoint num="13" id="3715" />
-<TGConnectingPoint num="14" id="3716" />
-<TGConnectingPoint num="15" id="3717" />
-<extraparam>
-<TextColor value="-1" />
-<FillColor value="-1" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="304" id="3735" >
-<cdparam x="504" y="300" />
-<sizeparam width="600" height="260" minWidth="16" minHeight="16" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Info" value="SW Design" />
-<TGConnectingPoint num="0" id="3719" />
-<TGConnectingPoint num="1" id="3720" />
-<TGConnectingPoint num="2" id="3721" />
-<TGConnectingPoint num="3" id="3722" />
-<TGConnectingPoint num="4" id="3723" />
-<TGConnectingPoint num="5" id="3724" />
-<TGConnectingPoint num="6" id="3725" />
-<TGConnectingPoint num="7" id="3726" />
-<TGConnectingPoint num="8" id="3727" />
-<TGConnectingPoint num="9" id="3728" />
-<TGConnectingPoint num="10" id="3729" />
-<TGConnectingPoint num="11" id="3730" />
-<TGConnectingPoint num="12" id="3731" />
-<TGConnectingPoint num="13" id="3732" />
-<TGConnectingPoint num="14" id="3733" />
-<TGConnectingPoint num="15" id="3734" />
-<extraparam>
-<TextColor value="-1" />
-<FillColor value="-1" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="304" id="3752" >
-<cdparam x="264" y="80" />
-<sizeparam width="192" height="440" minWidth="16" minHeight="16" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Info" value="Req / faults / attacks" />
-<TGConnectingPoint num="0" id="3736" />
-<TGConnectingPoint num="1" id="3737" />
-<TGConnectingPoint num="2" id="3738" />
-<TGConnectingPoint num="3" id="3739" />
-<TGConnectingPoint num="4" id="3740" />
-<TGConnectingPoint num="5" id="3741" />
-<TGConnectingPoint num="6" id="3742" />
-<TGConnectingPoint num="7" id="3743" />
-<TGConnectingPoint num="8" id="3744" />
-<TGConnectingPoint num="9" id="3745" />
-<TGConnectingPoint num="10" id="3746" />
-<TGConnectingPoint num="11" id="3747" />
-<TGConnectingPoint num="12" id="3748" />
-<TGConnectingPoint num="13" id="3749" />
-<TGConnectingPoint num="14" id="3750" />
-<TGConnectingPoint num="15" id="3751" />
-<extraparam>
-<TextColor value="-1" />
-<FillColor value="-1" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="6004" id="3754" >
-<cdparam x="1000" y="136" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3753" />
-<P1 x="1000" y="136" id="3663" />
-<P2 x="832" y="180" id="3654" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="6004" id="3756" >
-<cdparam x="800" y="136" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3755" />
-<P1 x="799" y="136" id="3648" />
-<P2 x="800" y="180" id="3655" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="6004" id="3758" >
-<cdparam x="600" y="136" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3757" />
-<P1 x="600" y="136" id="3669" />
-<P2 x="768" y="180" id="3653" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="5718" id="3764" >
-<cdparam x="440" y="308" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3761" />
-<TGConnectingPoint num="1" id="3762" />
-<TGConnectingPoint num="2" id="3763" />
-<P1 x="440" y="308" id="3688" />
-<P2 x="592" y="400" id="3623" />
-<Point x="476" y="308" />
-<Point x="476" y="360" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3759" >
-<father id="3764" num="0" />
-<cdparam x="476" y="308" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3760" >
-<father id="3764" num="1" />
-<cdparam x="476" y="360" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="5718" id="3768" >
-<cdparam x="832" y="456" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3766" />
-<TGConnectingPoint num="1" id="3767" />
-<P1 x="832" y="456" id="3637" />
-<P2 x="880" y="508" id="3628" />
-<Point x="848" y="500" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3765" >
-<father id="3768" num="0" />
-<cdparam x="848" y="500" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="5718" id="3772" >
-<cdparam x="768" y="376" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3770" />
-<TGConnectingPoint num="1" id="3771" />
-<P1 x="768" y="376" id="3643" />
-<P2 x="800" y="428" id="3636" />
-<Point x="768" y="420" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3769" >
-<father id="3772" num="0" />
-<cdparam x="768" y="420" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="5718" id="3774" >
-<cdparam x="376" y="440" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3773" />
-<P1 x="376" y="440" id="3682" />
-<P2 x="376" y="336" id="3690" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="5718" id="3776" >
-<cdparam x="376" y="176" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3775" />
-<P1 x="376" y="176" id="3675" />
-<P2 x="376" y="280" id="3691" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="5718" id="3778" >
-<cdparam x="328" y="280" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3777" />
-<P1 x="328" y="280" id="3692" />
-<P2 x="328" y="176" id="3674" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="5718" id="3780" >
-<cdparam x="328" y="336" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="3779" />
-<P1 x="328" y="336" id="3689" />
-<P2 x="328" y="440" id="3681" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</SysmlsecMethodologyDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="TML Architecture" nameTab="Mapping2_Sec_enc" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1102" id="3805" >
-<cdparam x="17" y="403" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="SecureBus1" value="name" />
-<TGConnectingPoint num="0" id="3781" />
-<TGConnectingPoint num="1" id="3782" />
-<TGConnectingPoint num="2" id="3783" />
-<TGConnectingPoint num="3" id="3784" />
-<TGConnectingPoint num="4" id="3785" />
-<TGConnectingPoint num="5" id="3786" />
-<TGConnectingPoint num="6" id="3787" />
-<TGConnectingPoint num="7" id="3788" />
-<TGConnectingPoint num="8" id="3789" />
-<TGConnectingPoint num="9" id="3790" />
-<TGConnectingPoint num="10" id="3791" />
-<TGConnectingPoint num="11" id="3792" />
-<TGConnectingPoint num="12" id="3793" />
-<TGConnectingPoint num="13" id="3794" />
-<TGConnectingPoint num="14" id="3795" />
-<TGConnectingPoint num="15" id="3796" />
-<TGConnectingPoint num="16" id="3797" />
-<TGConnectingPoint num="17" id="3798" />
-<TGConnectingPoint num="18" id="3799" />
-<TGConnectingPoint num="19" id="3800" />
-<TGConnectingPoint num="20" id="3801" />
-<TGConnectingPoint num="21" id="3802" />
-<TGConnectingPoint num="22" id="3803" />
-<TGConnectingPoint num="23" id="3804" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="SecureBus1" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataFromBus" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="3830" >
-<cdparam x="55" y="511" />
-<sizeparam width="176" height="106" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="secureMem1" value="name" />
-<TGConnectingPoint num="0" id="3806" />
-<TGConnectingPoint num="1" id="3807" />
-<TGConnectingPoint num="2" id="3808" />
-<TGConnectingPoint num="3" id="3809" />
-<TGConnectingPoint num="4" id="3810" />
-<TGConnectingPoint num="5" id="3811" />
-<TGConnectingPoint num="6" id="3812" />
-<TGConnectingPoint num="7" id="3813" />
-<TGConnectingPoint num="8" id="3814" />
-<TGConnectingPoint num="9" id="3815" />
-<TGConnectingPoint num="10" id="3816" />
-<TGConnectingPoint num="11" id="3817" />
-<TGConnectingPoint num="12" id="3818" />
-<TGConnectingPoint num="13" id="3819" />
-<TGConnectingPoint num="14" id="3820" />
-<TGConnectingPoint num="15" id="3821" />
-<TGConnectingPoint num="16" id="3822" />
-<TGConnectingPoint num="17" id="3823" />
-<TGConnectingPoint num="18" id="3824" />
-<TGConnectingPoint num="19" id="3825" />
-<TGConnectingPoint num="20" id="3826" />
-<TGConnectingPoint num="21" id="3827" />
-<TGConnectingPoint num="22" id="3828" />
-<TGConnectingPoint num="23" id="3829" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="secureMem1" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1111" id="5551" >
-<father id="3830" num="0" />
-<cdparam x="59" y="562" />
-<sizeparam width="160" height="40" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="66" />
-<infoparam name="TGComponent" value="autoEncrypt_fromDtoSC" />
-<TGConnectingPoint num="0" id="5552" />
-<TGConnectingPoint num="1" id="5553" />
-<TGConnectingPoint num="2" id="5554" />
-<TGConnectingPoint num="3" id="5555" />
-<TGConnectingPoint num="4" id="5556" />
-<TGConnectingPoint num="5" id="5557" />
-<TGConnectingPoint num="6" id="5558" />
-<TGConnectingPoint num="7" id="5559" />
-<extraparam>
-<info value="autoEncrypt_fromDtoSC" referenceKeyName="autoEncrypt_fromDtoSC" priority="5" typeName="key" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1111" id="5533" >
-<father id="3830" num="1" />
-<cdparam x="55" y="511" />
-<sizeparam width="160" height="40" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="66" />
-<infoparam name="TGComponent" value="autoEncrypt_fromSCtoD" />
-<TGConnectingPoint num="0" id="5534" />
-<TGConnectingPoint num="1" id="5535" />
-<TGConnectingPoint num="2" id="5536" />
-<TGConnectingPoint num="3" id="5537" />
-<TGConnectingPoint num="4" id="5538" />
-<TGConnectingPoint num="5" id="5539" />
-<TGConnectingPoint num="6" id="5540" />
-<TGConnectingPoint num="7" id="5541" />
-<extraparam>
-<info value="autoEncrypt_fromSCtoD" referenceKeyName="autoEncrypt_fromSCtoD" priority="5" typeName="key" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1105" id="3855" >
-<cdparam x="309" y="358" />
-<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="3831" />
-<TGConnectingPoint num="1" id="3832" />
-<TGConnectingPoint num="2" id="3833" />
-<TGConnectingPoint num="3" id="3834" />
-<TGConnectingPoint num="4" id="3835" />
-<TGConnectingPoint num="5" id="3836" />
-<TGConnectingPoint num="6" id="3837" />
-<TGConnectingPoint num="7" id="3838" />
-<TGConnectingPoint num="8" id="3839" />
-<TGConnectingPoint num="9" id="3840" />
-<TGConnectingPoint num="10" id="3841" />
-<TGConnectingPoint num="11" id="3842" />
-<TGConnectingPoint num="12" id="3843" />
-<TGConnectingPoint num="13" id="3844" />
-<TGConnectingPoint num="14" id="3845" />
-<TGConnectingPoint num="15" id="3846" />
-<TGConnectingPoint num="16" id="3847" />
-<TGConnectingPoint num="17" id="3848" />
-<TGConnectingPoint num="18" id="3849" />
-<TGConnectingPoint num="19" id="3850" />
-<TGConnectingPoint num="20" id="3851" />
-<TGConnectingPoint num="21" id="3852" />
-<TGConnectingPoint num="22" id="3853" />
-<TGConnectingPoint num="23" id="3854" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="3880" >
-<cdparam x="278" y="269" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="3856" />
-<TGConnectingPoint num="1" id="3857" />
-<TGConnectingPoint num="2" id="3858" />
-<TGConnectingPoint num="3" id="3859" />
-<TGConnectingPoint num="4" id="3860" />
-<TGConnectingPoint num="5" id="3861" />
-<TGConnectingPoint num="6" id="3862" />
-<TGConnectingPoint num="7" id="3863" />
-<TGConnectingPoint num="8" id="3864" />
-<TGConnectingPoint num="9" id="3865" />
-<TGConnectingPoint num="10" id="3866" />
-<TGConnectingPoint num="11" id="3867" />
-<TGConnectingPoint num="12" id="3868" />
-<TGConnectingPoint num="13" id="3869" />
-<TGConnectingPoint num="14" id="3870" />
-<TGConnectingPoint num="15" id="3871" />
-<TGConnectingPoint num="16" id="3872" />
-<TGConnectingPoint num="17" id="3873" />
-<TGConnectingPoint num="18" id="3874" />
-<TGConnectingPoint num="19" id="3875" />
-<TGConnectingPoint num="20" id="3876" />
-<TGConnectingPoint num="21" id="3877" />
-<TGConnectingPoint num="22" id="3878" />
-<TGConnectingPoint num="23" id="3879" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" referenceAttack="ReadDataFromBus" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1100" id="3914" >
-<cdparam x="574" y="227" />
-<sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="3890" />
-<TGConnectingPoint num="1" id="3891" />
-<TGConnectingPoint num="2" id="3892" />
-<TGConnectingPoint num="3" id="3893" />
-<TGConnectingPoint num="4" id="3894" />
-<TGConnectingPoint num="5" id="3895" />
-<TGConnectingPoint num="6" id="3896" />
-<TGConnectingPoint num="7" id="3897" />
-<TGConnectingPoint num="8" id="3898" />
-<TGConnectingPoint num="9" id="3899" />
-<TGConnectingPoint num="10" id="3900" />
-<TGConnectingPoint num="11" id="3901" />
-<TGConnectingPoint num="12" id="3902" />
-<TGConnectingPoint num="13" id="3903" />
-<TGConnectingPoint num="14" id="3904" />
-<TGConnectingPoint num="15" id="3905" />
-<TGConnectingPoint num="16" id="3906" />
-<TGConnectingPoint num="17" id="3907" />
-<TGConnectingPoint num="18" id="3908" />
-<TGConnectingPoint num="19" id="3909" />
-<TGConnectingPoint num="20" id="3910" />
-<TGConnectingPoint num="21" id="3911" />
-<TGConnectingPoint num="22" id="3912" />
-<TGConnectingPoint num="23" id="3913" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU2" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="3889" >
-<father id="3914" num="0" />
-<cdparam x="604" y="279" />
-<sizeparam width="135" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="39" minY="0" maxY="95" />
-<infoparam name="TGComponent" value="AppC_enc::Timer" />
-<TGConnectingPoint num="0" id="3881" />
-<TGConnectingPoint num="1" id="3882" />
-<TGConnectingPoint num="2" id="3883" />
-<TGConnectingPoint num="3" id="3884" />
-<TGConnectingPoint num="4" id="3885" />
-<TGConnectingPoint num="5" id="3886" />
-<TGConnectingPoint num="6" id="3887" />
-<TGConnectingPoint num="7" id="3888" />
-<extraparam>
-<info value="AppC_enc::Timer" taskName="Timer" referenceTaskName="AppC_enc" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="3948" >
-<cdparam x="56" y="231" />
-<sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="3924" />
-<TGConnectingPoint num="1" id="3925" />
-<TGConnectingPoint num="2" id="3926" />
-<TGConnectingPoint num="3" id="3927" />
-<TGConnectingPoint num="4" id="3928" />
-<TGConnectingPoint num="5" id="3929" />
-<TGConnectingPoint num="6" id="3930" />
-<TGConnectingPoint num="7" id="3931" />
-<TGConnectingPoint num="8" id="3932" />
-<TGConnectingPoint num="9" id="3933" />
-<TGConnectingPoint num="10" id="3934" />
-<TGConnectingPoint num="11" id="3935" />
-<TGConnectingPoint num="12" id="3936" />
-<TGConnectingPoint num="13" id="3937" />
-<TGConnectingPoint num="14" id="3938" />
-<TGConnectingPoint num="15" id="3939" />
-<TGConnectingPoint num="16" id="3940" />
-<TGConnectingPoint num="17" id="3941" />
-<TGConnectingPoint num="18" id="3942" />
-<TGConnectingPoint num="19" id="3943" />
-<TGConnectingPoint num="20" id="3944" />
-<TGConnectingPoint num="21" id="3945" />
-<TGConnectingPoint num="22" id="3946" />
-<TGConnectingPoint num="23" id="3947" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="3923" >
-<father id="3948" num="0" />
-<cdparam x="32" y="276" />
-<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="-24" minY="0" maxY="86" />
-<infoparam name="TGComponent" value="AppC_enc::InterfaceDevice" />
-<TGConnectingPoint num="0" id="3915" />
-<TGConnectingPoint num="1" id="3916" />
-<TGConnectingPoint num="2" id="3917" />
-<TGConnectingPoint num="3" id="3918" />
-<TGConnectingPoint num="4" id="3919" />
-<TGConnectingPoint num="5" id="3920" />
-<TGConnectingPoint num="6" id="3921" />
-<TGConnectingPoint num="7" id="3922" />
-<extraparam>
-<info value="AppC_enc::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC_enc" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="4000" >
-<cdparam x="267" y="59" />
-<sizeparam width="272" height="167" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="3976" />
-<TGConnectingPoint num="1" id="3977" />
-<TGConnectingPoint num="2" id="3978" />
-<TGConnectingPoint num="3" id="3979" />
-<TGConnectingPoint num="4" id="3980" />
-<TGConnectingPoint num="5" id="3981" />
-<TGConnectingPoint num="6" id="3982" />
-<TGConnectingPoint num="7" id="3983" />
-<TGConnectingPoint num="8" id="3984" />
-<TGConnectingPoint num="9" id="3985" />
-<TGConnectingPoint num="10" id="3986" />
-<TGConnectingPoint num="11" id="3987" />
-<TGConnectingPoint num="12" id="3988" />
-<TGConnectingPoint num="13" id="3989" />
-<TGConnectingPoint num="14" id="3990" />
-<TGConnectingPoint num="15" id="3991" />
-<TGConnectingPoint num="16" id="3992" />
-<TGConnectingPoint num="17" id="3993" />
-<TGConnectingPoint num="18" id="3994" />
-<TGConnectingPoint num="19" id="3995" />
-<TGConnectingPoint num="20" id="3996" />
-<TGConnectingPoint num="21" id="3997" />
-<TGConnectingPoint num="22" id="3998" />
-<TGConnectingPoint num="23" id="3999" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="3957" >
-<father id="4000" num="0" />
-<cdparam x="377" y="119" />
-<sizeparam width="162" height="37" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="110" minY="0" maxY="130" />
-<infoparam name="TGComponent" value="AppC_enc::SmartCard" />
-<TGConnectingPoint num="0" id="3949" />
-<TGConnectingPoint num="1" id="3950" />
-<TGConnectingPoint num="2" id="3951" />
-<TGConnectingPoint num="3" id="3952" />
-<TGConnectingPoint num="4" id="3953" />
-<TGConnectingPoint num="5" id="3954" />
-<TGConnectingPoint num="6" id="3955" />
-<TGConnectingPoint num="7" id="3956" />
-<extraparam>
-<info value="AppC_enc::SmartCard" taskName="SmartCard" referenceTaskName="AppC_enc" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="3966" >
-<father id="4000" num="1" />
-<cdparam x="293" y="165" />
-<sizeparam width="165" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC_enc::Application" />
-<TGConnectingPoint num="0" id="3958" />
-<TGConnectingPoint num="1" id="3959" />
-<TGConnectingPoint num="2" id="3960" />
-<TGConnectingPoint num="3" id="3961" />
-<TGConnectingPoint num="4" id="3962" />
-<TGConnectingPoint num="5" id="3963" />
-<TGConnectingPoint num="6" id="3964" />
-<TGConnectingPoint num="7" id="3965" />
-<extraparam>
-<info value="AppC_enc::Application" taskName="Application" referenceTaskName="AppC_enc" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="3975" >
-<father id="4000" num="2" />
-<cdparam x="277" y="90" />
-<sizeparam width="134" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="138" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC_enc::TCPIP" />
-<TGConnectingPoint num="0" id="3967" />
-<TGConnectingPoint num="1" id="3968" />
-<TGConnectingPoint num="2" id="3969" />
-<TGConnectingPoint num="3" id="3970" />
-<TGConnectingPoint num="4" id="3971" />
-<TGConnectingPoint num="5" id="3972" />
-<TGConnectingPoint num="6" id="3973" />
-<TGConnectingPoint num="7" id="3974" />
-<extraparam>
-<info value="AppC_enc::TCPIP" taskName="TCPIP" referenceTaskName="AppC_enc" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1102" id="4025" >
-<cdparam x="630" y="38" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="SecureBus2" value="name" />
-<TGConnectingPoint num="0" id="4001" />
-<TGConnectingPoint num="1" id="4002" />
-<TGConnectingPoint num="2" id="4003" />
-<TGConnectingPoint num="3" id="4004" />
-<TGConnectingPoint num="4" id="4005" />
-<TGConnectingPoint num="5" id="4006" />
-<TGConnectingPoint num="6" id="4007" />
-<TGConnectingPoint num="7" id="4008" />
-<TGConnectingPoint num="8" id="4009" />
-<TGConnectingPoint num="9" id="4010" />
-<TGConnectingPoint num="10" id="4011" />
-<TGConnectingPoint num="11" id="4012" />
-<TGConnectingPoint num="12" id="4013" />
-<TGConnectingPoint num="13" id="4014" />
-<TGConnectingPoint num="14" id="4015" />
-<TGConnectingPoint num="15" id="4016" />
-<TGConnectingPoint num="16" id="4017" />
-<TGConnectingPoint num="17" id="4018" />
-<TGConnectingPoint num="18" id="4019" />
-<TGConnectingPoint num="19" id="4020" />
-<TGConnectingPoint num="20" id="4021" />
-<TGConnectingPoint num="21" id="4022" />
-<TGConnectingPoint num="22" id="4023" />
-<TGConnectingPoint num="23" id="4024" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="SecureBus2" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataFromBus" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="4050" >
-<cdparam x="780" y="123" />
-<sizeparam width="176" height="106" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="secureMem2" value="name" />
-<TGConnectingPoint num="0" id="4026" />
-<TGConnectingPoint num="1" id="4027" />
-<TGConnectingPoint num="2" id="4028" />
-<TGConnectingPoint num="3" id="4029" />
-<TGConnectingPoint num="4" id="4030" />
-<TGConnectingPoint num="5" id="4031" />
-<TGConnectingPoint num="6" id="4032" />
-<TGConnectingPoint num="7" id="4033" />
-<TGConnectingPoint num="8" id="4034" />
-<TGConnectingPoint num="9" id="4035" />
-<TGConnectingPoint num="10" id="4036" />
-<TGConnectingPoint num="11" id="4037" />
-<TGConnectingPoint num="12" id="4038" />
-<TGConnectingPoint num="13" id="4039" />
-<TGConnectingPoint num="14" id="4040" />
-<TGConnectingPoint num="15" id="4041" />
-<TGConnectingPoint num="16" id="4042" />
-<TGConnectingPoint num="17" id="4043" />
-<TGConnectingPoint num="18" id="4044" />
-<TGConnectingPoint num="19" id="4045" />
-<TGConnectingPoint num="20" id="4046" />
-<TGConnectingPoint num="21" id="4047" />
-<TGConnectingPoint num="22" id="4048" />
-<TGConnectingPoint num="23" id="4049" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="secureMem2" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1111" id="5560" >
-<father id="4050" num="0" />
-<cdparam x="789" y="182" />
-<sizeparam width="160" height="40" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="66" />
-<infoparam name="TGComponent" value="autoEncrypt_fromDtoSC" />
-<TGConnectingPoint num="0" id="5561" />
-<TGConnectingPoint num="1" id="5562" />
-<TGConnectingPoint num="2" id="5563" />
-<TGConnectingPoint num="3" id="5564" />
-<TGConnectingPoint num="4" id="5565" />
-<TGConnectingPoint num="5" id="5566" />
-<TGConnectingPoint num="6" id="5567" />
-<TGConnectingPoint num="7" id="5568" />
-<extraparam>
-<info value="autoEncrypt_fromDtoSC" referenceKeyName="autoEncrypt_fromDtoSC" priority="5" typeName="key" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1111" id="5542" >
-<father id="4050" num="1" />
-<cdparam x="781" y="127" />
-<sizeparam width="160" height="40" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="66" />
-<infoparam name="TGComponent" value="autoEncrypt_fromSCtoD" />
-<TGConnectingPoint num="0" id="5543" />
-<TGConnectingPoint num="1" id="5544" />
-<TGConnectingPoint num="2" id="5545" />
-<TGConnectingPoint num="3" id="5546" />
-<TGConnectingPoint num="4" id="5547" />
-<TGConnectingPoint num="5" id="5548" />
-<TGConnectingPoint num="6" id="5549" />
-<TGConnectingPoint num="7" id="5550" />
-<extraparam>
-<info value="autoEncrypt_fromSCtoD" referenceKeyName="autoEncrypt_fromSCtoD" priority="5" typeName="key" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="125" id="4051" >
-<cdparam x="539" y="100" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="539" y="100" id="3987" />
-<P2 x="630" y="63" id="4004" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="4052" >
-<cdparam x="143" y="511" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="143" y="511" id="3807" />
-<P2 x="142" y="453" id="3787" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="4053" >
-<cdparam x="138" y="357" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="138" y="357" id="3930" />
-<P2 x="142" y="403" id="3782" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="4054" >
-<cdparam x="402" y="367" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="403" y="358" id="3832" />
-<P2 x="403" y="319" id="3862" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="4055" >
-<cdparam x="190" y="300" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1 x="221" y="294" id="3928" />
-<P2 x="278" y="294" id="3859" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="4056" >
-<cdparam x="662" y="310" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1 x="574" y="294" id="3893" />
-<P2 x="528" y="294" id="3860" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="4057" >
-<cdparam x="388" y="162" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1 x="403" y="226" id="3982" />
-<P2 x="403" y="269" id="3857" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="4058" >
-<cdparam x="812" y="190" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="868" y="123" id="4027" />
-<P2 x="755" y="88" id="4007" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="TML Component Design" nameTab="AppC_enc" >
-<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="2724" minY="0" maxY="916" channels="true" events="true" requests="true" zoom="1.0000000000000018" >
-<CONNECTOR type="126" id="4059" >
-<cdparam x="535" y="347" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="556" y="347" id="4227" />
-<P2 x="547" y="382" id="4274" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4061" >
-<cdparam x="820" y="398" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="1025" y="497" id="4121" />
-<P2 x="761" y="574" id="4242" />
-<Point x="887" y="577" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4060" >
-<father id="4061" num="0" />
-<cdparam x="887" y="577" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="1744" minY="0" maxY="587" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="126" id="4062" >
-<cdparam x="568" y="323" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="710" y="403" id="4244" />
-<P2 x="693" y="347" id="4205" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4063" >
-<cdparam x="522" y="390" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="521" y="382" id="4269" />
-<P2 x="466" y="335" id="4108" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4064" >
-<cdparam x="409" y="124" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="401" y="83" id="4110" />
-<P2 x="593" y="84" id="4229" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4065" >
-<cdparam x="656" y="426" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="552" id="4248" />
-<P2 x="969" y="495" id="4135" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4066" >
-<cdparam x="656" y="400" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="519" id="4250" />
-<P2 x="921" y="476" id="4133" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4067" >
-<cdparam x="602" y="327" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="750" y="406" id="4258" />
-<P2 x="828" y="375" id="4163" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4068" >
-<cdparam x="689" y="292" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="854" y="375" id="4167" />
-<P2 x="921" y="362" id="4143" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4069" >
-<cdparam x="656" y="377" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="491" id="4254" />
-<P2 x="921" y="453" id="4141" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4070" >
-<cdparam x="656" y="351" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="816" y="458" id="4252" />
-<P2 x="921" y="426" id="4139" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4071" >
-<cdparam x="741" y="296" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="921" y="397" id="4137" />
-<P2 x="816" y="429" id="4256" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4072" >
-<cdparam x="735" y="260" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="918" y="330" id="4145" />
-<P2 x="747" y="282" id="4217" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4073" >
-<cdparam x="641" y="230" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="747" y="248" id="4215" />
-<P2 x="918" y="291" id="4147" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4074" >
-<cdparam x="641" y="195" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="747" y="203" id="4213" />
-<P2 x="918" y="248" id="4149" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4075" >
-<cdparam x="740" y="353" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="828" y="375" id="4162" />
-<P2 x="747" y="314" id="4211" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4076" >
-<cdparam x="460" y="270" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="521" y="303" id="4221" />
-<P2 x="466" y="303" id="4102" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4077" >
-<cdparam x="387" y="129" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="464" y="126" id="4098" />
-<P2 x="524" y="126" id="4209" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4078" >
-<cdparam x="389" y="200" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="466" y="215" id="4104" />
-<P2 x="521" y="215" id="4223" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4079" >
-<cdparam x="460" y="236" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="521" y="260" id="4225" />
-<P2 x="466" y="260" id="4106" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4080" >
-<cdparam x="389" y="163" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="466" y="169" id="4100" />
-<P2 x="521" y="169" id="4219" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4081" >
-<cdparam x="967" y="190" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="918" y="198" id="4151" />
-<P2 x="747" y="124" id="4231" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4082" >
-<cdparam x="1028" y="535" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="630" y="345" id="4207" />
-<P2 x="669" y="406" id="4246" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4083" >
-<cdparam x="1308" y="303" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1222" y="378" id="4185" />
-<P2 x="1178" y="380" id="4131" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4084" >
-<cdparam x="1172" y="437" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1178" y="415" id="4129" />
-<P2 x="1222" y="413" id="4183" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="4087" >
-<cdparam x="1041" y="162" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1178" y="208" id="4127" />
-<P2 x="1178" y="276" id="4125" />
-<Point x="1227" y="207" />
-<Point x="1227" y="247" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4085" >
-<father id="4087" num="0" />
-<cdparam x="1227" y="207" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4086" >
-<father id="4087" num="1" />
-<cdparam x="1227" y="247" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="126" id="4088" >
-<cdparam x="877" y="343" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="1178" y="454" id="4123" />
-<P2 x="1222" y="441" id="4181" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1205" id="4097" >
-<cdparam x="1155" y="486" />
-<sizeparam width="205" height="105" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="2725" minY="0" maxY="917" />
-<infoparam name="Record component" value="TCP_CTRL" />
-<TGConnectingPoint num="0" id="4089" />
-<TGConnectingPoint num="1" id="4090" />
-<TGConnectingPoint num="2" id="4091" />
-<TGConnectingPoint num="3" id="4092" />
-<TGConnectingPoint num="4" id="4093" />
-<TGConnectingPoint num="5" id="4094" />
-<TGConnectingPoint num="6" id="4095" />
-<TGConnectingPoint num="7" id="4096" />
-<extraparam>
-<Attribute access="2" id="a" value="" type="0" typeOther="" />
-<Attribute access="2" id="state" value="" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1202" id="4120" >
-<cdparam x="163" y="96" />
-<sizeparam width="290" height="276" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="2725" minY="0" maxY="917" />
-<infoparam name="TGComponent" value="InterfaceDevice" />
-<TGConnectingPoint num="0" id="4112" />
-<TGConnectingPoint num="1" id="4113" />
-<TGConnectingPoint num="2" id="4114" />
-<TGConnectingPoint num="3" id="4115" />
-<TGConnectingPoint num="4" id="4116" />
-<TGConnectingPoint num="5" id="4117" />
-<TGConnectingPoint num="6" id="4118" />
-<TGConnectingPoint num="7" id="4119" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-<Attribute access="2" id="i" value="0" type="0" typeOther="" />
-<Attribute access="2" id="nbOfComputedPackets" value="1" type="0" typeOther="" />
-<Attribute access="2" id="b" value="" type="4" typeOther="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="4099" >
-<father id="4120" num="0" />
-<cdparam x="443" y="116" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
-<infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="4098" />
-<extraparam>
-<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4101" >
-<father id="4120" num="1" />
-<cdparam x="440" y="156" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready" />
-<TGConnectingPoint num="0" id="4100" />
-<extraparam>
-<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4103" >
-<father id="4120" num="2" />
-<cdparam x="440" y="290" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="4102" />
-<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4105" >
-<father id="4120" num="3" />
-<reference id="184" />
-<cdparam x="440" y="202" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="4104" />
-<extraparam>
-<Prop commName="fromDtoSC" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4107" >
-<father id="4120" num="4" />
-<reference id="184" />
-<cdparam x="440" y="247" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="4106" />
-<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4109" >
-<father id="4120" num="5" />
-<cdparam x="440" y="322" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="4108" />
-<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4111" >
-<father id="4120" num="6" />
-<reference id="184" />
-<cdparam x="388" y="83" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
-<TGConnectingPoint num="0" id="4110" />
-<extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1200" id="4296" >
-<cdparam x="534" y="93" />
-<sizeparam width="935" height="530" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="2725" minY="0" maxY="917" />
-<infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="4288" />
-<TGConnectingPoint num="1" id="4289" />
-<TGConnectingPoint num="2" id="4290" />
-<TGConnectingPoint num="3" id="4291" />
-<TGConnectingPoint num="4" id="4292" />
-<TGConnectingPoint num="5" id="4293" />
-<TGConnectingPoint num="6" id="4294" />
-<TGConnectingPoint num="7" id="4295" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1200" id="4204" >
-<father id="4296" num="0" />
-<cdparam x="841" y="133" />
-<sizeparam width="570" height="485" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
-<infoparam name="TGComponent" value="TCPIP Entities" />
-<TGConnectingPoint num="0" id="4196" />
-<TGConnectingPoint num="1" id="4197" />
-<TGConnectingPoint num="2" id="4198" />
-<TGConnectingPoint num="3" id="4199" />
-<TGConnectingPoint num="4" id="4200" />
-<TGConnectingPoint num="5" id="4201" />
-<TGConnectingPoint num="6" id="4202" />
-<TGConnectingPoint num="7" id="4203" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="4161" >
-<father id="4204" num="0" />
-<cdparam x="931" y="167" />
-<sizeparam width="236" height="317" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
-<infoparam name="TGComponent" value="TCPIP" />
-<TGConnectingPoint num="0" id="4153" />
-<TGConnectingPoint num="1" id="4154" />
-<TGConnectingPoint num="2" id="4155" />
-<TGConnectingPoint num="3" id="4156" />
-<TGConnectingPoint num="4" id="4157" />
-<TGConnectingPoint num="5" id="4158" />
-<TGConnectingPoint num="6" id="4159" />
-<TGConnectingPoint num="7" id="4160" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
-<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" />
-<Attribute access="2" id="i" value="" type="0" typeOther="" />
-<Attribute access="2" id="j" value="" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4122" >
-<father id="4161" num="0" />
-<cdparam x="1012" y="471" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="4121" />
-<extraparam>
-<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4124" >
-<father id="4161" num="1" />
-<cdparam x="1157" y="444" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="4123" />
-<extraparam>
-<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4126" >
-<father id="4161" num="2" />
-<cdparam x="1157" y="266" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="4125" />
-<extraparam>
-<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4128" >
-<father id="4161" num="3" />
-<cdparam x="1157" y="198" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="4127" />
-<extraparam>
-<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4130" >
-<father id="4161" num="4" />
-<cdparam x="1157" y="405" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="4129" />
-<extraparam>
-<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4132" >
-<father id="4161" num="5" />
-<cdparam x="1157" y="370" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="4131" />
-<extraparam>
-<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4134" >
-<father id="4161" num="6" />
-<cdparam x="921" y="466" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="4133" />
-<extraparam>
-<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4136" >
-<father id="4161" num="7" />
-<cdparam x="959" y="474" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="4135" />
-<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4138" >
-<father id="4161" num="8" />
-<cdparam x="921" y="387" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="4137" />
-<extraparam>
-<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4140" >
-<father id="4161" num="9" />
-<cdparam x="921" y="416" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="4139" />
-<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4142" >
-<father id="4161" num="10" />
-<cdparam x="921" y="443" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="4141" />
-<extraparam>
-<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4144" >
-<father id="4161" num="11" />
-<cdparam x="921" y="352" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="4143" />
-<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4146" >
-<father id="4161" num="12" />
-<cdparam x="918" y="317" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="4145" />
-<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4148" >
-<father id="4161" num="13" />
-<cdparam x="918" y="278" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="4147" />
-<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4150" >
-<father id="4161" num="14" />
-<cdparam x="918" y="235" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="4149" />
-<extraparam>
-<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4152" >
-<father id="4161" num="15" />
-<cdparam x="918" y="185" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="4151" />
-<extraparam>
-<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="4180" >
-<father id="4204" num="1" />
-<cdparam x="828" y="362" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="4162" />
-<TGConnectingPoint num="1" id="4163" />
-<TGConnectingPoint num="2" id="4164" />
-<TGConnectingPoint num="3" id="4165" />
-<TGConnectingPoint num="4" id="4166" />
-<TGConnectingPoint num="5" id="4167" />
-<TGConnectingPoint num="6" id="4168" />
-<TGConnectingPoint num="7" id="4169" />
-<TGConnectingPoint num="8" id="4170" />
-<TGConnectingPoint num="9" id="4171" />
-<TGConnectingPoint num="10" id="4172" />
-<TGConnectingPoint num="11" id="4173" />
-<TGConnectingPoint num="12" id="4174" />
-<TGConnectingPoint num="13" id="4175" />
-<TGConnectingPoint num="14" id="4176" />
-<TGConnectingPoint num="15" id="4177" />
-<TGConnectingPoint num="16" id="4178" />
-<TGConnectingPoint num="17" id="4179" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="4195" >
-<father id="4204" num="2" />
-<cdparam x="1232" y="328" />
-<sizeparam width="140" height="141" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
-<infoparam name="TGComponent" value="Timer" />
-<TGConnectingPoint num="0" id="4187" />
-<TGConnectingPoint num="1" id="4188" />
-<TGConnectingPoint num="2" id="4189" />
-<TGConnectingPoint num="3" id="4190" />
-<TGConnectingPoint num="4" id="4191" />
-<TGConnectingPoint num="5" id="4192" />
-<TGConnectingPoint num="6" id="4193" />
-<TGConnectingPoint num="7" id="4194" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4182" >
-<father id="4195" num="0" />
-<cdparam x="1222" y="431" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="4181" />
-<extraparam>
-<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4184" >
-<father id="4195" num="1" />
-<cdparam x="1222" y="403" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="4183" />
-<extraparam>
-<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4186" >
-<father id="4195" num="2" />
-<cdparam x="1222" y="368" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="4185" />
-<extraparam>
-<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="4241" >
-<father id="4296" num="1" />
-<cdparam x="534" y="97" />
-<sizeparam width="200" height="237" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
-<infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="4233" />
-<TGConnectingPoint num="1" id="4234" />
-<TGConnectingPoint num="2" id="4235" />
-<TGConnectingPoint num="3" id="4236" />
-<TGConnectingPoint num="4" id="4237" />
-<TGConnectingPoint num="5" id="4238" />
-<TGConnectingPoint num="6" id="4239" />
-<TGConnectingPoint num="7" id="4240" />
-<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="" type="4" typeOther="" />
-<Attribute access="2" id="i" value="0" type="0" typeOther="" />
-<Attribute access="2" id="j" value="0" type="0" typeOther="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
-<Attribute access="2" id="t" value="" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4206" >
-<father id="4241" num="0" />
-<cdparam x="680" y="321" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="4205" />
-<extraparam>
-<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4208" >
-<father id="4241" num="1" />
-<cdparam x="620" y="324" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="4207" />
-<extraparam>
-<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4210" >
-<father id="4241" num="2" />
-<cdparam x="524" y="116" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="4209" />
-<extraparam>
-<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4212" >
-<father id="4241" num="3" />
-<cdparam x="721" y="301" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="4211" />
-<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4214" >
-<father id="4241" num="4" />
-<cdparam x="721" y="190" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="4213" />
-<extraparam>
-<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4216" >
-<father id="4241" num="5" />
-<cdparam x="721" y="235" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="4215" />
-<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4218" >
-<father id="4241" num="6" />
-<cdparam x="721" y="269" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="4217" />
-<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4220" >
-<father id="4241" num="7" />
-<cdparam x="521" y="156" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready" />
-<TGConnectingPoint num="0" id="4219" />
-<extraparam>
-<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4222" >
-<father id="4241" num="8" />
-<cdparam x="521" y="290" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="4221" />
-<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4224" >
-<father id="4241" num="9" />
-<reference id="184" />
-<cdparam x="521" y="202" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="4223" />
-<extraparam>
-<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4226" >
-<father id="4241" num="10" />
-<reference id="184" />
-<cdparam x="521" y="247" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="4225" />
-<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4228" >
-<father id="4241" num="11" />
-<cdparam x="543" y="321" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="4227" />
-<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4230" >
-<father id="4241" num="12" />
-<reference id="184" />
-<cdparam x="580" y="84" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
-<TGConnectingPoint num="0" id="4229" />
-<extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4232" >
-<father id="4241" num="13" />
-<cdparam x="721" y="111" />
-<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="4231" />
-<extraparam>
-<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="4268" >
-<father id="4296" num="2" />
-<cdparam x="565" y="416" />
-<sizeparam width="240" height="145" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
-<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="4260" />
-<TGConnectingPoint num="1" id="4261" />
-<TGConnectingPoint num="2" id="4262" />
-<TGConnectingPoint num="3" id="4263" />
-<TGConnectingPoint num="4" id="4264" />
-<TGConnectingPoint num="5" id="4265" />
-<TGConnectingPoint num="6" id="4266" />
-<TGConnectingPoint num="7" id="4267" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4243" >
-<father id="4268" num="0" />
-<cdparam x="748" y="548" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="4242" />
-<extraparam>
-<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4245" >
-<father id="4268" num="1" />
-<cdparam x="697" y="403" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="4244" />
-<extraparam>
-<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4247" >
-<father id="4268" num="2" />
-<cdparam x="659" y="406" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="4246" />
-<extraparam>
-<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4249" >
-<father id="4268" num="3" />
-<cdparam x="795" y="542" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="4248" />
-<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4251" >
-<father id="4268" num="4" />
-<cdparam x="795" y="509" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="4250" />
-<extraparam>
-<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4253" >
-<father id="4268" num="5" />
-<cdparam x="795" y="448" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="4252" />
-<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4255" >
-<father id="4268" num="6" />
-<cdparam x="795" y="481" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="4254" />
-<extraparam>
-<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4257" >
-<father id="4268" num="7" />
-<cdparam x="795" y="419" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="4256" />
-<extraparam>
-<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4259" >
-<father id="4268" num="8" />
-<cdparam x="740" y="406" />
-<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="4258" />
-<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="4287" >
-<father id="4296" num="3" />
-<cdparam x="521" y="369" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="4269" />
-<TGConnectingPoint num="1" id="4270" />
-<TGConnectingPoint num="2" id="4271" />
-<TGConnectingPoint num="3" id="4272" />
-<TGConnectingPoint num="4" id="4273" />
-<TGConnectingPoint num="5" id="4274" />
-<TGConnectingPoint num="6" id="4275" />
-<TGConnectingPoint num="7" id="4276" />
-<TGConnectingPoint num="8" id="4277" />
-<TGConnectingPoint num="9" id="4278" />
-<TGConnectingPoint num="10" id="4279" />
-<TGConnectingPoint num="11" id="4280" />
-<TGConnectingPoint num="12" id="4281" />
-<TGConnectingPoint num="13" id="4282" />
-<TGConnectingPoint num="14" id="4283" />
-<TGConnectingPoint num="15" id="4284" />
-<TGConnectingPoint num="16" id="4285" />
-<TGConnectingPoint num="17" id="4286" />
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="1110" >
-<CONNECTOR type="115" id="5507" >
-<cdparam x="614" y="1010" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="631" y="895" id="5506" />
-<P2 x="659" y="979" id="4369" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1036" id="5504" >
-<cdparam x="624" y="850" />
-<sizeparam width="15" height="35" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1010" />
-<infoparam name="decrypt" value="null" />
-<TGConnectingPoint num="0" id="5505" />
-<TGConnectingPoint num="1" id="5506" />
-<extraparam>
-<Data secPattern="autoEncrypt_fromSCtoD" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="115" id="5495" >
-<cdparam x="433" y="608" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="466" y="513" id="5491" />
-<P2 x="476" y="553" id="4350" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1035" id="5489" >
-<cdparam x="459" y="468" />
-<sizeparam width="15" height="35" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="encrypt" value="null" />
-<TGConnectingPoint num="0" id="5490" />
-<TGConnectingPoint num="1" id="5491" />
-<extraparam>
-<Data secContext="autoEncrypt_fromDtoSC" type="Symmetric Encryption" overhead="0" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4299" >
-<cdparam x="320" y="433" />
-<sizeparam width="40" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="end()" />
-<TGConnectingPoint num="0" id="4297" />
-<TGConnectingPoint num="1" id="4298" />
-<latencyCheck />
-<extraparam>
-<Data eventName="end" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1012" id="4307" >
-<cdparam x="546" y="376" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4303" />
-<TGConnectingPoint num="1" id="4304" />
-<TGConnectingPoint num="2" id="4305" />
-<TGConnectingPoint num="3" id="4306" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4300" >
-<father id="4307" num="0" />
-<cdparam x="521" y="386" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4301" >
-<father id="4307" num="1" />
-<cdparam x="581" y="386" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4302" >
-<father id="4307" num="2" />
-<cdparam x="566" y="421" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4315" >
-<cdparam x="644" y="627" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4311" />
-<TGConnectingPoint num="1" id="4312" />
-<TGConnectingPoint num="2" id="4313" />
-<TGConnectingPoint num="3" id="4314" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4308" >
-<father id="4315" num="0" />
-<cdparam x="599" y="637" />
-<sizeparam width="51" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ x==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4309" >
-<father id="4315" num="1" />
-<cdparam x="679" y="637" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4310" >
-<father id="4315" num="2" />
-<cdparam x="664" y="672" />
-<sizeparam width="41" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ x>0 ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1000" id="4317" >
-<cdparam x="222" y="58" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4316" />
-</COMPONENT>
-
-<COMPONENT type="1007" id="4320" >
-<cdparam x="192" y="137" />
-<sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="activation()" />
-<TGConnectingPoint num="0" id="4318" />
-<TGConnectingPoint num="1" id="4319" />
-<extraparam>
-<Data requestName="activation" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4323" >
-<cdparam x="205" y="237" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="reset()" />
-<TGConnectingPoint num="0" id="4321" />
-<TGConnectingPoint num="1" id="4322" />
-<latencyCheck />
-<extraparam>
-<Data eventName="reset" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4326" >
-<cdparam x="173" y="288" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="answerToReset() " />
-<TGConnectingPoint num="0" id="4324" />
-<TGConnectingPoint num="1" id="4325" />
-<extraparam>
-<Data eventName="answerToReset" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4329" >
-<cdparam x="208" y="337" />
-<sizeparam width="40" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="pTS()" />
-<TGConnectingPoint num="0" id="4327" />
-<TGConnectingPoint num="1" id="4328" />
-<extraparam>
-<Data eventName="pTS" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4332" >
-<cdparam x="390" y="152" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="pTSConfirm() " />
-<TGConnectingPoint num="0" id="4330" />
-<TGConnectingPoint num="1" id="4331" />
-<breakpoint />
-<extraparam>
-<Data eventName="pTSConfirm" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="4349" >
-<cdparam x="453" y="214" />
-<sizeparam width="105" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="data exchange
-" />
-<TGConnectingPoint num="0" id="4333" />
-<TGConnectingPoint num="1" id="4334" />
-<TGConnectingPoint num="2" id="4335" />
-<TGConnectingPoint num="3" id="4336" />
-<TGConnectingPoint num="4" id="4337" />
-<TGConnectingPoint num="5" id="4338" />
-<TGConnectingPoint num="6" id="4339" />
-<TGConnectingPoint num="7" id="4340" />
-<TGConnectingPoint num="8" id="4341" />
-<TGConnectingPoint num="9" id="4342" />
-<TGConnectingPoint num="10" id="4343" />
-<TGConnectingPoint num="11" id="4344" />
-<TGConnectingPoint num="12" id="4345" />
-<TGConnectingPoint num="13" id="4346" />
-<TGConnectingPoint num="14" id="4347" />
-<TGConnectingPoint num="15" id="4348" />
-<extraparam>
-<Line value="data exchange" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="4352" >
-<cdparam x="433" y="558" />
-<sizeparam width="87" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromDtoSC(1)" />
-<TGConnectingPoint num="0" id="4350" />
-<TGConnectingPoint num="1" id="4351" />
-<extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="autoEncrypt_fromDtoSC" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4355" >
-<cdparam x="422" y="617" />
-<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="data_Ready(x, b)" />
-<TGConnectingPoint num="0" id="4353" />
-<TGConnectingPoint num="1" id="4354" />
-<latencyCheck />
-<extraparam>
-<Data eventName="data_Ready" nbOfParams="5" />
-<Param index="0" value="x" />
-<Param index="1" value="b" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4357" >
-<cdparam x="466" y="680" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4356" />
-</COMPONENT>
-
-<COMPONENT type="1017" id="4360" >
-<cdparam x="593" y="447" />
-<sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="notified event" value="x=?data_Ready_SC()" />
-<TGConnectingPoint num="0" id="4358" />
-<TGConnectingPoint num="1" id="4359" />
-<extraparam>
-<Data eventName="data_Ready_SC" variable="x" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4362" >
-<cdparam x="569" y="687" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4361" />
-</COMPONENT>
-
-<COMPONENT type="1009" id="4365" >
-<cdparam x="614" y="810" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromSCtoD(1) " />
-<TGConnectingPoint num="0" id="4363" />
-<TGConnectingPoint num="1" id="4364" />
-<extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="autoEncrypt_fromSCtoD" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4368" >
-<cdparam x="604" y="729" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="data_Ready_SC() " />
-<TGConnectingPoint num="0" id="4366" />
-<TGConnectingPoint num="1" id="4367" />
-<accessibility />
-<extraparam>
-<Data eventName="data_Ready_SC" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4370" >
-<cdparam x="649" y="984" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4369" />
-</COMPONENT>
-
-<COMPONENT type="1014" id="4374" >
-<cdparam x="307" y="287" />
-<sizeparam width="254" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="for loop" value="for(i=0;i<nbOfComputedPackets;i = i +1)" />
-<TGConnectingPoint num="0" id="4371" />
-<TGConnectingPoint num="1" id="4372" />
-<TGConnectingPoint num="2" id="4373" />
-<extraparam>
-<Data init="i=0" condition="i<nbOfComputedPackets" increment="i = i +1" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4376" >
-<cdparam x="330" y="587" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4375" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="4377" >
-<cdparam x="434" y="177" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="434" y="177" id="4331" />
-<P2 x="434" y="282" id="4371" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4378" >
-<cdparam x="340" y="568" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="340" y="458" id="4298" />
-<P2 x="340" y="582" id="4375" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4379" >
-<cdparam x="434" y="312" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="434" y="312" id="4373" />
-<P2 x="340" y="428" id="4297" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4380" >
-<cdparam x="561" y="301" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="561" y="301" id="4372" />
-<P2 x="561" y="366" id="4303" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4385" >
-<cdparam x="78" y="363" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="228" y="362" id="4328" />
-<P2 x="434" y="147" id="4330" />
-<Point x="228" y="382" />
-<Point x="228" y="382" />
-<Point x="286" y="376" />
-<Point x="285" y="127" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4381" >
-<father id="4385" num="0" />
-<cdparam x="228" y="382" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4382" >
-<father id="4385" num="1" />
-<cdparam x="228" y="382" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4383" >
-<father id="4385" num="2" />
-<cdparam x="286" y="376" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4384" >
-<father id="4385" num="3" />
-<cdparam x="285" y="127" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="115" id="4386" >
-<cdparam x="228" y="57" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to send request" value="null" />
-<P1 x="229" y="78" id="4316" />
-<P2 x="228" y="132" id="4318" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4387" >
-<cdparam x="228" y="162" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to send event" value="null" />
-<P1 x="228" y="162" id="4319" />
-<P2 x="228" y="232" id="4321" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4388" >
-<cdparam x="228" y="284" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="228" y="313" id="4325" />
-<P2 x="228" y="332" id="4327" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4389" >
-<cdparam x="528" y="391" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to write channel" value="null" />
-<P1 x="521" y="391" id="4304" />
-<P2 x="466" y="463" id="5490" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4390" >
-<cdparam x="476" y="583" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="476" y="583" id="4351" />
-<P2 x="476" y="612" id="4353" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4391" >
-<cdparam x="471" y="639" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="476" y="642" id="4354" />
-<P2 x="476" y="675" id="4356" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4392" >
-<cdparam x="619" y="642" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="619" y="642" id="4312" />
-<P2 x="579" y="682" id="4361" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4393" >
-<cdparam x="580" y="405" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to notified event" value="null" />
-<P1 x="601" y="391" id="4305" />
-<P2 x="659" y="442" id="4358" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4394" >
-<cdparam x="659" y="582" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from notified event to choice" value="null" />
-<P1 x="659" y="472" id="4359" />
-<P2 x="659" y="617" id="4311" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4395" >
-<cdparam x="659" y="682" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="659" y="682" id="4314" />
-<P2 x="659" y="724" id="4366" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4396" >
-<cdparam x="670" y="754" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="659" y="754" id="4367" />
-<P2 x="659" y="805" id="4363" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4397" >
-<cdparam x="659" y="935" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to stop state" value="null" />
-<P1 x="659" y="835" id="4364" />
-<P2 x="631" y="845" id="5505" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4398" >
-<cdparam x="228" y="262" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="228" y="262" id="4322" />
-<P2 x="228" y="283" id="4324" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="4402" >
-<cdparam x="505" y="259" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4400" />
-<TGConnectingPoint num="1" id="4401" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4399" >
-<father id="4402" num="0" />
-<cdparam x="520" y="279" />
-<sizeparam width="16" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="10" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1010" id="4405" >
-<cdparam x="479" y="129" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="opened() " />
-<TGConnectingPoint num="0" id="4403" />
-<TGConnectingPoint num="1" id="4404" />
-<extraparam>
-<Data eventName="opened" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4408" >
-<cdparam x="449" y="192" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="connectionOpened()" />
-<TGConnectingPoint num="0" id="4406" />
-<TGConnectingPoint num="1" id="4407" />
-<extraparam>
-<Data eventName="connectionOpened" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1012" id="4416" >
-<cdparam x="495" y="514" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4412" />
-<TGConnectingPoint num="1" id="4413" />
-<TGConnectingPoint num="2" id="4414" />
-<TGConnectingPoint num="3" id="4415" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4409" >
-<father id="4416" num="0" />
-<cdparam x="470" y="524" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4410" >
-<father id="4416" num="1" />
-<cdparam x="530" y="524" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4411" >
-<father id="4416" num="2" />
-<cdparam x="515" y="559" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1000" id="4418" >
-<cdparam x="498" y="33" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4417" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="4421" >
-<cdparam x="482" y="71" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="open()" />
-<TGConnectingPoint num="0" id="4419" />
-<TGConnectingPoint num="1" id="4420" />
-<extraparam>
-<Data eventName="open" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="4424" >
-<cdparam x="469" y="353" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromAtoT(1)" />
-<TGConnectingPoint num="0" id="4422" />
-<TGConnectingPoint num="1" id="4423" />
-<extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4427" >
-<cdparam x="471" y="399" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="send_TCP()" />
-<TGConnectingPoint num="0" id="4425" />
-<TGConnectingPoint num="1" id="4426" />
-<accessibility />
-<extraparam>
-<Data eventName="send_TCP" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4429" >
-<cdparam x="577" y="648" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4428" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="4432" >
-<cdparam x="563" y="589" />
-<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="abort()" />
-<TGConnectingPoint num="0" id="4430" />
-<TGConnectingPoint num="1" id="4431" />
-<extraparam>
-<Data eventName="abort" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4435" >
-<cdparam x="410" y="597" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="close()" />
-<TGConnectingPoint num="0" id="4433" />
-<TGConnectingPoint num="1" id="4434" />
-<extraparam>
-<Data eventName="close" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4437" >
-<cdparam x="423" y="646" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4436" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="4438" >
-<cdparam x="510" y="294" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="510" y="294" id="4401" />
-<P2 x="509" y="348" id="4422" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4439" >
-<cdparam x="508" y="424" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="508" y="424" id="4426" />
-<P2 x="510" y="504" id="4412" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4440" >
-<cdparam x="512" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="512" y="154" id="4404" />
-<P2 x="511" y="187" id="4406" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4441" >
-<cdparam x="594" y="221" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="511" y="217" id="4407" />
-<P2 x="510" y="254" id="4400" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4442" >
-<cdparam x="506" y="36" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to send event" value="null" />
-<P1 x="505" y="53" id="4417" />
-<P2 x="505" y="66" id="4419" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4443" >
-<cdparam x="508" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="505" y="96" id="4420" />
-<P2 x="512" y="124" id="4403" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4444" >
-<cdparam x="509" y="397" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="509" y="378" id="4423" />
-<P2 x="508" y="394" id="4425" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4445" >
-<cdparam x="587" y="614" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="587" y="614" id="4431" />
-<P2 x="587" y="643" id="4428" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4446" >
-<cdparam x="471" y="608" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="470" y="529" id="4413" />
-<P2 x="433" y="592" id="4433" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4447" >
-<cdparam x="433" y="622" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="433" y="622" id="4434" />
-<P2 x="433" y="641" id="4436" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4448" >
-<cdparam x="551" y="608" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="550" y="529" id="4414" />
-<P2 x="587" y="584" id="4430" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="1110" >
-<CONNECTOR type="115" id="5532" >
-<cdparam x="546" y="633" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="563" y="518" id="5531" />
-<P2 x="591" y="567" id="4510" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1036" id="5529" >
-<cdparam x="556" y="473" />
-<sizeparam width="15" height="35" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1010" />
-<infoparam name="decrypt" value="null" />
-<TGConnectingPoint num="0" id="5530" />
-<TGConnectingPoint num="1" id="5531" />
-<extraparam>
-<Data secPattern="autoEncrypt_fromDtoSC" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="115" id="5520" >
-<cdparam x="250" y="773" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="257" y="708" id="5516" />
-<P2 x="293" y="718" id="4507" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1035" id="5514" >
-<cdparam x="250" y="663" />
-<sizeparam width="15" height="35" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="encrypt" value="null" />
-<TGConnectingPoint num="0" id="5515" />
-<TGConnectingPoint num="1" id="5516" />
-<extraparam>
-<Data secContext="autoEncrypt_fromSCtoD" type="Symmetric Encryption" overhead="0" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4450" >
-<cdparam x="430" y="408" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4449" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="4453" >
-<cdparam x="418" y="364" />
-<sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="end() " />
-<TGConnectingPoint num="0" id="4451" />
-<TGConnectingPoint num="1" id="4452" />
-<extraparam>
-<Data eventName="end" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4456" >
-<cdparam x="238" y="201" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="connectionOpened() " />
-<TGConnectingPoint num="0" id="4454" />
-<TGConnectingPoint num="1" id="4455" />
-<extraparam>
-<Data eventName="connectionOpened" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="4458" >
-<cdparam x="159" y="66" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4457" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="4461" >
-<cdparam x="141" y="129" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="reset() " />
-<TGConnectingPoint num="0" id="4459" />
-<TGConnectingPoint num="1" id="4460" />
-<extraparam>
-<Data eventName="reset" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4464" >
-<cdparam x="113" y="182" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="answerToReset()" />
-<TGConnectingPoint num="0" id="4462" />
-<TGConnectingPoint num="1" id="4463" />
-<extraparam>
-<Data eventName="answerToReset" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4467" >
-<cdparam x="144" y="237" />
-<sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="pTS() " />
-<TGConnectingPoint num="0" id="4465" />
-<TGConnectingPoint num="1" id="4466" />
-<extraparam>
-<Data eventName="pTS" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4470" >
-<cdparam x="124" y="308" />
-<sizeparam width="85" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="pTSConfirm()" />
-<TGConnectingPoint num="0" id="4468" />
-<TGConnectingPoint num="1" id="4469" />
-<extraparam>
-<Data eventName="pTSConfirm" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="4487" >
-<cdparam x="376" y="98" />
-<sizeparam width="233" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="The first two layers of the OSI model
-are used to communicate between
-the smart card and the terminal
-" />
-<TGConnectingPoint num="0" id="4471" />
-<TGConnectingPoint num="1" id="4472" />
-<TGConnectingPoint num="2" id="4473" />
-<TGConnectingPoint num="3" id="4474" />
-<TGConnectingPoint num="4" id="4475" />
-<TGConnectingPoint num="5" id="4476" />
-<TGConnectingPoint num="6" id="4477" />
-<TGConnectingPoint num="7" id="4478" />
-<TGConnectingPoint num="8" id="4479" />
-<TGConnectingPoint num="9" id="4480" />
-<TGConnectingPoint num="10" id="4481" />
-<TGConnectingPoint num="11" id="4482" />
-<TGConnectingPoint num="12" id="4483" />
-<TGConnectingPoint num="13" id="4484" />
-<TGConnectingPoint num="14" id="4485" />
-<TGConnectingPoint num="15" id="4486" />
-<extraparam>
-<Line value="The first two layers of the OSI model " />
-<Line value="are used to communicate between " />
-<Line value="the smart card and the terminal" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1007" id="4490" >
-<cdparam x="254" y="97" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_TCP_IP()" />
-<TGConnectingPoint num="0" id="4488" />
-<TGConnectingPoint num="1" id="4489" />
-<extraparam>
-<Data requestName="start_TCP_IP" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1007" id="4493" >
-<cdparam x="241" y="148" />
-<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_Application()" />
-<TGConnectingPoint num="0" id="4491" />
-<TGConnectingPoint num="1" id="4492" />
-<breakpoint />
-<extraparam>
-<Data requestName="start_Application" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4495" >
-<cdparam x="581" y="760" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4494" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="4498" >
-<cdparam x="240" y="571" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="data_Ready_SC()" />
-<TGConnectingPoint num="0" id="4496" />
-<TGConnectingPoint num="1" id="4497" />
-<extraparam>
-<Data eventName="data_Ready_SC" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4500" >
-<cdparam x="283" y="757" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4499" />
-</COMPONENT>
-
-<COMPONENT type="1009" id="4503" >
-<cdparam x="252" y="429" />
-<sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromTtoP(1) " />
-<TGConnectingPoint num="0" id="4501" />
-<TGConnectingPoint num="1" id="4502" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4506" >
-<cdparam x="268" y="385" />
-<sizeparam width="50" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="send() " />
-<TGConnectingPoint num="0" id="4504" />
-<TGConnectingPoint num="1" id="4505" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="4509" >
-<cdparam x="250" y="723" />
-<sizeparam width="87" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromSCtoD(1)" />
-<TGConnectingPoint num="0" id="4507" />
-<TGConnectingPoint num="1" id="4508" />
-<extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="autoEncrypt_fromSCtoD" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4512" >
-<cdparam x="562" y="572" />
-<sizeparam width="59" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="receive()" />
-<TGConnectingPoint num="0" id="4510" />
-<TGConnectingPoint num="1" id="4511" />
-<extraparam>
-<Data eventName="receive" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="4515" >
-<cdparam x="546" y="433" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromDtoSC(1) " />
-<TGConnectingPoint num="0" id="4513" />
-<TGConnectingPoint num="1" id="4514" />
-<extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="autoEncrypt_fromDtoSC" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="4518" >
-<cdparam x="552" y="609" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromPtoT(1)" />
-<TGConnectingPoint num="0" id="4516" />
-<TGConnectingPoint num="1" id="4517" />
-<extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4521" >
-<cdparam x="536" y="390" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="data_Ready(t, b) " />
-<TGConnectingPoint num="0" id="4519" />
-<TGConnectingPoint num="1" id="4520" />
-<breakpoint />
-<extraparam>
-<Data eventName="data_Ready" nbOfParams="5" />
-<Param index="0" value="t" />
-<Param index="1" value="b" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1014" id="4525" >
-<cdparam x="236" y="261" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="for loop" value="for(j=0;x==0;j = j)" />
-<TGConnectingPoint num="0" id="4522" />
-<TGConnectingPoint num="1" id="4523" />
-<TGConnectingPoint num="2" id="4524" />
-<extraparam>
-<Data init="j=0" condition="x==0" increment="j = j" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4527" >
-<cdparam x="275" y="309" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4526" />
-</COMPONENT>
-
-<COMPONENT type="1018" id="4538" >
-<cdparam x="424" y="285" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="4528" />
-<TGConnectingPoint num="1" id="4529" />
-<TGConnectingPoint num="2" id="4530" />
-<TGConnectingPoint num="3" id="4531" />
-<TGConnectingPoint num="4" id="4532" />
-<TGConnectingPoint num="5" id="4533" />
-<TGConnectingPoint num="6" id="4534" />
-<TGConnectingPoint num="7" id="4535" />
-<TGConnectingPoint num="8" id="4536" />
-<TGConnectingPoint num="9" id="4537" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="4539" >
-<cdparam x="302" y="227" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="302" y="226" id="4455" />
-<P2 x="298" y="256" id="4522" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4544" >
-<cdparam x="111" y="331" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to send request" value="null" />
-<P1 x="166" y="333" id="4469" />
-<P2 x="298" y="92" id="4488" />
-<Point x="166" y="353" />
-<Point x="225" y="353" />
-<Point x="225" y="72" />
-<Point x="278" y="72" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4540" >
-<father id="4544" num="0" />
-<cdparam x="166" y="353" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4541" >
-<father id="4544" num="1" />
-<cdparam x="225" y="353" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4542" >
-<father id="4544" num="2" />
-<cdparam x="225" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4543" >
-<father id="4544" num="3" />
-<cdparam x="278" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="115" id="4545" >
-<cdparam x="166" y="64" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to wait event" value="null" />
-<P1 x="166" y="86" id="4457" />
-<P2 x="166" y="124" id="4459" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4546" >
-<cdparam x="166" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="166" y="154" id="4460" />
-<P2 x="166" y="177" id="4462" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4547" >
-<cdparam x="312" y="133" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to send request" value="null" />
-<P1 x="298" y="122" id="4489" />
-<P2 x="298" y="143" id="4491" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4548" >
-<cdparam x="286" y="421" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="293" y="410" id="4505" />
-<P2 x="293" y="424" id="4501" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4549" >
-<cdparam x="286" y="586" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="293" y="454" id="4502" />
-<P2 x="293" y="566" id="4496" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4550" >
-<cdparam x="286" y="748" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="293" y="596" id="4497" />
-<P2 x="257" y="658" id="5515" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4551" >
-<cdparam x="286" y="804" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="293" y="748" id="4508" />
-<P2 x="293" y="752" id="4499" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4552" >
-<cdparam x="607" y="580" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="591" y="458" id="4514" />
-<P2 x="563" y="468" id="5530" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4553" >
-<cdparam x="606" y="734" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="591" y="597" id="4511" />
-<P2 x="591" y="604" id="4516" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4554" >
-<cdparam x="609" y="427" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="591" y="415" id="4520" />
-<P2 x="591" y="428" id="4513" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4555" >
-<cdparam x="606" y="796" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="591" y="634" id="4517" />
-<P2 x="591" y="755" id="4494" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4556" >
-<cdparam x="298" y="173" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to for loop" value="null" />
-<P1 x="298" y="173" id="4492" />
-<P2 x="302" y="196" id="4454" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4557" >
-<cdparam x="328" y="291" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to stop state" value="null" />
-<P1 x="298" y="286" id="4524" />
-<P2 x="285" y="304" id="4526" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4558" >
-<cdparam x="385" y="404" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1 x="399" y="300" id="4529" />
-<P2 x="293" y="380" id="4504" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4559" >
-<cdparam x="533" y="562" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1 x="479" y="300" id="4530" />
-<P2 x="591" y="385" id="4519" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4560" >
-<cdparam x="391" y="341" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to select" value="null" />
-<P1 x="361" y="275" id="4523" />
-<P2 x="439" y="275" id="4528" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4561" >
-<cdparam x="164" y="262" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="166" y="262" id="4466" />
-<P2 x="166" y="303" id="4468" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4562" >
-<cdparam x="166" y="207" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="166" y="207" id="4463" />
-<P2 x="166" y="232" id="4465" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4563" >
-<cdparam x="439" y="340" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="439" y="340" id="4531" />
-<P2 x="440" y="359" id="4451" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4564" >
-<cdparam x="440" y="389" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="440" y="389" id="4452" />
-<P2 x="440" y="403" id="4449" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1012" id="4572" >
-<cdparam x="509" y="222" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4568" />
-<TGConnectingPoint num="1" id="4569" />
-<TGConnectingPoint num="2" id="4570" />
-<TGConnectingPoint num="3" id="4571" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4565" >
-<father id="4572" num="0" />
-<cdparam x="464" y="232" />
-<sizeparam width="51" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ x==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4566" >
-<father id="4572" num="1" />
-<cdparam x="544" y="234" />
-<sizeparam width="41" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ x>0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4567" >
-<father id="4572" num="2" />
-<cdparam x="529" y="267" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1000" id="4574" >
-<cdparam x="489" y="26" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4573" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4576" >
-<cdparam x="417" y="407" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4575" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="4579" >
-<cdparam x="396" y="339" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="timeOut()" />
-<TGConnectingPoint num="0" id="4577" />
-<TGConnectingPoint num="1" id="4578" />
-<extraparam>
-<Data eventName="timeOut" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4582" >
-<cdparam x="599" y="300" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="stop() " />
-<TGConnectingPoint num="0" id="4580" />
-<TGConnectingPoint num="1" id="4581" />
-<extraparam>
-<Data eventName="stop" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4584" >
-<cdparam x="612" y="365" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4583" />
-</COMPONENT>
-
-<COMPONENT type="1017" id="4587" >
-<cdparam x="491" y="157" />
-<sizeparam width="70" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="notified event" value="x=?stop()" />
-<TGConnectingPoint num="0" id="4585" />
-<TGConnectingPoint num="1" id="4586" />
-<extraparam>
-<Data eventName="stop" variable="x" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="115" id="4588" >
-<cdparam x="496" y="46" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="496" y="46" id="4573" />
-<P2 x="526" y="152" id="4585" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4589" >
-<cdparam x="484" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="484" y="237" id="4569" />
-<P2 x="427" y="334" id="4577" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4590" >
-<cdparam x="427" y="364" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="427" y="364" id="4578" />
-<P2 x="427" y="402" id="4575" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4591" >
-<cdparam x="622" y="325" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to stop state" value="null" />
-<P1 x="622" y="325" id="4581" />
-<P2 x="622" y="360" id="4583" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4592" >
-<cdparam x="524" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from notified event to choice" value="null" />
-<P1 x="526" y="182" id="4586" />
-<P2 x="524" y="212" id="4568" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4593" >
-<cdparam x="564" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="564" y="237" id="4570" />
-<P2 x="622" y="295" id="4580" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" >
-<COMPONENT type="1008" id="4596" >
-<cdparam x="159" y="424" />
-<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="opened()" />
-<TGConnectingPoint num="0" id="4594" />
-<TGConnectingPoint num="1" id="4595" />
-<extraparam>
-<Data eventName="opened" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1012" id="4604" >
-<cdparam x="2086" y="1378" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4600" />
-<TGConnectingPoint num="1" id="4601" />
-<TGConnectingPoint num="2" id="4602" />
-<TGConnectingPoint num="3" id="4603" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4597" >
-<father id="4604" num="0" />
-<cdparam x="2061" y="1388" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4598" >
-<father id="4604" num="1" />
-<cdparam x="2121" y="1388" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4599" >
-<father id="4604" num="2" />
-<cdparam x="2106" y="1426" />
-<sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==10 ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4612" >
-<cdparam x="2262" y="951" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4608" />
-<TGConnectingPoint num="1" id="4609" />
-<TGConnectingPoint num="2" id="4610" />
-<TGConnectingPoint num="3" id="4611" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4605" >
-<father id="4612" num="0" />
-<cdparam x="2212" y="961" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==1 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4606" >
-<father id="4612" num="1" />
-<cdparam x="2301" y="975" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ tcpctrl.state ==3 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4607" >
-<father id="4612" num="2" />
-<cdparam x="2282" y="996" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ else ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4620" >
-<cdparam x="1981" y="1346" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4616" />
-<TGConnectingPoint num="1" id="4617" />
-<TGConnectingPoint num="2" id="4618" />
-<TGConnectingPoint num="3" id="4619" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4613" >
-<father id="4620" num="0" />
-<cdparam x="1934" y="1356" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==5 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4614" >
-<father id="4620" num="1" />
-<cdparam x="2016" y="1356" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4615" >
-<father id="4620" num="2" />
-<cdparam x="2001" y="1391" />
-<sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state == 7 ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4628" >
-<cdparam x="1811" y="1269" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4624" />
-<TGConnectingPoint num="1" id="4625" />
-<TGConnectingPoint num="2" id="4626" />
-<TGConnectingPoint num="3" id="4627" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4621" >
-<father id="4628" num="0" />
-<cdparam x="1762" y="1279" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4622" >
-<father id="4628" num="1" />
-<cdparam x="1846" y="1279" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4623" >
-<father id="4628" num="2" />
-<cdparam x="1831" y="1314" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==2 ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4636" >
-<cdparam x="1713" y="1141" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4632" />
-<TGConnectingPoint num="1" id="4633" />
-<TGConnectingPoint num="2" id="4634" />
-<TGConnectingPoint num="3" id="4635" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4629" >
-<father id="4636" num="0" />
-<cdparam x="1688" y="1151" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4630" >
-<father id="4636" num="1" />
-<cdparam x="1748" y="1151" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4631" >
-<father id="4636" num="2" />
-<cdparam x="1733" y="1186" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4640" >
-<cdparam x="1524" y="1254" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4638" />
-<TGConnectingPoint num="1" id="4639" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4637" >
-<father id="4640" num="0" />
-<cdparam x="1539" y="1274" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4644" >
-<cdparam x="1524" y="1064" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4642" />
-<TGConnectingPoint num="1" id="4643" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4641" >
-<father id="4644" num="0" />
-<cdparam x="1538" y="1088" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4652" >
-<cdparam x="1592" y="1006" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4648" />
-<TGConnectingPoint num="1" id="4649" />
-<TGConnectingPoint num="2" id="4650" />
-<TGConnectingPoint num="3" id="4651" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4645" >
-<father id="4652" num="0" />
-<cdparam x="1542" y="1016" />
-<sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state == 4 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4646" >
-<father id="4652" num="1" />
-<cdparam x="1627" y="1016" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4647" >
-<father id="4652" num="2" />
-<cdparam x="1612" y="1051" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4660" >
-<cdparam x="1713" y="875" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4656" />
-<TGConnectingPoint num="1" id="4657" />
-<TGConnectingPoint num="2" id="4658" />
-<TGConnectingPoint num="3" id="4659" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4653" >
-<father id="4660" num="0" />
-<cdparam x="1688" y="885" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4654" >
-<father id="4660" num="1" />
-<cdparam x="1748" y="885" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4655" >
-<father id="4660" num="2" />
-<cdparam x="1733" y="920" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4664" >
-<cdparam x="1636" y="1235" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4662" />
-<TGConnectingPoint num="1" id="4663" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4661" >
-<father id="4664" num="0" />
-<cdparam x="1655" y="1254" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4668" >
-<cdparam x="2232" y="1059" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4666" />
-<TGConnectingPoint num="1" id="4667" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4665" >
-<father id="4668" num="0" />
-<cdparam x="2219" y="1083" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4672" >
-<cdparam x="2312" y="1024" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4670" />
-<TGConnectingPoint num="1" id="4671" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4669" >
-<father id="4672" num="0" />
-<cdparam x="2288" y="1044" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4680" >
-<cdparam x="1193" y="1020" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4676" />
-<TGConnectingPoint num="1" id="4677" />
-<TGConnectingPoint num="2" id="4678" />
-<TGConnectingPoint num="3" id="4679" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4673" >
-<father id="4680" num="0" />
-<cdparam x="1168" y="1030" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4674" >
-<father id="4680" num="1" />
-<cdparam x="1228" y="1030" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4675" >
-<father id="4680" num="2" />
-<cdparam x="1213" y="1065" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==6 ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4684" >
-<cdparam x="1203" y="1107" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4682" />
-<TGConnectingPoint num="1" id="4683" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4681" >
-<father id="4684" num="0" />
-<cdparam x="1218" y="1127" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4692" >
-<cdparam x="557" y="712" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4688" />
-<TGConnectingPoint num="1" id="4689" />
-<TGConnectingPoint num="2" id="4690" />
-<TGConnectingPoint num="3" id="4691" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4685" >
-<father id="4692" num="0" />
-<cdparam x="482" y="747" />
-<sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state == 1 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4686" >
-<father id="4692" num="1" />
-<cdparam x="592" y="722" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4687" >
-<father id="4692" num="2" />
-<cdparam x="577" y="757" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4696" >
-<cdparam x="717" y="694" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4694" />
-<TGConnectingPoint num="1" id="4695" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4693" >
-<father id="4696" num="0" />
-<cdparam x="732" y="714" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4700" >
-<cdparam x="938" y="1025" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4698" />
-<TGConnectingPoint num="1" id="4699" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4697" >
-<father id="4700" num="0" />
-<cdparam x="953" y="1045" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4708" >
-<cdparam x="1034" y="939" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4704" />
-<TGConnectingPoint num="1" id="4705" />
-<TGConnectingPoint num="2" id="4706" />
-<TGConnectingPoint num="3" id="4707" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4701" >
-<father id="4708" num="0" />
-<cdparam x="959" y="974" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4702" >
-<father id="4708" num="1" />
-<cdparam x="1070" y="949" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4703" >
-<father id="4708" num="2" />
-<cdparam x="1054" y="984" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state == 5]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4712" >
-<cdparam x="795" y="1009" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4710" />
-<TGConnectingPoint num="1" id="4711" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4709" >
-<father id="4712" num="0" />
-<cdparam x="818" y="1031" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4720" >
-<cdparam x="828" y="869" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4716" />
-<TGConnectingPoint num="1" id="4717" />
-<TGConnectingPoint num="2" id="4718" />
-<TGConnectingPoint num="3" id="4719" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4713" >
-<father id="4720" num="0" />
-<cdparam x="753" y="885" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4714" >
-<father id="4720" num="1" />
-<cdparam x="863" y="879" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4715" >
-<father id="4720" num="2" />
-<cdparam x="848" y="914" />
-<sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state==0 ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4724" >
-<cdparam x="341" y="764" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4722" />
-<TGConnectingPoint num="1" id="4723" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4721" >
-<father id="4724" num="0" />
-<cdparam x="354" y="785" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4728" >
-<cdparam x="127" y="794" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4726" />
-<TGConnectingPoint num="1" id="4727" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4725" >
-<father id="4728" num="0" />
-<cdparam x="146" y="818" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4736" >
-<cdparam x="993" y="780" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4732" />
-<TGConnectingPoint num="1" id="4733" />
-<TGConnectingPoint num="2" id="4734" />
-<TGConnectingPoint num="3" id="4735" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4729" >
-<father id="4736" num="0" />
-<cdparam x="949" y="793" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4730" >
-<father id="4736" num="1" />
-<cdparam x="1028" y="790" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4731" >
-<father id="4736" num="2" />
-<cdparam x="1013" y="825" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4740" >
-<cdparam x="1003" y="701" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4738" />
-<TGConnectingPoint num="1" id="4739" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4737" >
-<father id="4740" num="0" />
-<cdparam x="1018" y="721" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4744" >
-<cdparam x="459" y="783" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4742" />
-<TGConnectingPoint num="1" id="4743" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4741" >
-<father id="4744" num="0" />
-<cdparam x="474" y="802" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4748" >
-<cdparam x="225" y="863" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4746" />
-<TGConnectingPoint num="1" id="4747" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4745" >
-<father id="4748" num="0" />
-<cdparam x="245" y="885" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1013" id="4752" >
-<cdparam x="1044" y="1057" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4750" />
-<TGConnectingPoint num="1" id="4751" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4749" >
-<father id="4752" num="0" />
-<cdparam x="1059" y="1077" />
-<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="b" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4760" >
-<cdparam x="173" y="486" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4756" />
-<TGConnectingPoint num="1" id="4757" />
-<TGConnectingPoint num="2" id="4758" />
-<TGConnectingPoint num="3" id="4759" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4753" >
-<father id="4760" num="0" />
-<cdparam x="98" y="496" />
-<sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4754" >
-<father id="4760" num="1" />
-<cdparam x="208" y="496" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4755" >
-<father id="4760" num="2" />
-<cdparam x="193" y="531" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4768" >
-<cdparam x="359" y="192" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4764" />
-<TGConnectingPoint num="1" id="4765" />
-<TGConnectingPoint num="2" id="4766" />
-<TGConnectingPoint num="3" id="4767" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4761" >
-<father id="4768" num="0" />
-<cdparam x="317" y="202" />
-<sizeparam width="81" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.a>0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4762" >
-<father id="4768" num="1" />
-<cdparam x="394" y="202" />
-<sizeparam width="91" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ tcpctrl.a==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4763" >
-<father id="4768" num="2" />
-<cdparam x="379" y="237" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4776" >
-<cdparam x="449" y="582" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4772" />
-<TGConnectingPoint num="1" id="4773" />
-<TGConnectingPoint num="2" id="4774" />
-<TGConnectingPoint num="3" id="4775" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4769" >
-<father id="4776" num="0" />
-<cdparam x="404" y="592" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state ==9 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4770" >
-<father id="4776" num="1" />
-<cdparam x="500" y="599" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4771" >
-<father id="4776" num="2" />
-<cdparam x="469" y="627" />
-<sizeparam width="252" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ (tcpctrl.state ==2) or (tcpctrl.state ==4) ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1012" id="4784" >
-<cdparam x="274" y="564" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4780" />
-<TGConnectingPoint num="1" id="4781" />
-<TGConnectingPoint num="2" id="4782" />
-<TGConnectingPoint num="3" id="4783" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4777" >
-<father id="4784" num="0" />
-<cdparam x="228" y="574" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ tcpctrl.state == 1]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4778" >
-<father id="4784" num="1" />
-<cdparam x="317" y="584" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ else ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4779" >
-<father id="4784" num="2" />
-<cdparam x="306" y="616" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ tcpctrl.state ==4 ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1000" id="4786" >
-<cdparam x="227" y="27" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4785" />
-</COMPONENT>
-
-<COMPONENT type="301" id="4803" >
-<cdparam x="10" y="30" />
-<sizeparam width="92" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="0: closed
-1: Listen
-2: SYN rcvd
-3: SYN sent
-4: Estab
-5: Fin wait1
-6: Fin wait2
-7: closing
-8: Time wait
-9: close wait
-10:last ack
-" />
-<TGConnectingPoint num="0" id="4787" />
-<TGConnectingPoint num="1" id="4788" />
-<TGConnectingPoint num="2" id="4789" />
-<TGConnectingPoint num="3" id="4790" />
-<TGConnectingPoint num="4" id="4791" />
-<TGConnectingPoint num="5" id="4792" />
-<TGConnectingPoint num="6" id="4793" />
-<TGConnectingPoint num="7" id="4794" />
-<TGConnectingPoint num="8" id="4795" />
-<TGConnectingPoint num="9" id="4796" />
-<TGConnectingPoint num="10" id="4797" />
-<TGConnectingPoint num="11" id="4798" />
-<TGConnectingPoint num="12" id="4799" />
-<TGConnectingPoint num="13" id="4800" />
-<TGConnectingPoint num="14" id="4801" />
-<TGConnectingPoint num="15" id="4802" />
-<extraparam>
-<Line value="0: closed" />
-<Line value="1: Listen" />
-<Line value="2: SYN rcvd" />
-<Line value="3: SYN sent" />
-<Line value="4: Estab" />
-<Line value="5: Fin wait1" />
-<Line value="6: Fin wait2" />
-<Line value="7: closing" />
-<Line value="8: Time wait" />
-<Line value="9: close wait" />
-<Line value="10:last ack" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="4806" >
-<cdparam x="98" y="549" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="4804" />
-<TGConnectingPoint num="1" id="4805" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4808" >
-<cdparam x="138" y="615" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4807" />
-</COMPONENT>
-
-<COMPONENT type="1009" id="4811" >
-<cdparam x="967" y="585" />
-<sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="fromPtoT(1) " />
-<TGConnectingPoint num="0" id="4809" />
-<TGConnectingPoint num="1" id="4810" />
-<extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1014" id="4815" >
-<cdparam x="150" y="85" />
-<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="for loop" value="for(i=0;(tcpctrl.a==0);i = i)" />
-<TGConnectingPoint num="0" id="4812" />
-<TGConnectingPoint num="1" id="4813" />
-<TGConnectingPoint num="2" id="4814" />
-<extraparam>
-<Data init="i=0" condition="(tcpctrl.a==0)" increment="i = i" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4817" >
-<cdparam x="225" y="207" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4816" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="4820" >
-<cdparam x="187" y="144" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state=0" />
-<TGConnectingPoint num="0" id="4818" />
-<TGConnectingPoint num="1" id="4819" />
-</COMPONENT>
-
-<COMPONENT type="1017" id="4823" >
-<cdparam x="316" y="133" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="notified event" value="tcpctrl.a=?abort()" />
-<TGConnectingPoint num="0" id="4821" />
-<TGConnectingPoint num="1" id="4822" />
-<extraparam>
-<Data eventName="abort" variable="tcpctrl.a" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="4826" >
-<cdparam x="692" y="589" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="4824" />
-<TGConnectingPoint num="1" id="4825" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4829" >
-<cdparam x="689" y="534" />
-<sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="timeOut() " />
-<TGConnectingPoint num="0" id="4827" />
-<TGConnectingPoint num="1" id="4828" />
-<extraparam>
-<Data eventName="timeOut" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4832" >
-<cdparam x="977" y="528" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="receive() " />
-<TGConnectingPoint num="0" id="4830" />
-<TGConnectingPoint num="1" id="4831" />
-<extraparam>
-<Data eventName="receive" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4835" >
-<cdparam x="439" y="492" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="close() " />
-<TGConnectingPoint num="0" id="4833" />
-<TGConnectingPoint num="1" id="4834" />
-<extraparam>
-<Data eventName="close" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4838" >
-<cdparam x="250" y="468" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="send_TCP() " />
-<TGConnectingPoint num="0" id="4836" />
-<TGConnectingPoint num="1" id="4837" />
-<extraparam>
-<Data eventName="send_TCP" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="4841" >
-<cdparam x="163" y="383" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="open() " />
-<TGConnectingPoint num="0" id="4839" />
-<TGConnectingPoint num="1" id="4840" />
-<breakpoint />
-<extraparam>
-<Data eventName="open" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1018" id="4852" >
-<cdparam x="449" y="267" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="4842" />
-<TGConnectingPoint num="1" id="4843" />
-<TGConnectingPoint num="2" id="4844" />
-<TGConnectingPoint num="3" id="4845" />
-<TGConnectingPoint num="4" id="4846" />
-<TGConnectingPoint num="5" id="4847" />
-<TGConnectingPoint num="6" id="4848" />
-<TGConnectingPoint num="7" id="4849" />
-<TGConnectingPoint num="8" id="4850" />
-<TGConnectingPoint num="9" id="4851" />
-<breakpoint />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4854" >
-<cdparam x="218" y="529" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4853" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4856" >
-<cdparam x="319" y="614" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4855" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="4859" >
-<cdparam x="275" y="228" />
-<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="wait event" value="abort() " />
-<TGConnectingPoint num="0" id="4857" />
-<TGConnectingPoint num="1" id="4858" />
-<extraparam>
-<Data eventName="abort" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4861" >
-<cdparam x="291" y="290" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4860" />
-</COMPONENT>
-
-<COMPONENT type="301" id="4878" >
-<cdparam x="602" y="86" />
-<sizeparam width="360" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="b est le nombre d'instructions necessaires pour paquetiser
-ou depaquitiser un paquet TCP
-
-On prend b=1 comme exemple
-" />
-<TGConnectingPoint num="0" id="4862" />
-<TGConnectingPoint num="1" id="4863" />
-<TGConnectingPoint num="2" id="4864" />
-<TGConnectingPoint num="3" id="4865" />
-<TGConnectingPoint num="4" id="4866" />
-<TGConnectingPoint num="5" id="4867" />
-<TGConnectingPoint num="6" id="4868" />
-<TGConnectingPoint num="7" id="4869" />
-<TGConnectingPoint num="8" id="4870" />
-<TGConnectingPoint num="9" id="4871" />
-<TGConnectingPoint num="10" id="4872" />
-<TGConnectingPoint num="11" id="4873" />
-<TGConnectingPoint num="12" id="4874" />
-<TGConnectingPoint num="13" id="4875" />
-<TGConnectingPoint num="14" id="4876" />
-<TGConnectingPoint num="15" id="4877" />
-<extraparam>
-<Line value="b est le nombre d'instructions necessaires pour paquetiser" />
-<Line value="ou depaquitiser un paquet TCP" />
-<Line value="" />
-<Line value="On prend b=1 comme exemple" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="4881" >
-<cdparam x="188" y="808" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="fromAtoT(1) " />
-<TGConnectingPoint num="0" id="4879" />
-<TGConnectingPoint num="1" id="4880" />
-<extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="4884" >
-<cdparam x="191" y="1002" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="4882" />
-<TGConnectingPoint num="1" id="4883" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4886" >
-<cdparam x="220" y="1237" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4885" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="4889" >
-<cdparam x="414" y="1032" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =5" />
-<TGConnectingPoint num="0" id="4887" />
-<TGConnectingPoint num="1" id="4888" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4891" >
-<cdparam x="454" y="1213" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4890" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="4894" >
-<cdparam x="84" y="1041" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state=3" />
-<TGConnectingPoint num="0" id="4892" />
-<TGConnectingPoint num="1" id="4893" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="4897" >
-<cdparam x="93" y="938" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="4895" />
-<TGConnectingPoint num="1" id="4896" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="4900" >
-<cdparam x="292" y="1026" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =10" />
-<TGConnectingPoint num="0" id="4898" />
-<TGConnectingPoint num="1" id="4899" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4902" >
-<cdparam x="336" y="1229" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4901" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="4905" >
-<cdparam x="425" y="941" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="4903" />
-<TGConnectingPoint num="1" id="4904" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="4908" >
-<cdparam x="307" y="900" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="4906" />
-<TGConnectingPoint num="1" id="4907" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="4910" >
-<cdparam x="790" y="1270" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4909" />
-</COMPONENT>
-
-<COMPONENT type="301" id="4927" >
-<cdparam x="998" y="850" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Final
-" />
-<TGConnectingPoint num="0" id="4911" />
-<TGConnectingPoint num="1" id="4912" />
-<TGConnectingPoint num="2" id="4913" />
-<TGConnectingPoint num="3" id="4914" />
-<TGConnectingPoint num="4" id="4915" />
-<TGConnectingPoint num="5" id="4916" />
-<TGConnectingPoint num="6" id="4917" />
-<TGConnectingPoint num="7" id="4918" />
-<TGConnectingPoint num="8" id="4919" />
-<TGConnectingPoint num="9" id="4920" />
-<TGConnectingPoint num="10" id="4921" />
-<TGConnectingPoint num="11" id="4922" />
-<TGConnectingPoint num="12" id="4923" />
-<TGConnectingPoint num="13" id="4924" />
-<TGConnectingPoint num="14" id="4925" />
-<TGConnectingPoint num="15" id="4926" />
-<extraparam>
-<Line value="Final" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="4930" >
-<cdparam x="678" y="965" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="4928" />
-<TGConnectingPoint num="1" id="4929" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4932" >
-<cdparam x="718" y="1032" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4931" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="4935" >
-<cdparam x="761" y="1086" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="4933" />
-<TGConnectingPoint num="1" id="4934" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="4952" >
-<cdparam x="781" y="950" />
-<sizeparam width="89" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Active Open
-" />
-<TGConnectingPoint num="0" id="4936" />
-<TGConnectingPoint num="1" id="4937" />
-<TGConnectingPoint num="2" id="4938" />
-<TGConnectingPoint num="3" id="4939" />
-<TGConnectingPoint num="4" id="4940" />
-<TGConnectingPoint num="5" id="4941" />
-<TGConnectingPoint num="6" id="4942" />
-<TGConnectingPoint num="7" id="4943" />
-<TGConnectingPoint num="8" id="4944" />
-<TGConnectingPoint num="9" id="4945" />
-<TGConnectingPoint num="10" id="4946" />
-<TGConnectingPoint num="11" id="4947" />
-<TGConnectingPoint num="12" id="4948" />
-<TGConnectingPoint num="13" id="4949" />
-<TGConnectingPoint num="14" id="4950" />
-<TGConnectingPoint num="15" id="4951" />
-<extraparam>
-<Line value="Active Open" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="4969" >
-<cdparam x="715" y="907" />
-<sizeparam width="97" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Passive Open
-" />
-<TGConnectingPoint num="0" id="4953" />
-<TGConnectingPoint num="1" id="4954" />
-<TGConnectingPoint num="2" id="4955" />
-<TGConnectingPoint num="3" id="4956" />
-<TGConnectingPoint num="4" id="4957" />
-<TGConnectingPoint num="5" id="4958" />
-<TGConnectingPoint num="6" id="4959" />
-<TGConnectingPoint num="7" id="4960" />
-<TGConnectingPoint num="8" id="4961" />
-<TGConnectingPoint num="9" id="4962" />
-<TGConnectingPoint num="10" id="4963" />
-<TGConnectingPoint num="11" id="4964" />
-<TGConnectingPoint num="12" id="4965" />
-<TGConnectingPoint num="13" id="4966" />
-<TGConnectingPoint num="14" id="4967" />
-<TGConnectingPoint num="15" id="4968" />
-<extraparam>
-<Line value="Passive Open" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="4972" >
-<cdparam x="750" y="1193" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =3" />
-<TGConnectingPoint num="0" id="4970" />
-<TGConnectingPoint num="1" id="4971" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="4975" >
-<cdparam x="446" y="768" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="4973" />
-<TGConnectingPoint num="1" id="4974" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="4977" >
-<cdparam x="486" y="830" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4976" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="4980" >
-<cdparam x="904" y="1123" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="4978" />
-<TGConnectingPoint num="1" id="4979" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="4997" >
-<cdparam x="884" y="1068" />
-<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of Fin
-" />
-<TGConnectingPoint num="0" id="4981" />
-<TGConnectingPoint num="1" id="4982" />
-<TGConnectingPoint num="2" id="4983" />
-<TGConnectingPoint num="3" id="4984" />
-<TGConnectingPoint num="4" id="4985" />
-<TGConnectingPoint num="5" id="4986" />
-<TGConnectingPoint num="6" id="4987" />
-<TGConnectingPoint num="7" id="4988" />
-<TGConnectingPoint num="8" id="4989" />
-<TGConnectingPoint num="9" id="4990" />
-<TGConnectingPoint num="10" id="4991" />
-<TGConnectingPoint num="11" id="4992" />
-<TGConnectingPoint num="12" id="4993" />
-<TGConnectingPoint num="13" id="4994" />
-<TGConnectingPoint num="14" id="4995" />
-<TGConnectingPoint num="15" id="4996" />
-<extraparam>
-<Line value="send Ack of Fin" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="5000" >
-<cdparam x="893" y="1234" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =9" />
-<TGConnectingPoint num="0" id="4998" />
-<TGConnectingPoint num="1" id="4999" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5002" >
-<cdparam x="933" y="1311" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5001" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="5005" >
-<cdparam x="1010" y="1155" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="5003" />
-<TGConnectingPoint num="1" id="5004" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="5022" >
-<cdparam x="1000" y="1094" />
-<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of Fin
-" />
-<TGConnectingPoint num="0" id="5006" />
-<TGConnectingPoint num="1" id="5007" />
-<TGConnectingPoint num="2" id="5008" />
-<TGConnectingPoint num="3" id="5009" />
-<TGConnectingPoint num="4" id="5010" />
-<TGConnectingPoint num="5" id="5011" />
-<TGConnectingPoint num="6" id="5012" />
-<TGConnectingPoint num="7" id="5013" />
-<TGConnectingPoint num="8" id="5014" />
-<TGConnectingPoint num="9" id="5015" />
-<TGConnectingPoint num="10" id="5016" />
-<TGConnectingPoint num="11" id="5017" />
-<TGConnectingPoint num="12" id="5018" />
-<TGConnectingPoint num="13" id="5019" />
-<TGConnectingPoint num="14" id="5020" />
-<TGConnectingPoint num="15" id="5021" />
-<extraparam>
-<Line value="send Ack of Fin" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="5025" >
-<cdparam x="999" y="1266" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =7" />
-<TGConnectingPoint num="0" id="5023" />
-<TGConnectingPoint num="1" id="5024" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5027" >
-<cdparam x="1039" y="1341" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5026" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="5030" >
-<cdparam x="683" y="758" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="5028" />
-<TGConnectingPoint num="1" id="5029" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5032" >
-<cdparam x="712" y="865" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5031" />
-</COMPONENT>
-
-<COMPONENT type="1007" id="5035" >
-<cdparam x="93" y="1100" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="5033" />
-<TGConnectingPoint num="1" id="5034" />
-<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5038" >
-<cdparam x="104" y="1167" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="5036" />
-<TGConnectingPoint num="1" id="5037" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5040" >
-<cdparam x="122" y="1236" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5039" />
-</COMPONENT>
-
-<COMPONENT type="1007" id="5043" >
-<cdparam x="191" y="1102" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="5041" />
-<TGConnectingPoint num="1" id="5042" />
-<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5046" >
-<cdparam x="202" y="1169" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="5044" />
-<TGConnectingPoint num="1" id="5045" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1007" id="5049" >
-<cdparam x="307" y="1106" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="5047" />
-<TGConnectingPoint num="1" id="5048" />
-<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5052" >
-<cdparam x="318" y="1173" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="5050" />
-<TGConnectingPoint num="1" id="5051" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1007" id="5055" >
-<cdparam x="425" y="1090" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="5053" />
-<TGConnectingPoint num="1" id="5054" />
-<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5058" >
-<cdparam x="436" y="1159" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="5056" />
-<TGConnectingPoint num="1" id="5057" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="5061" >
-<cdparam x="56" y="861" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="5059" />
-<TGConnectingPoint num="1" id="5060" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5064" >
-<cdparam x="154" y="940" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="5062" />
-<TGConnectingPoint num="1" id="5063" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5067" >
-<cdparam x="388" y="865" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="5065" />
-<TGConnectingPoint num="1" id="5066" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5070" >
-<cdparam x="270" y="831" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="5068" />
-<TGConnectingPoint num="1" id="5069" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="5073" >
-<cdparam x="207" y="1052" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5071" />
-<TGConnectingPoint num="1" id="5072" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5076" >
-<cdparam x="323" y="962" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5074" />
-<TGConnectingPoint num="1" id="5075" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5079" >
-<cdparam x="441" y="983" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5077" />
-<TGConnectingPoint num="1" id="5078" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5082" >
-<cdparam x="109" y="986" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5080" />
-<TGConnectingPoint num="1" id="5081" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5085" >
-<cdparam x="699" y="813" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5083" />
-<TGConnectingPoint num="1" id="5084" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5088" >
-<cdparam x="777" y="1141" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5086" />
-<TGConnectingPoint num="1" id="5087" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5091" >
-<cdparam x="920" y="1178" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5089" />
-<TGConnectingPoint num="1" id="5090" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5094" >
-<cdparam x="1026" y="1211" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5092" />
-<TGConnectingPoint num="1" id="5093" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5096" >
-<cdparam x="602" y="762" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5095" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5098" >
-<cdparam x="873" y="922" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5097" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="5101" >
-<cdparam x="1169" y="1214" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="5099" />
-<TGConnectingPoint num="1" id="5100" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="5118" >
-<cdparam x="1159" y="1153" />
-<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of Fin
-" />
-<TGConnectingPoint num="0" id="5102" />
-<TGConnectingPoint num="1" id="5103" />
-<TGConnectingPoint num="2" id="5104" />
-<TGConnectingPoint num="3" id="5105" />
-<TGConnectingPoint num="4" id="5106" />
-<TGConnectingPoint num="5" id="5107" />
-<TGConnectingPoint num="6" id="5108" />
-<TGConnectingPoint num="7" id="5109" />
-<TGConnectingPoint num="8" id="5110" />
-<TGConnectingPoint num="9" id="5111" />
-<TGConnectingPoint num="10" id="5112" />
-<TGConnectingPoint num="11" id="5113" />
-<TGConnectingPoint num="12" id="5114" />
-<TGConnectingPoint num="13" id="5115" />
-<TGConnectingPoint num="14" id="5116" />
-<TGConnectingPoint num="15" id="5117" />
-<extraparam>
-<Line value="send Ack of Fin" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="5121" >
-<cdparam x="1158" y="1295" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="5119" />
-<TGConnectingPoint num="1" id="5120" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5123" >
-<cdparam x="1198" y="1471" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5122" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5126" >
-<cdparam x="1158" y="1402" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="5124" />
-<TGConnectingPoint num="1" id="5125" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="5129" >
-<cdparam x="1185" y="1351" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5127" />
-<TGConnectingPoint num="1" id="5128" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5131" >
-<cdparam x="1277" y="1070" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5130" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5133" >
-<cdparam x="1519" y="1457" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5132" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="5136" >
-<cdparam x="1489" y="1132" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoA(1)" />
-<TGConnectingPoint num="0" id="5134" />
-<TGConnectingPoint num="1" id="5135" />
-<extraparam>
-<Data channelName="fromTtoA" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5139" >
-<cdparam x="1490" y="1348" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="5137" />
-<TGConnectingPoint num="1" id="5138" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5142" >
-<cdparam x="1707" y="1026" />
-<sizeparam width="43" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="stop()" />
-<TGConnectingPoint num="0" id="5140" />
-<TGConnectingPoint num="1" id="5141" />
-<extraparam>
-<Data eventName="stop" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="5159" >
-<cdparam x="1759" y="1192" />
-<sizeparam width="86" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Correct ack
-" />
-<TGConnectingPoint num="0" id="5143" />
-<TGConnectingPoint num="1" id="5144" />
-<TGConnectingPoint num="2" id="5145" />
-<TGConnectingPoint num="3" id="5146" />
-<TGConnectingPoint num="4" id="5147" />
-<TGConnectingPoint num="5" id="5148" />
-<TGConnectingPoint num="6" id="5149" />
-<TGConnectingPoint num="7" id="5150" />
-<TGConnectingPoint num="8" id="5151" />
-<TGConnectingPoint num="9" id="5152" />
-<TGConnectingPoint num="10" id="5153" />
-<TGConnectingPoint num="11" id="5154" />
-<TGConnectingPoint num="12" id="5155" />
-<TGConnectingPoint num="13" id="5156" />
-<TGConnectingPoint num="14" id="5157" />
-<TGConnectingPoint num="15" id="5158" />
-<extraparam>
-<Line value="Correct ack" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="5176" >
-<cdparam x="1635" y="1168" />
-<sizeparam width="71" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="false ack
-" />
-<TGConnectingPoint num="0" id="5160" />
-<TGConnectingPoint num="1" id="5161" />
-<TGConnectingPoint num="2" id="5162" />
-<TGConnectingPoint num="3" id="5163" />
-<TGConnectingPoint num="4" id="5164" />
-<TGConnectingPoint num="5" id="5165" />
-<TGConnectingPoint num="6" id="5166" />
-<TGConnectingPoint num="7" id="5167" />
-<TGConnectingPoint num="8" id="5168" />
-<TGConnectingPoint num="9" id="5169" />
-<TGConnectingPoint num="10" id="5170" />
-<TGConnectingPoint num="11" id="5171" />
-<TGConnectingPoint num="12" id="5172" />
-<TGConnectingPoint num="13" id="5173" />
-<TGConnectingPoint num="14" id="5174" />
-<TGConnectingPoint num="15" id="5175" />
-<extraparam>
-<Line value="false ack" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5179" >
-<cdparam x="1602" y="1299" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="5177" />
-<TGConnectingPoint num="1" id="5178" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5181" >
-<cdparam x="1631" y="1468" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5180" />
-</COMPONENT>
-
-<COMPONENT type="301" id="5198" >
-<cdparam x="1469" y="1295" />
-<sizeparam width="127" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="return acknowldge
-" />
-<TGConnectingPoint num="0" id="5182" />
-<TGConnectingPoint num="1" id="5183" />
-<TGConnectingPoint num="2" id="5184" />
-<TGConnectingPoint num="3" id="5185" />
-<TGConnectingPoint num="4" id="5186" />
-<TGConnectingPoint num="5" id="5187" />
-<TGConnectingPoint num="6" id="5188" />
-<TGConnectingPoint num="7" id="5189" />
-<TGConnectingPoint num="8" id="5190" />
-<TGConnectingPoint num="9" id="5191" />
-<TGConnectingPoint num="10" id="5192" />
-<TGConnectingPoint num="11" id="5193" />
-<TGConnectingPoint num="12" id="5194" />
-<TGConnectingPoint num="13" id="5195" />
-<TGConnectingPoint num="14" id="5196" />
-<TGConnectingPoint num="15" id="5197" />
-<extraparam>
-<Line value="return acknowldge" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="5215" >
-<cdparam x="1620" y="927" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="data
-" />
-<TGConnectingPoint num="0" id="5199" />
-<TGConnectingPoint num="1" id="5200" />
-<TGConnectingPoint num="2" id="5201" />
-<TGConnectingPoint num="3" id="5202" />
-<TGConnectingPoint num="4" id="5203" />
-<TGConnectingPoint num="5" id="5204" />
-<TGConnectingPoint num="6" id="5205" />
-<TGConnectingPoint num="7" id="5206" />
-<TGConnectingPoint num="8" id="5207" />
-<TGConnectingPoint num="9" id="5208" />
-<TGConnectingPoint num="10" id="5209" />
-<TGConnectingPoint num="11" id="5210" />
-<TGConnectingPoint num="12" id="5211" />
-<TGConnectingPoint num="13" id="5212" />
-<TGConnectingPoint num="14" id="5213" />
-<TGConnectingPoint num="15" id="5214" />
-<extraparam>
-<Line value="data" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5218" >
-<cdparam x="1506" y="1405" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5216" />
-<TGConnectingPoint num="1" id="5217" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="5221" >
-<cdparam x="1618" y="1348" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5219" />
-<TGConnectingPoint num="1" id="5220" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5224" >
-<cdparam x="1613" y="1404" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="5222" />
-<TGConnectingPoint num="1" id="5223" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5226" >
-<cdparam x="1730" y="1335" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5225" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5229" >
-<cdparam x="1776" y="1349" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =4" />
-<TGConnectingPoint num="0" id="5227" />
-<TGConnectingPoint num="1" id="5228" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5231" >
-<cdparam x="1816" y="1457" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5230" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5234" >
-<cdparam x="1870" y="1411" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =6" />
-<TGConnectingPoint num="0" id="5232" />
-<TGConnectingPoint num="1" id="5233" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5236" >
-<cdparam x="1910" y="1481" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5235" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5238" >
-<cdparam x="1986" y="1543" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5237" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5241" >
-<cdparam x="2051" y="1466" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="5239" />
-<TGConnectingPoint num="1" id="5240" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5243" >
-<cdparam x="2091" y="1537" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5242" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5246" >
-<cdparam x="1946" y="1493" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="5244" />
-<TGConnectingPoint num="1" id="5245" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="5249" >
-<cdparam x="1946" y="1434" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="5247" />
-<TGConnectingPoint num="1" id="5248" />
-</COMPONENT>
-
-<COMPONENT type="301" id="5266" >
-<cdparam x="1825" y="889" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="Syn
-" />
-<TGConnectingPoint num="0" id="5250" />
-<TGConnectingPoint num="1" id="5251" />
-<TGConnectingPoint num="2" id="5252" />
-<TGConnectingPoint num="3" id="5253" />
-<TGConnectingPoint num="4" id="5254" />
-<TGConnectingPoint num="5" id="5255" />
-<TGConnectingPoint num="6" id="5256" />
-<TGConnectingPoint num="7" id="5257" />
-<TGConnectingPoint num="8" id="5258" />
-<TGConnectingPoint num="9" id="5259" />
-<TGConnectingPoint num="10" id="5260" />
-<TGConnectingPoint num="11" id="5261" />
-<TGConnectingPoint num="12" id="5262" />
-<TGConnectingPoint num="13" id="5263" />
-<TGConnectingPoint num="14" id="5264" />
-<TGConnectingPoint num="15" id="5265" />
-<extraparam>
-<Line value="Syn" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="5283" >
-<cdparam x="1707" y="945" />
-<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="ack
-" />
-<TGConnectingPoint num="0" id="5267" />
-<TGConnectingPoint num="1" id="5268" />
-<TGConnectingPoint num="2" id="5269" />
-<TGConnectingPoint num="3" id="5270" />
-<TGConnectingPoint num="4" id="5271" />
-<TGConnectingPoint num="5" id="5272" />
-<TGConnectingPoint num="6" id="5273" />
-<TGConnectingPoint num="7" id="5274" />
-<TGConnectingPoint num="8" id="5275" />
-<TGConnectingPoint num="9" id="5276" />
-<TGConnectingPoint num="10" id="5277" />
-<TGConnectingPoint num="11" id="5278" />
-<TGConnectingPoint num="12" id="5279" />
-<TGConnectingPoint num="13" id="5280" />
-<TGConnectingPoint num="14" id="5281" />
-<TGConnectingPoint num="15" id="5282" />
-<extraparam>
-<Line value="ack" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5286" >
-<cdparam x="2198" y="1198" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="5284" />
-<TGConnectingPoint num="1" id="5285" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5288" >
-<cdparam x="2227" y="1483" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5287" />
-</COMPONENT>
-
-<COMPONENT type="1007" id="5291" >
-<cdparam x="2198" y="1298" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="5289" />
-<TGConnectingPoint num="1" id="5290" />
-<extraparam>
-<Data requestName="req_Timer" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="5294" >
-<cdparam x="2209" y="1365" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="5292" />
-<TGConnectingPoint num="1" id="5293" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="5297" >
-<cdparam x="2161" y="1136" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="5295" />
-<TGConnectingPoint num="1" id="5296" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="5300" >
-<cdparam x="2214" y="1248" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5298" />
-<TGConnectingPoint num="1" id="5299" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="5303" >
-<cdparam x="2187" y="1424" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="5301" />
-<TGConnectingPoint num="1" id="5302" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="5306" >
-<cdparam x="2278" y="1122" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="5304" />
-<TGConnectingPoint num="1" id="5305" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="5323" >
-<cdparam x="2283" y="1065" />
-<sizeparam width="114" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="UML Note" value="send Ack of SYN
-" />
-<TGConnectingPoint num="0" id="5307" />
-<TGConnectingPoint num="1" id="5308" />
-<TGConnectingPoint num="2" id="5309" />
-<TGConnectingPoint num="3" id="5310" />
-<TGConnectingPoint num="4" id="5311" />
-<TGConnectingPoint num="5" id="5312" />
-<TGConnectingPoint num="6" id="5313" />
-<TGConnectingPoint num="7" id="5314" />
-<TGConnectingPoint num="8" id="5315" />
-<TGConnectingPoint num="9" id="5316" />
-<TGConnectingPoint num="10" id="5317" />
-<TGConnectingPoint num="11" id="5318" />
-<TGConnectingPoint num="12" id="5319" />
-<TGConnectingPoint num="13" id="5320" />
-<TGConnectingPoint num="14" id="5321" />
-<TGConnectingPoint num="15" id="5322" />
-<extraparam>
-<Line value="send Ack of SYN" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1011" id="5326" >
-<cdparam x="2267" y="1267" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="5324" />
-<TGConnectingPoint num="1" id="5325" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5328" >
-<cdparam x="2307" y="1324" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5327" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="5331" >
-<cdparam x="2294" y="1199" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="5329" />
-<TGConnectingPoint num="1" id="5330" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="5333" >
-<cdparam x="1637" y="1057" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5332" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5335" >
-<cdparam x="2168" y="1421" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5334" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="5337" >
-<cdparam x="2267" y="1039" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="5336" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="5340" >
-<cdparam x="1465" y="1192" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="send event" value="receive_Application()" />
-<TGConnectingPoint num="0" id="5338" />
-<TGConnectingPoint num="1" id="5339" />
-<extraparam>
-<Data eventName="receive_Application" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="5343" >
-<cdparam x="1698" y="1086" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
-<infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="5341" />
-<TGConnectingPoint num="1" id="5342" />
-<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="115" id="5344" >
-<cdparam x="192" y="445" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="190" y="449" id="4595" />
-<P2 x="188" y="476" id="4756" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5345" >
-<cdparam x="1048" y="795" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1048" y="795" id="4734" />
-<P2 x="1728" y="865" id="4656" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5346" >
-<cdparam x="1048" y="795" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1089" y="954" id="4706" />
-<P2 x="1208" y="1010" id="4676" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5347" >
-<cdparam x="1008" y="610" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="1008" y="610" id="4810" />
-<P2 x="1008" y="696" id="4738" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5348" >
-<cdparam x="722" y="614" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="722" y="614" id="4825" />
-<P2 x="722" y="689" id="4694" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5349" >
-<cdparam x="504" y="597" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="504" y="597" id="4774" />
-<P2 x="572" y="702" id="4688" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5350" >
-<cdparam x="464" y="637" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="464" y="637" id="4775" />
-<P2 x="464" y="778" id="4742" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5351" >
-<cdparam x="424" y="597" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="424" y="597" id="4773" />
-<P2 x="346" y="759" id="4722" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5352" >
-<cdparam x="289" y="619" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to read channel" value="null" />
-<P1 x="289" y="619" id="4783" />
-<P2 x="230" y="803" id="4879" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5353" >
-<cdparam x="249" y="579" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="249" y="579" id="4781" />
-<P2 x="132" y="789" id="4726" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5354" >
-<cdparam x="371" y="93" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to notified event" value="null" />
-<P1 x="320" y="99" id="4813" />
-<P2 x="374" y="128" id="4821" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5355" >
-<cdparam x="234" y="169" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="235" y="169" id="4819" />
-<P2 x="235" y="202" id="4816" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5356" >
-<cdparam x="234" y="104" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to action state" value="null" />
-<P1 x="235" y="110" id="4814" />
-<P2 x="235" y="139" id="4818" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5357" >
-<cdparam x="234" y="47" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to for loop" value="null" />
-<P1 x="234" y="47" id="4785" />
-<P2 x="235" y="80" id="4812" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5358" >
-<cdparam x="425" y="162" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from notified event to choice" value="null" />
-<P1 x="374" y="158" id="4822" />
-<P2 x="374" y="182" id="4764" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5359" >
-<cdparam x="564" y="482" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="464" y="322" id="4848" />
-<P2 x="722" y="529" id="4827" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5360" >
-<cdparam x="722" y="559" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="722" y="559" id="4828" />
-<P2 x="722" y="584" id="4824" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5361" >
-<cdparam x="604" y="442" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="504" y="282" id="4844" />
-<P2 x="1008" y="523" id="4830" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5362" >
-<cdparam x="1007" y="553" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="1008" y="553" id="4831" />
-<P2 x="1008" y="580" id="4809" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5363" >
-<cdparam x="524" y="442" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="464" y="322" id="4845" />
-<P2 x="464" y="487" id="4833" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5364" >
-<cdparam x="330" y="428" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="424" y="282" id="4846" />
-<P2 x="289" y="463" id="4836" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5365" >
-<cdparam x="318" y="520" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="289" y="493" id="4837" />
-<P2 x="289" y="554" id="4780" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5366" >
-<cdparam x="160" y="481" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to action state" value="null" />
-<P1 x="148" y="501" id="4757" />
-<P2 x="148" y="544" id="4804" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5367" >
-<cdparam x="290" y="388" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="424" y="282" id="4843" />
-<P2 x="188" y="378" id="4839" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5368" >
-<cdparam x="229" y="467" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="188" y="408" id="4840" />
-<P2 x="190" y="419" id="4594" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5369" >
-<cdparam x="228" y="501" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="228" y="501" id="4758" />
-<P2 x="228" y="524" id="4853" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5370" >
-<cdparam x="334" y="207" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="334" y="207" id="4765" />
-<P2 x="301" y="223" id="4857" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5371" >
-<cdparam x="301" y="253" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to stop state" value="null" />
-<P1 x="301" y="253" id="4858" />
-<P2 x="301" y="285" id="4860" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5372" >
-<cdparam x="464" y="517" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="464" y="517" id="4834" />
-<P2 x="464" y="572" id="4772" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5373" >
-<cdparam x="329" y="579" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="329" y="579" id="4782" />
-<P2 x="329" y="609" id="4855" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5374" >
-<cdparam x="126" y="574" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="148" y="574" id="4805" />
-<P2 x="148" y="610" id="4807" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5375" >
-<cdparam x="414" y="207" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to select" value="null" />
-<P1 x="414" y="207" id="4766" />
-<P2 x="464" y="257" id="4842" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5376" >
-<cdparam x="230" y="833" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="230" y="833" id="4880" />
-<P2 x="230" y="858" id="4746" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5377" >
-<cdparam x="716" y="749" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="968" y="795" id="4733" />
-<P2 x="843" y="859" id="4716" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5378" >
-<cdparam x="720" y="1074" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="728" y="990" id="4929" />
-<P2 x="728" y="1027" id="4931" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5379" >
-<cdparam x="733" y="899" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to action state" value="null" />
-<P1 x="803" y="884" id="4717" />
-<P2 x="728" y="960" id="4928" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5380" >
-<cdparam x="800" y="938" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="843" y="924" id="4719" />
-<P2 x="800" y="1004" id="4710" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5381" >
-<cdparam x="800" y="1057" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="800" y="1044" id="4711" />
-<P2 x="800" y="1081" id="4933" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5382" >
-<cdparam x="132" y="886" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="132" y="886" id="5060" />
-<P2 x="132" y="933" id="4895" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5383" >
-<cdparam x="943" y="1061" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="943" y="1060" id="4699" />
-<P2 x="943" y="1118" id="4978" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5384" >
-<cdparam x="1049" y="1093" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1049" y="1092" id="4751" />
-<P2 x="1049" y="1150" id="5003" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5385" >
-<cdparam x="1049" y="994" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1049" y="994" id="4707" />
-<P2 x="1049" y="1052" id="4750" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5386" >
-<cdparam x="696" y="742" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="722" y="729" id="4695" />
-<P2 x="722" y="753" id="5028" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5387" >
-<cdparam x="132" y="1125" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="132" y="1125" id="5034" />
-<P2 x="132" y="1162" id="5036" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5388" >
-<cdparam x="132" y="1192" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="132" y="1192" id="5037" />
-<P2 x="132" y="1231" id="5039" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5389" >
-<cdparam x="132" y="1066" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to send request" value="null" />
-<P1 x="132" y="1066" id="4893" />
-<P2 x="132" y="1095" id="5033" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5390" >
-<cdparam x="229" y="1127" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="230" y="1127" id="5042" />
-<P2 x="230" y="1164" id="5044" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5391" >
-<cdparam x="346" y="1131" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="346" y="1131" id="5048" />
-<P2 x="346" y="1168" id="5050" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5392" >
-<cdparam x="346" y="1051" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to send request" value="null" />
-<P1 x="346" y="1051" id="4899" />
-<P2 x="346" y="1101" id="5047" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5393" >
-<cdparam x="437" y="1118" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="464" y="1115" id="5054" />
-<P2 x="464" y="1154" id="5056" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5394" >
-<cdparam x="438" y="1057" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to send request" value="null" />
-<P1 x="464" y="1057" id="4888" />
-<P2 x="464" y="1085" id="5053" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5395" >
-<cdparam x="132" y="808" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to action state" value="null" />
-<P1 x="132" y="829" id="4727" />
-<P2 x="132" y="856" id="5059" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5396" >
-<cdparam x="230" y="898" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to action state" value="null" />
-<P1 x="230" y="898" id="4747" />
-<P2 x="230" y="935" id="5062" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5397" >
-<cdparam x="230" y="965" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="230" y="965" id="5063" />
-<P2 x="230" y="997" id="4882" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5398" >
-<cdparam x="346" y="799" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to action state" value="null" />
-<P1 x="346" y="799" id="4723" />
-<P2 x="346" y="826" id="5068" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5399" >
-<cdparam x="346" y="856" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="346" y="856" id="5069" />
-<P2 x="346" y="895" id="4906" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5400" >
-<cdparam x="439" y="818" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to action state" value="null" />
-<P1 x="464" y="818" id="4743" />
-<P2 x="464" y="860" id="5065" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5401" >
-<cdparam x="439" y="890" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="464" y="890" id="5066" />
-<P2 x="464" y="936" id="4903" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5402" >
-<cdparam x="132" y="963" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="132" y="963" id="4896" />
-<P2 x="132" y="981" id="5080" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5403" >
-<cdparam x="132" y="1011" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to action state" value="null" />
-<P1 x="132" y="1011" id="5081" />
-<P2 x="132" y="1036" id="4892" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5404" >
-<cdparam x="230" y="1027" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="230" y="1027" id="4883" />
-<P2 x="230" y="1047" id="5071" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5405" >
-<cdparam x="228" y="1088" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to send request" value="null" />
-<P1 x="230" y="1077" id="5072" />
-<P2 x="230" y="1097" id="5041" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5406" >
-<cdparam x="346" y="925" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="346" y="925" id="4907" />
-<P2 x="346" y="957" id="5074" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5407" >
-<cdparam x="348" y="987" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to action state" value="null" />
-<P1 x="346" y="987" id="5075" />
-<P2 x="346" y="1021" id="4898" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5408" >
-<cdparam x="439" y="966" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="464" y="966" id="4904" />
-<P2 x="464" y="978" id="5077" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5409" >
-<cdparam x="438" y="1008" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to action state" value="null" />
-<P1 x="464" y="1008" id="5078" />
-<P2 x="464" y="1027" id="4887" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5410" >
-<cdparam x="722" y="783" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="722" y="783" id="5029" />
-<P2 x="722" y="808" id="5083" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5411" >
-<cdparam x="722" y="838" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="722" y="838" id="5084" />
-<P2 x="722" y="860" id="5031" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5412" >
-<cdparam x="800" y="1111" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="800" y="1111" id="4934" />
-<P2 x="800" y="1136" id="5086" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5413" >
-<cdparam x="798" y="1166" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to action state" value="null" />
-<P1 x="800" y="1166" id="5087" />
-<P2 x="800" y="1188" id="4970" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5414" >
-<cdparam x="943" y="1148" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="943" y="1148" id="4979" />
-<P2 x="943" y="1173" id="5089" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5415" >
-<cdparam x="950" y="1201" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to action state" value="null" />
-<P1 x="943" y="1203" id="5090" />
-<P2 x="943" y="1229" id="4998" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5416" >
-<cdparam x="1049" y="1180" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1049" y="1180" id="5004" />
-<P2 x="1049" y="1206" id="5092" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5417" >
-<cdparam x="1049" y="1223" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to action state" value="null" />
-<P1 x="1049" y="1236" id="5093" />
-<P2 x="1049" y="1261" id="5023" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5418" >
-<cdparam x="883" y="884" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="883" y="884" id="4718" />
-<P2 x="883" y="917" id="5097" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5419" >
-<cdparam x="612" y="727" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="612" y="727" id="4690" />
-<P2 x="612" y="757" id="5095" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5420" >
-<cdparam x="532" y="727" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to action state" value="null" />
-<P1 x="532" y="727" id="4689" />
-<P2 x="496" y="763" id="4973" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5421" >
-<cdparam x="799" y="1218" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="800" y="1218" id="4971" />
-<P2 x="800" y="1265" id="4909" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5422" >
-<cdparam x="1009" y="954" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1009" y="954" id="4705" />
-<P2 x="943" y="1020" id="4698" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5423" >
-<cdparam x="229" y="1194" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="230" y="1194" id="5045" />
-<P2 x="230" y="1232" id="4885" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5424" >
-<cdparam x="346" y="1198" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="346" y="1198" id="5051" />
-<P2 x="346" y="1224" id="4901" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5425" >
-<cdparam x="438" y="1184" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="464" y="1184" id="5057" />
-<P2 x="464" y="1208" id="4890" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5426" >
-<cdparam x="496" y="793" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="496" y="793" id="4974" />
-<P2 x="496" y="825" id="4976" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5427" >
-<cdparam x="943" y="1259" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="943" y="1259" id="4999" />
-<P2 x="943" y="1306" id="5001" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5428" >
-<cdparam x="1008" y="736" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to choice" value="null" />
-<P1 x="1008" y="736" id="4739" />
-<P2 x="1008" y="770" id="4732" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5429" >
-<cdparam x="1008" y="835" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1008" y="835" id="4735" />
-<P2 x="1049" y="929" id="4704" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5430" >
-<cdparam x="1049" y="1291" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1049" y="1291" id="5024" />
-<P2 x="1049" y="1336" id="5026" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5431" >
-<cdparam x="1208" y="1152" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1208" y="1142" id="4683" />
-<P2 x="1208" y="1209" id="5099" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5432" >
-<cdparam x="1208" y="1239" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to action state" value="null" />
-<P1 x="1208" y="1239" id="5100" />
-<P2 x="1208" y="1290" id="5119" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5433" >
-<cdparam x="1208" y="1320" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to send event" value="null" />
-<P1 x="1208" y="1320" id="5120" />
-<P2 x="1208" y="1346" id="5127" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5434" >
-<cdparam x="1206" y="1385" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to action state" value="null" />
-<P1 x="1208" y="1376" id="5128" />
-<P2 x="1208" y="1397" id="5124" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5435" >
-<cdparam x="1206" y="1088" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1208" y="1075" id="4679" />
-<P2 x="1208" y="1102" id="4682" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5436" >
-<cdparam x="1248" y="1035" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1248" y="1035" id="4678" />
-<P2 x="1287" y="1065" id="5130" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5437" >
-<cdparam x="1207" y="1427" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1208" y="1427" id="5125" />
-<P2 x="1208" y="1466" id="5122" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5438" >
-<cdparam x="1553" y="1019" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1567" y="1021" id="4649" />
-<P2 x="1529" y="1059" id="4642" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5439" >
-<cdparam x="1529" y="1324" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1529" y="1289" id="4639" />
-<P2 x="1529" y="1343" id="5137" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5440" >
-<cdparam x="1684" y="929" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="1728" y="930" id="4659" />
-<P2 x="1728" y="1021" id="5140" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5441" >
-<cdparam x="1615" y="1283" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1641" y="1270" id="4663" />
-<P2 x="1641" y="1294" id="5177" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5442" >
-<cdparam x="1641" y="1324" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1641" y="1324" id="5178" />
-<P2 x="1641" y="1343" id="5219" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5443" >
-<cdparam x="1529" y="1373" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1529" y="1373" id="5138" />
-<P2 x="1529" y="1400" id="5216" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5444" >
-<cdparam x="1529" y="1422" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="1529" y="1430" id="5217" />
-<P2 x="1529" y="1452" id="5132" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5445" >
-<cdparam x="1642" y="1373" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="1641" y="1373" id="5220" />
-<P2 x="1641" y="1399" id="5222" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5446" >
-<cdparam x="1956" y="1361" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1956" y="1361" id="4617" />
-<P2 x="1920" y="1406" id="5232" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5447" >
-<cdparam x="2100" y="1490" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2101" y="1491" id="5240" />
-<P2 x="2101" y="1532" id="5242" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5448" >
-<cdparam x="1996" y="1401" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1996" y="1401" id="4619" />
-<P2 x="1996" y="1429" id="5247" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5449" >
-<cdparam x="1996" y="1459" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to action state" value="null" />
-<P1 x="1996" y="1459" id="5248" />
-<P2 x="1996" y="1488" id="5244" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5450" >
-<cdparam x="2021" y="1038" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="2237" y="966" id="4609" />
-<P2 x="2237" y="1054" id="4666" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5451" >
-<cdparam x="2217" y="1323" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="2237" y="1323" id="5290" />
-<P2 x="2237" y="1360" id="5292" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5452" >
-<cdparam x="2218" y="1094" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to action state" value="null" />
-<P1 x="2237" y="1094" id="4667" />
-<P2 x="2237" y="1131" id="5295" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5453" >
-<cdparam x="2218" y="1161" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="2237" y="1161" id="5296" />
-<P2 x="2237" y="1193" id="5284" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5454" >
-<cdparam x="2218" y="1223" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="2237" y="1223" id="5285" />
-<P2 x="2237" y="1243" id="5298" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5455" >
-<cdparam x="2216" y="1284" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to send request" value="null" />
-<P1 x="2237" y="1273" id="5299" />
-<P2 x="2237" y="1293" id="5289" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5456" >
-<cdparam x="2217" y="1390" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to action state" value="null" />
-<P1 x="2237" y="1390" id="5293" />
-<P2 x="2237" y="1419" id="5301" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5457" >
-<cdparam x="2341" y="1060" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="2317" y="1059" id="4671" />
-<P2 x="2317" y="1117" id="5304" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5458" >
-<cdparam x="1529" y="1099" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1529" y="1099" id="4643" />
-<P2 x="1529" y="1127" id="5134" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5459" >
-<cdparam x="2101" y="1433" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to action state" value="null" />
-<P1 x="2101" y="1433" id="4603" />
-<P2 x="2101" y="1461" id="5239" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5460" >
-<cdparam x="2158" y="1460" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="2141" y="1393" id="4602" />
-<P2 x="2178" y="1416" id="5334" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5461" >
-<cdparam x="1688" y="890" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1688" y="890" id="4657" />
-<P2 x="1607" y="996" id="4648" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5462" >
-<cdparam x="1768" y="890" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1768" y="890" id="4658" />
-<P2 x="2277" y="941" id="4608" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5463" >
-<cdparam x="2317" y="966" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="2317" y="966" id="4610" />
-<P2 x="2317" y="1019" id="4670" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5464" >
-<cdparam x="2341" y="1147" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="2317" y="1147" id="5305" />
-<P2 x="2317" y="1194" id="5329" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5465" >
-<cdparam x="2341" y="1224" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to send event" value="null" />
-<P1 x="2317" y="1224" id="5330" />
-<P2 x="2317" y="1262" id="5324" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5466" >
-<cdparam x="1731" y="1051" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to choice" value="null" />
-<P1 x="1728" y="1051" id="5141" />
-<P2 x="1728" y="1081" id="5341" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5467" >
-<cdparam x="1647" y="1021" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1647" y="1021" id="4650" />
-<P2 x="1647" y="1052" id="5332" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5468" >
-<cdparam x="1826" y="1324" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1826" y="1324" id="4627" />
-<P2 x="1826" y="1344" id="5227" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5469" >
-<cdparam x="1826" y="1374" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1826" y="1374" id="5228" />
-<P2 x="1826" y="1452" id="5230" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5470" >
-<cdparam x="1786" y="1284" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1786" y="1284" id="4625" />
-<P2 x="1740" y="1330" id="5225" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5471" >
-<cdparam x="1920" y="1436" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1920" y="1436" id="5233" />
-<P2 x="1920" y="1476" id="5235" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5472" >
-<cdparam x="1996" y="1518" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1996" y="1518" id="5245" />
-<P2 x="1996" y="1538" id="5237" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5473" >
-<cdparam x="2036" y="1361" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="2036" y="1361" id="4618" />
-<P2 x="2101" y="1368" id="4600" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5474" >
-<cdparam x="1866" y="1284" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1866" y="1284" id="4626" />
-<P2 x="1996" y="1336" id="4616" />
+<cdrectangleparam minX="355" maxX="355" minY="590" maxY="590" />
+<infoparam name="value " value="Attack Trees" />
+</SUBCOMPONENT>
+
+<COMPONENT type="5702" id="3696" >
+<cdparam x="280" y="280" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Requirements" />
+<TGConnectingPoint num="0" id="3688" />
+<TGConnectingPoint num="1" id="3689" />
+<TGConnectingPoint num="2" id="3690" />
+<TGConnectingPoint num="3" id="3691" />
+<TGConnectingPoint num="4" id="3692" />
+<TGConnectingPoint num="5" id="3693" />
+<TGConnectingPoint num="6" id="3694" />
+<TGConnectingPoint num="7" id="3695" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="3687" >
+<father id="3696" num="0" />
+<cdparam x="284" y="312" />
+<sizeparam width="8" height="8" minWidth="8" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="355" maxX="355" minY="390" maxY="390" />
+<infoparam name="value " value="Requirements" />
+</SUBCOMPONENT>
+
+<COMPONENT type="5701" id="3701" >
+<cdparam x="40" y="280" />
+<sizeparam width="160" height="56" minWidth="8" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="TGComponent" value="Assumptions" />
+<TGConnectingPoint num="0" id="3697" />
+<TGConnectingPoint num="1" id="3698" />
+<TGConnectingPoint num="2" id="3699" />
+<TGConnectingPoint num="3" id="3700" />
+</COMPONENT>
+
+<COMPONENT type="304" id="3718" >
+<cdparam x="504" y="52" />
+<sizeparam width="600" height="200" minWidth="16" minHeight="16" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="Info" value="SW/HW Partitioning" />
+<TGConnectingPoint num="0" id="3702" />
+<TGConnectingPoint num="1" id="3703" />
+<TGConnectingPoint num="2" id="3704" />
+<TGConnectingPoint num="3" id="3705" />
+<TGConnectingPoint num="4" id="3706" />
+<TGConnectingPoint num="5" id="3707" />
+<TGConnectingPoint num="6" id="3708" />
+<TGConnectingPoint num="7" id="3709" />
+<TGConnectingPoint num="8" id="3710" />
+<TGConnectingPoint num="9" id="3711" />
+<TGConnectingPoint num="10" id="3712" />
+<TGConnectingPoint num="11" id="3713" />
+<TGConnectingPoint num="12" id="3714" />
+<TGConnectingPoint num="13" id="3715" />
+<TGConnectingPoint num="14" id="3716" />
+<TGConnectingPoint num="15" id="3717" />
+<extraparam>
+<TextColor value="-1" />
+<FillColor value="-1" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="304" id="3735" >
+<cdparam x="504" y="300" />
+<sizeparam width="600" height="260" minWidth="16" minHeight="16" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="Info" value="SW Design" />
+<TGConnectingPoint num="0" id="3719" />
+<TGConnectingPoint num="1" id="3720" />
+<TGConnectingPoint num="2" id="3721" />
+<TGConnectingPoint num="3" id="3722" />
+<TGConnectingPoint num="4" id="3723" />
+<TGConnectingPoint num="5" id="3724" />
+<TGConnectingPoint num="6" id="3725" />
+<TGConnectingPoint num="7" id="3726" />
+<TGConnectingPoint num="8" id="3727" />
+<TGConnectingPoint num="9" id="3728" />
+<TGConnectingPoint num="10" id="3729" />
+<TGConnectingPoint num="11" id="3730" />
+<TGConnectingPoint num="12" id="3731" />
+<TGConnectingPoint num="13" id="3732" />
+<TGConnectingPoint num="14" id="3733" />
+<TGConnectingPoint num="15" id="3734" />
+<extraparam>
+<TextColor value="-1" />
+<FillColor value="-1" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="304" id="3752" >
+<cdparam x="264" y="80" />
+<sizeparam width="192" height="440" minWidth="16" minHeight="16" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="8" maxX="1601" minY="8" maxY="961" />
+<infoparam name="Info" value="Req / faults / attacks" />
+<TGConnectingPoint num="0" id="3736" />
+<TGConnectingPoint num="1" id="3737" />
+<TGConnectingPoint num="2" id="3738" />
+<TGConnectingPoint num="3" id="3739" />
+<TGConnectingPoint num="4" id="3740" />
+<TGConnectingPoint num="5" id="3741" />
+<TGConnectingPoint num="6" id="3742" />
+<TGConnectingPoint num="7" id="3743" />
+<TGConnectingPoint num="8" id="3744" />
+<TGConnectingPoint num="9" id="3745" />
+<TGConnectingPoint num="10" id="3746" />
+<TGConnectingPoint num="11" id="3747" />
+<TGConnectingPoint num="12" id="3748" />
+<TGConnectingPoint num="13" id="3749" />
+<TGConnectingPoint num="14" id="3750" />
+<TGConnectingPoint num="15" id="3751" />
+<extraparam>
+<TextColor value="-1" />
+<FillColor value="-1" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="6004" id="3754" >
+<cdparam x="1000" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3753" />
+<P1 x="1000" y="136" id="3663" />
+<P2 x="832" y="180" id="3654" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5475" >
-<cdparam x="2341" y="1292" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2317" y="1292" id="5325" />
-<P2 x="2317" y="1319" id="5327" />
+<CONNECTOR type="6004" id="3756" >
+<cdparam x="800" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3755" />
+<P1 x="799" y="136" id="3648" />
+<P2 x="800" y="180" id="3655" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5476" >
-<cdparam x="2217" y="1449" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2237" y="1449" id="5302" />
-<P2 x="2237" y="1478" id="5287" />
+<CONNECTOR type="6004" id="3758" >
+<cdparam x="600" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3757" />
+<P1 x="600" y="136" id="3669" />
+<P2 x="768" y="180" id="3653" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5477" >
-<cdparam x="2277" y="1006" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="2277" y="1006" id="4611" />
-<P2 x="2277" y="1034" id="5336" />
+<CONNECTOR type="5718" id="3764" >
+<cdparam x="440" y="308" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3761" />
+<TGConnectingPoint num="1" id="3762" />
+<TGConnectingPoint num="2" id="3763" />
+<P1 x="440" y="308" id="3688" />
+<P2 x="592" y="400" id="3623" />
+<Point x="476" y="308" />
+<Point x="476" y="360" />
<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5478" >
-<cdparam x="1642" y="1429" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="1641" y="1429" id="5223" />
-<P2 x="1641" y="1463" id="5180" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3759" >
+<father id="3764" num="0" />
+<cdparam x="476" y="308" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3760" >
+<father id="3764" num="1" />
+<cdparam x="476" y="360" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5718" id="3768" >
+<cdparam x="832" y="456" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3766" />
+<TGConnectingPoint num="1" id="3767" />
+<P1 x="832" y="456" id="3637" />
+<P2 x="880" y="508" id="3628" />
+<Point x="848" y="500" />
<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5479" >
-<cdparam x="1529" y="1157" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1529" y="1157" id="5135" />
-<P2 x="1529" y="1187" id="5338" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3765" >
+<father id="3768" num="0" />
+<cdparam x="848" y="500" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5718" id="3772" >
+<cdparam x="768" y="376" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3770" />
+<TGConnectingPoint num="1" id="3771" />
+<P1 x="768" y="376" id="3643" />
+<P2 x="800" y="428" id="3636" />
+<Point x="768" y="420" />
<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="5480" >
-<cdparam x="1529" y="1217" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to execI" value="null" />
-<P1 x="1529" y="1217" id="5339" />
-<P2 x="1529" y="1249" id="4638" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3769" >
+<father id="3772" num="0" />
+<cdparam x="768" y="420" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="5718" id="3774" >
+<cdparam x="376" y="440" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3773" />
+<P1 x="376" y="440" id="3682" />
+<P2 x="376" y="336" id="3690" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5481" >
-<cdparam x="1691" y="1156" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1688" y="1156" id="4633" />
-<P2 x="1641" y="1230" id="4662" />
+<CONNECTOR type="5718" id="3776" >
+<cdparam x="376" y="176" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3775" />
+<P1 x="376" y="176" id="3675" />
+<P2 x="376" y="280" id="3691" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5482" >
-<cdparam x="1771" y="1156" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1768" y="1156" id="4634" />
-<P2 x="1826" y="1259" id="4624" />
+<CONNECTOR type="5718" id="3778" >
+<cdparam x="328" y="280" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3777" />
+<P1 x="328" y="280" id="3692" />
+<P2 x="328" y="176" id="3674" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5483" >
-<cdparam x="1731" y="1111" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to choice" value="null" />
-<P1 x="1728" y="1111" id="5342" />
-<P2 x="1728" y="1131" id="4632" />
+<CONNECTOR type="5718" id="3780" >
+<cdparam x="328" y="336" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="<<deriveReqt>>" />
+<TGConnectingPoint num="0" id="3779" />
+<P1 x="328" y="336" id="3689" />
+<P2 x="328" y="440" id="3681" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-</TMLActivityDiagramPanel>
+</SysmlsecMethodologyDiagramPanel>
</Modeling>
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol_test.xml b/modeling/DIPLODOCUS/SmartCardProtocol_test.xml
index a86d9318b159e4ff97f386770f8413c55dfbb06f..4793d2296e6e0e22c3b2209fb06aae96969f611d 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol_test.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol_test.xml
@@ -1,205 +1,205 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<TURTLEGMODELING version="1.0beta">
<Modeling type="TML Component Design" nameTab="AppC" >
-<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="1399" minY="0" maxY="970" channels="true" events="true" requests="true" zoom="0.8000000000000029" >
+<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="1749" minY="0" maxY="1212" channels="true" events="true" requests="true" zoom="1.0000000000000036" >
<CONNECTOR type="126" id="1" >
<cdparam x="522" y="390" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="413" y="310" id="60" />
-<P2 x="366" y="266" id="39" />
+<P1 x="528" y="374" id="200" />
+<P2 x="444" y="319" id="47" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="2" >
<cdparam x="409" y="124" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="319" y="65" id="37" />
-<P2 x="470" y="65" id="186" />
+<P1 x="399" y="80" id="49" />
+<P2 x="587" y="80" id="82" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="3" >
<cdparam x="652" y="444" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="636" y="451" id="89" />
-<P2 x="775" y="389" id="152" />
+<P1 x="795" y="543" id="179" />
+<P2 x="968" y="466" id="107" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4" >
<cdparam x="652" y="418" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="646" y="412" id="87" />
-<P2 x="734" y="381" id="154" />
+<P1 x="797" y="504" id="181" />
+<P2 x="927" y="466" id="105" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="5" >
<cdparam x="602" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="598" y="320" id="79" />
-<P2 x="661" y="292" id="103" />
+<P1 x="747" y="400" id="189" />
+<P2 x="838" y="352" id="150" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="6" >
<cdparam x="685" y="310" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="681" y="292" id="107" />
-<P2 x="734" y="290" id="144" />
+<P1 x="838" y="378" id="154" />
+<P2 x="927" y="352" id="115" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="7" >
<cdparam x="652" y="395" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="646" y="392" id="83" />
-<P2 x="734" y="362" id="146" />
+<P1 x="797" y="479" id="185" />
+<P2 x="927" y="442" id="113" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="8" >
<cdparam x="652" y="369" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="646" y="364" id="85" />
-<P2 x="734" y="337" id="148" />
+<P1 x="797" y="444" id="183" />
+<P2 x="927" y="411" id="111" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="9" >
<cdparam x="737" y="314" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="734" y="314" id="150" />
-<P2 x="646" y="340" id="81" />
+<P1 x="927" y="382" id="109" />
+<P2 x="797" y="414" id="187" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="10" >
<cdparam x="735" y="260" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="732" y="264" id="142" />
-<P2 x="593" y="224" id="198" />
+<P1 x="927" y="317" id="117" />
+<P2 x="728" y="267" id="70" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="11" >
<cdparam x="641" y="230" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="593" y="194" id="200" />
-<P2 x="732" y="230" id="140" />
+<P1 x="728" y="229" id="68" />
+<P2 x="927" y="274" id="119" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="12" >
<cdparam x="641" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="593" y="156" id="202" />
-<P2 x="732" y="197" id="138" />
+<P1 x="728" y="182" id="66" />
+<P2 x="927" y="233" id="121" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="13" >
<cdparam x="740" y="353" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="661" y="292" id="102" />
-<P2 x="593" y="247" id="204" />
+<P1 x="838" y="352" id="149" />
+<P2 x="728" y="296" id="64" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="14" >
<cdparam x="460" y="270" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="413" y="238" id="194" />
-<P2 x="366" y="238" id="45" />
+<P1 x="528" y="285" id="74" />
+<P2 x="444" y="285" id="41" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="15" >
<cdparam x="387" y="129" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="364" y="97" id="49" />
-<P2 x="415" y="97" id="206" />
+<P1 x="444" y="111" id="37" />
+<P2 x="528" y="111" id="62" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="16" >
<cdparam x="389" y="200" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="366" y="166" id="43" />
-<P2 x="413" y="166" id="192" />
+<P1 x="444" y="194" id="43" />
+<P2 x="528" y="194" id="76" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="17" >
<cdparam x="460" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="413" y="203" id="190" />
-<P2 x="366" y="203" id="41" />
+<P1 x="528" y="241" id="78" />
+<P2 x="444" y="241" id="45" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="18" >
<cdparam x="460" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="413" y="256" id="188" />
-<P2 x="433" y="310" id="65" />
+<P1 x="528" y="307" id="80" />
+<P2 x="528" y="400" id="205" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="19" >
<cdparam x="389" y="163" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="366" y="131" id="47" />
-<P2 x="413" y="131" id="196" />
+<P1 x="444" y="151" id="39" />
+<P2 x="528" y="151" id="72" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="20" >
<cdparam x="967" y="190" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="732" y="155" id="136" />
-<P2 x="593" y="94" id="184" />
+<P1 x="927" y="181" id="123" />
+<P2 x="728" y="104" id="84" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="21" >
<cdparam x="1028" y="535" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="497" y="270" id="208" />
-<P2 x="531" y="320" id="91" />
+<P1 x="621" y="316" id="60" />
+<P2 x="663" y="400" id="177" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="22" >
<cdparam x="1304" y="321" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="973" y="295" id="121" />
-<P2 x="938" y="300" id="156" />
+<P1 x="1226" y="358" id="138" />
+<P2 x="1162" y="364" id="103" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="23" >
<cdparam x="1168" y="455" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="938" y="329" id="158" />
-<P2 x="973" y="325" id="123" />
+<P1 x="1162" y="401" id="101" />
+<P2 x="1226" y="396" id="136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="26" >
<cdparam x="1037" y="180" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="938" y="167" id="160" />
-<P2 x="938" y="218" id="162" />
-<Point x="976" y="174" />
-<Point x="976" y="209" />
+<P1 x="1162" y="198" id="99" />
+<P2 x="1162" y="262" id="97" />
+<Point x="1219" y="217" />
+<Point x="1219" y="261" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="24" >
<father id="26" num="0" />
-<cdparam x="976" y="174" />
+<cdparam x="1219" y="217" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -207,7 +207,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="-1" id="25" >
<father id="26" num="1" />
-<cdparam x="976" y="209" />
+<cdparam x="1219" y="261" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -218,15 +218,15 @@
<cdparam x="873" y="361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1 x="938" y="362" id="164" />
-<P2 x="973" y="347" id="125" />
+<P1 x="1162" y="442" id="95" />
+<P2 x="1226" y="423" id="134" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1205" id="36" >
-<cdparam x="918" y="400" />
-<sizeparam width="163" height="82" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1147" y="499" />
+<sizeparam width="203" height="102" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="1120" minY="0" maxY="777" />
+<cdrectangleparam minX="0" maxX="1750" minY="0" maxY="1213" />
<infoparam name="Record component" value="TCP_CTRL" />
<TGConnectingPoint num="0" id="28" />
<TGConnectingPoint num="1" id="29" />
@@ -243,10 +243,10 @@
</COMPONENT>
<COMPONENT type="1202" id="59" >
-<cdparam x="126" y="75" />
-<sizeparam width="230" height="220" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="157" y="93" />
+<sizeparam width="287" height="275" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="1120" minY="0" maxY="777" />
+<cdrectangleparam minX="0" maxX="1750" minY="0" maxY="1213" />
<infoparam name="TGComponent" value="InterfaceDevice" />
<TGConnectingPoint num="0" id="51" />
<TGConnectingPoint num="1" id="52" />
@@ -267,14 +267,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="38" >
<father id="59" num="0" />
-<cdparam x="309" y="65" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="434" y="111" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="220" minY="-10" maxY="210" />
-<infoparam name="TGComponent" value="Event reset, pTS" />
+<cdrectangleparam minX="-10" maxX="277" minY="-10" maxY="265" />
+<infoparam name="TGComponent" value="Request activation" />
<TGConnectingPoint num="0" id="37" />
<extraparam>
-<Prop commName="reset, pTS" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -284,16 +284,16 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="40" >
<father id="59" num="1" />
-<cdparam x="346" y="256" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="431" y="151" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="220" minY="-10" maxY="210" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<cdrectangleparam minX="-13" maxX="274" minY="-13" maxY="262" />
+<infoparam name="TGComponent" value="Event data_Ready" />
<TGConnectingPoint num="0" id="39" />
<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -301,14 +301,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="42" >
<father id="59" num="2" />
-<cdparam x="346" y="193" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="431" y="285" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="220" minY="-10" maxY="210" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<cdrectangleparam minX="-13" maxX="274" minY="-13" maxY="262" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
<TGConnectingPoint num="0" id="41" />
<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -318,10 +318,10 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="44" >
<father id="59" num="3" />
-<cdparam x="346" y="156" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="431" y="194" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="220" minY="-10" maxY="210" />
+<cdrectangleparam minX="-13" maxX="274" minY="-13" maxY="262" />
<infoparam name="TGComponent" value="Channel fromDtoSC" />
<TGConnectingPoint num="0" id="43" />
<extraparam>
@@ -335,14 +335,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="46" >
<father id="59" num="4" />
-<cdparam x="346" y="228" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="431" y="241" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="220" minY="-10" maxY="210" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<cdrectangleparam minX="-13" maxX="274" minY="-13" maxY="262" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
<TGConnectingPoint num="0" id="45" />
<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -352,16 +352,16 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="48" >
<father id="59" num="5" />
-<cdparam x="346" y="121" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="431" y="319" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="220" minY="-10" maxY="210" />
-<infoparam name="TGComponent" value="Event data_Ready" />
+<cdrectangleparam minX="-13" maxX="274" minY="-13" maxY="262" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
<TGConnectingPoint num="0" id="47" />
<extraparam>
-<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -369,14 +369,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="50" >
<father id="59" num="6" />
-<cdparam x="348" y="89" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="386" y="80" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="222" minY="-8" maxY="212" />
-<infoparam name="TGComponent" value="Request activation" />
+<cdrectangleparam minX="-13" maxX="274" minY="-13" maxY="262" />
+<infoparam name="TGComponent" value="Event reset, pTS" />
<TGConnectingPoint num="0" id="49" />
<extraparam>
-<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="reset, pTS" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -386,10 +386,10 @@
</SUBCOMPONENT>
<COMPONENT type="1200" id="227" >
-<cdparam x="423" y="70" />
-<sizeparam width="751" height="420" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="528" y="87" />
+<sizeparam width="938" height="525" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="1120" minY="0" maxY="777" />
+<cdrectangleparam minX="0" maxX="1750" minY="0" maxY="1213" />
<infoparam name="TGComponent" value="SmartCard" />
<TGConnectingPoint num="0" id="219" />
<TGConnectingPoint num="1" id="220" />
@@ -403,61 +403,43 @@
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1201" id="78" >
+<SUBCOMPONENT type="1202" id="94" >
<father id="227" num="0" />
-<cdparam x="413" y="300" />
-<sizeparam width="20" height="20" minWidth="3" minHeight="3" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="741" minY="-10" maxY="410" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="60" />
-<TGConnectingPoint num="1" id="61" />
-<TGConnectingPoint num="2" id="62" />
-<TGConnectingPoint num="3" id="63" />
-<TGConnectingPoint num="4" id="64" />
-<TGConnectingPoint num="5" id="65" />
-<TGConnectingPoint num="6" id="66" />
-<TGConnectingPoint num="7" id="67" />
-<TGConnectingPoint num="8" id="68" />
-<TGConnectingPoint num="9" id="69" />
-<TGConnectingPoint num="10" id="70" />
-<TGConnectingPoint num="11" id="71" />
-<TGConnectingPoint num="12" id="72" />
-<TGConnectingPoint num="13" id="73" />
-<TGConnectingPoint num="14" id="74" />
-<TGConnectingPoint num="15" id="75" />
-<TGConnectingPoint num="16" id="76" />
-<TGConnectingPoint num="17" id="77" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="101" >
-<father id="227" num="1" />
-<cdparam x="446" y="328" />
-<sizeparam width="192" height="115" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="528" y="93" />
+<sizeparam width="200" height="233" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="559" minY="0" maxY="305" />
-<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="93" />
-<TGConnectingPoint num="1" id="94" />
-<TGConnectingPoint num="2" id="95" />
-<TGConnectingPoint num="3" id="96" />
-<TGConnectingPoint num="4" id="97" />
-<TGConnectingPoint num="5" id="98" />
-<TGConnectingPoint num="6" id="99" />
-<TGConnectingPoint num="7" id="100" />
+<cdrectangleparam minX="0" maxX="738" minY="0" maxY="292" />
+<infoparam name="TGComponent" value="SmartCard" />
+<TGConnectingPoint num="0" id="86" />
+<TGConnectingPoint num="1" id="87" />
+<TGConnectingPoint num="2" id="88" />
+<TGConnectingPoint num="3" id="89" />
+<TGConnectingPoint num="4" id="90" />
+<TGConnectingPoint num="5" id="91" />
+<TGConnectingPoint num="6" id="92" />
+<TGConnectingPoint num="7" id="93" />
<extraparam>
<Data isAttacker="No" />
+<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
+<Attribute access="2" id="a" value="0" type="0" typeOther="" />
+<Attribute access="2" id="b" value="" type="4" typeOther="" />
+<Attribute access="2" id="i" value="0" type="0" typeOther="" />
+<Attribute access="2" id="j" value="0" type="0" typeOther="" />
+<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
+<Attribute access="2" id="t" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="80" >
-<father id="101" num="0" />
-<cdparam x="590" y="320" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="61" >
+<father id="94" num="0" />
+<cdparam x="611" y="316" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="184" minY="-8" maxY="107" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="79" />
+<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="223" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="60" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -465,16 +447,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="82" >
-<father id="101" num="1" />
-<cdparam x="630" y="332" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="63" >
+<father id="94" num="1" />
+<cdparam x="518" y="111" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="184" minY="-8" maxY="107" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="81" />
+<cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="223" />
+<infoparam name="TGComponent" value="Request activation" />
+<TGConnectingPoint num="0" id="62" />
<extraparam>
-<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -482,16 +464,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="84" >
-<father id="101" num="2" />
-<cdparam x="630" y="384" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="65" >
+<father id="94" num="2" />
+<cdparam x="715" y="296" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="184" minY="-8" maxY="107" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="83" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="64" />
<extraparam>
-<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -499,16 +481,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="86" >
-<father id="101" num="3" />
-<cdparam x="630" y="356" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="67" >
+<father id="94" num="3" />
+<cdparam x="715" y="182" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="184" minY="-8" maxY="107" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="85" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="66" />
<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -516,16 +498,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="88" >
-<father id="101" num="4" />
-<cdparam x="630" y="404" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="69" >
+<father id="94" num="4" />
+<cdparam x="715" y="229" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="184" minY="-8" maxY="107" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="87" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="68" />
<extraparam>
-<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -533,16 +515,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="90" >
-<father id="101" num="5" />
-<cdparam x="628" y="435" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="71" >
+<father id="94" num="5" />
+<cdparam x="715" y="267" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="184" minY="-8" maxY="107" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="89" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="70" />
<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -550,16 +532,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="92" >
-<father id="101" num="6" />
-<cdparam x="523" y="320" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="73" >
+<father id="94" num="6" />
+<cdparam x="515" y="151" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="184" minY="-8" maxY="107" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="91" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Event data_Ready" />
+<TGConnectingPoint num="0" id="72" />
<extraparam>
-<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="75" >
+<father id="94" num="7" />
+<cdparam x="515" y="285" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<TGConnectingPoint num="0" id="74" />
+<extraparam>
+<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -567,81 +566,50 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1200" id="183" >
-<father id="227" num="2" />
-<cdparam x="671" y="101" />
-<sizeparam width="456" height="388" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="77" >
+<father id="94" num="8" />
+<cdparam x="515" y="194" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="295" minY="0" maxY="32" />
-<infoparam name="TGComponent" value="TCPIP Entities" />
-<TGConnectingPoint num="0" id="175" />
-<TGConnectingPoint num="1" id="176" />
-<TGConnectingPoint num="2" id="177" />
-<TGConnectingPoint num="3" id="178" />
-<TGConnectingPoint num="4" id="179" />
-<TGConnectingPoint num="5" id="180" />
-<TGConnectingPoint num="6" id="181" />
-<TGConnectingPoint num="7" id="182" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Channel fromDtoSC" />
+<TGConnectingPoint num="0" id="76" />
<extraparam>
-<info hiddeni="false" />
+<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="120" >
-<father id="183" num="0" />
-<cdparam x="661" y="282" />
-<sizeparam width="20" height="20" minWidth="3" minHeight="3" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="79" >
+<father id="94" num="9" />
+<cdparam x="515" y="241" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="446" minY="-10" maxY="378" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="102" />
-<TGConnectingPoint num="1" id="103" />
-<TGConnectingPoint num="2" id="104" />
-<TGConnectingPoint num="3" id="105" />
-<TGConnectingPoint num="4" id="106" />
-<TGConnectingPoint num="5" id="107" />
-<TGConnectingPoint num="6" id="108" />
-<TGConnectingPoint num="7" id="109" />
-<TGConnectingPoint num="8" id="110" />
-<TGConnectingPoint num="9" id="111" />
-<TGConnectingPoint num="10" id="112" />
-<TGConnectingPoint num="11" id="113" />
-<TGConnectingPoint num="12" id="114" />
-<TGConnectingPoint num="13" id="115" />
-<TGConnectingPoint num="14" id="116" />
-<TGConnectingPoint num="15" id="117" />
-<TGConnectingPoint num="16" id="118" />
-<TGConnectingPoint num="17" id="119" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="135" >
-<father id="183" num="1" />
-<cdparam x="981" y="259" />
-<sizeparam width="111" height="110" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="345" minY="0" maxY="278" />
-<infoparam name="TGComponent" value="Timer" />
-<TGConnectingPoint num="0" id="127" />
-<TGConnectingPoint num="1" id="128" />
-<TGConnectingPoint num="2" id="129" />
-<TGConnectingPoint num="3" id="130" />
-<TGConnectingPoint num="4" id="131" />
-<TGConnectingPoint num="5" id="132" />
-<TGConnectingPoint num="6" id="133" />
-<TGConnectingPoint num="7" id="134" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<TGConnectingPoint num="0" id="78" />
<extraparam>
-<Data isAttacker="No" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="122" >
-<father id="135" num="0" />
-<cdparam x="973" y="287" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="81" >
+<father id="94" num="10" />
+<cdparam x="515" y="307" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="103" minY="-8" maxY="102" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="121" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<TGConnectingPoint num="0" id="80" />
<extraparam>
-<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -649,16 +617,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="124" >
-<father id="135" num="1" />
-<cdparam x="973" y="317" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="83" >
+<father id="94" num="11" />
+<cdparam x="574" y="80" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="103" minY="-8" maxY="102" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="123" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Event reset, pTS" />
+<TGConnectingPoint num="0" id="82" />
<extraparam>
-<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="reset, pTS" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -666,16 +634,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="126" >
-<father id="135" num="2" />
-<cdparam x="973" y="339" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="85" >
+<father id="94" num="12" />
+<cdparam x="715" y="104" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="103" minY="-8" maxY="102" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="125" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="220" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="84" />
<extraparam>
-<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -683,21 +651,40 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="174" >
-<father id="183" num="2" />
-<cdparam x="742" y="129" />
-<sizeparam width="188" height="252" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1200" id="176" >
+<father id="227" num="1" />
+<cdparam x="838" y="126" />
+<sizeparam width="570" height="485" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="368" minY="0" maxY="40" />
+<infoparam name="TGComponent" value="TCPIP Entities" />
+<TGConnectingPoint num="0" id="168" />
+<TGConnectingPoint num="1" id="169" />
+<TGConnectingPoint num="2" id="170" />
+<TGConnectingPoint num="3" id="171" />
+<TGConnectingPoint num="4" id="172" />
+<TGConnectingPoint num="5" id="173" />
+<TGConnectingPoint num="6" id="174" />
+<TGConnectingPoint num="7" id="175" />
+<extraparam>
+<info hiddeni="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="133" >
+<father id="176" num="0" />
+<cdparam x="927" y="161" />
+<sizeparam width="235" height="315" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="268" minY="0" maxY="136" />
+<cdrectangleparam minX="0" maxX="335" minY="0" maxY="170" />
<infoparam name="TGComponent" value="TCPIP" />
-<TGConnectingPoint num="0" id="166" />
-<TGConnectingPoint num="1" id="167" />
-<TGConnectingPoint num="2" id="168" />
-<TGConnectingPoint num="3" id="169" />
-<TGConnectingPoint num="4" id="170" />
-<TGConnectingPoint num="5" id="171" />
-<TGConnectingPoint num="6" id="172" />
-<TGConnectingPoint num="7" id="173" />
+<TGConnectingPoint num="0" id="125" />
+<TGConnectingPoint num="1" id="126" />
+<TGConnectingPoint num="2" id="127" />
+<TGConnectingPoint num="3" id="128" />
+<TGConnectingPoint num="4" id="129" />
+<TGConnectingPoint num="5" id="130" />
+<TGConnectingPoint num="6" id="131" />
+<TGConnectingPoint num="7" id="132" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
@@ -709,16 +696,16 @@
<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="137" >
-<father id="174" num="0" />
-<cdparam x="732" y="145" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="96" >
+<father id="133" num="0" />
+<cdparam x="1152" y="442" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="178" minY="-10" maxY="242" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="136" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="95" />
<extraparam>
-<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -726,16 +713,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="139" >
-<father id="174" num="1" />
-<cdparam x="732" y="187" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="98" >
+<father id="133" num="1" />
+<cdparam x="1152" y="262" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="178" minY="-10" maxY="242" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="138" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="97" />
<extraparam>
-<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -743,16 +730,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="141" >
-<father id="174" num="2" />
-<cdparam x="732" y="220" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="100" >
+<father id="133" num="2" />
+<cdparam x="1152" y="198" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="178" minY="-10" maxY="242" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="140" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="99" />
<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -760,16 +747,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="143" >
-<father id="174" num="3" />
-<cdparam x="732" y="254" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="102" >
+<father id="133" num="3" />
+<cdparam x="1152" y="401" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="178" minY="-10" maxY="242" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="142" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="101" />
<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -777,16 +764,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="145" >
-<father id="174" num="4" />
-<cdparam x="734" y="282" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="104" >
+<father id="133" num="4" />
+<cdparam x="1152" y="364" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="144" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="103" />
<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -794,16 +781,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="147" >
-<father id="174" num="5" />
-<cdparam x="734" y="354" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="106" >
+<father id="133" num="5" />
+<cdparam x="917" y="466" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="146" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="105" />
<extraparam>
-<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -811,16 +798,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="149" >
-<father id="174" num="6" />
-<cdparam x="734" y="329" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="108" >
+<father id="133" num="6" />
+<cdparam x="958" y="466" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="148" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="107" />
<extraparam>
-<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -828,14 +815,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="151" >
-<father id="174" num="7" />
-<cdparam x="734" y="306" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="110" >
+<father id="133" num="7" />
+<cdparam x="917" y="382" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="150" />
+<TGConnectingPoint num="0" id="109" />
<extraparam>
<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -845,16 +832,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="153" >
-<father id="174" num="8" />
-<cdparam x="767" y="373" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="112" >
+<father id="133" num="8" />
+<cdparam x="917" y="411" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="152" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="111" />
<extraparam>
-<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -862,16 +849,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="155" >
-<father id="174" num="9" />
-<cdparam x="734" y="373" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="114" >
+<father id="133" num="9" />
+<cdparam x="917" y="442" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="154" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="113" />
<extraparam>
-<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -879,16 +866,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="157" >
-<father id="174" num="10" />
-<cdparam x="922" y="292" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="116" >
+<father id="133" num="10" />
+<cdparam x="917" y="352" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="156" />
+<cdrectangleparam minX="-10" maxX="225" minY="-10" maxY="305" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="115" />
<extraparam>
-<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -896,16 +883,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="159" >
-<father id="174" num="11" />
-<cdparam x="922" y="321" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="118" >
+<father id="133" num="11" />
+<cdparam x="914" y="317" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="158" />
+<cdrectangleparam minX="-13" maxX="222" minY="-13" maxY="302" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="117" />
<extraparam>
-<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -913,16 +900,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="161" >
-<father id="174" num="12" />
-<cdparam x="922" y="159" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="120" >
+<father id="133" num="12" />
+<cdparam x="914" y="274" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="160" />
+<cdrectangleparam minX="-13" maxX="222" minY="-13" maxY="302" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="119" />
<extraparam>
-<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -930,16 +917,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="163" >
-<father id="174" num="13" />
-<cdparam x="922" y="210" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="122" >
+<father id="133" num="13" />
+<cdparam x="914" y="233" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="162" />
+<cdrectangleparam minX="-13" maxX="222" minY="-13" maxY="302" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="121" />
<extraparam>
-<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -947,16 +934,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="165" >
-<father id="174" num="14" />
-<cdparam x="922" y="354" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="124" >
+<father id="133" num="14" />
+<cdparam x="914" y="181" />
+<sizeparam width="26" height="26" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="180" minY="-8" maxY="244" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="164" />
+<cdrectangleparam minX="-13" maxX="222" minY="-13" maxY="302" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="123" />
<extraparam>
-<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -964,43 +951,36 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="218" >
-<father id="227" num="3" />
-<cdparam x="423" y="75" />
-<sizeparam width="160" height="187" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="148" >
+<father id="176" num="1" />
+<cdparam x="1226" y="323" />
+<sizeparam width="138" height="137" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="591" minY="0" maxY="233" />
-<infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="210" />
-<TGConnectingPoint num="1" id="211" />
-<TGConnectingPoint num="2" id="212" />
-<TGConnectingPoint num="3" id="213" />
-<TGConnectingPoint num="4" id="214" />
-<TGConnectingPoint num="5" id="215" />
-<TGConnectingPoint num="6" id="216" />
-<TGConnectingPoint num="7" id="217" />
+<cdrectangleparam minX="0" maxX="432" minY="0" maxY="348" />
+<infoparam name="TGComponent" value="Timer" />
+<TGConnectingPoint num="0" id="140" />
+<TGConnectingPoint num="1" id="141" />
+<TGConnectingPoint num="2" id="142" />
+<TGConnectingPoint num="3" id="143" />
+<TGConnectingPoint num="4" id="144" />
+<TGConnectingPoint num="5" id="145" />
+<TGConnectingPoint num="6" id="146" />
+<TGConnectingPoint num="7" id="147" />
<extraparam>
<Data isAttacker="No" />
-<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="" type="4" typeOther="" />
-<Attribute access="2" id="i" value="0" type="0" typeOther="" />
-<Attribute access="2" id="j" value="0" type="0" typeOther="" />
<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
-<Attribute access="2" id="t" value="" type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="185" >
-<father id="218" num="0" />
-<cdparam x="573" y="84" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="135" >
+<father id="148" num="0" />
+<cdparam x="1216" y="423" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="184" />
+<cdrectangleparam minX="-10" maxX="128" minY="-10" maxY="127" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="134" />
<extraparam>
-<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1008,16 +988,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="187" >
-<father id="218" num="1" />
-<cdparam x="460" y="65" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="137" >
+<father id="148" num="1" />
+<cdparam x="1216" y="396" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Event reset, pTS" />
-<TGConnectingPoint num="0" id="186" />
+<cdrectangleparam minX="-10" maxX="128" minY="-10" maxY="127" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="136" />
<extraparam>
-<Prop commName="reset, pTS" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1025,16 +1005,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="189" >
-<father id="218" num="2" />
-<cdparam x="413" y="246" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="139" >
+<father id="148" num="2" />
+<cdparam x="1216" y="358" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="188" />
+<cdrectangleparam minX="-10" maxX="128" minY="-10" maxY="127" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="138" />
<extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1042,16 +1022,61 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="191" >
-<father id="218" num="3" />
-<cdparam x="413" y="193" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1201" id="167" >
+<father id="176" num="2" />
+<cdparam x="825" y="352" />
+<sizeparam width="26" height="26" minWidth="3" minHeight="3" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="190" />
+<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="149" />
+<TGConnectingPoint num="1" id="150" />
+<TGConnectingPoint num="2" id="151" />
+<TGConnectingPoint num="3" id="152" />
+<TGConnectingPoint num="4" id="153" />
+<TGConnectingPoint num="5" id="154" />
+<TGConnectingPoint num="6" id="155" />
+<TGConnectingPoint num="7" id="156" />
+<TGConnectingPoint num="8" id="157" />
+<TGConnectingPoint num="9" id="158" />
+<TGConnectingPoint num="10" id="159" />
+<TGConnectingPoint num="11" id="160" />
+<TGConnectingPoint num="12" id="161" />
+<TGConnectingPoint num="13" id="162" />
+<TGConnectingPoint num="14" id="163" />
+<TGConnectingPoint num="15" id="164" />
+<TGConnectingPoint num="16" id="165" />
+<TGConnectingPoint num="17" id="166" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="199" >
+<father id="227" num="2" />
+<cdparam x="557" y="410" />
+<sizeparam width="240" height="143" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="698" minY="0" maxY="382" />
+<infoparam name="TGComponent" value="Application" />
+<TGConnectingPoint num="0" id="191" />
+<TGConnectingPoint num="1" id="192" />
+<TGConnectingPoint num="2" id="193" />
+<TGConnectingPoint num="3" id="194" />
+<TGConnectingPoint num="4" id="195" />
+<TGConnectingPoint num="5" id="196" />
+<TGConnectingPoint num="6" id="197" />
+<TGConnectingPoint num="7" id="198" />
<extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Data isAttacker="No" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="178" >
+<father id="199" num="0" />
+<cdparam x="653" y="400" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="133" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="177" />
+<extraparam>
+<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1059,16 +1084,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="193" >
-<father id="218" num="4" />
-<cdparam x="413" y="156" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="180" >
+<father id="199" num="1" />
+<cdparam x="785" y="543" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="192" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="133" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="179" />
<extraparam>
-<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1076,50 +1101,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="195" >
-<father id="218" num="5" />
-<cdparam x="413" y="228" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="182" >
+<father id="199" num="2" />
+<cdparam x="787" y="504" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="194" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="133" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="181" />
<extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="197" >
-<father id="218" num="6" />
-<cdparam x="413" y="121" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Event data_Ready" />
-<TGConnectingPoint num="0" id="196" />
-<extraparam>
-<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="199" >
-<father id="218" num="7" />
-<cdparam x="573" y="214" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="184" >
+<father id="199" num="3" />
+<cdparam x="787" y="444" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="198" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="133" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="183" />
<extraparam>
-<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1127,16 +1135,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="201" >
-<father id="218" num="8" />
-<cdparam x="573" y="184" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="186" >
+<father id="199" num="4" />
+<cdparam x="787" y="479" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="200" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="133" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="185" />
<extraparam>
-<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1144,16 +1152,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="203" >
-<father id="218" num="9" />
-<cdparam x="573" y="146" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="188" >
+<father id="199" num="5" />
+<cdparam x="787" y="414" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="202" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="133" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
+<TGConnectingPoint num="0" id="187" />
<extraparam>
-<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1161,33 +1169,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="205" >
-<father id="218" num="10" />
-<cdparam x="573" y="237" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="190" >
+<father id="199" num="6" />
+<cdparam x="737" y="400" />
+<sizeparam width="21" height="21" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="150" minY="-10" maxY="177" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="133" />
<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="204" />
-<extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="207" >
-<father id="218" num="11" />
-<cdparam x="415" y="89" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="152" minY="-8" maxY="179" />
-<infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="206" />
+<TGConnectingPoint num="0" id="189" />
<extraparam>
-<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1195,22 +1186,31 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="209" >
-<father id="218" num="12" />
-<cdparam x="489" y="254" />
-<sizeparam width="16" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1201" id="218" >
+<father id="227" num="3" />
+<cdparam x="515" y="374" />
+<sizeparam width="26" height="26" minWidth="3" minHeight="3" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-8" maxX="152" minY="-8" maxY="179" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="208" />
-<extraparam>
-<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
+<cdrectangleparam minX="-13" maxX="925" minY="-13" maxY="512" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="200" />
+<TGConnectingPoint num="1" id="201" />
+<TGConnectingPoint num="2" id="202" />
+<TGConnectingPoint num="3" id="203" />
+<TGConnectingPoint num="4" id="204" />
+<TGConnectingPoint num="5" id="205" />
+<TGConnectingPoint num="6" id="206" />
+<TGConnectingPoint num="7" id="207" />
+<TGConnectingPoint num="8" id="208" />
+<TGConnectingPoint num="9" id="209" />
+<TGConnectingPoint num="10" id="210" />
+<TGConnectingPoint num="11" id="211" />
+<TGConnectingPoint num="12" id="212" />
+<TGConnectingPoint num="13" id="213" />
+<TGConnectingPoint num="14" id="214" />
+<TGConnectingPoint num="15" id="215" />
+<TGConnectingPoint num="16" id="216" />
+<TGConnectingPoint num="17" id="217" />
</SUBCOMPONENT>
@@ -1403,7 +1403,7 @@
<TGConnectingPoint num="0" id="278" />
<TGConnectingPoint num="1" id="279" />
<extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -1463,7 +1463,7 @@
<TGConnectingPoint num="0" id="291" />
<TGConnectingPoint num="1" id="292" />
<extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -1688,513 +1688,386 @@
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="327" >
-<cdparam x="159" y="66" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1012" id="333" >
+<cdparam x="491" y="277" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="326" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="329" />
+<TGConnectingPoint num="1" id="330" />
+<TGConnectingPoint num="2" id="331" />
+<TGConnectingPoint num="3" id="332" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="326" >
+<father id="333" num="0" />
+<cdparam x="466" y="287" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="327" >
+<father id="333" num="1" />
+<cdparam x="526" y="287" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="328" >
+<father id="333" num="2" />
+<cdparam x="511" y="322" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1010" id="330" >
-<cdparam x="138" y="129" />
-<sizeparam width="57" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="335" >
+<cdparam x="501" y="91" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="reset() " />
-<TGConnectingPoint num="0" id="328" />
-<TGConnectingPoint num="1" id="329" />
-<extraparam>
-<Data eventName="reset" nbOfParams="5" />
-</extraparam>
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="334" />
</COMPONENT>
-<COMPONENT type="1008" id="333" >
-<cdparam x="108" y="182" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="338" >
+<cdparam x="482" y="129" />
+<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="answerToReset()" />
-<TGConnectingPoint num="0" id="331" />
-<TGConnectingPoint num="1" id="332" />
+<infoparam name="send event" value="open()" />
+<TGConnectingPoint num="0" id="336" />
+<TGConnectingPoint num="1" id="337" />
<extraparam>
-<Data eventName="answerToReset" nbOfParams="5" />
+<Data eventName="open" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="336" >
-<cdparam x="143" y="237" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="341" >
+<cdparam x="466" y="178" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="pTS() " />
-<TGConnectingPoint num="0" id="334" />
-<TGConnectingPoint num="1" id="335" />
+<infoparam name="write channel" value="fromAtoT(1)" />
+<TGConnectingPoint num="0" id="339" />
+<TGConnectingPoint num="1" id="340" />
<extraparam>
-<Data eventName="pTS" nbOfParams="5" />
+<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="339" >
-<cdparam x="121" y="308" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="344" >
+<cdparam x="467" y="226" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="pTSConfirm()" />
-<TGConnectingPoint num="0" id="337" />
-<TGConnectingPoint num="1" id="338" />
+<infoparam name="send event" value="send_TCP()" />
+<TGConnectingPoint num="0" id="342" />
+<TGConnectingPoint num="1" id="343" />
<extraparam>
-<Data eventName="pTSConfirm" nbOfParams="5" />
+<Data eventName="send_TCP" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="356" >
-<cdparam x="376" y="98" />
-<sizeparam width="249" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="346" >
+<cdparam x="576" y="388" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="The first two layers of the OSI model
-are used to communicate between
-the smart card and the terminal
-" />
-<TGConnectingPoint num="0" id="340" />
-<TGConnectingPoint num="1" id="341" />
-<TGConnectingPoint num="2" id="342" />
-<TGConnectingPoint num="3" id="343" />
-<TGConnectingPoint num="4" id="344" />
-<TGConnectingPoint num="5" id="345" />
-<TGConnectingPoint num="6" id="346" />
-<TGConnectingPoint num="7" id="347" />
-<TGConnectingPoint num="8" id="348" />
-<TGConnectingPoint num="9" id="349" />
-<TGConnectingPoint num="10" id="350" />
-<TGConnectingPoint num="11" id="351" />
-<TGConnectingPoint num="12" id="352" />
-<TGConnectingPoint num="13" id="353" />
-<TGConnectingPoint num="14" id="354" />
-<TGConnectingPoint num="15" id="355" />
-<extraparam>
-<Line value="The first two layers of the OSI model " />
-<Line value="are used to communicate between " />
-<Line value="the smart card and the terminal" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="345" />
</COMPONENT>
-<COMPONENT type="1007" id="359" >
-<cdparam x="250" y="97" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="349" >
+<cdparam x="559" y="329" />
+<sizeparam width="54" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_TCP_IP()" />
-<TGConnectingPoint num="0" id="357" />
-<TGConnectingPoint num="1" id="358" />
+<infoparam name="send event" value="abort()" />
+<TGConnectingPoint num="0" id="347" />
+<TGConnectingPoint num="1" id="348" />
<extraparam>
-<Data requestName="start_TCP_IP" nbOfParams="5" />
+<Data eventName="abort" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="362" >
-<cdparam x="236" y="148" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="352" >
+<cdparam x="406" y="337" />
+<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_Application()" />
-<TGConnectingPoint num="0" id="360" />
-<TGConnectingPoint num="1" id="361" />
+<infoparam name="send event" value="close()" />
+<TGConnectingPoint num="0" id="350" />
+<TGConnectingPoint num="1" id="351" />
<extraparam>
-<Data requestName="start_Application" nbOfParams="5" />
+<Data eventName="close" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="364" >
-<cdparam x="515" y="428" />
+<COMPONENT type="1001" id="354" >
+<cdparam x="422" y="386" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="363" />
+<TGConnectingPoint num="0" id="353" />
</COMPONENT>
-<COMPONENT type="1008" id="367" >
-<cdparam x="305" y="350" />
-<sizeparam width="115" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="115" id="355" >
+<cdparam x="509" y="94" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to send event" value="null" />
+<P1 x="508" y="111" id="334" />
+<P2 x="508" y="124" id="336" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="356" >
+<cdparam x="508" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1 x="508" y="154" id="337" />
+<P2 x="508" y="173" id="339" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="357" >
+<cdparam x="508" y="222" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to send event" value="null" />
+<P1 x="508" y="203" id="340" />
+<P2 x="507" y="221" id="342" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="358" >
+<cdparam x="586" y="354" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1 x="586" y="354" id="348" />
+<P2 x="586" y="383" id="345" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="359" >
+<cdparam x="508" y="298" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to choice" value="null" />
+<P1 x="507" y="251" id="343" />
+<P2 x="506" y="267" id="329" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="360" >
+<cdparam x="470" y="348" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1 x="466" y="292" id="330" />
+<P2 x="432" y="332" id="350" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="361" >
+<cdparam x="432" y="362" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1 x="432" y="362" id="351" />
+<P2 x="432" y="381" id="353" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="362" >
+<cdparam x="550" y="348" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1 x="546" y="292" id="331" />
+<P2 x="586" y="324" id="347" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1012" id="370" >
+<cdparam x="509" y="222" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="data_Ready_SC()" />
-<TGConnectingPoint num="0" id="365" />
-<TGConnectingPoint num="1" id="366" />
-<extraparam>
-<Data eventName="data_Ready_SC" nbOfParams="5" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="366" />
+<TGConnectingPoint num="1" id="367" />
+<TGConnectingPoint num="2" id="368" />
+<TGConnectingPoint num="3" id="369" />
</COMPONENT>
+<SUBCOMPONENT type="-1" id="363" >
+<father id="370" num="0" />
+<cdparam x="464" y="232" />
+<sizeparam width="52" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ x==0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="364" >
+<father id="370" num="1" />
+<cdparam x="544" y="234" />
+<sizeparam width="42" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ x>0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="365" >
+<father id="370" num="2" />
+<cdparam x="529" y="267" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
-<COMPONENT type="1001" id="369" >
-<cdparam x="352" y="426" />
+<COMPONENT type="1000" id="372" >
+<cdparam x="517" y="87" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="371" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="374" >
+<cdparam x="417" y="367" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="368" />
+<TGConnectingPoint num="0" id="373" />
</COMPONENT>
-<COMPONENT type="1009" id="372" >
-<cdparam x="318" y="308" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="377" >
+<cdparam x="393" y="299" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromTtoP(1) " />
-<TGConnectingPoint num="0" id="370" />
-<TGConnectingPoint num="1" id="371" />
+<infoparam name="send event" value="timeOut()" />
+<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="1" id="376" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data eventName="timeOut" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="375" >
-<cdparam x="335" y="264" />
-<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="380" >
+<cdparam x="596" y="300" />
+<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="send() " />
-<TGConnectingPoint num="0" id="373" />
-<TGConnectingPoint num="1" id="374" />
+<infoparam name="wait event" value="stop() " />
+<TGConnectingPoint num="0" id="378" />
+<TGConnectingPoint num="1" id="379" />
<extraparam>
-<Data eventName="send" nbOfParams="5" />
+<Data eventName="stop" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="378" >
-<cdparam x="315" y="392" />
-<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="382" >
+<cdparam x="612" y="365" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromSCtoD(1)" />
-<TGConnectingPoint num="0" id="376" />
-<TGConnectingPoint num="1" id="377" />
-<extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="381" />
</COMPONENT>
-<COMPONENT type="1008" id="381" >
-<cdparam x="493" y="350" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="receive()" />
-<TGConnectingPoint num="0" id="379" />
-<TGConnectingPoint num="1" id="380" />
-<extraparam>
-<Data eventName="receive" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="384" >
-<cdparam x="476" y="311" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromDtoSC(1) " />
-<TGConnectingPoint num="0" id="382" />
-<TGConnectingPoint num="1" id="383" />
-<extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="387" >
-<cdparam x="483" y="387" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromPtoT(1)" />
-<TGConnectingPoint num="0" id="385" />
-<TGConnectingPoint num="1" id="386" />
-<extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="390" >
-<cdparam x="466" y="268" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="data_Ready(t, b) " />
-<TGConnectingPoint num="0" id="388" />
-<TGConnectingPoint num="1" id="389" />
-<breakpoint />
-<extraparam>
-<Data eventName="data_Ready" nbOfParams="5" />
-<Param index="0" value="t" />
-<Param index="1" value="b" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1014" id="394" >
-<cdparam x="236" y="202" />
-<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1017" id="385" >
+<cdparam x="487" y="150" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="for loop" value="for(j=0;x==0;j = j)" />
-<TGConnectingPoint num="0" id="391" />
-<TGConnectingPoint num="1" id="392" />
-<TGConnectingPoint num="2" id="393" />
+<infoparam name="notified event" value="x=?stop()" />
+<TGConnectingPoint num="0" id="383" />
+<TGConnectingPoint num="1" id="384" />
<extraparam>
-<Data init="j=0" condition="x==0" increment="j = j" />
+<Data eventName="stop" variable="x" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="396" >
-<cdparam x="297" y="231" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="395" />
-</COMPONENT>
-
-<COMPONENT type="1018" id="407" >
-<cdparam x="424" y="226" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="397" />
-<TGConnectingPoint num="1" id="398" />
-<TGConnectingPoint num="2" id="399" />
-<TGConnectingPoint num="3" id="400" />
-<TGConnectingPoint num="4" id="401" />
-<TGConnectingPoint num="5" id="402" />
-<TGConnectingPoint num="6" id="403" />
-<TGConnectingPoint num="7" id="404" />
-<TGConnectingPoint num="8" id="405" />
-<TGConnectingPoint num="9" id="406" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="412" >
-<cdparam x="111" y="331" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to send request" value="null" />
-<P1 x="166" y="333" id="338" />
-<P2 x="298" y="92" id="357" />
-<Point x="166" y="351" />
-<Point x="231" y="351" />
-<Point x="231" y="72" />
-<Point x="298" y="72" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="408" >
-<father id="412" num="0" />
-<cdparam x="166" y="351" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="409" >
-<father id="412" num="1" />
-<cdparam x="231" y="351" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="410" >
-<father id="412" num="2" />
-<cdparam x="231" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="411" >
-<father id="412" num="3" />
-<cdparam x="298" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="115" id="413" >
-<cdparam x="166" y="64" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to wait event" value="null" />
-<P1 x="166" y="86" id="326" />
-<P2 x="166" y="124" id="328" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="414" >
-<cdparam x="166" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="166" y="154" id="329" />
-<P2 x="166" y="177" id="331" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="415" >
-<cdparam x="312" y="133" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to send request" value="null" />
-<P1 x="298" y="122" id="358" />
-<P2 x="298" y="143" id="360" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="416" >
-<cdparam x="355" y="300" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="362" y="289" id="374" />
-<P2 x="362" y="303" id="370" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="417" >
-<cdparam x="355" y="365" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="362" y="333" id="371" />
-<P2 x="362" y="345" id="365" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="418" >
-<cdparam x="355" y="417" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="362" y="375" id="366" />
-<P2 x="362" y="387" id="376" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="419" >
-<cdparam x="355" y="473" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="362" y="417" id="377" />
-<P2 x="362" y="421" id="368" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="420" >
-<cdparam x="541" y="358" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="525" y="336" id="383" />
-<P2 x="525" y="345" id="379" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="421" >
-<cdparam x="540" y="402" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="525" y="375" id="380" />
-<P2 x="525" y="382" id="385" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="422" >
-<cdparam x="543" y="305" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="525" y="293" id="389" />
-<P2 x="525" y="306" id="382" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="423" >
-<cdparam x="540" y="464" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="525" y="412" id="386" />
-<P2 x="525" y="423" id="363" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="424" >
-<cdparam x="298" y="173" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to for loop" value="null" />
-<P1 x="298" y="173" id="361" />
-<P2 x="298" y="197" id="391" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="425" >
-<cdparam x="328" y="232" />
+<CONNECTOR type="115" id="386" >
+<cdparam x="427" y="324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to stop state" value="null" />
-<P1 x="298" y="227" id="393" />
-<P2 x="307" y="226" id="395" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1 x="427" y="324" id="376" />
+<P2 x="427" y="362" id="373" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="426" >
-<cdparam x="395" y="283" />
+<CONNECTOR type="115" id="387" >
+<cdparam x="622" y="325" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1 x="399" y="241" id="398" />
-<P2 x="362" y="259" id="373" />
+<infoparam name="connector from wait event to stop state" value="null" />
+<P1 x="622" y="325" id="379" />
+<P2 x="622" y="360" id="381" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="427" >
-<cdparam x="543" y="341" />
+<CONNECTOR type="115" id="388" >
+<cdparam x="524" y="107" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1 x="479" y="241" id="399" />
-<P2 x="525" y="263" id="388" />
+<infoparam name="connector from start state to notified event" value="null" />
+<P1 x="524" y="107" id="371" />
+<P2 x="524" y="145" id="383" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="428" >
-<cdparam x="391" y="282" />
+<CONNECTOR type="115" id="389" >
+<cdparam x="524" y="175" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to select" value="null" />
-<P1 x="360" y="216" id="392" />
-<P2 x="439" y="216" id="397" />
+<infoparam name="connector from notified event to choice" value="null" />
+<P1 x="524" y="175" id="384" />
+<P2 x="524" y="212" id="366" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="429" >
-<cdparam x="164" y="262" />
+<CONNECTOR type="115" id="390" >
+<cdparam x="484" y="237" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="166" y="262" id="335" />
-<P2 x="166" y="303" id="337" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1 x="484" y="237" id="367" />
+<P2 x="427" y="294" id="375" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="430" >
-<cdparam x="166" y="207" />
+<CONNECTOR type="115" id="391" >
+<cdparam x="564" y="237" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="166" y="207" id="332" />
-<P2 x="166" y="232" id="334" />
+<infoparam name="connector from choice to wait event" value="null" />
+<P1 x="564" y="237" id="368" />
+<P2 x="622" y="295" id="378" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" >
-<COMPONENT type="1012" id="438" >
+<COMPONENT type="1012" id="399" >
<cdparam x="2086" y="1378" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="434" />
-<TGConnectingPoint num="1" id="435" />
-<TGConnectingPoint num="2" id="436" />
-<TGConnectingPoint num="3" id="437" />
+<TGConnectingPoint num="0" id="395" />
+<TGConnectingPoint num="1" id="396" />
+<TGConnectingPoint num="2" id="397" />
+<TGConnectingPoint num="3" id="398" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="431" >
-<father id="438" num="0" />
+<SUBCOMPONENT type="-1" id="392" >
+<father id="399" num="0" />
<cdparam x="2061" y="1388" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="432" >
-<father id="438" num="1" />
+<SUBCOMPONENT type="-1" id="393" >
+<father id="399" num="1" />
<cdparam x="2121" y="1388" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="433" >
-<father id="438" num="2" />
+<SUBCOMPONENT type="-1" id="394" >
+<father id="399" num="2" />
<cdparam x="2106" y="1426" />
<sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2202,35 +2075,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ tcpctrl.state ==10 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="446" >
+<COMPONENT type="1012" id="407" >
<cdparam x="2262" y="951" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="442" />
-<TGConnectingPoint num="1" id="443" />
-<TGConnectingPoint num="2" id="444" />
-<TGConnectingPoint num="3" id="445" />
+<TGConnectingPoint num="0" id="403" />
+<TGConnectingPoint num="1" id="404" />
+<TGConnectingPoint num="2" id="405" />
+<TGConnectingPoint num="3" id="406" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="439" >
-<father id="446" num="0" />
+<SUBCOMPONENT type="-1" id="400" >
+<father id="407" num="0" />
<cdparam x="2212" y="961" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state ==1 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="440" >
-<father id="446" num="1" />
+<SUBCOMPONENT type="-1" id="401" >
+<father id="407" num="1" />
<cdparam x="2297" y="961" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ tcpctrl.state ==3 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="441" >
-<father id="446" num="2" />
+<SUBCOMPONENT type="-1" id="402" >
+<father id="407" num="2" />
<cdparam x="2282" y="996" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2238,35 +2111,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ else ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="454" >
+<COMPONENT type="1012" id="415" >
<cdparam x="1981" y="1346" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="450" />
-<TGConnectingPoint num="1" id="451" />
-<TGConnectingPoint num="2" id="452" />
-<TGConnectingPoint num="3" id="453" />
+<TGConnectingPoint num="0" id="411" />
+<TGConnectingPoint num="1" id="412" />
+<TGConnectingPoint num="2" id="413" />
+<TGConnectingPoint num="3" id="414" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="447" >
-<father id="454" num="0" />
+<SUBCOMPONENT type="-1" id="408" >
+<father id="415" num="0" />
<cdparam x="1934" y="1356" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state ==5 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="448" >
-<father id="454" num="1" />
+<SUBCOMPONENT type="-1" id="409" >
+<father id="415" num="1" />
<cdparam x="2016" y="1356" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="449" >
-<father id="454" num="2" />
+<SUBCOMPONENT type="-1" id="410" >
+<father id="415" num="2" />
<cdparam x="2001" y="1391" />
<sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2274,35 +2147,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ tcpctrl.state == 7 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="462" >
+<COMPONENT type="1012" id="423" >
<cdparam x="1811" y="1269" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="458" />
-<TGConnectingPoint num="1" id="459" />
-<TGConnectingPoint num="2" id="460" />
-<TGConnectingPoint num="3" id="461" />
+<TGConnectingPoint num="0" id="419" />
+<TGConnectingPoint num="1" id="420" />
+<TGConnectingPoint num="2" id="421" />
+<TGConnectingPoint num="3" id="422" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="455" >
-<father id="462" num="0" />
+<SUBCOMPONENT type="-1" id="416" >
+<father id="423" num="0" />
<cdparam x="1762" y="1279" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="456" >
-<father id="462" num="1" />
+<SUBCOMPONENT type="-1" id="417" >
+<father id="423" num="1" />
<cdparam x="1846" y="1279" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="457" >
-<father id="462" num="2" />
+<SUBCOMPONENT type="-1" id="418" >
+<father id="423" num="2" />
<cdparam x="1831" y="1314" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2310,35 +2183,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ tcpctrl.state ==2 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="470" >
+<COMPONENT type="1012" id="431" >
<cdparam x="1716" y="1141" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="466" />
-<TGConnectingPoint num="1" id="467" />
-<TGConnectingPoint num="2" id="468" />
-<TGConnectingPoint num="3" id="469" />
+<TGConnectingPoint num="0" id="427" />
+<TGConnectingPoint num="1" id="428" />
+<TGConnectingPoint num="2" id="429" />
+<TGConnectingPoint num="3" id="430" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="463" >
-<father id="470" num="0" />
+<SUBCOMPONENT type="-1" id="424" >
+<father id="431" num="0" />
<cdparam x="1691" y="1151" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="464" >
-<father id="470" num="1" />
+<SUBCOMPONENT type="-1" id="425" >
+<father id="431" num="1" />
<cdparam x="1751" y="1151" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="465" >
-<father id="470" num="2" />
+<SUBCOMPONENT type="-1" id="426" >
+<father id="431" num="2" />
<cdparam x="1736" y="1186" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2346,17 +2219,17 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="474" >
+<COMPONENT type="1013" id="435" >
<cdparam x="1524" y="1254" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="472" />
-<TGConnectingPoint num="1" id="473" />
+<TGConnectingPoint num="0" id="433" />
+<TGConnectingPoint num="1" id="434" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="471" >
-<father id="474" num="0" />
+<SUBCOMPONENT type="-1" id="432" >
+<father id="435" num="0" />
<cdparam x="1539" y="1274" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2364,17 +2237,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="478" >
+<COMPONENT type="1013" id="439" >
<cdparam x="1524" y="1064" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
+<TGConnectingPoint num="0" id="437" />
+<TGConnectingPoint num="1" id="438" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="475" >
-<father id="478" num="0" />
+<SUBCOMPONENT type="-1" id="436" >
+<father id="439" num="0" />
<cdparam x="1538" y="1088" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2382,35 +2255,35 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="486" >
+<COMPONENT type="1012" id="447" >
<cdparam x="1592" y="1006" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="482" />
-<TGConnectingPoint num="1" id="483" />
-<TGConnectingPoint num="2" id="484" />
-<TGConnectingPoint num="3" id="485" />
+<TGConnectingPoint num="0" id="443" />
+<TGConnectingPoint num="1" id="444" />
+<TGConnectingPoint num="2" id="445" />
+<TGConnectingPoint num="3" id="446" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="479" >
-<father id="486" num="0" />
+<SUBCOMPONENT type="-1" id="440" >
+<father id="447" num="0" />
<cdparam x="1542" y="1016" />
<sizeparam width="124" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state == 4 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="480" >
-<father id="486" num="1" />
+<SUBCOMPONENT type="-1" id="441" >
+<father id="447" num="1" />
<cdparam x="1627" y="1016" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="481" >
-<father id="486" num="2" />
+<SUBCOMPONENT type="-1" id="442" >
+<father id="447" num="2" />
<cdparam x="1612" y="1051" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2418,35 +2291,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="494" >
+<COMPONENT type="1012" id="455" >
<cdparam x="1713" y="875" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="490" />
-<TGConnectingPoint num="1" id="491" />
-<TGConnectingPoint num="2" id="492" />
-<TGConnectingPoint num="3" id="493" />
+<TGConnectingPoint num="0" id="451" />
+<TGConnectingPoint num="1" id="452" />
+<TGConnectingPoint num="2" id="453" />
+<TGConnectingPoint num="3" id="454" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="487" >
-<father id="494" num="0" />
+<SUBCOMPONENT type="-1" id="448" >
+<father id="455" num="0" />
<cdparam x="1688" y="885" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="488" >
-<father id="494" num="1" />
+<SUBCOMPONENT type="-1" id="449" >
+<father id="455" num="1" />
<cdparam x="1748" y="885" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="489" >
-<father id="494" num="2" />
+<SUBCOMPONENT type="-1" id="450" >
+<father id="455" num="2" />
<cdparam x="1733" y="920" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2454,17 +2327,17 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="498" >
+<COMPONENT type="1013" id="459" >
<cdparam x="1636" y="1235" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="496" />
-<TGConnectingPoint num="1" id="497" />
+<TGConnectingPoint num="0" id="457" />
+<TGConnectingPoint num="1" id="458" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="495" >
-<father id="498" num="0" />
+<SUBCOMPONENT type="-1" id="456" >
+<father id="459" num="0" />
<cdparam x="1655" y="1254" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2472,17 +2345,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="502" >
+<COMPONENT type="1013" id="463" >
<cdparam x="2213" y="1059" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="500" />
-<TGConnectingPoint num="1" id="501" />
+<TGConnectingPoint num="0" id="461" />
+<TGConnectingPoint num="1" id="462" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="499" >
-<father id="502" num="0" />
+<SUBCOMPONENT type="-1" id="460" >
+<father id="463" num="0" />
<cdparam x="2200" y="1083" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2490,17 +2363,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="506" >
+<COMPONENT type="1013" id="467" >
<cdparam x="2336" y="1024" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="504" />
-<TGConnectingPoint num="1" id="505" />
+<TGConnectingPoint num="0" id="465" />
+<TGConnectingPoint num="1" id="466" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="503" >
-<father id="506" num="0" />
+<SUBCOMPONENT type="-1" id="464" >
+<father id="467" num="0" />
<cdparam x="2312" y="1044" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2508,35 +2381,35 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="514" >
+<COMPONENT type="1012" id="475" >
<cdparam x="1193" y="1020" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="510" />
-<TGConnectingPoint num="1" id="511" />
-<TGConnectingPoint num="2" id="512" />
-<TGConnectingPoint num="3" id="513" />
+<TGConnectingPoint num="0" id="471" />
+<TGConnectingPoint num="1" id="472" />
+<TGConnectingPoint num="2" id="473" />
+<TGConnectingPoint num="3" id="474" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="507" >
-<father id="514" num="0" />
+<SUBCOMPONENT type="-1" id="468" >
+<father id="475" num="0" />
<cdparam x="1168" y="1030" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="508" >
-<father id="514" num="1" />
+<SUBCOMPONENT type="-1" id="469" >
+<father id="475" num="1" />
<cdparam x="1228" y="1030" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="509" >
-<father id="514" num="2" />
+<SUBCOMPONENT type="-1" id="470" >
+<father id="475" num="2" />
<cdparam x="1213" y="1065" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2544,17 +2417,17 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ tcpctrl.state ==6 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="518" >
+<COMPONENT type="1013" id="479" >
<cdparam x="1203" y="1107" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="516" />
-<TGConnectingPoint num="1" id="517" />
+<TGConnectingPoint num="0" id="477" />
+<TGConnectingPoint num="1" id="478" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="515" >
-<father id="518" num="0" />
+<SUBCOMPONENT type="-1" id="476" >
+<father id="479" num="0" />
<cdparam x="1218" y="1127" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2562,35 +2435,35 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="526" >
+<COMPONENT type="1012" id="487" >
<cdparam x="557" y="712" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="522" />
-<TGConnectingPoint num="1" id="523" />
-<TGConnectingPoint num="2" id="524" />
-<TGConnectingPoint num="3" id="525" />
+<TGConnectingPoint num="0" id="483" />
+<TGConnectingPoint num="1" id="484" />
+<TGConnectingPoint num="2" id="485" />
+<TGConnectingPoint num="3" id="486" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="519" >
-<father id="526" num="0" />
+<SUBCOMPONENT type="-1" id="480" >
+<father id="487" num="0" />
<cdparam x="514" y="722" />
<sizeparam width="120" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state == 1 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="520" >
-<father id="526" num="1" />
+<SUBCOMPONENT type="-1" id="481" >
+<father id="487" num="1" />
<cdparam x="592" y="722" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="521" >
-<father id="526" num="2" />
+<SUBCOMPONENT type="-1" id="482" >
+<father id="487" num="2" />
<cdparam x="577" y="757" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2598,17 +2471,17 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="530" >
+<COMPONENT type="1013" id="491" >
<cdparam x="717" y="694" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="528" />
-<TGConnectingPoint num="1" id="529" />
+<TGConnectingPoint num="0" id="489" />
+<TGConnectingPoint num="1" id="490" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="527" >
-<father id="530" num="0" />
+<SUBCOMPONENT type="-1" id="488" >
+<father id="491" num="0" />
<cdparam x="732" y="714" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2616,17 +2489,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="534" >
+<COMPONENT type="1013" id="495" >
<cdparam x="938" y="1025" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="532" />
-<TGConnectingPoint num="1" id="533" />
+<TGConnectingPoint num="0" id="493" />
+<TGConnectingPoint num="1" id="494" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="531" >
-<father id="534" num="0" />
+<SUBCOMPONENT type="-1" id="492" >
+<father id="495" num="0" />
<cdparam x="953" y="1045" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2634,35 +2507,35 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="542" >
+<COMPONENT type="1012" id="503" >
<cdparam x="1034" y="939" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="538" />
-<TGConnectingPoint num="1" id="539" />
-<TGConnectingPoint num="2" id="540" />
-<TGConnectingPoint num="3" id="541" />
+<TGConnectingPoint num="0" id="499" />
+<TGConnectingPoint num="1" id="500" />
+<TGConnectingPoint num="2" id="501" />
+<TGConnectingPoint num="3" id="502" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="535" >
-<father id="542" num="0" />
+<SUBCOMPONENT type="-1" id="496" >
+<father id="503" num="0" />
<cdparam x="989" y="949" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="536" >
-<father id="542" num="1" />
+<SUBCOMPONENT type="-1" id="497" >
+<father id="503" num="1" />
<cdparam x="1070" y="949" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="537" >
-<father id="542" num="2" />
+<SUBCOMPONENT type="-1" id="498" >
+<father id="503" num="2" />
<cdparam x="1054" y="984" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2670,17 +2543,17 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ tcpctrl.state == 5]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="546" >
+<COMPONENT type="1013" id="507" >
<cdparam x="795" y="1009" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="544" />
-<TGConnectingPoint num="1" id="545" />
+<TGConnectingPoint num="0" id="505" />
+<TGConnectingPoint num="1" id="506" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="543" >
-<father id="546" num="0" />
+<SUBCOMPONENT type="-1" id="504" >
+<father id="507" num="0" />
<cdparam x="818" y="1031" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2688,35 +2561,35 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="554" >
+<COMPONENT type="1012" id="515" >
<cdparam x="828" y="869" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="550" />
-<TGConnectingPoint num="1" id="551" />
-<TGConnectingPoint num="2" id="552" />
-<TGConnectingPoint num="3" id="553" />
+<TGConnectingPoint num="0" id="511" />
+<TGConnectingPoint num="1" id="512" />
+<TGConnectingPoint num="2" id="513" />
+<TGConnectingPoint num="3" id="514" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="547" >
-<father id="554" num="0" />
+<SUBCOMPONENT type="-1" id="508" >
+<father id="515" num="0" />
<cdparam x="753" y="885" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state ==0 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="548" >
-<father id="554" num="1" />
+<SUBCOMPONENT type="-1" id="509" >
+<father id="515" num="1" />
<cdparam x="863" y="879" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="549" >
-<father id="554" num="2" />
+<SUBCOMPONENT type="-1" id="510" >
+<father id="515" num="2" />
<cdparam x="848" y="914" />
<sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2724,17 +2597,17 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ tcpctrl.state==0 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="558" >
+<COMPONENT type="1013" id="519" >
<cdparam x="341" y="764" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="556" />
-<TGConnectingPoint num="1" id="557" />
+<TGConnectingPoint num="0" id="517" />
+<TGConnectingPoint num="1" id="518" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="555" >
-<father id="558" num="0" />
+<SUBCOMPONENT type="-1" id="516" >
+<father id="519" num="0" />
<cdparam x="354" y="785" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2742,17 +2615,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="562" >
+<COMPONENT type="1013" id="523" >
<cdparam x="127" y="794" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="560" />
-<TGConnectingPoint num="1" id="561" />
+<TGConnectingPoint num="0" id="521" />
+<TGConnectingPoint num="1" id="522" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="559" >
-<father id="562" num="0" />
+<SUBCOMPONENT type="-1" id="520" >
+<father id="523" num="0" />
<cdparam x="146" y="818" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2760,35 +2633,35 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="570" >
+<COMPONENT type="1012" id="531" >
<cdparam x="993" y="780" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="566" />
-<TGConnectingPoint num="1" id="567" />
-<TGConnectingPoint num="2" id="568" />
-<TGConnectingPoint num="3" id="569" />
+<TGConnectingPoint num="0" id="527" />
+<TGConnectingPoint num="1" id="528" />
+<TGConnectingPoint num="2" id="529" />
+<TGConnectingPoint num="3" id="530" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="563" >
-<father id="570" num="0" />
+<SUBCOMPONENT type="-1" id="524" >
+<father id="531" num="0" />
<cdparam x="949" y="793" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="564" >
-<father id="570" num="1" />
+<SUBCOMPONENT type="-1" id="525" >
+<father id="531" num="1" />
<cdparam x="1028" y="790" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="565" >
-<father id="570" num="2" />
+<SUBCOMPONENT type="-1" id="526" >
+<father id="531" num="2" />
<cdparam x="1013" y="825" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2796,17 +2669,17 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="574" >
+<COMPONENT type="1013" id="535" >
<cdparam x="1003" y="701" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="572" />
-<TGConnectingPoint num="1" id="573" />
+<TGConnectingPoint num="0" id="533" />
+<TGConnectingPoint num="1" id="534" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="571" >
-<father id="574" num="0" />
+<SUBCOMPONENT type="-1" id="532" >
+<father id="535" num="0" />
<cdparam x="1018" y="721" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2814,17 +2687,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="578" >
+<COMPONENT type="1013" id="539" >
<cdparam x="434" y="783" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="576" />
-<TGConnectingPoint num="1" id="577" />
+<TGConnectingPoint num="0" id="537" />
+<TGConnectingPoint num="1" id="538" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="575" >
-<father id="578" num="0" />
+<SUBCOMPONENT type="-1" id="536" >
+<father id="539" num="0" />
<cdparam x="449" y="802" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2832,17 +2705,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="582" >
+<COMPONENT type="1013" id="543" >
<cdparam x="225" y="863" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="580" />
-<TGConnectingPoint num="1" id="581" />
+<TGConnectingPoint num="0" id="541" />
+<TGConnectingPoint num="1" id="542" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="579" >
-<father id="582" num="0" />
+<SUBCOMPONENT type="-1" id="540" >
+<father id="543" num="0" />
<cdparam x="245" y="885" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2850,17 +2723,17 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="586" >
+<COMPONENT type="1013" id="547" >
<cdparam x="1044" y="1057" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="584" />
-<TGConnectingPoint num="1" id="585" />
+<TGConnectingPoint num="0" id="545" />
+<TGConnectingPoint num="1" id="546" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="583" >
-<father id="586" num="0" />
+<SUBCOMPONENT type="-1" id="544" >
+<father id="547" num="0" />
<cdparam x="1059" y="1077" />
<sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2868,35 +2741,35 @@ the smart card and the terminal
<infoparam name="value of the delay" value="b" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="594" >
+<COMPONENT type="1012" id="555" >
<cdparam x="173" y="486" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="590" />
-<TGConnectingPoint num="1" id="591" />
-<TGConnectingPoint num="2" id="592" />
-<TGConnectingPoint num="3" id="593" />
+<TGConnectingPoint num="0" id="551" />
+<TGConnectingPoint num="1" id="552" />
+<TGConnectingPoint num="2" id="553" />
+<TGConnectingPoint num="3" id="554" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="587" >
-<father id="594" num="0" />
+<SUBCOMPONENT type="-1" id="548" >
+<father id="555" num="0" />
<cdparam x="98" y="496" />
<sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state==0 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="588" >
-<father id="594" num="1" />
+<SUBCOMPONENT type="-1" id="549" >
+<father id="555" num="1" />
<cdparam x="208" y="496" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="589" >
-<father id="594" num="2" />
+<SUBCOMPONENT type="-1" id="550" >
+<father id="555" num="2" />
<cdparam x="193" y="531" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2904,35 +2777,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="602" >
+<COMPONENT type="1012" id="563" >
<cdparam x="359" y="192" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="598" />
-<TGConnectingPoint num="1" id="599" />
-<TGConnectingPoint num="2" id="600" />
-<TGConnectingPoint num="3" id="601" />
+<TGConnectingPoint num="0" id="559" />
+<TGConnectingPoint num="1" id="560" />
+<TGConnectingPoint num="2" id="561" />
+<TGConnectingPoint num="3" id="562" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="595" >
-<father id="602" num="0" />
+<SUBCOMPONENT type="-1" id="556" >
+<father id="563" num="0" />
<cdparam x="317" y="202" />
<sizeparam width="81" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.a>0 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="596" >
-<father id="602" num="1" />
+<SUBCOMPONENT type="-1" id="557" >
+<father id="563" num="1" />
<cdparam x="394" y="202" />
<sizeparam width="91" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ tcpctrl.a==0 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="597" >
-<father id="602" num="2" />
+<SUBCOMPONENT type="-1" id="558" >
+<father id="563" num="2" />
<cdparam x="379" y="237" />
<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2940,35 +2813,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="610" >
+<COMPONENT type="1012" id="571" >
<cdparam x="449" y="582" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="606" />
-<TGConnectingPoint num="1" id="607" />
-<TGConnectingPoint num="2" id="608" />
-<TGConnectingPoint num="3" id="609" />
+<TGConnectingPoint num="0" id="567" />
+<TGConnectingPoint num="1" id="568" />
+<TGConnectingPoint num="2" id="569" />
+<TGConnectingPoint num="3" id="570" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="603" >
-<father id="610" num="0" />
+<SUBCOMPONENT type="-1" id="564" >
+<father id="571" num="0" />
<cdparam x="398" y="592" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state ==9 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="604" >
-<father id="610" num="1" />
+<SUBCOMPONENT type="-1" id="565" >
+<father id="571" num="1" />
<cdparam x="500" y="599" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="605" >
-<father id="610" num="2" />
+<SUBCOMPONENT type="-1" id="566" >
+<father id="571" num="2" />
<cdparam x="469" y="627" />
<sizeparam width="252" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2976,35 +2849,35 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ (tcpctrl.state ==2) or (tcpctrl.state ==4) ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="618" >
+<COMPONENT type="1012" id="579" >
<cdparam x="274" y="564" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="614" />
-<TGConnectingPoint num="1" id="615" />
-<TGConnectingPoint num="2" id="616" />
-<TGConnectingPoint num="3" id="617" />
+<TGConnectingPoint num="0" id="575" />
+<TGConnectingPoint num="1" id="576" />
+<TGConnectingPoint num="2" id="577" />
+<TGConnectingPoint num="3" id="578" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="611" >
-<father id="618" num="0" />
+<SUBCOMPONENT type="-1" id="572" >
+<father id="579" num="0" />
<cdparam x="228" y="574" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ tcpctrl.state == 1]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="612" >
-<father id="618" num="1" />
+<SUBCOMPONENT type="-1" id="573" >
+<father id="579" num="1" />
<cdparam x="317" y="584" />
<sizeparam width="39" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ else ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="613" >
-<father id="618" num="2" />
+<SUBCOMPONENT type="-1" id="574" >
+<father id="579" num="2" />
<cdparam x="294" y="613" />
<sizeparam width="116" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3012,16 +2885,16 @@ the smart card and the terminal
<infoparam name="guard 3" value="[ tcpctrl.state ==4 ]" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="620" >
+<COMPONENT type="1000" id="581" >
<cdparam x="227" y="27" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="619" />
+<TGConnectingPoint num="0" id="580" />
</COMPONENT>
-<COMPONENT type="301" id="637" >
+<COMPONENT type="301" id="598" >
<cdparam x="10" y="30" />
<sizeparam width="92" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3038,22 +2911,22 @@ the smart card and the terminal
9: close wait
10:last ack
" />
-<TGConnectingPoint num="0" id="621" />
-<TGConnectingPoint num="1" id="622" />
-<TGConnectingPoint num="2" id="623" />
-<TGConnectingPoint num="3" id="624" />
-<TGConnectingPoint num="4" id="625" />
-<TGConnectingPoint num="5" id="626" />
-<TGConnectingPoint num="6" id="627" />
-<TGConnectingPoint num="7" id="628" />
-<TGConnectingPoint num="8" id="629" />
-<TGConnectingPoint num="9" id="630" />
-<TGConnectingPoint num="10" id="631" />
-<TGConnectingPoint num="11" id="632" />
-<TGConnectingPoint num="12" id="633" />
-<TGConnectingPoint num="13" id="634" />
-<TGConnectingPoint num="14" id="635" />
-<TGConnectingPoint num="15" id="636" />
+<TGConnectingPoint num="0" id="582" />
+<TGConnectingPoint num="1" id="583" />
+<TGConnectingPoint num="2" id="584" />
+<TGConnectingPoint num="3" id="585" />
+<TGConnectingPoint num="4" id="586" />
+<TGConnectingPoint num="5" id="587" />
+<TGConnectingPoint num="6" id="588" />
+<TGConnectingPoint num="7" id="589" />
+<TGConnectingPoint num="8" id="590" />
+<TGConnectingPoint num="9" id="591" />
+<TGConnectingPoint num="10" id="592" />
+<TGConnectingPoint num="11" id="593" />
+<TGConnectingPoint num="12" id="594" />
+<TGConnectingPoint num="13" id="595" />
+<TGConnectingPoint num="14" id="596" />
+<TGConnectingPoint num="15" id="597" />
<extraparam>
<Line value="0: closed" />
<Line value="1: Listen" />
@@ -3069,223 +2942,223 @@ the smart card and the terminal
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="640" >
+<COMPONENT type="1011" id="601" >
<cdparam x="76" y="549" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="638" />
-<TGConnectingPoint num="1" id="639" />
+<TGConnectingPoint num="0" id="599" />
+<TGConnectingPoint num="1" id="600" />
</COMPONENT>
-<COMPONENT type="1001" id="642" >
+<COMPONENT type="1001" id="603" >
<cdparam x="116" y="615" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="641" />
+<TGConnectingPoint num="0" id="602" />
</COMPONENT>
-<COMPONENT type="1009" id="645" >
+<COMPONENT type="1009" id="606" >
<cdparam x="967" y="585" />
<sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="read channel" value="fromPtoT(1) " />
-<TGConnectingPoint num="0" id="643" />
-<TGConnectingPoint num="1" id="644" />
+<TGConnectingPoint num="0" id="604" />
+<TGConnectingPoint num="1" id="605" />
<extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1014" id="649" >
+<COMPONENT type="1014" id="610" >
<cdparam x="150" y="85" />
<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="for loop" value="for(i=0;(tcpctrl.a==0);i = i)" />
-<TGConnectingPoint num="0" id="646" />
-<TGConnectingPoint num="1" id="647" />
-<TGConnectingPoint num="2" id="648" />
+<TGConnectingPoint num="0" id="607" />
+<TGConnectingPoint num="1" id="608" />
+<TGConnectingPoint num="2" id="609" />
<extraparam>
<Data init="i=0" condition="(tcpctrl.a==0)" increment="i = i" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="651" >
+<COMPONENT type="1001" id="612" >
<cdparam x="224" y="207" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="650" />
+<TGConnectingPoint num="0" id="611" />
</COMPONENT>
-<COMPONENT type="1011" id="654" >
+<COMPONENT type="1011" id="615" >
<cdparam x="186" y="144" />
<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state=0" />
-<TGConnectingPoint num="0" id="652" />
-<TGConnectingPoint num="1" id="653" />
+<TGConnectingPoint num="0" id="613" />
+<TGConnectingPoint num="1" id="614" />
</COMPONENT>
-<COMPONENT type="1017" id="657" >
+<COMPONENT type="1017" id="618" >
<cdparam x="316" y="133" />
<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="notified event" value="tcpctrl.a=?abort()" />
-<TGConnectingPoint num="0" id="655" />
-<TGConnectingPoint num="1" id="656" />
+<TGConnectingPoint num="0" id="616" />
+<TGConnectingPoint num="1" id="617" />
<extraparam>
<Data eventName="abort" variable="tcpctrl.a" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="660" >
+<COMPONENT type="1009" id="621" >
<cdparam x="692" y="589" />
<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="658" />
-<TGConnectingPoint num="1" id="659" />
+<TGConnectingPoint num="0" id="619" />
+<TGConnectingPoint num="1" id="620" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="663" >
+<COMPONENT type="1010" id="624" >
<cdparam x="689" y="534" />
<sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="wait event" value="timeOut() " />
-<TGConnectingPoint num="0" id="661" />
-<TGConnectingPoint num="1" id="662" />
+<TGConnectingPoint num="0" id="622" />
+<TGConnectingPoint num="1" id="623" />
<extraparam>
<Data eventName="timeOut" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="666" >
+<COMPONENT type="1010" id="627" >
<cdparam x="977" y="528" />
<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="wait event" value="receive() " />
-<TGConnectingPoint num="0" id="664" />
-<TGConnectingPoint num="1" id="665" />
+<TGConnectingPoint num="0" id="625" />
+<TGConnectingPoint num="1" id="626" />
<extraparam>
<Data eventName="receive" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="669" >
+<COMPONENT type="1010" id="630" >
<cdparam x="439" y="492" />
<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="wait event" value="close() " />
-<TGConnectingPoint num="0" id="667" />
-<TGConnectingPoint num="1" id="668" />
+<TGConnectingPoint num="0" id="628" />
+<TGConnectingPoint num="1" id="629" />
<extraparam>
<Data eventName="close" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="672" >
+<COMPONENT type="1010" id="633" >
<cdparam x="250" y="468" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="wait event" value="send_TCP() " />
-<TGConnectingPoint num="0" id="670" />
-<TGConnectingPoint num="1" id="671" />
+<TGConnectingPoint num="0" id="631" />
+<TGConnectingPoint num="1" id="632" />
<extraparam>
<Data eventName="send_TCP" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="675" >
+<COMPONENT type="1010" id="636" >
<cdparam x="163" y="419" />
<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="wait event" value="open() " />
-<TGConnectingPoint num="0" id="673" />
-<TGConnectingPoint num="1" id="674" />
+<TGConnectingPoint num="0" id="634" />
+<TGConnectingPoint num="1" id="635" />
<breakpoint />
<extraparam>
<Data eventName="open" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1018" id="686" >
+<COMPONENT type="1018" id="647" >
<cdparam x="449" y="267" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="676" />
-<TGConnectingPoint num="1" id="677" />
-<TGConnectingPoint num="2" id="678" />
-<TGConnectingPoint num="3" id="679" />
-<TGConnectingPoint num="4" id="680" />
-<TGConnectingPoint num="5" id="681" />
-<TGConnectingPoint num="6" id="682" />
-<TGConnectingPoint num="7" id="683" />
-<TGConnectingPoint num="8" id="684" />
-<TGConnectingPoint num="9" id="685" />
+<TGConnectingPoint num="0" id="637" />
+<TGConnectingPoint num="1" id="638" />
+<TGConnectingPoint num="2" id="639" />
+<TGConnectingPoint num="3" id="640" />
+<TGConnectingPoint num="4" id="641" />
+<TGConnectingPoint num="5" id="642" />
+<TGConnectingPoint num="6" id="643" />
+<TGConnectingPoint num="7" id="644" />
+<TGConnectingPoint num="8" id="645" />
+<TGConnectingPoint num="9" id="646" />
<breakpoint />
</COMPONENT>
-<COMPONENT type="1001" id="688" >
+<COMPONENT type="1001" id="649" >
<cdparam x="226" y="529" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="687" />
+<TGConnectingPoint num="0" id="648" />
</COMPONENT>
-<COMPONENT type="1001" id="690" >
+<COMPONENT type="1001" id="651" >
<cdparam x="343" y="614" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="689" />
+<TGConnectingPoint num="0" id="650" />
</COMPONENT>
-<COMPONENT type="1010" id="693" >
+<COMPONENT type="1010" id="654" >
<cdparam x="275" y="228" />
<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="wait event" value="abort() " />
-<TGConnectingPoint num="0" id="691" />
-<TGConnectingPoint num="1" id="692" />
+<TGConnectingPoint num="0" id="652" />
+<TGConnectingPoint num="1" id="653" />
<extraparam>
<Data eventName="abort" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="695" >
+<COMPONENT type="1001" id="656" >
<cdparam x="291" y="290" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="694" />
+<TGConnectingPoint num="0" id="655" />
</COMPONENT>
-<COMPONENT type="301" id="712" >
+<COMPONENT type="301" id="673" >
<cdparam x="602" y="86" />
<sizeparam width="360" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3295,22 +3168,22 @@ ou depaquitiser un paquet TCP
On prend b=1 comme exemple
" />
-<TGConnectingPoint num="0" id="696" />
-<TGConnectingPoint num="1" id="697" />
-<TGConnectingPoint num="2" id="698" />
-<TGConnectingPoint num="3" id="699" />
-<TGConnectingPoint num="4" id="700" />
-<TGConnectingPoint num="5" id="701" />
-<TGConnectingPoint num="6" id="702" />
-<TGConnectingPoint num="7" id="703" />
-<TGConnectingPoint num="8" id="704" />
-<TGConnectingPoint num="9" id="705" />
-<TGConnectingPoint num="10" id="706" />
-<TGConnectingPoint num="11" id="707" />
-<TGConnectingPoint num="12" id="708" />
-<TGConnectingPoint num="13" id="709" />
-<TGConnectingPoint num="14" id="710" />
-<TGConnectingPoint num="15" id="711" />
+<TGConnectingPoint num="0" id="657" />
+<TGConnectingPoint num="1" id="658" />
+<TGConnectingPoint num="2" id="659" />
+<TGConnectingPoint num="3" id="660" />
+<TGConnectingPoint num="4" id="661" />
+<TGConnectingPoint num="5" id="662" />
+<TGConnectingPoint num="6" id="663" />
+<TGConnectingPoint num="7" id="664" />
+<TGConnectingPoint num="8" id="665" />
+<TGConnectingPoint num="9" id="666" />
+<TGConnectingPoint num="10" id="667" />
+<TGConnectingPoint num="11" id="668" />
+<TGConnectingPoint num="12" id="669" />
+<TGConnectingPoint num="13" id="670" />
+<TGConnectingPoint num="14" id="671" />
+<TGConnectingPoint num="15" id="672" />
<extraparam>
<Line value="b est le nombre d'instructions necessaires pour paquetiser" />
<Line value="ou depaquitiser un paquet TCP" />
@@ -3319,2830 +3192,2957 @@ On prend b=1 comme exemple
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="715" >
+<COMPONENT type="1009" id="676" >
<cdparam x="188" y="808" />
<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="read channel" value="fromAtoT(1) " />
-<TGConnectingPoint num="0" id="713" />
-<TGConnectingPoint num="1" id="714" />
+<TGConnectingPoint num="0" id="674" />
+<TGConnectingPoint num="1" id="675" />
<extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="718" >
+<COMPONENT type="1006" id="679" >
<cdparam x="191" y="1002" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="716" />
-<TGConnectingPoint num="1" id="717" />
+<TGConnectingPoint num="0" id="677" />
+<TGConnectingPoint num="1" id="678" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="720" >
+<COMPONENT type="1001" id="681" >
<cdparam x="219" y="1237" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="719" />
+<TGConnectingPoint num="0" id="680" />
</COMPONENT>
-<COMPONENT type="1011" id="723" >
+<COMPONENT type="1011" id="684" >
<cdparam x="388" y="1032" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =5" />
-<TGConnectingPoint num="0" id="721" />
-<TGConnectingPoint num="1" id="722" />
+<TGConnectingPoint num="0" id="682" />
+<TGConnectingPoint num="1" id="683" />
</COMPONENT>
-<COMPONENT type="1001" id="725" >
+<COMPONENT type="1001" id="686" >
<cdparam x="428" y="1213" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="724" />
+<TGConnectingPoint num="0" id="685" />
</COMPONENT>
-<COMPONENT type="1011" id="728" >
+<COMPONENT type="1011" id="689" >
<cdparam x="84" y="1041" />
<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state=3" />
-<TGConnectingPoint num="0" id="726" />
-<TGConnectingPoint num="1" id="727" />
+<TGConnectingPoint num="0" id="687" />
+<TGConnectingPoint num="1" id="688" />
</COMPONENT>
-<COMPONENT type="1006" id="731" >
+<COMPONENT type="1006" id="692" >
<cdparam x="93" y="938" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="729" />
-<TGConnectingPoint num="1" id="730" />
+<TGConnectingPoint num="0" id="690" />
+<TGConnectingPoint num="1" id="691" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="734" >
+<COMPONENT type="1011" id="695" >
<cdparam x="292" y="1026" />
<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =10" />
-<TGConnectingPoint num="0" id="732" />
-<TGConnectingPoint num="1" id="733" />
+<TGConnectingPoint num="0" id="693" />
+<TGConnectingPoint num="1" id="694" />
</COMPONENT>
-<COMPONENT type="1001" id="736" >
+<COMPONENT type="1001" id="697" >
<cdparam x="334" y="1229" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="735" />
+<TGConnectingPoint num="0" id="696" />
</COMPONENT>
-<COMPONENT type="1006" id="739" >
+<COMPONENT type="1006" id="700" >
<cdparam x="400" y="941" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="737" />
-<TGConnectingPoint num="1" id="738" />
+<TGConnectingPoint num="0" id="698" />
+<TGConnectingPoint num="1" id="699" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="742" >
+<COMPONENT type="1006" id="703" >
<cdparam x="307" y="900" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="740" />
-<TGConnectingPoint num="1" id="741" />
+<TGConnectingPoint num="0" id="701" />
+<TGConnectingPoint num="1" id="702" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="744" >
+<COMPONENT type="1001" id="705" >
<cdparam x="789" y="1270" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="743" />
+<TGConnectingPoint num="0" id="704" />
</COMPONENT>
-<COMPONENT type="301" id="761" >
+<COMPONENT type="301" id="722" >
<cdparam x="998" y="850" />
<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Fin
" />
-<TGConnectingPoint num="0" id="745" />
-<TGConnectingPoint num="1" id="746" />
-<TGConnectingPoint num="2" id="747" />
-<TGConnectingPoint num="3" id="748" />
-<TGConnectingPoint num="4" id="749" />
-<TGConnectingPoint num="5" id="750" />
-<TGConnectingPoint num="6" id="751" />
-<TGConnectingPoint num="7" id="752" />
-<TGConnectingPoint num="8" id="753" />
-<TGConnectingPoint num="9" id="754" />
-<TGConnectingPoint num="10" id="755" />
-<TGConnectingPoint num="11" id="756" />
-<TGConnectingPoint num="12" id="757" />
-<TGConnectingPoint num="13" id="758" />
-<TGConnectingPoint num="14" id="759" />
-<TGConnectingPoint num="15" id="760" />
+<TGConnectingPoint num="0" id="706" />
+<TGConnectingPoint num="1" id="707" />
+<TGConnectingPoint num="2" id="708" />
+<TGConnectingPoint num="3" id="709" />
+<TGConnectingPoint num="4" id="710" />
+<TGConnectingPoint num="5" id="711" />
+<TGConnectingPoint num="6" id="712" />
+<TGConnectingPoint num="7" id="713" />
+<TGConnectingPoint num="8" id="714" />
+<TGConnectingPoint num="9" id="715" />
+<TGConnectingPoint num="10" id="716" />
+<TGConnectingPoint num="11" id="717" />
+<TGConnectingPoint num="12" id="718" />
+<TGConnectingPoint num="13" id="719" />
+<TGConnectingPoint num="14" id="720" />
+<TGConnectingPoint num="15" id="721" />
<extraparam>
<Line value="Fin" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="764" >
+<COMPONENT type="1011" id="725" >
<cdparam x="678" y="965" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="762" />
-<TGConnectingPoint num="1" id="763" />
+<TGConnectingPoint num="0" id="723" />
+<TGConnectingPoint num="1" id="724" />
</COMPONENT>
-<COMPONENT type="1001" id="766" >
+<COMPONENT type="1001" id="727" >
<cdparam x="718" y="1032" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="765" />
+<TGConnectingPoint num="0" id="726" />
</COMPONENT>
-<COMPONENT type="1006" id="769" >
+<COMPONENT type="1006" id="730" >
<cdparam x="761" y="1086" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="767" />
-<TGConnectingPoint num="1" id="768" />
+<TGConnectingPoint num="0" id="728" />
+<TGConnectingPoint num="1" id="729" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="786" >
+<COMPONENT type="301" id="747" >
<cdparam x="781" y="950" />
<sizeparam width="89" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Active Open
" />
-<TGConnectingPoint num="0" id="770" />
-<TGConnectingPoint num="1" id="771" />
-<TGConnectingPoint num="2" id="772" />
-<TGConnectingPoint num="3" id="773" />
-<TGConnectingPoint num="4" id="774" />
-<TGConnectingPoint num="5" id="775" />
-<TGConnectingPoint num="6" id="776" />
-<TGConnectingPoint num="7" id="777" />
-<TGConnectingPoint num="8" id="778" />
-<TGConnectingPoint num="9" id="779" />
-<TGConnectingPoint num="10" id="780" />
-<TGConnectingPoint num="11" id="781" />
-<TGConnectingPoint num="12" id="782" />
-<TGConnectingPoint num="13" id="783" />
-<TGConnectingPoint num="14" id="784" />
-<TGConnectingPoint num="15" id="785" />
+<TGConnectingPoint num="0" id="731" />
+<TGConnectingPoint num="1" id="732" />
+<TGConnectingPoint num="2" id="733" />
+<TGConnectingPoint num="3" id="734" />
+<TGConnectingPoint num="4" id="735" />
+<TGConnectingPoint num="5" id="736" />
+<TGConnectingPoint num="6" id="737" />
+<TGConnectingPoint num="7" id="738" />
+<TGConnectingPoint num="8" id="739" />
+<TGConnectingPoint num="9" id="740" />
+<TGConnectingPoint num="10" id="741" />
+<TGConnectingPoint num="11" id="742" />
+<TGConnectingPoint num="12" id="743" />
+<TGConnectingPoint num="13" id="744" />
+<TGConnectingPoint num="14" id="745" />
+<TGConnectingPoint num="15" id="746" />
<extraparam>
<Line value="Active Open" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="803" >
+<COMPONENT type="301" id="764" >
<cdparam x="715" y="907" />
<sizeparam width="97" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Passive Open
" />
-<TGConnectingPoint num="0" id="787" />
-<TGConnectingPoint num="1" id="788" />
-<TGConnectingPoint num="2" id="789" />
-<TGConnectingPoint num="3" id="790" />
-<TGConnectingPoint num="4" id="791" />
-<TGConnectingPoint num="5" id="792" />
-<TGConnectingPoint num="6" id="793" />
-<TGConnectingPoint num="7" id="794" />
-<TGConnectingPoint num="8" id="795" />
-<TGConnectingPoint num="9" id="796" />
-<TGConnectingPoint num="10" id="797" />
-<TGConnectingPoint num="11" id="798" />
-<TGConnectingPoint num="12" id="799" />
-<TGConnectingPoint num="13" id="800" />
-<TGConnectingPoint num="14" id="801" />
-<TGConnectingPoint num="15" id="802" />
+<TGConnectingPoint num="0" id="748" />
+<TGConnectingPoint num="1" id="749" />
+<TGConnectingPoint num="2" id="750" />
+<TGConnectingPoint num="3" id="751" />
+<TGConnectingPoint num="4" id="752" />
+<TGConnectingPoint num="5" id="753" />
+<TGConnectingPoint num="6" id="754" />
+<TGConnectingPoint num="7" id="755" />
+<TGConnectingPoint num="8" id="756" />
+<TGConnectingPoint num="9" id="757" />
+<TGConnectingPoint num="10" id="758" />
+<TGConnectingPoint num="11" id="759" />
+<TGConnectingPoint num="12" id="760" />
+<TGConnectingPoint num="13" id="761" />
+<TGConnectingPoint num="14" id="762" />
+<TGConnectingPoint num="15" id="763" />
<extraparam>
<Line value="Passive Open" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="806" >
+<COMPONENT type="1011" id="767" >
<cdparam x="749" y="1193" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =3" />
-<TGConnectingPoint num="0" id="804" />
-<TGConnectingPoint num="1" id="805" />
+<TGConnectingPoint num="0" id="765" />
+<TGConnectingPoint num="1" id="766" />
</COMPONENT>
-<COMPONENT type="1011" id="809" >
+<COMPONENT type="1011" id="770" >
<cdparam x="446" y="768" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="807" />
-<TGConnectingPoint num="1" id="808" />
+<TGConnectingPoint num="0" id="768" />
+<TGConnectingPoint num="1" id="769" />
</COMPONENT>
-<COMPONENT type="1001" id="811" >
+<COMPONENT type="1001" id="772" >
<cdparam x="486" y="830" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="810" />
+<TGConnectingPoint num="0" id="771" />
</COMPONENT>
-<COMPONENT type="1006" id="814" >
+<COMPONENT type="1006" id="775" >
<cdparam x="904" y="1123" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="812" />
-<TGConnectingPoint num="1" id="813" />
+<TGConnectingPoint num="0" id="773" />
+<TGConnectingPoint num="1" id="774" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="831" >
+<COMPONENT type="301" id="792" >
<cdparam x="884" y="1068" />
<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of Fin
" />
-<TGConnectingPoint num="0" id="815" />
-<TGConnectingPoint num="1" id="816" />
-<TGConnectingPoint num="2" id="817" />
-<TGConnectingPoint num="3" id="818" />
-<TGConnectingPoint num="4" id="819" />
-<TGConnectingPoint num="5" id="820" />
-<TGConnectingPoint num="6" id="821" />
-<TGConnectingPoint num="7" id="822" />
-<TGConnectingPoint num="8" id="823" />
-<TGConnectingPoint num="9" id="824" />
-<TGConnectingPoint num="10" id="825" />
-<TGConnectingPoint num="11" id="826" />
-<TGConnectingPoint num="12" id="827" />
-<TGConnectingPoint num="13" id="828" />
-<TGConnectingPoint num="14" id="829" />
-<TGConnectingPoint num="15" id="830" />
+<TGConnectingPoint num="0" id="776" />
+<TGConnectingPoint num="1" id="777" />
+<TGConnectingPoint num="2" id="778" />
+<TGConnectingPoint num="3" id="779" />
+<TGConnectingPoint num="4" id="780" />
+<TGConnectingPoint num="5" id="781" />
+<TGConnectingPoint num="6" id="782" />
+<TGConnectingPoint num="7" id="783" />
+<TGConnectingPoint num="8" id="784" />
+<TGConnectingPoint num="9" id="785" />
+<TGConnectingPoint num="10" id="786" />
+<TGConnectingPoint num="11" id="787" />
+<TGConnectingPoint num="12" id="788" />
+<TGConnectingPoint num="13" id="789" />
+<TGConnectingPoint num="14" id="790" />
+<TGConnectingPoint num="15" id="791" />
<extraparam>
<Line value="send Ack of Fin" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="834" >
+<COMPONENT type="1011" id="795" >
<cdparam x="893" y="1234" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =9" />
-<TGConnectingPoint num="0" id="832" />
-<TGConnectingPoint num="1" id="833" />
+<TGConnectingPoint num="0" id="793" />
+<TGConnectingPoint num="1" id="794" />
</COMPONENT>
-<COMPONENT type="1001" id="836" >
+<COMPONENT type="1001" id="797" >
<cdparam x="933" y="1311" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="835" />
+<TGConnectingPoint num="0" id="796" />
</COMPONENT>
-<COMPONENT type="1006" id="839" >
+<COMPONENT type="1006" id="800" >
<cdparam x="1010" y="1155" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="837" />
-<TGConnectingPoint num="1" id="838" />
+<TGConnectingPoint num="0" id="798" />
+<TGConnectingPoint num="1" id="799" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="856" >
+<COMPONENT type="301" id="817" >
<cdparam x="1000" y="1094" />
<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of Fin
" />
-<TGConnectingPoint num="0" id="840" />
-<TGConnectingPoint num="1" id="841" />
-<TGConnectingPoint num="2" id="842" />
-<TGConnectingPoint num="3" id="843" />
-<TGConnectingPoint num="4" id="844" />
-<TGConnectingPoint num="5" id="845" />
-<TGConnectingPoint num="6" id="846" />
-<TGConnectingPoint num="7" id="847" />
-<TGConnectingPoint num="8" id="848" />
-<TGConnectingPoint num="9" id="849" />
-<TGConnectingPoint num="10" id="850" />
-<TGConnectingPoint num="11" id="851" />
-<TGConnectingPoint num="12" id="852" />
-<TGConnectingPoint num="13" id="853" />
-<TGConnectingPoint num="14" id="854" />
-<TGConnectingPoint num="15" id="855" />
+<TGConnectingPoint num="0" id="801" />
+<TGConnectingPoint num="1" id="802" />
+<TGConnectingPoint num="2" id="803" />
+<TGConnectingPoint num="3" id="804" />
+<TGConnectingPoint num="4" id="805" />
+<TGConnectingPoint num="5" id="806" />
+<TGConnectingPoint num="6" id="807" />
+<TGConnectingPoint num="7" id="808" />
+<TGConnectingPoint num="8" id="809" />
+<TGConnectingPoint num="9" id="810" />
+<TGConnectingPoint num="10" id="811" />
+<TGConnectingPoint num="11" id="812" />
+<TGConnectingPoint num="12" id="813" />
+<TGConnectingPoint num="13" id="814" />
+<TGConnectingPoint num="14" id="815" />
+<TGConnectingPoint num="15" id="816" />
<extraparam>
<Line value="send Ack of Fin" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="859" >
+<COMPONENT type="1011" id="820" >
<cdparam x="999" y="1266" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =7" />
-<TGConnectingPoint num="0" id="857" />
-<TGConnectingPoint num="1" id="858" />
+<TGConnectingPoint num="0" id="818" />
+<TGConnectingPoint num="1" id="819" />
</COMPONENT>
-<COMPONENT type="1001" id="861" >
+<COMPONENT type="1001" id="822" >
<cdparam x="1039" y="1341" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="860" />
+<TGConnectingPoint num="0" id="821" />
</COMPONENT>
-<COMPONENT type="1006" id="864" >
+<COMPONENT type="1006" id="825" >
<cdparam x="683" y="758" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="862" />
-<TGConnectingPoint num="1" id="863" />
+<TGConnectingPoint num="0" id="823" />
+<TGConnectingPoint num="1" id="824" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="866" >
+<COMPONENT type="1001" id="827" >
<cdparam x="712" y="865" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="865" />
+<TGConnectingPoint num="0" id="826" />
</COMPONENT>
-<COMPONENT type="1007" id="869" >
+<COMPONENT type="1007" id="830" >
<cdparam x="93" y="1100" />
<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="867" />
-<TGConnectingPoint num="1" id="868" />
+<TGConnectingPoint num="0" id="828" />
+<TGConnectingPoint num="1" id="829" />
<extraparam>
<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="872" >
+<COMPONENT type="1006" id="833" >
<cdparam x="104" y="1167" />
<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="870" />
-<TGConnectingPoint num="1" id="871" />
+<TGConnectingPoint num="0" id="831" />
+<TGConnectingPoint num="1" id="832" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="874" >
+<COMPONENT type="1001" id="835" >
<cdparam x="122" y="1236" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="873" />
+<TGConnectingPoint num="0" id="834" />
</COMPONENT>
-<COMPONENT type="1007" id="877" >
+<COMPONENT type="1007" id="838" >
<cdparam x="190" y="1102" />
<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="875" />
-<TGConnectingPoint num="1" id="876" />
+<TGConnectingPoint num="0" id="836" />
+<TGConnectingPoint num="1" id="837" />
<extraparam>
<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="880" >
+<COMPONENT type="1006" id="841" >
<cdparam x="201" y="1169" />
<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="878" />
-<TGConnectingPoint num="1" id="879" />
+<TGConnectingPoint num="0" id="839" />
+<TGConnectingPoint num="1" id="840" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="883" >
+<COMPONENT type="1007" id="844" >
<cdparam x="307" y="1106" />
<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="881" />
-<TGConnectingPoint num="1" id="882" />
+<TGConnectingPoint num="0" id="842" />
+<TGConnectingPoint num="1" id="843" />
<extraparam>
<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="886" >
+<COMPONENT type="1006" id="847" >
<cdparam x="318" y="1173" />
<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="884" />
-<TGConnectingPoint num="1" id="885" />
+<TGConnectingPoint num="0" id="845" />
+<TGConnectingPoint num="1" id="846" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1007" id="889" >
+<COMPONENT type="1007" id="850" >
<cdparam x="399" y="1090" />
<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="887" />
-<TGConnectingPoint num="1" id="888" />
+<TGConnectingPoint num="0" id="848" />
+<TGConnectingPoint num="1" id="849" />
<extraparam>
<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="892" >
+<COMPONENT type="1006" id="853" >
<cdparam x="410" y="1159" />
<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="890" />
-<TGConnectingPoint num="1" id="891" />
+<TGConnectingPoint num="0" id="851" />
+<TGConnectingPoint num="1" id="852" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="895" >
+<COMPONENT type="1011" id="856" >
<cdparam x="56" y="861" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="893" />
-<TGConnectingPoint num="1" id="894" />
+<TGConnectingPoint num="0" id="854" />
+<TGConnectingPoint num="1" id="855" />
</COMPONENT>
-<COMPONENT type="1011" id="898" >
+<COMPONENT type="1011" id="859" >
<cdparam x="154" y="940" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="896" />
-<TGConnectingPoint num="1" id="897" />
+<TGConnectingPoint num="0" id="857" />
+<TGConnectingPoint num="1" id="858" />
</COMPONENT>
-<COMPONENT type="1011" id="901" >
+<COMPONENT type="1011" id="862" >
<cdparam x="363" y="865" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="899" />
-<TGConnectingPoint num="1" id="900" />
+<TGConnectingPoint num="0" id="860" />
+<TGConnectingPoint num="1" id="861" />
</COMPONENT>
-<COMPONENT type="1011" id="904" >
+<COMPONENT type="1011" id="865" >
<cdparam x="270" y="831" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="902" />
-<TGConnectingPoint num="1" id="903" />
+<TGConnectingPoint num="0" id="863" />
+<TGConnectingPoint num="1" id="864" />
</COMPONENT>
-<COMPONENT type="1008" id="907" >
+<COMPONENT type="1008" id="868" >
<cdparam x="206" y="1052" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="905" />
-<TGConnectingPoint num="1" id="906" />
+<TGConnectingPoint num="0" id="866" />
+<TGConnectingPoint num="1" id="867" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="910" >
+<COMPONENT type="1008" id="871" >
<cdparam x="323" y="962" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="908" />
-<TGConnectingPoint num="1" id="909" />
+<TGConnectingPoint num="0" id="869" />
+<TGConnectingPoint num="1" id="870" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="913" >
+<COMPONENT type="1008" id="874" >
<cdparam x="415" y="983" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="911" />
-<TGConnectingPoint num="1" id="912" />
+<TGConnectingPoint num="0" id="872" />
+<TGConnectingPoint num="1" id="873" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="916" >
+<COMPONENT type="1008" id="877" >
<cdparam x="109" y="986" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="914" />
-<TGConnectingPoint num="1" id="915" />
+<TGConnectingPoint num="0" id="875" />
+<TGConnectingPoint num="1" id="876" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="919" >
+<COMPONENT type="1008" id="880" >
<cdparam x="699" y="813" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="917" />
-<TGConnectingPoint num="1" id="918" />
+<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="1" id="879" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="922" >
+<COMPONENT type="1008" id="883" >
<cdparam x="775" y="1141" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="920" />
-<TGConnectingPoint num="1" id="921" />
+<TGConnectingPoint num="0" id="881" />
+<TGConnectingPoint num="1" id="882" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="925" >
+<COMPONENT type="1008" id="886" >
<cdparam x="920" y="1178" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="923" />
-<TGConnectingPoint num="1" id="924" />
+<TGConnectingPoint num="0" id="884" />
+<TGConnectingPoint num="1" id="885" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="928" >
+<COMPONENT type="1008" id="889" >
<cdparam x="1026" y="1211" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="926" />
-<TGConnectingPoint num="1" id="927" />
+<TGConnectingPoint num="0" id="887" />
+<TGConnectingPoint num="1" id="888" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="930" >
+<COMPONENT type="1001" id="891" >
<cdparam x="612" y="762" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="929" />
+<TGConnectingPoint num="0" id="890" />
</COMPONENT>
-<COMPONENT type="1001" id="932" >
+<COMPONENT type="1001" id="893" >
<cdparam x="899" y="922" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="931" />
+<TGConnectingPoint num="0" id="892" />
</COMPONENT>
-<COMPONENT type="1006" id="935" >
+<COMPONENT type="1006" id="896" >
<cdparam x="1169" y="1214" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="933" />
-<TGConnectingPoint num="1" id="934" />
+<TGConnectingPoint num="0" id="894" />
+<TGConnectingPoint num="1" id="895" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="952" >
+<COMPONENT type="301" id="913" >
<cdparam x="1159" y="1153" />
<sizeparam width="108" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of Fin
" />
-<TGConnectingPoint num="0" id="936" />
-<TGConnectingPoint num="1" id="937" />
-<TGConnectingPoint num="2" id="938" />
-<TGConnectingPoint num="3" id="939" />
-<TGConnectingPoint num="4" id="940" />
-<TGConnectingPoint num="5" id="941" />
-<TGConnectingPoint num="6" id="942" />
-<TGConnectingPoint num="7" id="943" />
-<TGConnectingPoint num="8" id="944" />
-<TGConnectingPoint num="9" id="945" />
-<TGConnectingPoint num="10" id="946" />
-<TGConnectingPoint num="11" id="947" />
-<TGConnectingPoint num="12" id="948" />
-<TGConnectingPoint num="13" id="949" />
-<TGConnectingPoint num="14" id="950" />
-<TGConnectingPoint num="15" id="951" />
+<TGConnectingPoint num="0" id="897" />
+<TGConnectingPoint num="1" id="898" />
+<TGConnectingPoint num="2" id="899" />
+<TGConnectingPoint num="3" id="900" />
+<TGConnectingPoint num="4" id="901" />
+<TGConnectingPoint num="5" id="902" />
+<TGConnectingPoint num="6" id="903" />
+<TGConnectingPoint num="7" id="904" />
+<TGConnectingPoint num="8" id="905" />
+<TGConnectingPoint num="9" id="906" />
+<TGConnectingPoint num="10" id="907" />
+<TGConnectingPoint num="11" id="908" />
+<TGConnectingPoint num="12" id="909" />
+<TGConnectingPoint num="13" id="910" />
+<TGConnectingPoint num="14" id="911" />
+<TGConnectingPoint num="15" id="912" />
<extraparam>
<Line value="send Ack of Fin" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="955" >
+<COMPONENT type="1011" id="916" >
<cdparam x="1158" y="1295" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="953" />
-<TGConnectingPoint num="1" id="954" />
+<TGConnectingPoint num="0" id="914" />
+<TGConnectingPoint num="1" id="915" />
</COMPONENT>
-<COMPONENT type="1001" id="957" >
+<COMPONENT type="1001" id="918" >
<cdparam x="1197" y="1471" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="956" />
+<TGConnectingPoint num="0" id="917" />
</COMPONENT>
-<COMPONENT type="1011" id="960" >
+<COMPONENT type="1011" id="921" >
<cdparam x="1157" y="1402" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="958" />
-<TGConnectingPoint num="1" id="959" />
+<TGConnectingPoint num="0" id="919" />
+<TGConnectingPoint num="1" id="920" />
</COMPONENT>
-<COMPONENT type="1008" id="963" >
+<COMPONENT type="1008" id="924" >
<cdparam x="1185" y="1351" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="961" />
-<TGConnectingPoint num="1" id="962" />
+<TGConnectingPoint num="0" id="922" />
+<TGConnectingPoint num="1" id="923" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="965" >
+<COMPONENT type="1001" id="926" >
<cdparam x="1277" y="1070" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="964" />
+<TGConnectingPoint num="0" id="925" />
</COMPONENT>
-<COMPONENT type="1001" id="967" >
+<COMPONENT type="1001" id="928" >
<cdparam x="1519" y="1457" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="966" />
+<TGConnectingPoint num="0" id="927" />
</COMPONENT>
-<COMPONENT type="1006" id="970" >
+<COMPONENT type="1006" id="931" >
<cdparam x="1489" y="1132" />
<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoA(1)" />
-<TGConnectingPoint num="0" id="968" />
-<TGConnectingPoint num="1" id="969" />
+<TGConnectingPoint num="0" id="929" />
+<TGConnectingPoint num="1" id="930" />
<extraparam>
-<Data channelName="fromTtoA" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoA" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="973" >
+<COMPONENT type="1006" id="934" >
<cdparam x="1490" y="1348" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="971" />
-<TGConnectingPoint num="1" id="972" />
+<TGConnectingPoint num="0" id="932" />
+<TGConnectingPoint num="1" id="933" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="976" >
+<COMPONENT type="1008" id="937" >
<cdparam x="1710" y="1026" />
<sizeparam width="43" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="stop()" />
-<TGConnectingPoint num="0" id="974" />
-<TGConnectingPoint num="1" id="975" />
+<TGConnectingPoint num="0" id="935" />
+<TGConnectingPoint num="1" id="936" />
<extraparam>
<Data eventName="stop" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="993" >
+<COMPONENT type="301" id="954" >
<cdparam x="1759" y="1192" />
<sizeparam width="86" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Correct ack
" />
-<TGConnectingPoint num="0" id="977" />
-<TGConnectingPoint num="1" id="978" />
-<TGConnectingPoint num="2" id="979" />
-<TGConnectingPoint num="3" id="980" />
-<TGConnectingPoint num="4" id="981" />
-<TGConnectingPoint num="5" id="982" />
-<TGConnectingPoint num="6" id="983" />
-<TGConnectingPoint num="7" id="984" />
-<TGConnectingPoint num="8" id="985" />
-<TGConnectingPoint num="9" id="986" />
-<TGConnectingPoint num="10" id="987" />
-<TGConnectingPoint num="11" id="988" />
-<TGConnectingPoint num="12" id="989" />
-<TGConnectingPoint num="13" id="990" />
-<TGConnectingPoint num="14" id="991" />
-<TGConnectingPoint num="15" id="992" />
+<TGConnectingPoint num="0" id="938" />
+<TGConnectingPoint num="1" id="939" />
+<TGConnectingPoint num="2" id="940" />
+<TGConnectingPoint num="3" id="941" />
+<TGConnectingPoint num="4" id="942" />
+<TGConnectingPoint num="5" id="943" />
+<TGConnectingPoint num="6" id="944" />
+<TGConnectingPoint num="7" id="945" />
+<TGConnectingPoint num="8" id="946" />
+<TGConnectingPoint num="9" id="947" />
+<TGConnectingPoint num="10" id="948" />
+<TGConnectingPoint num="11" id="949" />
+<TGConnectingPoint num="12" id="950" />
+<TGConnectingPoint num="13" id="951" />
+<TGConnectingPoint num="14" id="952" />
+<TGConnectingPoint num="15" id="953" />
<extraparam>
<Line value="Correct ack" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1010" >
+<COMPONENT type="301" id="971" >
<cdparam x="1635" y="1168" />
<sizeparam width="71" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="false ack
" />
-<TGConnectingPoint num="0" id="994" />
-<TGConnectingPoint num="1" id="995" />
-<TGConnectingPoint num="2" id="996" />
-<TGConnectingPoint num="3" id="997" />
-<TGConnectingPoint num="4" id="998" />
-<TGConnectingPoint num="5" id="999" />
-<TGConnectingPoint num="6" id="1000" />
-<TGConnectingPoint num="7" id="1001" />
-<TGConnectingPoint num="8" id="1002" />
-<TGConnectingPoint num="9" id="1003" />
-<TGConnectingPoint num="10" id="1004" />
-<TGConnectingPoint num="11" id="1005" />
-<TGConnectingPoint num="12" id="1006" />
-<TGConnectingPoint num="13" id="1007" />
-<TGConnectingPoint num="14" id="1008" />
-<TGConnectingPoint num="15" id="1009" />
+<TGConnectingPoint num="0" id="955" />
+<TGConnectingPoint num="1" id="956" />
+<TGConnectingPoint num="2" id="957" />
+<TGConnectingPoint num="3" id="958" />
+<TGConnectingPoint num="4" id="959" />
+<TGConnectingPoint num="5" id="960" />
+<TGConnectingPoint num="6" id="961" />
+<TGConnectingPoint num="7" id="962" />
+<TGConnectingPoint num="8" id="963" />
+<TGConnectingPoint num="9" id="964" />
+<TGConnectingPoint num="10" id="965" />
+<TGConnectingPoint num="11" id="966" />
+<TGConnectingPoint num="12" id="967" />
+<TGConnectingPoint num="13" id="968" />
+<TGConnectingPoint num="14" id="969" />
+<TGConnectingPoint num="15" id="970" />
<extraparam>
<Line value="false ack" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1013" >
+<COMPONENT type="1006" id="974" >
<cdparam x="1602" y="1299" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1011" />
-<TGConnectingPoint num="1" id="1012" />
+<TGConnectingPoint num="0" id="972" />
+<TGConnectingPoint num="1" id="973" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1015" >
+<COMPONENT type="1001" id="976" >
<cdparam x="1632" y="1468" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1014" />
+<TGConnectingPoint num="0" id="975" />
</COMPONENT>
-<COMPONENT type="301" id="1032" >
+<COMPONENT type="301" id="993" >
<cdparam x="1469" y="1295" />
<sizeparam width="127" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="return acknowldge
" />
-<TGConnectingPoint num="0" id="1016" />
-<TGConnectingPoint num="1" id="1017" />
-<TGConnectingPoint num="2" id="1018" />
-<TGConnectingPoint num="3" id="1019" />
-<TGConnectingPoint num="4" id="1020" />
-<TGConnectingPoint num="5" id="1021" />
-<TGConnectingPoint num="6" id="1022" />
-<TGConnectingPoint num="7" id="1023" />
-<TGConnectingPoint num="8" id="1024" />
-<TGConnectingPoint num="9" id="1025" />
-<TGConnectingPoint num="10" id="1026" />
-<TGConnectingPoint num="11" id="1027" />
-<TGConnectingPoint num="12" id="1028" />
-<TGConnectingPoint num="13" id="1029" />
-<TGConnectingPoint num="14" id="1030" />
-<TGConnectingPoint num="15" id="1031" />
+<TGConnectingPoint num="0" id="977" />
+<TGConnectingPoint num="1" id="978" />
+<TGConnectingPoint num="2" id="979" />
+<TGConnectingPoint num="3" id="980" />
+<TGConnectingPoint num="4" id="981" />
+<TGConnectingPoint num="5" id="982" />
+<TGConnectingPoint num="6" id="983" />
+<TGConnectingPoint num="7" id="984" />
+<TGConnectingPoint num="8" id="985" />
+<TGConnectingPoint num="9" id="986" />
+<TGConnectingPoint num="10" id="987" />
+<TGConnectingPoint num="11" id="988" />
+<TGConnectingPoint num="12" id="989" />
+<TGConnectingPoint num="13" id="990" />
+<TGConnectingPoint num="14" id="991" />
+<TGConnectingPoint num="15" id="992" />
<extraparam>
<Line value="return acknowldge" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1049" >
+<COMPONENT type="301" id="1010" >
<cdparam x="1620" y="927" />
<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="data
" />
-<TGConnectingPoint num="0" id="1033" />
-<TGConnectingPoint num="1" id="1034" />
-<TGConnectingPoint num="2" id="1035" />
-<TGConnectingPoint num="3" id="1036" />
-<TGConnectingPoint num="4" id="1037" />
-<TGConnectingPoint num="5" id="1038" />
-<TGConnectingPoint num="6" id="1039" />
-<TGConnectingPoint num="7" id="1040" />
-<TGConnectingPoint num="8" id="1041" />
-<TGConnectingPoint num="9" id="1042" />
-<TGConnectingPoint num="10" id="1043" />
-<TGConnectingPoint num="11" id="1044" />
-<TGConnectingPoint num="12" id="1045" />
-<TGConnectingPoint num="13" id="1046" />
-<TGConnectingPoint num="14" id="1047" />
-<TGConnectingPoint num="15" id="1048" />
+<TGConnectingPoint num="0" id="994" />
+<TGConnectingPoint num="1" id="995" />
+<TGConnectingPoint num="2" id="996" />
+<TGConnectingPoint num="3" id="997" />
+<TGConnectingPoint num="4" id="998" />
+<TGConnectingPoint num="5" id="999" />
+<TGConnectingPoint num="6" id="1000" />
+<TGConnectingPoint num="7" id="1001" />
+<TGConnectingPoint num="8" id="1002" />
+<TGConnectingPoint num="9" id="1003" />
+<TGConnectingPoint num="10" id="1004" />
+<TGConnectingPoint num="11" id="1005" />
+<TGConnectingPoint num="12" id="1006" />
+<TGConnectingPoint num="13" id="1007" />
+<TGConnectingPoint num="14" id="1008" />
+<TGConnectingPoint num="15" id="1009" />
<extraparam>
<Line value="data" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1052" >
+<COMPONENT type="1008" id="1013" >
<cdparam x="1506" y="1405" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1050" />
-<TGConnectingPoint num="1" id="1051" />
+<TGConnectingPoint num="0" id="1011" />
+<TGConnectingPoint num="1" id="1012" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1055" >
+<COMPONENT type="1008" id="1016" >
<cdparam x="1619" y="1348" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1053" />
-<TGConnectingPoint num="1" id="1054" />
+<TGConnectingPoint num="0" id="1014" />
+<TGConnectingPoint num="1" id="1015" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1058" >
+<COMPONENT type="1006" id="1019" >
<cdparam x="1614" y="1404" />
<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1056" />
-<TGConnectingPoint num="1" id="1057" />
+<TGConnectingPoint num="0" id="1017" />
+<TGConnectingPoint num="1" id="1018" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1060" >
+<COMPONENT type="1001" id="1021" >
<cdparam x="1730" y="1335" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1059" />
+<TGConnectingPoint num="0" id="1020" />
</COMPONENT>
-<COMPONENT type="1011" id="1063" >
+<COMPONENT type="1011" id="1024" >
<cdparam x="1776" y="1349" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =4" />
-<TGConnectingPoint num="0" id="1061" />
-<TGConnectingPoint num="1" id="1062" />
+<TGConnectingPoint num="0" id="1022" />
+<TGConnectingPoint num="1" id="1023" />
</COMPONENT>
-<COMPONENT type="1001" id="1065" >
+<COMPONENT type="1001" id="1026" >
<cdparam x="1818" y="1457" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1064" />
+<TGConnectingPoint num="0" id="1025" />
</COMPONENT>
-<COMPONENT type="1011" id="1068" >
+<COMPONENT type="1011" id="1029" >
<cdparam x="1870" y="1411" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =6" />
-<TGConnectingPoint num="0" id="1066" />
-<TGConnectingPoint num="1" id="1067" />
+<TGConnectingPoint num="0" id="1027" />
+<TGConnectingPoint num="1" id="1028" />
</COMPONENT>
-<COMPONENT type="1001" id="1070" >
+<COMPONENT type="1001" id="1031" >
<cdparam x="1910" y="1481" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1069" />
+<TGConnectingPoint num="0" id="1030" />
</COMPONENT>
-<COMPONENT type="1001" id="1072" >
+<COMPONENT type="1001" id="1033" >
<cdparam x="1986" y="1543" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1071" />
+<TGConnectingPoint num="0" id="1032" />
</COMPONENT>
-<COMPONENT type="1011" id="1075" >
+<COMPONENT type="1011" id="1036" >
<cdparam x="2051" y="1466" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1073" />
-<TGConnectingPoint num="1" id="1074" />
+<TGConnectingPoint num="0" id="1034" />
+<TGConnectingPoint num="1" id="1035" />
</COMPONENT>
-<COMPONENT type="1001" id="1077" >
+<COMPONENT type="1001" id="1038" >
<cdparam x="2091" y="1537" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1076" />
+<TGConnectingPoint num="0" id="1037" />
</COMPONENT>
-<COMPONENT type="1011" id="1080" >
+<COMPONENT type="1011" id="1041" >
<cdparam x="1946" y="1493" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1078" />
-<TGConnectingPoint num="1" id="1079" />
+<TGConnectingPoint num="0" id="1039" />
+<TGConnectingPoint num="1" id="1040" />
</COMPONENT>
-<COMPONENT type="1011" id="1083" >
+<COMPONENT type="1011" id="1044" >
<cdparam x="1946" y="1434" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="1081" />
-<TGConnectingPoint num="1" id="1082" />
+<TGConnectingPoint num="0" id="1042" />
+<TGConnectingPoint num="1" id="1043" />
</COMPONENT>
-<COMPONENT type="301" id="1100" >
+<COMPONENT type="301" id="1061" >
<cdparam x="1825" y="889" />
<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Syn
" />
-<TGConnectingPoint num="0" id="1084" />
-<TGConnectingPoint num="1" id="1085" />
-<TGConnectingPoint num="2" id="1086" />
-<TGConnectingPoint num="3" id="1087" />
-<TGConnectingPoint num="4" id="1088" />
-<TGConnectingPoint num="5" id="1089" />
-<TGConnectingPoint num="6" id="1090" />
-<TGConnectingPoint num="7" id="1091" />
-<TGConnectingPoint num="8" id="1092" />
-<TGConnectingPoint num="9" id="1093" />
-<TGConnectingPoint num="10" id="1094" />
-<TGConnectingPoint num="11" id="1095" />
-<TGConnectingPoint num="12" id="1096" />
-<TGConnectingPoint num="13" id="1097" />
-<TGConnectingPoint num="14" id="1098" />
-<TGConnectingPoint num="15" id="1099" />
+<TGConnectingPoint num="0" id="1045" />
+<TGConnectingPoint num="1" id="1046" />
+<TGConnectingPoint num="2" id="1047" />
+<TGConnectingPoint num="3" id="1048" />
+<TGConnectingPoint num="4" id="1049" />
+<TGConnectingPoint num="5" id="1050" />
+<TGConnectingPoint num="6" id="1051" />
+<TGConnectingPoint num="7" id="1052" />
+<TGConnectingPoint num="8" id="1053" />
+<TGConnectingPoint num="9" id="1054" />
+<TGConnectingPoint num="10" id="1055" />
+<TGConnectingPoint num="11" id="1056" />
+<TGConnectingPoint num="12" id="1057" />
+<TGConnectingPoint num="13" id="1058" />
+<TGConnectingPoint num="14" id="1059" />
+<TGConnectingPoint num="15" id="1060" />
<extraparam>
<Line value="Syn" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1117" >
+<COMPONENT type="301" id="1078" >
<cdparam x="1707" y="945" />
<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="ack
" />
-<TGConnectingPoint num="0" id="1101" />
-<TGConnectingPoint num="1" id="1102" />
-<TGConnectingPoint num="2" id="1103" />
-<TGConnectingPoint num="3" id="1104" />
-<TGConnectingPoint num="4" id="1105" />
-<TGConnectingPoint num="5" id="1106" />
-<TGConnectingPoint num="6" id="1107" />
-<TGConnectingPoint num="7" id="1108" />
-<TGConnectingPoint num="8" id="1109" />
-<TGConnectingPoint num="9" id="1110" />
-<TGConnectingPoint num="10" id="1111" />
-<TGConnectingPoint num="11" id="1112" />
-<TGConnectingPoint num="12" id="1113" />
-<TGConnectingPoint num="13" id="1114" />
-<TGConnectingPoint num="14" id="1115" />
-<TGConnectingPoint num="15" id="1116" />
+<TGConnectingPoint num="0" id="1062" />
+<TGConnectingPoint num="1" id="1063" />
+<TGConnectingPoint num="2" id="1064" />
+<TGConnectingPoint num="3" id="1065" />
+<TGConnectingPoint num="4" id="1066" />
+<TGConnectingPoint num="5" id="1067" />
+<TGConnectingPoint num="6" id="1068" />
+<TGConnectingPoint num="7" id="1069" />
+<TGConnectingPoint num="8" id="1070" />
+<TGConnectingPoint num="9" id="1071" />
+<TGConnectingPoint num="10" id="1072" />
+<TGConnectingPoint num="11" id="1073" />
+<TGConnectingPoint num="12" id="1074" />
+<TGConnectingPoint num="13" id="1075" />
+<TGConnectingPoint num="14" id="1076" />
+<TGConnectingPoint num="15" id="1077" />
<extraparam>
<Line value="ack" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1120" >
+<COMPONENT type="1006" id="1081" >
<cdparam x="2179" y="1198" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1118" />
-<TGConnectingPoint num="1" id="1119" />
+<TGConnectingPoint num="0" id="1079" />
+<TGConnectingPoint num="1" id="1080" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1122" >
+<COMPONENT type="1001" id="1083" >
<cdparam x="2207" y="1483" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1121" />
+<TGConnectingPoint num="0" id="1082" />
</COMPONENT>
-<COMPONENT type="1007" id="1125" >
+<COMPONENT type="1007" id="1086" >
<cdparam x="2178" y="1298" />
<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1123" />
-<TGConnectingPoint num="1" id="1124" />
+<TGConnectingPoint num="0" id="1084" />
+<TGConnectingPoint num="1" id="1085" />
<extraparam>
<Data requestName="req_Timer" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1128" >
+<COMPONENT type="1006" id="1089" >
<cdparam x="2189" y="1365" />
<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1126" />
-<TGConnectingPoint num="1" id="1127" />
+<TGConnectingPoint num="0" id="1087" />
+<TGConnectingPoint num="1" id="1088" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1131" >
+<COMPONENT type="1011" id="1092" >
<cdparam x="2142" y="1136" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1129" />
-<TGConnectingPoint num="1" id="1130" />
+<TGConnectingPoint num="0" id="1090" />
+<TGConnectingPoint num="1" id="1091" />
</COMPONENT>
-<COMPONENT type="1008" id="1134" >
+<COMPONENT type="1008" id="1095" >
<cdparam x="2194" y="1248" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1132" />
-<TGConnectingPoint num="1" id="1133" />
+<TGConnectingPoint num="0" id="1093" />
+<TGConnectingPoint num="1" id="1094" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1137" >
+<COMPONENT type="1011" id="1098" >
<cdparam x="2167" y="1424" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1135" />
-<TGConnectingPoint num="1" id="1136" />
+<TGConnectingPoint num="0" id="1096" />
+<TGConnectingPoint num="1" id="1097" />
</COMPONENT>
-<COMPONENT type="1006" id="1140" >
+<COMPONENT type="1006" id="1101" >
<cdparam x="2302" y="1122" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1138" />
-<TGConnectingPoint num="1" id="1139" />
+<TGConnectingPoint num="0" id="1099" />
+<TGConnectingPoint num="1" id="1100" />
<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1157" >
+<COMPONENT type="301" id="1118" >
<cdparam x="2283" y="1065" />
<sizeparam width="114" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of SYN
" />
-<TGConnectingPoint num="0" id="1141" />
-<TGConnectingPoint num="1" id="1142" />
-<TGConnectingPoint num="2" id="1143" />
-<TGConnectingPoint num="3" id="1144" />
-<TGConnectingPoint num="4" id="1145" />
-<TGConnectingPoint num="5" id="1146" />
-<TGConnectingPoint num="6" id="1147" />
-<TGConnectingPoint num="7" id="1148" />
-<TGConnectingPoint num="8" id="1149" />
-<TGConnectingPoint num="9" id="1150" />
-<TGConnectingPoint num="10" id="1151" />
-<TGConnectingPoint num="11" id="1152" />
-<TGConnectingPoint num="12" id="1153" />
-<TGConnectingPoint num="13" id="1154" />
-<TGConnectingPoint num="14" id="1155" />
-<TGConnectingPoint num="15" id="1156" />
+<TGConnectingPoint num="0" id="1102" />
+<TGConnectingPoint num="1" id="1103" />
+<TGConnectingPoint num="2" id="1104" />
+<TGConnectingPoint num="3" id="1105" />
+<TGConnectingPoint num="4" id="1106" />
+<TGConnectingPoint num="5" id="1107" />
+<TGConnectingPoint num="6" id="1108" />
+<TGConnectingPoint num="7" id="1109" />
+<TGConnectingPoint num="8" id="1110" />
+<TGConnectingPoint num="9" id="1111" />
+<TGConnectingPoint num="10" id="1112" />
+<TGConnectingPoint num="11" id="1113" />
+<TGConnectingPoint num="12" id="1114" />
+<TGConnectingPoint num="13" id="1115" />
+<TGConnectingPoint num="14" id="1116" />
+<TGConnectingPoint num="15" id="1117" />
<extraparam>
<Line value="send Ack of SYN" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1160" >
+<COMPONENT type="1011" id="1121" >
<cdparam x="2291" y="1267" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1158" />
-<TGConnectingPoint num="1" id="1159" />
+<TGConnectingPoint num="0" id="1119" />
+<TGConnectingPoint num="1" id="1120" />
</COMPONENT>
-<COMPONENT type="1001" id="1162" >
+<COMPONENT type="1001" id="1123" >
<cdparam x="2330" y="1324" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1161" />
+<TGConnectingPoint num="0" id="1122" />
</COMPONENT>
-<COMPONENT type="1008" id="1165" >
+<COMPONENT type="1008" id="1126" >
<cdparam x="2318" y="1199" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1163" />
-<TGConnectingPoint num="1" id="1164" />
+<TGConnectingPoint num="0" id="1124" />
+<TGConnectingPoint num="1" id="1125" />
<extraparam>
<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1167" >
+<COMPONENT type="1001" id="1128" >
<cdparam x="1649" y="1057" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1166" />
+<TGConnectingPoint num="0" id="1127" />
</COMPONENT>
-<COMPONENT type="1001" id="1169" >
+<COMPONENT type="1001" id="1130" >
<cdparam x="2168" y="1421" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1168" />
+<TGConnectingPoint num="0" id="1129" />
</COMPONENT>
-<COMPONENT type="1001" id="1171" >
+<COMPONENT type="1001" id="1132" >
<cdparam x="2268" y="1039" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1170" />
+<TGConnectingPoint num="0" id="1131" />
</COMPONENT>
-<COMPONENT type="1008" id="1174" >
+<COMPONENT type="1008" id="1135" >
<cdparam x="1465" y="1192" />
<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="send event" value="receive_Application()" />
-<TGConnectingPoint num="0" id="1172" />
-<TGConnectingPoint num="1" id="1173" />
+<TGConnectingPoint num="0" id="1133" />
+<TGConnectingPoint num="1" id="1134" />
<extraparam>
<Data eventName="receive_Application" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="1177" >
+<COMPONENT type="1009" id="1138" >
<cdparam x="1701" y="1086" />
<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="1175" />
-<TGConnectingPoint num="1" id="1176" />
+<TGConnectingPoint num="0" id="1136" />
+<TGConnectingPoint num="1" id="1137" />
<extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="1178" >
+<CONNECTOR type="115" id="1139" >
<cdparam x="1048" y="795" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1048" y="795" id="568" />
-<P2 x="1728" y="865" id="490" />
+<P1 x="1048" y="795" id="529" />
+<P2 x="1728" y="865" id="451" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1179" >
+<CONNECTOR type="115" id="1140" >
<cdparam x="1048" y="795" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1089" y="954" id="540" />
-<P2 x="1208" y="1010" id="510" />
+<P1 x="1089" y="954" id="501" />
+<P2 x="1208" y="1010" id="471" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1180" >
+<CONNECTOR type="115" id="1141" >
<cdparam x="1008" y="610" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="1008" y="610" id="644" />
-<P2 x="1008" y="696" id="572" />
+<P1 x="1008" y="610" id="605" />
+<P2 x="1008" y="696" id="533" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1181" >
+<CONNECTOR type="115" id="1142" >
<cdparam x="722" y="614" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="722" y="614" id="659" />
-<P2 x="722" y="689" id="528" />
+<P1 x="722" y="614" id="620" />
+<P2 x="722" y="689" id="489" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1182" >
+<CONNECTOR type="115" id="1143" >
<cdparam x="504" y="597" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="504" y="597" id="608" />
-<P2 x="572" y="702" id="522" />
+<P1 x="504" y="597" id="569" />
+<P2 x="572" y="702" id="483" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1183" >
+<CONNECTOR type="115" id="1144" >
<cdparam x="464" y="637" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="464" y="637" id="609" />
-<P2 x="439" y="778" id="576" />
+<P1 x="464" y="637" id="570" />
+<P2 x="439" y="778" id="537" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1184" >
+<CONNECTOR type="115" id="1145" >
<cdparam x="424" y="597" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="424" y="597" id="607" />
-<P2 x="346" y="759" id="556" />
+<P1 x="424" y="597" id="568" />
+<P2 x="346" y="759" id="517" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1185" >
+<CONNECTOR type="115" id="1146" >
<cdparam x="289" y="619" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to read channel" value="null" />
-<P1 x="289" y="619" id="617" />
-<P2 x="230" y="803" id="713" />
+<P1 x="289" y="619" id="578" />
+<P2 x="230" y="803" id="674" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1186" >
+<CONNECTOR type="115" id="1147" >
<cdparam x="249" y="579" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="249" y="579" id="615" />
-<P2 x="132" y="789" id="560" />
+<P1 x="249" y="579" id="576" />
+<P2 x="132" y="789" id="521" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1187" >
+<CONNECTOR type="115" id="1148" >
<cdparam x="371" y="93" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to notified event" value="null" />
-<P1 x="320" y="99" id="647" />
-<P2 x="374" y="128" id="655" />
+<P1 x="320" y="99" id="608" />
+<P2 x="374" y="128" id="616" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1188" >
+<CONNECTOR type="115" id="1149" >
<cdparam x="234" y="169" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="234" y="169" id="653" />
-<P2 x="234" y="202" id="650" />
+<P1 x="234" y="169" id="614" />
+<P2 x="234" y="202" id="611" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1189" >
+<CONNECTOR type="115" id="1150" >
<cdparam x="234" y="104" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to action state" value="null" />
-<P1 x="235" y="110" id="648" />
-<P2 x="234" y="139" id="652" />
+<P1 x="235" y="110" id="609" />
+<P2 x="234" y="139" id="613" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1190" >
+<CONNECTOR type="115" id="1151" >
<cdparam x="234" y="47" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for loop" value="null" />
-<P1 x="234" y="47" id="619" />
-<P2 x="235" y="80" id="646" />
+<P1 x="234" y="47" id="580" />
+<P2 x="235" y="80" id="607" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1191" >
+<CONNECTOR type="115" id="1152" >
<cdparam x="425" y="162" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from notified event to choice" value="null" />
-<P1 x="374" y="158" id="656" />
-<P2 x="374" y="182" id="598" />
+<P1 x="374" y="158" id="617" />
+<P2 x="374" y="182" id="559" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1192" >
+<CONNECTOR type="115" id="1153" >
<cdparam x="564" y="482" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="464" y="322" id="682" />
-<P2 x="722" y="529" id="661" />
+<P1 x="464" y="322" id="643" />
+<P2 x="722" y="529" id="622" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1193" >
+<CONNECTOR type="115" id="1154" >
<cdparam x="722" y="559" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="722" y="559" id="662" />
-<P2 x="722" y="584" id="658" />
+<P1 x="722" y="559" id="623" />
+<P2 x="722" y="584" id="619" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1194" >
+<CONNECTOR type="115" id="1155" >
<cdparam x="604" y="442" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="504" y="282" id="678" />
-<P2 x="1008" y="523" id="664" />
+<P1 x="504" y="282" id="639" />
+<P2 x="1008" y="523" id="625" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1195" >
+<CONNECTOR type="115" id="1156" >
<cdparam x="1007" y="553" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="1008" y="553" id="665" />
-<P2 x="1008" y="580" id="643" />
+<P1 x="1008" y="553" id="626" />
+<P2 x="1008" y="580" id="604" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1196" >
+<CONNECTOR type="115" id="1157" >
<cdparam x="524" y="442" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="464" y="322" id="679" />
-<P2 x="464" y="487" id="667" />
+<P1 x="464" y="322" id="640" />
+<P2 x="464" y="487" id="628" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1197" >
+<CONNECTOR type="115" id="1158" >
<cdparam x="330" y="428" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="424" y="282" id="680" />
-<P2 x="289" y="463" id="670" />
+<P1 x="424" y="282" id="641" />
+<P2 x="289" y="463" id="631" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1198" >
+<CONNECTOR type="115" id="1159" >
<cdparam x="318" y="520" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="289" y="493" id="671" />
-<P2 x="289" y="554" id="614" />
+<P1 x="289" y="493" id="632" />
+<P2 x="289" y="554" id="575" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1199" >
+<CONNECTOR type="115" id="1160" >
<cdparam x="160" y="481" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="148" y="501" id="591" />
-<P2 x="126" y="544" id="638" />
+<P1 x="148" y="501" id="552" />
+<P2 x="126" y="544" id="599" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1200" >
+<CONNECTOR type="115" id="1161" >
<cdparam x="290" y="388" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="424" y="282" id="677" />
-<P2 x="188" y="414" id="673" />
+<P1 x="424" y="282" id="638" />
+<P2 x="188" y="414" id="634" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1201" >
+<CONNECTOR type="115" id="1162" >
<cdparam x="229" y="467" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="188" y="444" id="674" />
-<P2 x="188" y="476" id="590" />
+<P1 x="188" y="444" id="635" />
+<P2 x="188" y="476" id="551" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1202" >
+<CONNECTOR type="115" id="1163" >
<cdparam x="228" y="501" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="228" y="501" id="592" />
-<P2 x="236" y="524" id="687" />
+<P1 x="228" y="501" id="553" />
+<P2 x="236" y="524" id="648" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1203" >
+<CONNECTOR type="115" id="1164" >
<cdparam x="334" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="334" y="207" id="599" />
-<P2 x="301" y="223" id="691" />
+<P1 x="334" y="207" id="560" />
+<P2 x="301" y="223" id="652" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1204" >
+<CONNECTOR type="115" id="1165" >
<cdparam x="301" y="253" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to stop state" value="null" />
-<P1 x="301" y="253" id="692" />
-<P2 x="301" y="285" id="694" />
+<P1 x="301" y="253" id="653" />
+<P2 x="301" y="285" id="655" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1205" >
+<CONNECTOR type="115" id="1166" >
<cdparam x="464" y="517" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to choice" value="null" />
-<P1 x="464" y="517" id="668" />
-<P2 x="464" y="572" id="606" />
+<P1 x="464" y="517" id="629" />
+<P2 x="464" y="572" id="567" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1206" >
+<CONNECTOR type="115" id="1167" >
<cdparam x="329" y="579" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="329" y="579" id="616" />
-<P2 x="353" y="609" id="689" />
+<P1 x="329" y="579" id="577" />
+<P2 x="353" y="609" id="650" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1207" >
+<CONNECTOR type="115" id="1168" >
<cdparam x="126" y="574" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="126" y="574" id="639" />
-<P2 x="126" y="610" id="641" />
+<P1 x="126" y="574" id="600" />
+<P2 x="126" y="610" id="602" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1208" >
+<CONNECTOR type="115" id="1169" >
<cdparam x="414" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to select" value="null" />
-<P1 x="414" y="207" id="600" />
-<P2 x="464" y="257" id="676" />
+<P1 x="414" y="207" id="561" />
+<P2 x="464" y="257" id="637" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1209" >
+<CONNECTOR type="115" id="1170" >
<cdparam x="230" y="833" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to execI" value="null" />
-<P1 x="230" y="833" id="714" />
-<P2 x="230" y="858" id="580" />
+<P1 x="230" y="833" id="675" />
+<P2 x="230" y="858" id="541" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1210" >
+<CONNECTOR type="115" id="1171" >
<cdparam x="716" y="749" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="968" y="795" id="567" />
-<P2 x="843" y="859" id="550" />
+<P1 x="968" y="795" id="528" />
+<P2 x="843" y="859" id="511" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1211" >
+<CONNECTOR type="115" id="1172" >
<cdparam x="720" y="1074" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="728" y="990" id="763" />
-<P2 x="728" y="1027" id="765" />
+<P1 x="728" y="990" id="724" />
+<P2 x="728" y="1027" id="726" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1212" >
+<CONNECTOR type="115" id="1173" >
<cdparam x="733" y="899" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="803" y="884" id="551" />
-<P2 x="728" y="960" id="762" />
+<P1 x="803" y="884" id="512" />
+<P2 x="728" y="960" id="723" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1213" >
+<CONNECTOR type="115" id="1174" >
<cdparam x="800" y="938" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="843" y="924" id="553" />
-<P2 x="800" y="1004" id="544" />
+<P1 x="843" y="924" id="514" />
+<P2 x="800" y="1004" id="505" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1214" >
+<CONNECTOR type="115" id="1175" >
<cdparam x="800" y="1057" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="800" y="1044" id="545" />
-<P2 x="800" y="1081" id="767" />
+<P1 x="800" y="1044" id="506" />
+<P2 x="800" y="1081" id="728" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1215" >
+<CONNECTOR type="115" id="1176" >
<cdparam x="132" y="886" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="132" y="886" id="894" />
-<P2 x="132" y="933" id="729" />
+<P1 x="132" y="886" id="855" />
+<P2 x="132" y="933" id="690" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1216" >
+<CONNECTOR type="115" id="1177" >
<cdparam x="943" y="1061" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="943" y="1060" id="533" />
-<P2 x="943" y="1118" id="812" />
+<P1 x="943" y="1060" id="494" />
+<P2 x="943" y="1118" id="773" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1217" >
+<CONNECTOR type="115" id="1178" >
<cdparam x="1049" y="1093" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1049" y="1092" id="585" />
-<P2 x="1049" y="1150" id="837" />
+<P1 x="1049" y="1092" id="546" />
+<P2 x="1049" y="1150" id="798" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1218" >
+<CONNECTOR type="115" id="1179" >
<cdparam x="1049" y="994" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1049" y="994" id="541" />
-<P2 x="1049" y="1052" id="584" />
+<P1 x="1049" y="994" id="502" />
+<P2 x="1049" y="1052" id="545" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1219" >
+<CONNECTOR type="115" id="1180" >
<cdparam x="696" y="742" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="722" y="729" id="529" />
-<P2 x="722" y="753" id="862" />
+<P1 x="722" y="729" id="490" />
+<P2 x="722" y="753" id="823" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1220" >
+<CONNECTOR type="115" id="1181" >
<cdparam x="132" y="1125" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="132" y="1125" id="868" />
-<P2 x="132" y="1162" id="870" />
+<P1 x="132" y="1125" id="829" />
+<P2 x="132" y="1162" id="831" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1221" >
+<CONNECTOR type="115" id="1182" >
<cdparam x="132" y="1192" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="132" y="1192" id="871" />
-<P2 x="132" y="1231" id="873" />
+<P1 x="132" y="1192" id="832" />
+<P2 x="132" y="1231" id="834" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1222" >
+<CONNECTOR type="115" id="1183" >
<cdparam x="132" y="1066" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send request" value="null" />
-<P1 x="132" y="1066" id="727" />
-<P2 x="132" y="1095" id="867" />
+<P1 x="132" y="1066" id="688" />
+<P2 x="132" y="1095" id="828" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1223" >
+<CONNECTOR type="115" id="1184" >
<cdparam x="229" y="1127" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="229" y="1127" id="876" />
-<P2 x="229" y="1164" id="878" />
+<P1 x="229" y="1127" id="837" />
+<P2 x="229" y="1164" id="839" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1224" >
+<CONNECTOR type="115" id="1185" >
<cdparam x="346" y="1131" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="346" y="1131" id="882" />
-<P2 x="346" y="1168" id="884" />
+<P1 x="346" y="1131" id="843" />
+<P2 x="346" y="1168" id="845" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1225" >
+<CONNECTOR type="115" id="1186" >
<cdparam x="346" y="1051" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send request" value="null" />
-<P1 x="346" y="1051" id="733" />
-<P2 x="346" y="1101" id="881" />
+<P1 x="346" y="1051" id="694" />
+<P2 x="346" y="1101" id="842" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1226" >
+<CONNECTOR type="115" id="1187" >
<cdparam x="437" y="1118" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="438" y="1115" id="888" />
-<P2 x="438" y="1154" id="890" />
+<P1 x="438" y="1115" id="849" />
+<P2 x="438" y="1154" id="851" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1227" >
+<CONNECTOR type="115" id="1188" >
<cdparam x="438" y="1057" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send request" value="null" />
-<P1 x="438" y="1057" id="722" />
-<P2 x="438" y="1085" id="887" />
+<P1 x="438" y="1057" id="683" />
+<P2 x="438" y="1085" id="848" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1228" >
+<CONNECTOR type="115" id="1189" >
<cdparam x="132" y="808" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="132" y="829" id="561" />
-<P2 x="132" y="856" id="893" />
+<P1 x="132" y="829" id="522" />
+<P2 x="132" y="856" id="854" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1229" >
+<CONNECTOR type="115" id="1190" >
<cdparam x="230" y="898" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="230" y="898" id="581" />
-<P2 x="230" y="935" id="896" />
+<P1 x="230" y="898" id="542" />
+<P2 x="230" y="935" id="857" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1230" >
+<CONNECTOR type="115" id="1191" >
<cdparam x="230" y="965" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="230" y="965" id="897" />
-<P2 x="230" y="997" id="716" />
+<P1 x="230" y="965" id="858" />
+<P2 x="230" y="997" id="677" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1231" >
+<CONNECTOR type="115" id="1192" >
<cdparam x="346" y="799" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="346" y="799" id="557" />
-<P2 x="346" y="826" id="902" />
+<P1 x="346" y="799" id="518" />
+<P2 x="346" y="826" id="863" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1232" >
+<CONNECTOR type="115" id="1193" >
<cdparam x="346" y="856" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="346" y="856" id="903" />
-<P2 x="346" y="895" id="740" />
+<P1 x="346" y="856" id="864" />
+<P2 x="346" y="895" id="701" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1233" >
+<CONNECTOR type="115" id="1194" >
<cdparam x="439" y="818" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="439" y="818" id="577" />
-<P2 x="439" y="860" id="899" />
+<P1 x="439" y="818" id="538" />
+<P2 x="439" y="860" id="860" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1234" >
+<CONNECTOR type="115" id="1195" >
<cdparam x="439" y="890" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="439" y="890" id="900" />
-<P2 x="439" y="936" id="737" />
+<P1 x="439" y="890" id="861" />
+<P2 x="439" y="936" id="698" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1235" >
+<CONNECTOR type="115" id="1196" >
<cdparam x="132" y="963" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="132" y="963" id="730" />
-<P2 x="132" y="981" id="914" />
+<P1 x="132" y="963" id="691" />
+<P2 x="132" y="981" id="875" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1236" >
+<CONNECTOR type="115" id="1197" >
<cdparam x="132" y="1011" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="132" y="1011" id="915" />
-<P2 x="132" y="1036" id="726" />
+<P1 x="132" y="1011" id="876" />
+<P2 x="132" y="1036" id="687" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1237" >
+<CONNECTOR type="115" id="1198" >
<cdparam x="230" y="1027" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="230" y="1027" id="717" />
-<P2 x="229" y="1047" id="905" />
+<P1 x="230" y="1027" id="678" />
+<P2 x="229" y="1047" id="866" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1238" >
+<CONNECTOR type="115" id="1199" >
<cdparam x="228" y="1088" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to send request" value="null" />
-<P1 x="229" y="1077" id="906" />
-<P2 x="229" y="1097" id="875" />
+<P1 x="229" y="1077" id="867" />
+<P2 x="229" y="1097" id="836" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1239" >
+<CONNECTOR type="115" id="1200" >
<cdparam x="346" y="925" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="346" y="925" id="741" />
-<P2 x="346" y="957" id="908" />
+<P1 x="346" y="925" id="702" />
+<P2 x="346" y="957" id="869" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1240" >
+<CONNECTOR type="115" id="1201" >
<cdparam x="348" y="987" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="346" y="987" id="909" />
-<P2 x="346" y="1021" id="732" />
+<P1 x="346" y="987" id="870" />
+<P2 x="346" y="1021" id="693" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1241" >
+<CONNECTOR type="115" id="1202" >
<cdparam x="439" y="966" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="439" y="966" id="738" />
-<P2 x="438" y="978" id="911" />
+<P1 x="439" y="966" id="699" />
+<P2 x="438" y="978" id="872" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1242" >
+<CONNECTOR type="115" id="1203" >
<cdparam x="438" y="1008" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="438" y="1008" id="912" />
-<P2 x="438" y="1027" id="721" />
+<P1 x="438" y="1008" id="873" />
+<P2 x="438" y="1027" id="682" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1243" >
+<CONNECTOR type="115" id="1204" >
<cdparam x="722" y="783" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="722" y="783" id="863" />
-<P2 x="722" y="808" id="917" />
+<P1 x="722" y="783" id="824" />
+<P2 x="722" y="808" id="878" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1244" >
+<CONNECTOR type="115" id="1205" >
<cdparam x="722" y="838" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="722" y="838" id="918" />
-<P2 x="722" y="860" id="865" />
+<P1 x="722" y="838" id="879" />
+<P2 x="722" y="860" id="826" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1245" >
+<CONNECTOR type="115" id="1206" >
<cdparam x="800" y="1111" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="800" y="1111" id="768" />
-<P2 x="798" y="1136" id="920" />
+<P1 x="800" y="1111" id="729" />
+<P2 x="798" y="1136" id="881" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1246" >
+<CONNECTOR type="115" id="1207" >
<cdparam x="798" y="1166" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="798" y="1166" id="921" />
-<P2 x="799" y="1188" id="804" />
+<P1 x="798" y="1166" id="882" />
+<P2 x="799" y="1188" id="765" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1247" >
+<CONNECTOR type="115" id="1208" >
<cdparam x="943" y="1148" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="943" y="1148" id="813" />
-<P2 x="943" y="1173" id="923" />
+<P1 x="943" y="1148" id="774" />
+<P2 x="943" y="1173" id="884" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1248" >
+<CONNECTOR type="115" id="1209" >
<cdparam x="950" y="1201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="943" y="1203" id="924" />
-<P2 x="943" y="1229" id="832" />
+<P1 x="943" y="1203" id="885" />
+<P2 x="943" y="1229" id="793" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1249" >
+<CONNECTOR type="115" id="1210" >
<cdparam x="1049" y="1180" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1049" y="1180" id="838" />
-<P2 x="1049" y="1206" id="926" />
+<P1 x="1049" y="1180" id="799" />
+<P2 x="1049" y="1206" id="887" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1250" >
+<CONNECTOR type="115" id="1211" >
<cdparam x="1049" y="1223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="1049" y="1236" id="927" />
-<P2 x="1049" y="1261" id="857" />
+<P1 x="1049" y="1236" id="888" />
+<P2 x="1049" y="1261" id="818" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1251" >
+<CONNECTOR type="115" id="1212" >
<cdparam x="883" y="884" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="883" y="884" id="552" />
-<P2 x="909" y="917" id="931" />
+<P1 x="883" y="884" id="513" />
+<P2 x="909" y="917" id="892" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1252" >
+<CONNECTOR type="115" id="1213" >
<cdparam x="612" y="727" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="612" y="727" id="524" />
-<P2 x="622" y="757" id="929" />
+<P1 x="612" y="727" id="485" />
+<P2 x="622" y="757" id="890" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1253" >
+<CONNECTOR type="115" id="1214" >
<cdparam x="532" y="727" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="532" y="727" id="523" />
-<P2 x="496" y="763" id="807" />
+<P1 x="532" y="727" id="484" />
+<P2 x="496" y="763" id="768" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1254" >
+<CONNECTOR type="115" id="1215" >
<cdparam x="799" y="1218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="799" y="1218" id="805" />
-<P2 x="799" y="1265" id="743" />
+<P1 x="799" y="1218" id="766" />
+<P2 x="799" y="1265" id="704" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1255" >
+<CONNECTOR type="115" id="1216" >
<cdparam x="1009" y="954" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1009" y="954" id="539" />
-<P2 x="943" y="1020" id="532" />
+<P1 x="1009" y="954" id="500" />
+<P2 x="943" y="1020" id="493" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1256" >
+<CONNECTOR type="115" id="1217" >
<cdparam x="229" y="1194" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="229" y="1194" id="879" />
-<P2 x="229" y="1232" id="719" />
+<P1 x="229" y="1194" id="840" />
+<P2 x="229" y="1232" id="680" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1257" >
+<CONNECTOR type="115" id="1218" >
<cdparam x="346" y="1198" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="346" y="1198" id="885" />
-<P2 x="344" y="1224" id="735" />
+<P1 x="346" y="1198" id="846" />
+<P2 x="344" y="1224" id="696" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1258" >
+<CONNECTOR type="115" id="1219" >
<cdparam x="438" y="1184" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="438" y="1184" id="891" />
-<P2 x="438" y="1208" id="724" />
+<P1 x="438" y="1184" id="852" />
+<P2 x="438" y="1208" id="685" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1259" >
+<CONNECTOR type="115" id="1220" >
<cdparam x="496" y="793" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="496" y="793" id="808" />
-<P2 x="496" y="825" id="810" />
+<P1 x="496" y="793" id="769" />
+<P2 x="496" y="825" id="771" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1260" >
+<CONNECTOR type="115" id="1221" >
<cdparam x="943" y="1259" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="943" y="1259" id="833" />
-<P2 x="943" y="1306" id="835" />
+<P1 x="943" y="1259" id="794" />
+<P2 x="943" y="1306" id="796" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1261" >
+<CONNECTOR type="115" id="1222" >
<cdparam x="1008" y="736" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to choice" value="null" />
-<P1 x="1008" y="736" id="573" />
-<P2 x="1008" y="770" id="566" />
+<P1 x="1008" y="736" id="534" />
+<P2 x="1008" y="770" id="527" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1262" >
+<CONNECTOR type="115" id="1223" >
<cdparam x="1008" y="835" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1008" y="835" id="569" />
-<P2 x="1049" y="929" id="538" />
+<P1 x="1008" y="835" id="530" />
+<P2 x="1049" y="929" id="499" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1263" >
+<CONNECTOR type="115" id="1224" >
<cdparam x="1049" y="1291" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1049" y="1291" id="858" />
-<P2 x="1049" y="1336" id="860" />
+<P1 x="1049" y="1291" id="819" />
+<P2 x="1049" y="1336" id="821" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1264" >
+<CONNECTOR type="115" id="1225" >
<cdparam x="1208" y="1152" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1208" y="1142" id="517" />
-<P2 x="1208" y="1209" id="933" />
+<P1 x="1208" y="1142" id="478" />
+<P2 x="1208" y="1209" id="894" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1265" >
+<CONNECTOR type="115" id="1226" >
<cdparam x="1208" y="1239" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to action state" value="null" />
-<P1 x="1208" y="1239" id="934" />
-<P2 x="1208" y="1290" id="953" />
+<P1 x="1208" y="1239" id="895" />
+<P2 x="1208" y="1290" id="914" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1266" >
+<CONNECTOR type="115" id="1227" >
<cdparam x="1208" y="1320" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="1208" y="1320" id="954" />
-<P2 x="1208" y="1346" id="961" />
+<P1 x="1208" y="1320" id="915" />
+<P2 x="1208" y="1346" id="922" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1267" >
+<CONNECTOR type="115" id="1228" >
<cdparam x="1206" y="1385" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to action state" value="null" />
-<P1 x="1208" y="1376" id="962" />
-<P2 x="1207" y="1397" id="958" />
+<P1 x="1208" y="1376" id="923" />
+<P2 x="1207" y="1397" id="919" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1268" >
+<CONNECTOR type="115" id="1229" >
<cdparam x="1206" y="1088" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1208" y="1075" id="513" />
-<P2 x="1208" y="1102" id="516" />
+<P1 x="1208" y="1075" id="474" />
+<P2 x="1208" y="1102" id="477" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1269" >
+<CONNECTOR type="115" id="1230" >
<cdparam x="1248" y="1035" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1248" y="1035" id="512" />
-<P2 x="1287" y="1065" id="964" />
+<P1 x="1248" y="1035" id="473" />
+<P2 x="1287" y="1065" id="925" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1270" >
+<CONNECTOR type="115" id="1231" >
<cdparam x="1207" y="1427" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1207" y="1427" id="959" />
-<P2 x="1207" y="1466" id="956" />
+<P1 x="1207" y="1427" id="920" />
+<P2 x="1207" y="1466" id="917" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1271" >
+<CONNECTOR type="115" id="1232" >
<cdparam x="1553" y="1019" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1567" y="1021" id="483" />
-<P2 x="1529" y="1059" id="476" />
+<P1 x="1567" y="1021" id="444" />
+<P2 x="1529" y="1059" id="437" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1272" >
+<CONNECTOR type="115" id="1233" >
<cdparam x="1529" y="1324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1529" y="1289" id="473" />
-<P2 x="1529" y="1343" id="971" />
+<P1 x="1529" y="1289" id="434" />
+<P2 x="1529" y="1343" id="932" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1273" >
+<CONNECTOR type="115" id="1234" >
<cdparam x="1684" y="929" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to send event" value="null" />
-<P1 x="1728" y="930" id="493" />
-<P2 x="1731" y="1021" id="974" />
+<P1 x="1728" y="930" id="454" />
+<P2 x="1731" y="1021" id="935" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1274" >
+<CONNECTOR type="115" id="1235" >
<cdparam x="1615" y="1283" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1641" y="1270" id="497" />
-<P2 x="1641" y="1294" id="1011" />
+<P1 x="1641" y="1270" id="458" />
+<P2 x="1641" y="1294" id="972" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1275" >
+<CONNECTOR type="115" id="1236" >
<cdparam x="1641" y="1324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1641" y="1324" id="1012" />
-<P2 x="1642" y="1343" id="1053" />
+<P1 x="1641" y="1324" id="973" />
+<P2 x="1642" y="1343" id="1014" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1276" >
+<CONNECTOR type="115" id="1237" >
<cdparam x="1529" y="1373" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1529" y="1373" id="972" />
-<P2 x="1529" y="1400" id="1050" />
+<P1 x="1529" y="1373" id="933" />
+<P2 x="1529" y="1400" id="1011" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1277" >
+<CONNECTOR type="115" id="1238" >
<cdparam x="1529" y="1422" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="1529" y="1430" id="1051" />
-<P2 x="1529" y="1452" id="966" />
+<P1 x="1529" y="1430" id="1012" />
+<P2 x="1529" y="1452" id="927" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1278" >
+<CONNECTOR type="115" id="1239" >
<cdparam x="1642" y="1373" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="1642" y="1373" id="1054" />
-<P2 x="1642" y="1399" id="1056" />
+<P1 x="1642" y="1373" id="1015" />
+<P2 x="1642" y="1399" id="1017" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1279" >
+<CONNECTOR type="115" id="1240" >
<cdparam x="1956" y="1361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1956" y="1361" id="451" />
-<P2 x="1920" y="1406" id="1066" />
+<P1 x="1956" y="1361" id="412" />
+<P2 x="1920" y="1406" id="1027" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1280" >
+<CONNECTOR type="115" id="1241" >
<cdparam x="2100" y="1490" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2101" y="1491" id="1074" />
-<P2 x="2101" y="1532" id="1076" />
+<P1 x="2101" y="1491" id="1035" />
+<P2 x="2101" y="1532" id="1037" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1281" >
+<CONNECTOR type="115" id="1242" >
<cdparam x="1996" y="1401" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1996" y="1401" id="453" />
-<P2 x="1996" y="1429" id="1081" />
+<P1 x="1996" y="1401" id="414" />
+<P2 x="1996" y="1429" id="1042" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1282" >
+<CONNECTOR type="115" id="1243" >
<cdparam x="1996" y="1459" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to action state" value="null" />
-<P1 x="1996" y="1459" id="1082" />
-<P2 x="1996" y="1488" id="1078" />
+<P1 x="1996" y="1459" id="1043" />
+<P2 x="1996" y="1488" id="1039" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1283" >
+<CONNECTOR type="115" id="1244" >
<cdparam x="2021" y="1038" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="2237" y="966" id="443" />
-<P2 x="2218" y="1054" id="500" />
+<P1 x="2237" y="966" id="404" />
+<P2 x="2218" y="1054" id="461" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1284" >
+<CONNECTOR type="115" id="1245" >
<cdparam x="2217" y="1323" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send request to write channel" value="null" />
-<P1 x="2217" y="1323" id="1124" />
-<P2 x="2217" y="1360" id="1126" />
+<P1 x="2217" y="1323" id="1085" />
+<P2 x="2217" y="1360" id="1087" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1285" >
+<CONNECTOR type="115" id="1246" >
<cdparam x="2218" y="1094" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to action state" value="null" />
-<P1 x="2218" y="1094" id="501" />
-<P2 x="2218" y="1131" id="1129" />
+<P1 x="2218" y="1094" id="462" />
+<P2 x="2218" y="1131" id="1090" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1286" >
+<CONNECTOR type="115" id="1247" >
<cdparam x="2218" y="1161" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to write channel" value="null" />
-<P1 x="2218" y="1161" id="1130" />
-<P2 x="2218" y="1193" id="1118" />
+<P1 x="2218" y="1161" id="1091" />
+<P2 x="2218" y="1193" id="1079" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1287" >
+<CONNECTOR type="115" id="1248" >
<cdparam x="2218" y="1223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="2218" y="1223" id="1119" />
-<P2 x="2217" y="1243" id="1132" />
+<P1 x="2218" y="1223" id="1080" />
+<P2 x="2217" y="1243" id="1093" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1288" >
+<CONNECTOR type="115" id="1249" >
<cdparam x="2216" y="1284" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to send request" value="null" />
-<P1 x="2217" y="1273" id="1133" />
-<P2 x="2217" y="1293" id="1123" />
+<P1 x="2217" y="1273" id="1094" />
+<P2 x="2217" y="1293" id="1084" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1289" >
+<CONNECTOR type="115" id="1250" >
<cdparam x="2217" y="1390" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to action state" value="null" />
-<P1 x="2217" y="1390" id="1127" />
-<P2 x="2217" y="1419" id="1135" />
+<P1 x="2217" y="1390" id="1088" />
+<P2 x="2217" y="1419" id="1096" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1290" >
+<CONNECTOR type="115" id="1251" >
<cdparam x="2341" y="1060" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="2341" y="1059" id="505" />
-<P2 x="2341" y="1117" id="1138" />
+<P1 x="2341" y="1059" id="466" />
+<P2 x="2341" y="1117" id="1099" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1291" >
+<CONNECTOR type="115" id="1252" >
<cdparam x="1529" y="1099" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to write channel" value="null" />
-<P1 x="1529" y="1099" id="477" />
-<P2 x="1529" y="1127" id="968" />
+<P1 x="1529" y="1099" id="438" />
+<P2 x="1529" y="1127" id="929" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1292" >
+<CONNECTOR type="115" id="1253" >
<cdparam x="2101" y="1433" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="2101" y="1433" id="437" />
-<P2 x="2101" y="1461" id="1073" />
+<P1 x="2101" y="1433" id="398" />
+<P2 x="2101" y="1461" id="1034" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1293" >
+<CONNECTOR type="115" id="1254" >
<cdparam x="2158" y="1460" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="2141" y="1393" id="436" />
-<P2 x="2178" y="1416" id="1168" />
+<P1 x="2141" y="1393" id="397" />
+<P2 x="2178" y="1416" id="1129" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1294" >
+<CONNECTOR type="115" id="1255" >
<cdparam x="1688" y="890" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1688" y="890" id="491" />
-<P2 x="1607" y="996" id="482" />
+<P1 x="1688" y="890" id="452" />
+<P2 x="1607" y="996" id="443" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1295" >
+<CONNECTOR type="115" id="1256" >
<cdparam x="1768" y="890" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1768" y="890" id="492" />
-<P2 x="2277" y="941" id="442" />
+<P1 x="1768" y="890" id="453" />
+<P2 x="2277" y="941" id="403" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1296" >
+<CONNECTOR type="115" id="1257" >
<cdparam x="2317" y="966" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="2317" y="966" id="444" />
-<P2 x="2341" y="1019" id="504" />
+<P1 x="2317" y="966" id="405" />
+<P2 x="2341" y="1019" id="465" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1297" >
+<CONNECTOR type="115" id="1258" >
<cdparam x="2341" y="1147" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="2341" y="1147" id="1139" />
-<P2 x="2341" y="1194" id="1163" />
+<P1 x="2341" y="1147" id="1100" />
+<P2 x="2341" y="1194" id="1124" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1298" >
+<CONNECTOR type="115" id="1259" >
<cdparam x="2341" y="1224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to send event" value="null" />
-<P1 x="2341" y="1224" id="1164" />
-<P2 x="2341" y="1262" id="1158" />
+<P1 x="2341" y="1224" id="1125" />
+<P2 x="2341" y="1262" id="1119" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1299" >
+<CONNECTOR type="115" id="1260" >
<cdparam x="1731" y="1051" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to choice" value="null" />
-<P1 x="1731" y="1051" id="975" />
-<P2 x="1731" y="1081" id="1175" />
+<P1 x="1731" y="1051" id="936" />
+<P2 x="1731" y="1081" id="1136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1300" >
+<CONNECTOR type="115" id="1261" >
<cdparam x="1647" y="1021" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1647" y="1021" id="484" />
-<P2 x="1659" y="1052" id="1166" />
+<P1 x="1647" y="1021" id="445" />
+<P2 x="1659" y="1052" id="1127" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1301" >
+<CONNECTOR type="115" id="1262" >
<cdparam x="1826" y="1324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to action state" value="null" />
-<P1 x="1826" y="1324" id="461" />
-<P2 x="1826" y="1344" id="1061" />
+<P1 x="1826" y="1324" id="422" />
+<P2 x="1826" y="1344" id="1022" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1302" >
+<CONNECTOR type="115" id="1263" >
<cdparam x="1826" y="1374" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1826" y="1374" id="1062" />
-<P2 x="1828" y="1452" id="1064" />
+<P1 x="1826" y="1374" id="1023" />
+<P2 x="1828" y="1452" id="1025" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1303" >
+<CONNECTOR type="115" id="1264" >
<cdparam x="1786" y="1284" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="1786" y="1284" id="459" />
-<P2 x="1740" y="1330" id="1059" />
+<P1 x="1786" y="1284" id="420" />
+<P2 x="1740" y="1330" id="1020" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1304" >
+<CONNECTOR type="115" id="1265" >
<cdparam x="1920" y="1436" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1920" y="1436" id="1067" />
-<P2 x="1920" y="1476" id="1069" />
+<P1 x="1920" y="1436" id="1028" />
+<P2 x="1920" y="1476" id="1030" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1305" >
+<CONNECTOR type="115" id="1266" >
<cdparam x="1996" y="1518" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="1996" y="1518" id="1079" />
-<P2 x="1996" y="1538" id="1071" />
+<P1 x="1996" y="1518" id="1040" />
+<P2 x="1996" y="1538" id="1032" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1306" >
+<CONNECTOR type="115" id="1267" >
<cdparam x="2036" y="1361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="2036" y="1361" id="452" />
-<P2 x="2101" y="1368" id="434" />
+<P1 x="2036" y="1361" id="413" />
+<P2 x="2101" y="1368" id="395" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1307" >
+<CONNECTOR type="115" id="1268" >
<cdparam x="1866" y="1284" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1866" y="1284" id="460" />
-<P2 x="1996" y="1336" id="450" />
+<P1 x="1866" y="1284" id="421" />
+<P2 x="1996" y="1336" id="411" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1308" >
+<CONNECTOR type="115" id="1269" >
<cdparam x="2341" y="1292" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2341" y="1292" id="1159" />
-<P2 x="2340" y="1319" id="1161" />
+<P1 x="2341" y="1292" id="1120" />
+<P2 x="2340" y="1319" id="1122" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1309" >
+<CONNECTOR type="115" id="1270" >
<cdparam x="2217" y="1449" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="2217" y="1449" id="1136" />
-<P2 x="2217" y="1478" id="1121" />
+<P1 x="2217" y="1449" id="1097" />
+<P2 x="2217" y="1478" id="1082" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1310" >
+<CONNECTOR type="115" id="1271" >
<cdparam x="2277" y="1006" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to stop state" value="null" />
-<P1 x="2277" y="1006" id="445" />
-<P2 x="2278" y="1034" id="1170" />
+<P1 x="2277" y="1006" id="406" />
+<P2 x="2278" y="1034" id="1131" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1311" >
+<CONNECTOR type="115" id="1272" >
<cdparam x="1642" y="1429" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="1642" y="1429" id="1057" />
-<P2 x="1642" y="1463" id="1014" />
+<P1 x="1642" y="1429" id="1018" />
+<P2 x="1642" y="1463" id="975" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1312" >
+<CONNECTOR type="115" id="1273" >
<cdparam x="1529" y="1157" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="1529" y="1157" id="969" />
-<P2 x="1529" y="1187" id="1172" />
+<P1 x="1529" y="1157" id="930" />
+<P2 x="1529" y="1187" id="1133" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1313" >
+<CONNECTOR type="115" id="1274" >
<cdparam x="1529" y="1217" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to execI" value="null" />
-<P1 x="1529" y="1217" id="1173" />
-<P2 x="1529" y="1249" id="472" />
+<P1 x="1529" y="1217" id="1134" />
+<P2 x="1529" y="1249" id="433" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1314" >
+<CONNECTOR type="115" id="1275" >
<cdparam x="1691" y="1156" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to execI" value="null" />
-<P1 x="1691" y="1156" id="467" />
-<P2 x="1641" y="1230" id="496" />
+<P1 x="1691" y="1156" id="428" />
+<P2 x="1641" y="1230" id="457" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1315" >
+<CONNECTOR type="115" id="1276" >
<cdparam x="1771" y="1156" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to choice" value="null" />
-<P1 x="1771" y="1156" id="468" />
-<P2 x="1826" y="1259" id="458" />
+<P1 x="1771" y="1156" id="429" />
+<P2 x="1826" y="1259" id="419" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1316" >
+<CONNECTOR type="115" id="1277" >
<cdparam x="1731" y="1111" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to choice" value="null" />
-<P1 x="1731" y="1111" id="1176" />
-<P2 x="1731" y="1131" id="466" />
+<P1 x="1731" y="1111" id="1137" />
+<P2 x="1731" y="1131" id="427" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1012" id="1324" >
-<cdparam x="509" y="222" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1320" />
-<TGConnectingPoint num="1" id="1321" />
-<TGConnectingPoint num="2" id="1322" />
-<TGConnectingPoint num="3" id="1323" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1317" >
-<father id="1324" num="0" />
-<cdparam x="464" y="232" />
-<sizeparam width="52" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ x==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1318" >
-<father id="1324" num="1" />
-<cdparam x="544" y="234" />
-<sizeparam width="42" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ x>0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1319" >
-<father id="1324" num="2" />
-<cdparam x="529" y="267" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1000" id="1326" >
-<cdparam x="517" y="87" />
+<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1000" id="1279" >
+<cdparam x="159" y="66" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1325" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="1328" >
-<cdparam x="417" y="367" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1327" />
+<TGConnectingPoint num="0" id="1278" />
</COMPONENT>
-<COMPONENT type="1008" id="1331" >
-<cdparam x="393" y="299" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="1282" >
+<cdparam x="138" y="129" />
+<sizeparam width="57" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="timeOut()" />
-<TGConnectingPoint num="0" id="1329" />
-<TGConnectingPoint num="1" id="1330" />
+<infoparam name="wait event" value="reset() " />
+<TGConnectingPoint num="0" id="1280" />
+<TGConnectingPoint num="1" id="1281" />
<extraparam>
-<Data eventName="timeOut" nbOfParams="5" />
+<Data eventName="reset" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1334" >
-<cdparam x="596" y="300" />
-<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1285" >
+<cdparam x="108" y="182" />
+<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="stop() " />
-<TGConnectingPoint num="0" id="1332" />
-<TGConnectingPoint num="1" id="1333" />
+<infoparam name="send event" value="answerToReset()" />
+<TGConnectingPoint num="0" id="1283" />
+<TGConnectingPoint num="1" id="1284" />
<extraparam>
-<Data eventName="stop" nbOfParams="5" />
+<Data eventName="answerToReset" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1336" >
-<cdparam x="612" y="365" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="1288" >
+<cdparam x="143" y="237" />
+<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1335" />
+<infoparam name="wait event" value="pTS() " />
+<TGConnectingPoint num="0" id="1286" />
+<TGConnectingPoint num="1" id="1287" />
+<extraparam>
+<Data eventName="pTS" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1017" id="1339" >
-<cdparam x="487" y="150" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1291" >
+<cdparam x="121" y="308" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="notified event" value="x=?stop()" />
-<TGConnectingPoint num="0" id="1337" />
-<TGConnectingPoint num="1" id="1338" />
+<infoparam name="send event" value="pTSConfirm()" />
+<TGConnectingPoint num="0" id="1289" />
+<TGConnectingPoint num="1" id="1290" />
<extraparam>
-<Data eventName="stop" variable="x" />
+<Data eventName="pTSConfirm" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="1340" >
-<cdparam x="427" y="324" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="427" y="324" id="1330" />
-<P2 x="427" y="362" id="1327" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1341" >
-<cdparam x="622" y="325" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to stop state" value="null" />
-<P1 x="622" y="325" id="1333" />
-<P2 x="622" y="360" id="1335" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1342" >
-<cdparam x="524" y="107" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to notified event" value="null" />
-<P1 x="524" y="107" id="1325" />
-<P2 x="524" y="145" id="1337" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1343" >
-<cdparam x="524" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from notified event to choice" value="null" />
-<P1 x="524" y="175" id="1338" />
-<P2 x="524" y="212" id="1320" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1344" >
-<cdparam x="484" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="484" y="237" id="1321" />
-<P2 x="427" y="294" id="1329" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1345" >
-<cdparam x="564" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1 x="564" y="237" id="1322" />
-<P2 x="622" y="295" id="1332" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1012" id="1353" >
-<cdparam x="491" y="277" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1308" >
+<cdparam x="376" y="98" />
+<sizeparam width="249" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1349" />
-<TGConnectingPoint num="1" id="1350" />
-<TGConnectingPoint num="2" id="1351" />
-<TGConnectingPoint num="3" id="1352" />
+<infoparam name="UML Note" value="The first two layers of the OSI model
+are used to communicate between
+the smart card and the terminal
+" />
+<TGConnectingPoint num="0" id="1292" />
+<TGConnectingPoint num="1" id="1293" />
+<TGConnectingPoint num="2" id="1294" />
+<TGConnectingPoint num="3" id="1295" />
+<TGConnectingPoint num="4" id="1296" />
+<TGConnectingPoint num="5" id="1297" />
+<TGConnectingPoint num="6" id="1298" />
+<TGConnectingPoint num="7" id="1299" />
+<TGConnectingPoint num="8" id="1300" />
+<TGConnectingPoint num="9" id="1301" />
+<TGConnectingPoint num="10" id="1302" />
+<TGConnectingPoint num="11" id="1303" />
+<TGConnectingPoint num="12" id="1304" />
+<TGConnectingPoint num="13" id="1305" />
+<TGConnectingPoint num="14" id="1306" />
+<TGConnectingPoint num="15" id="1307" />
+<extraparam>
+<Line value="The first two layers of the OSI model " />
+<Line value="are used to communicate between " />
+<Line value="the smart card and the terminal" />
+</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1346" >
-<father id="1353" num="0" />
-<cdparam x="466" y="287" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1347" >
-<father id="1353" num="1" />
-<cdparam x="526" y="287" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1348" >
-<father id="1353" num="2" />
-<cdparam x="511" y="322" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
-<COMPONENT type="1000" id="1355" >
-<cdparam x="501" y="91" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1311" >
+<cdparam x="250" y="97" />
+<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1354" />
+<infoparam name="send request" value="start_TCP_IP()" />
+<TGConnectingPoint num="0" id="1309" />
+<TGConnectingPoint num="1" id="1310" />
+<extraparam>
+<Data requestName="start_TCP_IP" nbOfParams="5" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1358" >
-<cdparam x="482" y="129" />
-<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1314" >
+<cdparam x="236" y="148" />
+<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="open()" />
-<TGConnectingPoint num="0" id="1356" />
-<TGConnectingPoint num="1" id="1357" />
+<infoparam name="send request" value="start_Application()" />
+<TGConnectingPoint num="0" id="1312" />
+<TGConnectingPoint num="1" id="1313" />
<extraparam>
-<Data eventName="open" nbOfParams="5" />
+<Data requestName="start_Application" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1361" >
-<cdparam x="466" y="178" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1316" >
+<cdparam x="515" y="428" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromAtoT(1)" />
-<TGConnectingPoint num="0" id="1359" />
-<TGConnectingPoint num="1" id="1360" />
-<extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1315" />
</COMPONENT>
-<COMPONENT type="1008" id="1364" >
-<cdparam x="467" y="226" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1319" >
+<cdparam x="305" y="350" />
+<sizeparam width="115" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="send_TCP()" />
-<TGConnectingPoint num="0" id="1362" />
-<TGConnectingPoint num="1" id="1363" />
+<infoparam name="send event" value="data_Ready_SC()" />
+<TGConnectingPoint num="0" id="1317" />
+<TGConnectingPoint num="1" id="1318" />
<extraparam>
-<Data eventName="send_TCP" nbOfParams="5" />
+<Data eventName="data_Ready_SC" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1366" >
-<cdparam x="576" y="388" />
+<COMPONENT type="1001" id="1321" >
+<cdparam x="352" y="426" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="0" id="1320" />
</COMPONENT>
-<COMPONENT type="1008" id="1369" >
-<cdparam x="559" y="329" />
-<sizeparam width="54" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="1324" >
+<cdparam x="318" y="308" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="abort()" />
-<TGConnectingPoint num="0" id="1367" />
-<TGConnectingPoint num="1" id="1368" />
+<infoparam name="read channel" value="fromTtoP(1) " />
+<TGConnectingPoint num="0" id="1322" />
+<TGConnectingPoint num="1" id="1323" />
<extraparam>
-<Data eventName="abort" nbOfParams="5" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1372" >
-<cdparam x="406" y="337" />
-<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="1327" >
+<cdparam x="335" y="264" />
+<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="close()" />
-<TGConnectingPoint num="0" id="1370" />
-<TGConnectingPoint num="1" id="1371" />
+<infoparam name="wait event" value="send() " />
+<TGConnectingPoint num="0" id="1325" />
+<TGConnectingPoint num="1" id="1326" />
<extraparam>
-<Data eventName="close" nbOfParams="5" />
+<Data eventName="send" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1374" >
-<cdparam x="422" y="386" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1330" >
+<cdparam x="315" y="392" />
+<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1373" />
+<infoparam name="write channel" value="fromSCtoD(1)" />
+<TGConnectingPoint num="0" id="1328" />
+<TGConnectingPoint num="1" id="1329" />
+<extraparam>
+<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="1375" >
-<cdparam x="509" y="94" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to send event" value="null" />
-<P1 x="508" y="111" id="1354" />
-<P2 x="508" y="124" id="1356" />
-<AutomaticDrawing data="true" />
+<COMPONENT type="1008" id="1333" >
+<cdparam x="493" y="350" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="receive()" />
+<TGConnectingPoint num="0" id="1331" />
+<TGConnectingPoint num="1" id="1332" />
+<extraparam>
+<Data eventName="receive" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1009" id="1336" >
+<cdparam x="476" y="311" />
+<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="read channel" value="fromDtoSC(1) " />
+<TGConnectingPoint num="0" id="1334" />
+<TGConnectingPoint num="1" id="1335" />
+<extraparam>
+<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="1339" >
+<cdparam x="483" y="387" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="write channel" value="fromPtoT(1)" />
+<TGConnectingPoint num="0" id="1337" />
+<TGConnectingPoint num="1" id="1338" />
+<extraparam>
+<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1010" id="1342" >
+<cdparam x="466" y="268" />
+<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="data_Ready(t, b) " />
+<TGConnectingPoint num="0" id="1340" />
+<TGConnectingPoint num="1" id="1341" />
+<breakpoint />
+<extraparam>
+<Data eventName="data_Ready" nbOfParams="5" />
+<Param index="0" value="t" />
+<Param index="1" value="b" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1014" id="1346" >
+<cdparam x="236" y="202" />
+<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="for loop" value="for(j=0;x==0;j = j)" />
+<TGConnectingPoint num="0" id="1343" />
+<TGConnectingPoint num="1" id="1344" />
+<TGConnectingPoint num="2" id="1345" />
+<extraparam>
+<Data init="j=0" condition="x==0" increment="j = j" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="1348" >
+<cdparam x="297" y="231" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1347" />
+</COMPONENT>
+
+<COMPONENT type="1018" id="1359" >
+<cdparam x="424" y="226" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="select" value="null" />
+<TGConnectingPoint num="0" id="1349" />
+<TGConnectingPoint num="1" id="1350" />
+<TGConnectingPoint num="2" id="1351" />
+<TGConnectingPoint num="3" id="1352" />
+<TGConnectingPoint num="4" id="1353" />
+<TGConnectingPoint num="5" id="1354" />
+<TGConnectingPoint num="6" id="1355" />
+<TGConnectingPoint num="7" id="1356" />
+<TGConnectingPoint num="8" id="1357" />
+<TGConnectingPoint num="9" id="1358" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="1364" >
+<cdparam x="111" y="331" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to send request" value="null" />
+<P1 x="166" y="333" id="1290" />
+<P2 x="298" y="92" id="1309" />
+<Point x="166" y="351" />
+<Point x="231" y="351" />
+<Point x="231" y="72" />
+<Point x="298" y="72" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1360" >
+<father id="1364" num="0" />
+<cdparam x="166" y="351" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1361" >
+<father id="1364" num="1" />
+<cdparam x="231" y="351" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1362" >
+<father id="1364" num="2" />
+<cdparam x="231" y="72" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1363" >
+<father id="1364" num="3" />
+<cdparam x="298" y="72" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="115" id="1365" >
+<cdparam x="166" y="64" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to wait event" value="null" />
+<P1 x="166" y="86" id="1278" />
+<P2 x="166" y="124" id="1280" />
+<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1376" >
-<cdparam x="508" y="154" />
+<CONNECTOR type="115" id="1366" >
+<cdparam x="166" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to send event" value="null" />
+<P1 x="166" y="154" id="1281" />
+<P2 x="166" y="177" id="1283" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1367" >
+<cdparam x="312" y="133" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send request to send request" value="null" />
+<P1 x="298" y="122" id="1310" />
+<P2 x="298" y="143" id="1312" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1368" >
+<cdparam x="355" y="300" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to read channel" value="null" />
+<P1 x="362" y="289" id="1326" />
+<P2 x="362" y="303" id="1322" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1369" >
+<cdparam x="355" y="365" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to send event" value="null" />
+<P1 x="362" y="333" id="1323" />
+<P2 x="362" y="345" id="1317" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1370" >
+<cdparam x="355" y="417" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1 x="362" y="375" id="1318" />
+<P2 x="362" y="387" id="1328" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1371" >
+<cdparam x="355" y="473" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to stop state" value="null" />
+<P1 x="362" y="417" id="1329" />
+<P2 x="362" y="421" id="1320" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1372" >
+<cdparam x="541" y="358" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to send event" value="null" />
+<P1 x="525" y="336" id="1335" />
+<P2 x="525" y="345" id="1331" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1373" >
+<cdparam x="540" y="402" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="508" y="154" id="1357" />
-<P2 x="508" y="173" id="1359" />
+<P1 x="525" y="375" id="1332" />
+<P2 x="525" y="382" id="1337" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1374" >
+<cdparam x="543" y="305" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to read channel" value="null" />
+<P1 x="525" y="293" id="1341" />
+<P2 x="525" y="306" id="1334" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1375" >
+<cdparam x="540" y="464" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to stop state" value="null" />
+<P1 x="525" y="412" id="1338" />
+<P2 x="525" y="423" id="1315" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1376" >
+<cdparam x="298" y="173" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send request to for loop" value="null" />
+<P1 x="298" y="173" id="1313" />
+<P2 x="298" y="197" id="1343" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1377" >
-<cdparam x="508" y="222" />
+<cdparam x="328" y="232" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1 x="508" y="203" id="1360" />
-<P2 x="507" y="221" id="1362" />
+<infoparam name="connector from for loop to stop state" value="null" />
+<P1 x="298" y="227" id="1345" />
+<P2 x="307" y="226" id="1347" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1378" >
-<cdparam x="586" y="354" />
+<cdparam x="395" y="283" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="586" y="354" id="1368" />
-<P2 x="586" y="383" id="1365" />
+<infoparam name="connector from select to wait event" value="null" />
+<P1 x="399" y="241" id="1350" />
+<P2 x="362" y="259" id="1325" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1379" >
-<cdparam x="508" y="298" />
+<cdparam x="543" y="341" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to choice" value="null" />
-<P1 x="507" y="251" id="1363" />
-<P2 x="506" y="267" id="1349" />
+<infoparam name="connector from select to wait event" value="null" />
+<P1 x="479" y="241" id="1351" />
+<P2 x="525" y="263" id="1340" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1380" >
-<cdparam x="470" y="348" />
+<cdparam x="391" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="466" y="292" id="1350" />
-<P2 x="432" y="332" id="1370" />
+<infoparam name="connector from for loop to select" value="null" />
+<P1 x="360" y="216" id="1344" />
+<P2 x="439" y="216" id="1349" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1381" >
-<cdparam x="432" y="362" />
+<cdparam x="164" y="262" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="432" y="362" id="1371" />
-<P2 x="432" y="381" id="1373" />
+<infoparam name="connector from wait event to send event" value="null" />
+<P1 x="166" y="262" id="1287" />
+<P2 x="166" y="303" id="1289" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="1382" >
-<cdparam x="550" y="348" />
+<cdparam x="166" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1 x="546" y="292" id="1351" />
-<P2 x="586" y="324" id="1367" />
+<infoparam name="connector from send event to wait event" value="null" />
+<P1 x="166" y="207" id="1284" />
+<P2 x="166" y="232" id="1286" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -6319,11 +6319,11 @@ On prend b=1 comme exemple
</COMPONENT>
<SUBCOMPONENT type="1101" id="1475" >
<father id="1536" num="0" />
-<cdparam x="226" y="304" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="92" y="154" />
+<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Timer" />
+<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
<TGConnectingPoint num="0" id="1467" />
<TGConnectingPoint num="1" id="1468" />
<TGConnectingPoint num="2" id="1469" />
@@ -6333,16 +6333,16 @@ On prend b=1 comme exemple
<TGConnectingPoint num="6" id="1473" />
<TGConnectingPoint num="7" id="1474" />
<extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1484" >
<father id="1536" num="1" />
-<cdparam x="290" y="234" />
-<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="291" y="153" />
+<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Application" />
+<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
<TGConnectingPoint num="0" id="1476" />
<TGConnectingPoint num="1" id="1477" />
<TGConnectingPoint num="2" id="1478" />
@@ -6352,7 +6352,7 @@ On prend b=1 comme exemple
<TGConnectingPoint num="6" id="1482" />
<TGConnectingPoint num="7" id="1483" />
<extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1493" >
@@ -6376,11 +6376,11 @@ On prend b=1 comme exemple
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1502" >
<father id="1536" num="3" />
-<cdparam x="291" y="153" />
-<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="290" y="234" />
+<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
+<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Application" />
<TGConnectingPoint num="0" id="1494" />
<TGConnectingPoint num="1" id="1495" />
<TGConnectingPoint num="2" id="1496" />
@@ -6390,16 +6390,16 @@ On prend b=1 comme exemple
<TGConnectingPoint num="6" id="1500" />
<TGConnectingPoint num="7" id="1501" />
<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1511" >
<father id="1536" num="4" />
-<cdparam x="92" y="154" />
-<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="226" y="304" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
+<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Timer" />
<TGConnectingPoint num="0" id="1503" />
<TGConnectingPoint num="1" id="1504" />
<TGConnectingPoint num="2" id="1505" />
@@ -6409,7 +6409,7 @@ On prend b=1 comme exemple
<TGConnectingPoint num="6" id="1509" />
<TGConnectingPoint num="7" id="1510" />
<extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -6459,124 +6459,9 @@ On prend b=1 comme exemple
<Modeling type="TML Architecture" nameTab="Mapping2" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<CONNECTOR type="125" id="2040" >
-<cdparam x="283" y="683" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="233" y="679" id="2017" />
-<P2 x="275" y="571" id="1996" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1105" id="2015" >
-<cdparam x="133" y="679" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory2" value="name" />
-<TGConnectingPoint num="0" id="2016" />
-<TGConnectingPoint num="1" id="2017" />
-<TGConnectingPoint num="2" id="2018" />
-<TGConnectingPoint num="3" id="2019" />
-<TGConnectingPoint num="4" id="2020" />
-<TGConnectingPoint num="5" id="2021" />
-<TGConnectingPoint num="6" id="2022" />
-<TGConnectingPoint num="7" id="2023" />
-<TGConnectingPoint num="8" id="2024" />
-<TGConnectingPoint num="9" id="2025" />
-<TGConnectingPoint num="10" id="2026" />
-<TGConnectingPoint num="11" id="2027" />
-<TGConnectingPoint num="12" id="2028" />
-<TGConnectingPoint num="13" id="2029" />
-<TGConnectingPoint num="14" id="2030" />
-<TGConnectingPoint num="15" id="2031" />
-<TGConnectingPoint num="16" id="2032" />
-<TGConnectingPoint num="17" id="2033" />
-<TGConnectingPoint num="18" id="2034" />
-<TGConnectingPoint num="19" id="2035" />
-<TGConnectingPoint num="20" id="2036" />
-<TGConnectingPoint num="21" id="2037" />
-<TGConnectingPoint num="22" id="2038" />
-<TGConnectingPoint num="23" id="2039" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory2" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1103" id="2041" >
-<father id="2015" num="0" />
-<cdparam x="155" y="751" />
-<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="59" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="AppC::fromDtoSC" />
-<TGConnectingPoint num="0" id="2042" />
-<TGConnectingPoint num="1" id="2043" />
-<TGConnectingPoint num="2" id="2044" />
-<TGConnectingPoint num="3" id="2045" />
-<TGConnectingPoint num="4" id="2046" />
-<TGConnectingPoint num="5" id="2047" />
-<TGConnectingPoint num="6" id="2048" />
-<TGConnectingPoint num="7" id="2049" />
-<extraparam>
-<info value="AppC::fromDtoSC" communicationName="fromDtoSC" referenceCommunicationName="AppC" priority="0" typeName="channel" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="125" id="2014" >
-<cdparam x="206" y="401" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="206" y="401" id="1648" />
-<P2 x="275" y="521" id="1991" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1102" id="1989" >
-<cdparam x="150" y="521" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Bus1" value="name" />
-<TGConnectingPoint num="0" id="1990" />
-<TGConnectingPoint num="1" id="1991" />
-<TGConnectingPoint num="2" id="1992" />
-<TGConnectingPoint num="3" id="1993" />
-<TGConnectingPoint num="4" id="1994" />
-<TGConnectingPoint num="5" id="1995" />
-<TGConnectingPoint num="6" id="1996" />
-<TGConnectingPoint num="7" id="1997" />
-<TGConnectingPoint num="8" id="1998" />
-<TGConnectingPoint num="9" id="1999" />
-<TGConnectingPoint num="10" id="2000" />
-<TGConnectingPoint num="11" id="2001" />
-<TGConnectingPoint num="12" id="2002" />
-<TGConnectingPoint num="13" id="2003" />
-<TGConnectingPoint num="14" id="2004" />
-<TGConnectingPoint num="15" id="2005" />
-<TGConnectingPoint num="16" id="2006" />
-<TGConnectingPoint num="17" id="2007" />
-<TGConnectingPoint num="18" id="2008" />
-<TGConnectingPoint num="19" id="2009" />
-<TGConnectingPoint num="20" id="2010" />
-<TGConnectingPoint num="21" id="2011" />
-<TGConnectingPoint num="22" id="2012" />
-<TGConnectingPoint num="23" id="2013" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus1" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="1564" >
-<cdparam x="603" y="533" />
-<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="1564" >
+<cdparam x="603" y="533" />
+<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Memory0" value="name" />
@@ -6793,11 +6678,11 @@ On prend b=1 comme exemple
</COMPONENT>
<SUBCOMPONENT type="1101" id="1666" >
<father id="1709" num="0" />
-<cdparam x="562" y="117" />
-<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="464" y="86" />
+<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="131" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
+<cdrectangleparam minX="0" maxX="163" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
<TGConnectingPoint num="0" id="1658" />
<TGConnectingPoint num="1" id="1659" />
<TGConnectingPoint num="2" id="1660" />
@@ -6807,7 +6692,7 @@ On prend b=1 comme exemple
<TGConnectingPoint num="6" id="1664" />
<TGConnectingPoint num="7" id="1665" />
<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1675" >
@@ -6831,11 +6716,11 @@ On prend b=1 comme exemple
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="1684" >
<father id="1709" num="2" />
-<cdparam x="464" y="86" />
-<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="562" y="117" />
+<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="163" minY="0" maxY="127" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
+<cdrectangleparam minX="0" maxX="131" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
<TGConnectingPoint num="0" id="1676" />
<TGConnectingPoint num="1" id="1677" />
<TGConnectingPoint num="2" id="1678" />
@@ -6845,7 +6730,7 @@ On prend b=1 comme exemple
<TGConnectingPoint num="6" id="1682" />
<TGConnectingPoint num="7" id="1683" />
<extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -6946,19 +6831,19 @@ On prend b=1 comme exemple
</COMPONENT>
<SUBCOMPONENT type="6005" id="1724" >
<father id="1732" num="0" />
-<cdparam x="523" y="361" />
+<cdparam x="523" y="346" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="355" maxY="355" />
-<infoparam name="value " value="Mapping2" />
+<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
+<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
<SUBCOMPONENT type="6005" id="1725" >
<father id="1732" num="1" />
-<cdparam x="523" y="346" />
+<cdparam x="523" y="361" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
-<infoparam name="value " value="Mapping1" />
+<cdrectangleparam minX="605" maxX="605" minY="355" maxY="355" />
+<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
<COMPONENT type="6001" id="1739" >
@@ -6974,19 +6859,19 @@ On prend b=1 comme exemple
</COMPONENT>
<SUBCOMPONENT type="6005" id="1733" >
<father id="1739" num="0" />
-<cdparam x="855" y="155" />
+<cdparam x="855" y="140" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="855" maxX="855" minY="155" maxY="155" />
-<infoparam name="value " value="Mapping2" />
+<cdrectangleparam minX="855" maxX="855" minY="140" maxY="140" />
+<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
<SUBCOMPONENT type="6005" id="1734" >
<father id="1739" num="1" />
-<cdparam x="855" y="140" />
+<cdparam x="855" y="155" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="855" maxX="855" minY="140" maxY="140" />
-<infoparam name="value " value="Mapping1" />
+<cdrectangleparam minX="855" maxX="855" minY="155" maxY="155" />
+<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
<COMPONENT type="6000" id="1745" >
@@ -7044,583 +6929,4 @@ On prend b=1 comme exemple
-<Modeling type="TML Component Design" nameTab="DIPLODOCUS_C_Design" >
-<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="1752" >
-<cdparam x="466" y="535" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="466" y="535" id="1766" />
-<P2 x="683" y="530" id="1755" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="1753" >
-<cdparam x="467" y="181" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="467" y="317" id="1777" />
-<P2 x="640" y="193" id="1790" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="126" id="1754" >
-<cdparam x="467" y="127" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="Connector between ports" />
-<P1 x="467" y="110" id="1801" />
-<P2 x="640" y="140" id="1788" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1202" id="1765" >
-<cdparam x="696" y="476" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Primitive component" value="TMLComp_4" />
-<TGConnectingPoint num="0" id="1757" />
-<TGConnectingPoint num="1" id="1758" />
-<TGConnectingPoint num="2" id="1759" />
-<TGConnectingPoint num="3" id="1760" />
-<TGConnectingPoint num="4" id="1761" />
-<TGConnectingPoint num="5" id="1762" />
-<TGConnectingPoint num="6" id="1763" />
-<TGConnectingPoint num="7" id="1764" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="1756" >
-<father id="1765" num="0" />
-<cdparam x="683" y="517" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event comm" />
-<TGConnectingPoint num="0" id="1755" />
-<extraparam>
-<Prop commName="comm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="1776" >
-<cdparam x="253" y="486" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Primitive component" value="TMLComp_3" />
-<TGConnectingPoint num="0" id="1768" />
-<TGConnectingPoint num="1" id="1769" />
-<TGConnectingPoint num="2" id="1770" />
-<TGConnectingPoint num="3" id="1771" />
-<TGConnectingPoint num="4" id="1772" />
-<TGConnectingPoint num="5" id="1773" />
-<TGConnectingPoint num="6" id="1774" />
-<TGConnectingPoint num="7" id="1775" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="1767" >
-<father id="1776" num="0" />
-<cdparam x="440" y="522" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event comm" />
-<TGConnectingPoint num="0" id="1766" />
-<extraparam>
-<Prop commName="comm" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="1787" >
-<cdparam x="254" y="255" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Primitive component" value="TMLComp_2" />
-<TGConnectingPoint num="0" id="1779" />
-<TGConnectingPoint num="1" id="1780" />
-<TGConnectingPoint num="2" id="1781" />
-<TGConnectingPoint num="3" id="1782" />
-<TGConnectingPoint num="4" id="1783" />
-<TGConnectingPoint num="5" id="1784" />
-<TGConnectingPoint num="6" id="1785" />
-<TGConnectingPoint num="7" id="1786" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="1778" >
-<father id="1787" num="0" />
-<cdparam x="441" y="304" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event comm" />
-<TGConnectingPoint num="0" id="1777" />
-<extraparam>
-<Prop commName="comm" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="1800" >
-<cdparam x="653" y="75" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Primitive component" value="TMLComp_1" />
-<TGConnectingPoint num="0" id="1792" />
-<TGConnectingPoint num="1" id="1793" />
-<TGConnectingPoint num="2" id="1794" />
-<TGConnectingPoint num="3" id="1795" />
-<TGConnectingPoint num="4" id="1796" />
-<TGConnectingPoint num="5" id="1797" />
-<TGConnectingPoint num="6" id="1798" />
-<TGConnectingPoint num="7" id="1799" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="1789" >
-<father id="1800" num="0" />
-<cdparam x="640" y="127" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="1788" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="1791" >
-<father id="1800" num="1" />
-<cdparam x="640" y="180" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event comm" />
-<TGConnectingPoint num="0" id="1790" />
-<extraparam>
-<Prop commName="comm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="1811" >
-<cdparam x="254" y="70" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Primitive component" value="TMLComp_0" />
-<TGConnectingPoint num="0" id="1803" />
-<TGConnectingPoint num="1" id="1804" />
-<TGConnectingPoint num="2" id="1805" />
-<TGConnectingPoint num="3" id="1806" />
-<TGConnectingPoint num="4" id="1807" />
-<TGConnectingPoint num="5" id="1808" />
-<TGConnectingPoint num="6" id="1809" />
-<TGConnectingPoint num="7" id="1810" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="1802" >
-<father id="1811" num="0" />
-<cdparam x="441" y="97" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="1801" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_4" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1000" id="1813" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1812" />
-</COMPONENT>
-
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_3" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1000" id="1815" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1814" />
-</COMPONENT>
-
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="1817" >
-<cdparam x="400" y="91" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1816" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1819" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1818" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="1820" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="1818" />
-<P2 x="410" y="86" id="1816" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="1822" >
-<cdparam x="409" y="101" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1821" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1824" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1823" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="1825" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="1823" />
-<P2 x="419" y="96" id="1821" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="1827" >
-<cdparam x="393" y="85" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1826" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1829" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1828" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="1830" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="1828" />
-<P2 x="403" y="80" id="1826" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="TML Architecture" nameTab="Mapping1_cloned" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="1855" >
-<cdparam x="637" y="595" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory1" value="name" />
-<TGConnectingPoint num="0" id="1831" />
-<TGConnectingPoint num="1" id="1832" />
-<TGConnectingPoint num="2" id="1833" />
-<TGConnectingPoint num="3" id="1834" />
-<TGConnectingPoint num="4" id="1835" />
-<TGConnectingPoint num="5" id="1836" />
-<TGConnectingPoint num="6" id="1837" />
-<TGConnectingPoint num="7" id="1838" />
-<TGConnectingPoint num="8" id="1839" />
-<TGConnectingPoint num="9" id="1840" />
-<TGConnectingPoint num="10" id="1841" />
-<TGConnectingPoint num="11" id="1842" />
-<TGConnectingPoint num="12" id="1843" />
-<TGConnectingPoint num="13" id="1844" />
-<TGConnectingPoint num="14" id="1845" />
-<TGConnectingPoint num="15" id="1846" />
-<TGConnectingPoint num="16" id="1847" />
-<TGConnectingPoint num="17" id="1848" />
-<TGConnectingPoint num="18" id="1849" />
-<TGConnectingPoint num="19" id="1850" />
-<TGConnectingPoint num="20" id="1851" />
-<TGConnectingPoint num="21" id="1852" />
-<TGConnectingPoint num="22" id="1853" />
-<TGConnectingPoint num="23" id="1854" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory1" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="1914" >
-<cdparam x="931" y="56" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1890" />
-<TGConnectingPoint num="1" id="1891" />
-<TGConnectingPoint num="2" id="1892" />
-<TGConnectingPoint num="3" id="1893" />
-<TGConnectingPoint num="4" id="1894" />
-<TGConnectingPoint num="5" id="1895" />
-<TGConnectingPoint num="6" id="1896" />
-<TGConnectingPoint num="7" id="1897" />
-<TGConnectingPoint num="8" id="1898" />
-<TGConnectingPoint num="9" id="1899" />
-<TGConnectingPoint num="10" id="1900" />
-<TGConnectingPoint num="11" id="1901" />
-<TGConnectingPoint num="12" id="1902" />
-<TGConnectingPoint num="13" id="1903" />
-<TGConnectingPoint num="14" id="1904" />
-<TGConnectingPoint num="15" id="1905" />
-<TGConnectingPoint num="16" id="1906" />
-<TGConnectingPoint num="17" id="1907" />
-<TGConnectingPoint num="18" id="1908" />
-<TGConnectingPoint num="19" id="1909" />
-<TGConnectingPoint num="20" id="1910" />
-<TGConnectingPoint num="21" id="1911" />
-<TGConnectingPoint num="22" id="1912" />
-<TGConnectingPoint num="23" id="1913" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1103" id="1889" >
-<father id="1914" num="0" />
-<cdparam x="934" y="132" />
-<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="59" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="AppC::fromDtoSC" />
-<TGConnectingPoint num="0" id="1881" />
-<TGConnectingPoint num="1" id="1882" />
-<TGConnectingPoint num="2" id="1883" />
-<TGConnectingPoint num="3" id="1884" />
-<TGConnectingPoint num="4" id="1885" />
-<TGConnectingPoint num="5" id="1886" />
-<TGConnectingPoint num="6" id="1887" />
-<TGConnectingPoint num="7" id="1888" />
-<extraparam>
-<info value="AppC::fromDtoSC" communicationName="fromDtoSC" referenceCommunicationName="AppC" priority="0" typeName="channel" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="1984" >
-<cdparam x="149" y="89" />
-<sizeparam width="459" height="321" minWidth="150" minHeight="150" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="cpu0" value="name" />
-<TGConnectingPoint num="0" id="1960" />
-<TGConnectingPoint num="1" id="1961" />
-<TGConnectingPoint num="2" id="1962" />
-<TGConnectingPoint num="3" id="1963" />
-<TGConnectingPoint num="4" id="1964" />
-<TGConnectingPoint num="5" id="1965" />
-<TGConnectingPoint num="6" id="1966" />
-<TGConnectingPoint num="7" id="1967" />
-<TGConnectingPoint num="8" id="1968" />
-<TGConnectingPoint num="9" id="1969" />
-<TGConnectingPoint num="10" id="1970" />
-<TGConnectingPoint num="11" id="1971" />
-<TGConnectingPoint num="12" id="1972" />
-<TGConnectingPoint num="13" id="1973" />
-<TGConnectingPoint num="14" id="1974" />
-<TGConnectingPoint num="15" id="1975" />
-<TGConnectingPoint num="16" id="1976" />
-<TGConnectingPoint num="17" id="1977" />
-<TGConnectingPoint num="18" id="1978" />
-<TGConnectingPoint num="19" id="1979" />
-<TGConnectingPoint num="20" id="1980" />
-<TGConnectingPoint num="21" id="1981" />
-<TGConnectingPoint num="22" id="1982" />
-<TGConnectingPoint num="23" id="1983" />
-<extraparam>
-<info stereotype="CPURRPB" nodeName="cpu0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="99" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1101" id="1923" >
-<father id="1984" num="0" />
-<cdparam x="190" y="153" />
-<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1915" />
-<TGConnectingPoint num="1" id="1916" />
-<TGConnectingPoint num="2" id="1917" />
-<TGConnectingPoint num="3" id="1918" />
-<TGConnectingPoint num="4" id="1919" />
-<TGConnectingPoint num="5" id="1920" />
-<TGConnectingPoint num="6" id="1921" />
-<TGConnectingPoint num="7" id="1922" />
-<extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1932" >
-<father id="1984" num="1" />
-<cdparam x="389" y="152" />
-<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1924" />
-<TGConnectingPoint num="1" id="1925" />
-<TGConnectingPoint num="2" id="1926" />
-<TGConnectingPoint num="3" id="1927" />
-<TGConnectingPoint num="4" id="1928" />
-<TGConnectingPoint num="5" id="1929" />
-<TGConnectingPoint num="6" id="1930" />
-<TGConnectingPoint num="7" id="1931" />
-<extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1941" >
-<father id="1984" num="2" />
-<cdparam x="194" y="245" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1933" />
-<TGConnectingPoint num="1" id="1934" />
-<TGConnectingPoint num="2" id="1935" />
-<TGConnectingPoint num="3" id="1936" />
-<TGConnectingPoint num="4" id="1937" />
-<TGConnectingPoint num="5" id="1938" />
-<TGConnectingPoint num="6" id="1939" />
-<TGConnectingPoint num="7" id="1940" />
-<extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1950" >
-<father id="1984" num="3" />
-<cdparam x="388" y="233" />
-<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1942" />
-<TGConnectingPoint num="1" id="1943" />
-<TGConnectingPoint num="2" id="1944" />
-<TGConnectingPoint num="3" id="1945" />
-<TGConnectingPoint num="4" id="1946" />
-<TGConnectingPoint num="5" id="1947" />
-<TGConnectingPoint num="6" id="1948" />
-<TGConnectingPoint num="7" id="1949" />
-<extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1959" >
-<father id="1984" num="4" />
-<cdparam x="324" y="303" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1951" />
-<TGConnectingPoint num="1" id="1952" />
-<TGConnectingPoint num="2" id="1953" />
-<TGConnectingPoint num="3" id="1954" />
-<TGConnectingPoint num="4" id="1955" />
-<TGConnectingPoint num="5" id="1956" />
-<TGConnectingPoint num="6" id="1957" />
-<TGConnectingPoint num="7" id="1958" />
-<extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
-
</TURTLEGMODELING>
\ No newline at end of file
diff --git a/modeling/LIP6/miniAsynchronousDeployClusteredVGMN.xml b/modeling/LIP6/miniAsynchronousDeployClusteredVGMN.xml
index 0cd1b8954162eeef36d6630a64bf5bdadafb7635..80dfba07266d5895c3cd6ddc074ae93a2e2b2040 100644
--- a/modeling/LIP6/miniAsynchronousDeployClusteredVGMN.xml
+++ b/modeling/LIP6/miniAsynchronousDeployClusteredVGMN.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="1.0beta">
<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
-<Validated value="Block1;Block0;" />
+<Validated value="" />
<Ignored value="" />
<CONNECTOR type="5002" id="2" >
@@ -55,8 +55,9 @@
<TGConnectingPoint num="22" id="25" />
<TGConnectingPoint num="23" id="26" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Signal value="in val()" />
+<Signal value="in val()" attached="true" />
</extraparam>
</COMPONENT>
@@ -91,8 +92,9 @@
<TGConnectingPoint num="22" id="50" />
<TGConnectingPoint num="23" id="51" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Signal value="out val()" />
+<Signal value="out val()" attached="true" />
</extraparam>
</COMPONENT>
@@ -125,6 +127,7 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
@@ -153,6 +156,7 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
@@ -181,6 +185,7 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
@@ -299,6 +304,7 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
@@ -327,6 +333,7 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
@@ -355,6 +362,7 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<probability value="" />
</extraparam>
</SUBCOMPONENT>
@@ -454,12 +462,59 @@
<Modeling type="ADD" nameTab="Avatar Deployment" >
<ADDDiagramPanel name="Deployment Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="5363" id="231" >
-<cdparam x="431" y="307" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5350" id="435" >
+<cdparam x="351" y="402" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="351" y="402" id="412" />
+<P2 x="281" y="335" id="288" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="5355" id="410" >
+<cdparam x="251" y="402" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Vgmn0" value="name" />
+<infoparam name="Memory0" value="name" />
+<TGConnectingPoint num="0" id="411" />
+<TGConnectingPoint num="1" id="412" />
+<TGConnectingPoint num="2" id="413" />
+<TGConnectingPoint num="3" id="414" />
+<TGConnectingPoint num="4" id="415" />
+<TGConnectingPoint num="5" id="416" />
+<TGConnectingPoint num="6" id="417" />
+<TGConnectingPoint num="7" id="418" />
+<TGConnectingPoint num="8" id="419" />
+<TGConnectingPoint num="9" id="420" />
+<TGConnectingPoint num="10" id="421" />
+<TGConnectingPoint num="11" id="422" />
+<TGConnectingPoint num="12" id="423" />
+<TGConnectingPoint num="13" id="424" />
+<TGConnectingPoint num="14" id="425" />
+<TGConnectingPoint num="15" id="426" />
+<TGConnectingPoint num="16" id="427" />
+<TGConnectingPoint num="17" id="428" />
+<TGConnectingPoint num="18" id="429" />
+<TGConnectingPoint num="19" id="430" />
+<TGConnectingPoint num="20" id="431" />
+<TGConnectingPoint num="21" id="432" />
+<TGConnectingPoint num="22" id="433" />
+<TGConnectingPoint num="23" id="434" />
+<extraparam>
+<info stereotype="RAM" nodeName="Memory0" />
+<attributes byteDataSize="1024" index="0" cluster_index="0" processCode="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5354" id="231" >
+<cdparam x="746" y="442" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="TTY1" value="name" />
<TGConnectingPoint num="0" id="207" />
<TGConnectingPoint num="1" id="208" />
<TGConnectingPoint num="2" id="209" />
@@ -485,14 +540,14 @@
<TGConnectingPoint num="22" id="229" />
<TGConnectingPoint num="23" id="230" />
<extraparam>
-<info stereotype="VGMN" nodeName="Vgmn0" />
-<attributes index="0" nbOfAttachedInitiators="0" nbOfAttachedTargets="0" minLatency="0" fifoDepth="0" />
+<info stereotype="TTY" nodeName="TTY1" />
+<attributes index="1" cluster_index="0" />
</extraparam>
</COMPONENT>
<COMPONENT type="5354" id="256" >
-<cdparam x="10" y="378" />
-<sizeparam width="163" height="176" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="17" y="356" />
+<sizeparam width="150" height="187" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="TTY0" value="name" />
@@ -522,16 +577,16 @@
<TGConnectingPoint num="23" id="255" />
<extraparam>
<info stereotype="TTY" nodeName="TTY0" />
-<attributes index="0" />
+<attributes index="0" cluster_index="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5364" id="281" >
-<cdparam x="156" y="285" />
+<COMPONENT type="5363" id="281" >
+<cdparam x="431" y="307" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Crossbar0" value="name" />
+<infoparam name="Vgmn0" value="name" />
<TGConnectingPoint num="0" id="257" />
<TGConnectingPoint num="1" id="258" />
<TGConnectingPoint num="2" id="259" />
@@ -557,17 +612,17 @@
<TGConnectingPoint num="22" id="279" />
<TGConnectingPoint num="23" id="280" />
<extraparam>
-<info stereotype="CROSSBAR" nodeName="Crossbar0" />
- cluster_index="0" cluster_address="0" />
+<info stereotype="VGMN" nodeName="Vgmn0" />
+<attributes index="0" nbOfAttachedInitiators="0" nbOfAttachedTargets="0" minLatency="10" fifoDepth="8" />
</extraparam>
</COMPONENT>
<COMPONENT type="5364" id="306" >
-<cdparam x="725" y="322" />
+<cdparam x="156" y="285" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Crossbar1" value="name" />
+<infoparam name="Crossbar0" value="name" />
<TGConnectingPoint num="0" id="282" />
<TGConnectingPoint num="1" id="283" />
<TGConnectingPoint num="2" id="284" />
@@ -593,53 +648,17 @@
<TGConnectingPoint num="22" id="304" />
<TGConnectingPoint num="23" id="305" />
<extraparam>
-<info stereotype="CROSSBAR" nodeName="Crossbar1" />
- cluster_index="0" cluster_address="0" />
+<info stereotype="CROSSBAR" nodeName="Crossbar0" />
+<attributes cluster_index="0" cluster_address="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5355" id="340" >
-<cdparam x="218" y="386" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5364" id="331" >
+<cdparam x="725" y="322" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="316" />
-<TGConnectingPoint num="1" id="317" />
-<TGConnectingPoint num="2" id="318" />
-<TGConnectingPoint num="3" id="319" />
-<TGConnectingPoint num="4" id="320" />
-<TGConnectingPoint num="5" id="321" />
-<TGConnectingPoint num="6" id="322" />
-<TGConnectingPoint num="7" id="323" />
-<TGConnectingPoint num="8" id="324" />
-<TGConnectingPoint num="9" id="325" />
-<TGConnectingPoint num="10" id="326" />
-<TGConnectingPoint num="11" id="327" />
-<TGConnectingPoint num="12" id="328" />
-<TGConnectingPoint num="13" id="329" />
-<TGConnectingPoint num="14" id="330" />
-<TGConnectingPoint num="15" id="331" />
-<TGConnectingPoint num="16" id="332" />
-<TGConnectingPoint num="17" id="333" />
-<TGConnectingPoint num="18" id="334" />
-<TGConnectingPoint num="19" id="335" />
-<TGConnectingPoint num="20" id="336" />
-<TGConnectingPoint num="21" id="337" />
-<TGConnectingPoint num="22" id="338" />
-<TGConnectingPoint num="23" id="339" />
-<extraparam>
-<info stereotype="RAM" nodeName="Memory0" />
-<attributes byteDataSize="1048576" index="0" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5362" id="315" >
-<father id="340" num="0" />
-<cdparam x="288" y="436" />
-<sizeparam width="122" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="78" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Block0/out val" />
+<infoparam name="Crossbar1" value="name" />
<TGConnectingPoint num="0" id="307" />
<TGConnectingPoint num="1" id="308" />
<TGConnectingPoint num="2" id="309" />
@@ -648,17 +667,34 @@
<TGConnectingPoint num="5" id="312" />
<TGConnectingPoint num="6" id="313" />
<TGConnectingPoint num="7" id="314" />
+<TGConnectingPoint num="8" id="315" />
+<TGConnectingPoint num="9" id="316" />
+<TGConnectingPoint num="10" id="317" />
+<TGConnectingPoint num="11" id="318" />
+<TGConnectingPoint num="12" id="319" />
+<TGConnectingPoint num="13" id="320" />
+<TGConnectingPoint num="14" id="321" />
+<TGConnectingPoint num="15" id="322" />
+<TGConnectingPoint num="16" id="323" />
+<TGConnectingPoint num="17" id="324" />
+<TGConnectingPoint num="18" id="325" />
+<TGConnectingPoint num="19" id="326" />
+<TGConnectingPoint num="20" id="327" />
+<TGConnectingPoint num="21" id="328" />
+<TGConnectingPoint num="22" id="329" />
+<TGConnectingPoint num="23" id="330" />
<extraparam>
-<info value="Block0/out val" channelName="Block0/out val() #--# Block1/in val()" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info stereotype="CROSSBAR" nodeName="Crossbar1" />
+<attributes cluster_index="1" cluster_address="0" />
</extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
-<COMPONENT type="5354" id="365" >
-<cdparam x="639" y="474" />
+<COMPONENT type="5351" id="365" >
+<cdparam x="545" y="49" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="TTY1" value="name" />
+<infoparam name="CPU1" value="name" />
<TGConnectingPoint num="0" id="341" />
<TGConnectingPoint num="1" id="342" />
<TGConnectingPoint num="2" id="343" />
@@ -684,17 +720,36 @@
<TGConnectingPoint num="22" id="363" />
<TGConnectingPoint num="23" id="364" />
<extraparam>
-<info stereotype="TTY" nodeName="TTY1" />
-<attributes index="1" />
+<info stereotype="CPU" nodeName="CPU1" />
+<attributes nbOfIrq="6" iCacheWays="1" iCacheSets="8" iCacheWords="4" dCacheWays="1" dCacheSets="8" dCacheWords="4" />
</extraparam>
</COMPONENT>
+<SUBCOMPONENT type="5352" id="340" >
+<father id="365" num="0" />
+<cdparam x="604" y="119" />
+<sizeparam width="175" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="75" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="AVATAR Design::Block1" />
+<TGConnectingPoint num="0" id="332" />
+<TGConnectingPoint num="1" id="333" />
+<TGConnectingPoint num="2" id="334" />
+<TGConnectingPoint num="3" id="335" />
+<TGConnectingPoint num="4" id="336" />
+<TGConnectingPoint num="5" id="337" />
+<TGConnectingPoint num="6" id="338" />
+<TGConnectingPoint num="7" id="339" />
+<extraparam>
+<info value="AVATAR Design::Block1" taskName="Block1" referenceTaskName="AVATAR Design" />
+</extraparam>
+</SUBCOMPONENT>
<COMPONENT type="5351" id="399" >
-<cdparam x="545" y="49" />
+<cdparam x="113" y="44" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU1" value="name" />
+<infoparam name="CPU0" value="name" />
<TGConnectingPoint num="0" id="375" />
<TGConnectingPoint num="1" id="376" />
<TGConnectingPoint num="2" id="377" />
@@ -720,17 +775,17 @@
<TGConnectingPoint num="22" id="397" />
<TGConnectingPoint num="23" id="398" />
<extraparam>
-<info stereotype="CPU" nodeName="CPU1" />
+<info stereotype="CPU" nodeName="CPU0" />
<attributes nbOfIrq="6" iCacheWays="1" iCacheSets="8" iCacheWords="4" dCacheWays="1" dCacheSets="8" dCacheWords="4" />
</extraparam>
</COMPONENT>
<SUBCOMPONENT type="5352" id="374" >
<father id="399" num="0" />
-<cdparam x="604" y="119" />
-<sizeparam width="175" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="172" y="134" />
+<sizeparam width="176" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="75" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="AVATAR Design::Block1" />
+<cdrectangleparam minX="0" maxX="74" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="AVATAR Design::Block0" />
<TGConnectingPoint num="0" id="366" />
<TGConnectingPoint num="1" id="367" />
<TGConnectingPoint num="2" id="368" />
@@ -740,122 +795,67 @@
<TGConnectingPoint num="6" id="372" />
<TGConnectingPoint num="7" id="373" />
<extraparam>
-<info value="AVATAR Design::Block1" taskName="Block1" referenceTaskName="AVATAR Design" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5351" id="433" >
-<cdparam x="113" y="44" />
-<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="409" />
-<TGConnectingPoint num="1" id="410" />
-<TGConnectingPoint num="2" id="411" />
-<TGConnectingPoint num="3" id="412" />
-<TGConnectingPoint num="4" id="413" />
-<TGConnectingPoint num="5" id="414" />
-<TGConnectingPoint num="6" id="415" />
-<TGConnectingPoint num="7" id="416" />
-<TGConnectingPoint num="8" id="417" />
-<TGConnectingPoint num="9" id="418" />
-<TGConnectingPoint num="10" id="419" />
-<TGConnectingPoint num="11" id="420" />
-<TGConnectingPoint num="12" id="421" />
-<TGConnectingPoint num="13" id="422" />
-<TGConnectingPoint num="14" id="423" />
-<TGConnectingPoint num="15" id="424" />
-<TGConnectingPoint num="16" id="425" />
-<TGConnectingPoint num="17" id="426" />
-<TGConnectingPoint num="18" id="427" />
-<TGConnectingPoint num="19" id="428" />
-<TGConnectingPoint num="20" id="429" />
-<TGConnectingPoint num="21" id="430" />
-<TGConnectingPoint num="22" id="431" />
-<TGConnectingPoint num="23" id="432" />
-<extraparam>
-<info stereotype="CPU" nodeName="CPU0" />
-<attributes nbOfIrq="6" iCacheWays="1" iCacheSets="8" iCacheWords="4" dCacheWays="1" dCacheSets="8" dCacheWords="4" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5352" id="408" >
-<father id="433" num="0" />
-<cdparam x="172" y="134" />
-<sizeparam width="176" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="74" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="AVATAR Design::Block0" />
-<TGConnectingPoint num="0" id="400" />
-<TGConnectingPoint num="1" id="401" />
-<TGConnectingPoint num="2" id="402" />
-<TGConnectingPoint num="3" id="403" />
-<TGConnectingPoint num="4" id="404" />
-<TGConnectingPoint num="5" id="405" />
-<TGConnectingPoint num="6" id="406" />
-<TGConnectingPoint num="7" id="407" />
-<extraparam>
<info value="AVATAR Design::Block0" taskName="Block0" referenceTaskName="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5350" id="434" >
-<cdparam x="681" y="332" />
+<CONNECTOR type="5350" id="401" >
+<cdparam x="167" y="402" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="681" y="332" id="211" />
-<P2 x="725" y="347" id="285" />
+<P1 x="167" y="402" id="243" />
+<P2 x="218" y="335" id="296" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5350" id="435" >
-<cdparam x="431" y="319" />
+<CONNECTOR type="5350" id="402" >
+<cdparam x="871" y="442" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="431" y="319" id="217" />
-<P2 x="406" y="310" id="261" />
+<P1 x="871" y="442" id="208" />
+<P2 x="850" y="372" id="313" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5350" id="436" >
-<cdparam x="173" y="378" />
+<CONNECTOR type="5350" id="404" >
+<cdparam x="681" y="332" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="173" y="378" id="234" />
-<P2 x="218" y="335" id="271" />
+<P1 x="681" y="332" id="261" />
+<P2 x="725" y="347" id="310" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5350" id="437" >
-<cdparam x="764" y="474" />
+<CONNECTOR type="5350" id="405" >
+<cdparam x="431" y="319" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="764" y="474" id="342" />
-<P2 x="850" y="372" id="288" />
+<P1 x="431" y="319" id="267" />
+<P2 x="406" y="310" id="286" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5350" id="439" >
+<CONNECTOR type="5350" id="407" >
<cdparam x="732" y="249" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="732" y="249" id="390" />
-<P2 x="787" y="322" id="290" />
+<P1 x="732" y="249" id="356" />
+<P2 x="787" y="322" id="315" />
<Point x="788" y="318" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="438" >
-<father id="439" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="406" >
+<father id="407" num="0" />
<cdparam x="788" y="318" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -863,23 +863,12 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5350" id="440" >
-<cdparam x="318" y="386" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="318" y="386" id="317" />
-<P2 x="281" y="335" id="263" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="5350" id="441" >
+<CONNECTOR type="5350" id="408" >
<cdparam x="300" y="244" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="300" y="244" id="424" />
-<P2 x="281" y="285" id="258" />
+<P1 x="300" y="244" id="390" />
+<P2 x="281" y="285" id="283" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="false" />
diff --git a/modeling/LIP6/telecom_journal.xml b/modeling/LIP6/telecom_journal.xml
index 6b0b64849c28f2732b7d050618cfa06ff84a528c..ff418f59aced2a0341e6048bc32023538ad635b7 100644
--- a/modeling/LIP6/telecom_journal.xml
+++ b/modeling/LIP6/telecom_journal.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<TURTLEGMODELING version="1.0beta">
@@ -71,7 +71,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="9" />
-<P1 x="531" y="400" id="111" />
+<P1 x="531" y="400" id="161" />
<P2 x="532" y="494" id="195" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -91,7 +91,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="11" />
-<P1 x="366" y="230" id="160" />
+<P1 x="366" y="230" id="110" />
<P2 x="366" y="494" id="186" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -149,7 +149,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="17" />
-<P1 x="926" y="230" id="215" />
+<P1 x="926" y="230" id="240" />
<P2 x="871" y="232" id="258" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -165,7 +165,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="19" />
-<P1 x="928" y="390" id="233" />
+<P1 x="928" y="390" id="208" />
<P2 x="871" y="343" id="267" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -207,6 +207,7 @@
<TGConnectingPoint num="22" id="43" />
<TGConnectingPoint num="23" id="44" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="address" value="" type="8" typeOther="" />
<Attribute access="0" id="counter" value="16" type="8" typeOther="" />
@@ -245,6 +246,7 @@
<TGConnectingPoint num="22" id="68" />
<TGConnectingPoint num="23" id="69" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
<Attribute access="0" id="address" value="" type="8" typeOther="" />
@@ -284,6 +286,7 @@
<TGConnectingPoint num="22" id="93" />
<TGConnectingPoint num="23" id="94" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
<Attribute access="0" id="address" value="" type="8" typeOther="" />
@@ -346,6 +349,7 @@
<TGConnectingPoint num="22" id="202" />
<TGConnectingPoint num="23" id="203" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
<Attribute access="0" id="f1" value="true" type="4" typeOther="" />
@@ -371,11 +375,11 @@
</COMPONENT>
<SUBCOMPONENT type="5000" id="129" >
<father id="204" num="0" />
-<cdparam x="396" y="257" />
-<sizeparam width="271" height="143" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="366" y="80" />
+<sizeparam width="266" height="150" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="392" minY="0" maxY="341" />
-<infoparam name="Block0" value="Classif2" />
+<cdrectangleparam minX="0" maxX="397" minY="0" maxY="334" />
+<infoparam name="Block0" value="Classif0" />
<TGConnectingPoint num="0" id="105" />
<TGConnectingPoint num="1" id="106" />
<TGConnectingPoint num="2" id="107" />
@@ -401,8 +405,10 @@
<TGConnectingPoint num="22" id="127" />
<TGConnectingPoint num="23" id="128" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
+<Attribute access="0" id="nbPackets" value="" type="8" typeOther="" />
<Signal value="out to_queue_low(PacketDesc packet)" attached="true" />
<Signal value="out to_queue_medium(PacketDesc packet)" attached="true" />
<Signal value="out to_queue_high(PacketDesc packet)" attached="true" />
@@ -441,6 +447,7 @@
<TGConnectingPoint num="22" id="152" />
<TGConnectingPoint num="23" id="153" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
<Signal value="out to_queue_low(PacketDesc packet)" attached="true" />
@@ -451,11 +458,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="179" >
<father id="204" num="2" />
-<cdparam x="366" y="80" />
-<sizeparam width="266" height="150" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="396" y="257" />
+<sizeparam width="271" height="143" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="397" minY="0" maxY="334" />
-<infoparam name="Block0" value="Classif0" />
+<cdrectangleparam minX="0" maxX="392" minY="0" maxY="341" />
+<infoparam name="Block0" value="Classif2" />
<TGConnectingPoint num="0" id="155" />
<TGConnectingPoint num="1" id="156" />
<TGConnectingPoint num="2" id="157" />
@@ -481,9 +488,9 @@
<TGConnectingPoint num="22" id="177" />
<TGConnectingPoint num="23" id="178" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
-<Attribute access="0" id="nbPackets" value="" type="8" typeOther="" />
<Signal value="out to_queue_low(PacketDesc packet)" attached="true" />
<Signal value="out to_queue_medium(PacketDesc packet)" attached="true" />
<Signal value="out to_queue_high(PacketDesc packet)" attached="true" />
@@ -522,6 +529,7 @@
<TGConnectingPoint num="22" id="277" />
<TGConnectingPoint num="23" id="278" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
<Signal value="in from_queue_low(PacketDesc packet)" attached="true" />
@@ -536,11 +544,11 @@
</COMPONENT>
<SUBCOMPONENT type="5000" id="229" >
<father id="279" num="0" />
-<cdparam x="926" y="202" />
-<sizeparam width="277" height="114" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="928" y="333" />
+<sizeparam width="274" height="114" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="101" minY="0" maxY="331" />
-<infoparam name="Block0" value="Sched0" />
+<cdrectangleparam minX="0" maxX="104" minY="0" maxY="331" />
+<infoparam name="Block0" value="Sched1" />
<TGConnectingPoint num="0" id="205" />
<TGConnectingPoint num="1" id="206" />
<TGConnectingPoint num="2" id="207" />
@@ -566,19 +574,20 @@
<TGConnectingPoint num="22" id="227" />
<TGConnectingPoint num="23" id="228" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
-<Signal value="out scheduledPacket0(PacketDesc packet)" attached="true" />
-<Signal value="in toScheduler0(PacketDesc packet)" attached="true" />
+<Signal value="out scheduledPacket1(PacketDesc packet)" attached="true" />
+<Signal value="in toScheduler1(PacketDesc packet)" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="254" >
<father id="279" num="1" />
-<cdparam x="928" y="333" />
-<sizeparam width="274" height="114" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="926" y="202" />
+<sizeparam width="277" height="114" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="104" minY="0" maxY="331" />
-<infoparam name="Block0" value="Sched1" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="331" />
+<infoparam name="Block0" value="Sched0" />
<TGConnectingPoint num="0" id="230" />
<TGConnectingPoint num="1" id="231" />
<TGConnectingPoint num="2" id="232" />
@@ -604,10 +613,11 @@
<TGConnectingPoint num="22" id="252" />
<TGConnectingPoint num="23" id="253" />
<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Attribute access="0" id="packet" value="" type="5" typeOther="PacketDesc" />
-<Signal value="out scheduledPacket1(PacketDesc packet)" attached="true" />
-<Signal value="in toScheduler1(PacketDesc packet)" attached="true" />
+<Signal value="out scheduledPacket0(PacketDesc packet)" attached="true" />
+<Signal value="in toScheduler0(PacketDesc packet)" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -5670,46 +5680,26 @@
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="Classif0" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2351" >
-<cdparam x="626" y="282" />
+<AVATARStateMachineDiagramPanel name="Classif2" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="2347" >
+<cdparam x="2384" y="30" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2348" />
-<TGConnectingPoint num="1" id="2349" />
-<TGConnectingPoint num="2" id="2350" />
-<P1 x="627" y="340" id="2521" />
-<P2 x="561" y="60" id="2426" />
-<Point x="357" y="309" />
-<Point x="356" y="59" />
+<TGConnectingPoint num="0" id="2346" />
+<P1 x="2384" y="30" id="2542" />
+<P2 x="2389" y="48" id="2434" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2341" >
-<father id="2351" num="0" />
-<cdparam x="357" y="309" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2342" >
-<father id="2351" num="1" />
-<cdparam x="356" y="59" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2347" >
-<father id="2351" num="2" />
-<cdparam x="593" y="171" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2345" >
+<father id="2347" num="0" />
+<cdparam x="2382" y="39" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2343" />
-<TGConnectingPoint num="1" id="2344" />
-<TGConnectingPoint num="2" id="2345" />
-<TGConnectingPoint num="3" id="2346" />
+<TGConnectingPoint num="0" id="2341" />
+<TGConnectingPoint num="1" id="2342" />
+<TGConnectingPoint num="2" id="2343" />
+<TGConnectingPoint num="3" id="2344" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -5720,45 +5710,54 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2362" >
-<cdparam x="805" y="250" />
+<CONNECTOR type="5102" id="2354" >
+<cdparam x="2395" y="176" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2359" />
-<TGConnectingPoint num="1" id="2360" />
-<TGConnectingPoint num="2" id="2361" />
-<P1 x="807" y="313" id="2510" />
-<P2 x="661" y="79" id="2442" />
-<Point x="922" y="246" />
-<Point x="866" y="94" />
+<TGConnectingPoint num="0" id="2353" />
+<P1 x="2393" y="222" id="2463" />
+<P2 x="2392" y="252" id="2520" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2352" >
-<father id="2362" num="0" />
-<cdparam x="922" y="246" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2354" num="0" />
+<cdparam x="2393" y="194" />
+<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2348" />
+<TGConnectingPoint num="1" id="2349" />
+<TGConnectingPoint num="2" id="2350" />
+<TGConnectingPoint num="3" id="2351" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="50" />
+<afterMax value="100" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2353" >
-<father id="2362" num="1" />
-<cdparam x="866" y="94" />
+
+<CONNECTOR type="5102" id="2361" >
+<cdparam x="2385" y="98" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2358" >
-<father id="2362" num="2" />
-<cdparam x="733" y="164" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2360" />
+<P1 x="2383" y="149" id="2499" />
+<P2 x="2380" y="172" id="2474" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2359" >
+<father id="2361" num="0" />
+<cdparam x="2383" y="112" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2354" />
-<TGConnectingPoint num="1" id="2355" />
-<TGConnectingPoint num="2" id="2356" />
-<TGConnectingPoint num="3" id="2357" />
+<TGConnectingPoint num="0" id="2355" />
+<TGConnectingPoint num="1" id="2356" />
+<TGConnectingPoint num="2" id="2357" />
+<TGConnectingPoint num="3" id="2358" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -5769,45 +5768,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2373" >
-<cdparam x="489" y="244" />
+<CONNECTOR type="5102" id="2368" >
+<cdparam x="2377" y="98" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2370" />
-<TGConnectingPoint num="1" id="2371" />
-<TGConnectingPoint num="2" id="2372" />
-<P1 x="482" y="296" id="2532" />
-<P2 x="561" y="79" id="2440" />
-<Point x="379" y="270" />
-<Point x="384" y="91" />
+<TGConnectingPoint num="0" id="2367" />
+<P1 x="2377" y="98" id="2422" />
+<P2 x="2383" y="119" id="2498" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2363" >
-<father id="2373" num="0" />
-<cdparam x="379" y="270" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2364" >
-<father id="2373" num="1" />
-<cdparam x="384" y="91" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2369" >
-<father id="2373" num="2" />
-<cdparam x="525" y="161" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2366" >
+<father id="2368" num="0" />
+<cdparam x="2380" y="108" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2365" />
-<TGConnectingPoint num="1" id="2366" />
-<TGConnectingPoint num="2" id="2367" />
-<TGConnectingPoint num="3" id="2368" />
+<TGConnectingPoint num="0" id="2362" />
+<TGConnectingPoint num="1" id="2363" />
+<TGConnectingPoint num="2" id="2364" />
+<TGConnectingPoint num="3" id="2365" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -5818,25 +5797,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2380" >
-<cdparam x="677" y="197" />
+<CONNECTOR type="5102" id="2375" >
+<cdparam x="2343" y="197" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2379" />
-<P1 x="681" y="238" id="2461" />
-<P2 x="807" y="283" id="2509" />
+<TGConnectingPoint num="0" id="2374" />
+<P1 x="2343" y="197" id="2460" />
+<P2 x="2255" y="214" id="2531" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2378" >
-<father id="2380" num="0" />
-<cdparam x="729" y="247" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2373" >
+<father id="2375" num="0" />
+<cdparam x="1327" y="263" />
<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2374" />
-<TGConnectingPoint num="1" id="2375" />
-<TGConnectingPoint num="2" id="2376" />
-<TGConnectingPoint num="3" id="2377" />
+<TGConnectingPoint num="0" id="2369" />
+<TGConnectingPoint num="1" id="2370" />
+<TGConnectingPoint num="2" id="2371" />
+<TGConnectingPoint num="3" id="2372" />
<extraparam>
<guard value="[ ]" />
<afterMin value="50" />
@@ -5847,25 +5826,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2387" >
-<cdparam x="577" y="197" />
+<CONNECTOR type="5102" id="2382" >
+<cdparam x="2443" y="197" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2386" />
-<P1 x="581" y="238" id="2460" />
-<P2 x="482" y="266" id="2531" />
+<TGConnectingPoint num="0" id="2381" />
+<P1 x="2443" y="197" id="2461" />
+<P2 x="2571" y="220" id="2509" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2385" >
-<father id="2387" num="0" />
-<cdparam x="494" y="230" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2380" >
+<father id="2382" num="0" />
+<cdparam x="2507" y="208" />
<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2381" />
-<TGConnectingPoint num="1" id="2382" />
-<TGConnectingPoint num="2" id="2383" />
-<TGConnectingPoint num="3" id="2384" />
+<TGConnectingPoint num="0" id="2376" />
+<TGConnectingPoint num="1" id="2377" />
+<TGConnectingPoint num="2" id="2378" />
+<TGConnectingPoint num="3" id="2379" />
<extraparam>
<guard value="[ ]" />
<afterMin value="50" />
@@ -5876,25 +5855,45 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2394" >
-<cdparam x="611" y="98" />
+<CONNECTOR type="5102" id="2393" >
+<cdparam x="2255" y="244" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2393" />
-<P1 x="611" y="98" id="2422" />
-<P2 x="615" y="138" id="2498" />
+<TGConnectingPoint num="0" id="2390" />
+<TGConnectingPoint num="1" id="2391" />
+<TGConnectingPoint num="2" id="2392" />
+<P1 x="2255" y="244" id="2532" />
+<P2 x="2327" y="79" id="2440" />
+<Point x="2145" y="270" />
+<Point x="2150" y="91" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2392" >
-<father id="2394" num="0" />
-<cdparam x="620" y="121" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2383" >
+<father id="2393" num="0" />
+<cdparam x="2145" y="270" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2384" >
+<father id="2393" num="1" />
+<cdparam x="2150" y="91" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2389" >
+<father id="2393" num="2" />
+<cdparam x="2291" y="161" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2388" />
-<TGConnectingPoint num="1" id="2389" />
-<TGConnectingPoint num="2" id="2390" />
-<TGConnectingPoint num="3" id="2391" />
+<TGConnectingPoint num="0" id="2385" />
+<TGConnectingPoint num="1" id="2386" />
+<TGConnectingPoint num="2" id="2387" />
+<TGConnectingPoint num="3" id="2388" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -5905,25 +5904,45 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2401" >
-<cdparam x="619" y="98" />
+<CONNECTOR type="5102" id="2404" >
+<cdparam x="2571" y="250" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2400" />
-<P1 x="615" y="168" id="2499" />
-<P2 x="618" y="207" id="2474" />
+<TGConnectingPoint num="0" id="2401" />
+<TGConnectingPoint num="1" id="2402" />
+<TGConnectingPoint num="2" id="2403" />
+<P1 x="2571" y="250" id="2510" />
+<P2 x="2427" y="79" id="2442" />
+<Point x="2688" y="246" />
+<Point x="2632" y="94" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2399" >
-<father id="2401" num="0" />
-<cdparam x="631" y="124" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2394" >
+<father id="2404" num="0" />
+<cdparam x="2688" y="246" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2395" >
+<father id="2404" num="1" />
+<cdparam x="2632" y="94" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2400" >
+<father id="2404" num="2" />
+<cdparam x="2499" y="164" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2395" />
-<TGConnectingPoint num="1" id="2396" />
-<TGConnectingPoint num="2" id="2397" />
-<TGConnectingPoint num="3" id="2398" />
+<TGConnectingPoint num="0" id="2396" />
+<TGConnectingPoint num="1" id="2397" />
+<TGConnectingPoint num="2" id="2398" />
+<TGConnectingPoint num="3" id="2399" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -5934,54 +5953,45 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2408" >
-<cdparam x="629" y="176" />
+<CONNECTOR type="5102" id="2415" >
+<cdparam x="2392" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2407" />
-<P1 x="631" y="270" id="2463" />
-<P2 x="627" y="310" id="2520" />
+<TGConnectingPoint num="0" id="2412" />
+<TGConnectingPoint num="1" id="2413" />
+<TGConnectingPoint num="2" id="2414" />
+<P1 x="2392" y="282" id="2521" />
+<P2 x="2327" y="60" id="2426" />
+<Point x="2123" y="309" />
+<Point x="2122" y="59" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2406" >
-<father id="2408" num="0" />
-<cdparam x="645" y="298" />
-<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2405" >
+<father id="2415" num="0" />
+<cdparam x="2123" y="309" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2402" />
-<TGConnectingPoint num="1" id="2403" />
-<TGConnectingPoint num="2" id="2404" />
-<TGConnectingPoint num="3" id="2405" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="50" />
-<afterMax value="100" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="2415" >
-<cdparam x="618" y="30" />
+<SUBCOMPONENT type="-1" id="2406" >
+<father id="2415" num="1" />
+<cdparam x="2122" y="59" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2414" />
-<P1 x="618" y="30" id="2542" />
-<P2 x="623" y="48" id="2434" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2413" >
-<father id="2415" num="0" />
-<cdparam x="616" y="39" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2411" >
+<father id="2415" num="2" />
+<cdparam x="2359" y="171" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2409" />
-<TGConnectingPoint num="1" id="2410" />
-<TGConnectingPoint num="2" id="2411" />
-<TGConnectingPoint num="3" id="2412" />
+<TGConnectingPoint num="0" id="2407" />
+<TGConnectingPoint num="1" id="2408" />
+<TGConnectingPoint num="2" id="2409" />
+<TGConnectingPoint num="3" id="2410" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -5993,10 +6003,10 @@
</SUBCOMPONENT>
<COMPONENT type="5106" id="2456" >
-<cdparam x="561" y="48" />
+<cdparam x="2327" y="48" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="State" value="Waiting" />
<TGConnectingPoint num="0" id="2416" />
<TGConnectingPoint num="1" id="2417" />
@@ -6043,10 +6053,10 @@
</COMPONENT>
<COMPONENT type="5106" id="2497" >
-<cdparam x="581" y="207" />
-<sizeparam width="100" height="63" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2343" y="172" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="State" value="Classify" />
<TGConnectingPoint num="0" id="2457" />
<TGConnectingPoint num="1" id="2458" />
@@ -6093,10 +6103,10 @@
</COMPONENT>
<COMPONENT type="5104" id="2508" >
-<cdparam x="552" y="143" />
+<cdparam x="2320" y="124" />
<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Receive signal" value="from_classif(packet)" />
<TGConnectingPoint num="0" id="2498" />
<TGConnectingPoint num="1" id="2499" />
@@ -6111,10 +6121,10 @@
</COMPONENT>
<COMPONENT type="5103" id="2519" >
-<cdparam x="741" y="288" />
+<cdparam x="2505" y="225" />
<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Send signal" value="to_queue_high(packet)" />
<TGConnectingPoint num="0" id="2509" />
<TGConnectingPoint num="1" id="2510" />
@@ -6129,10 +6139,10 @@
</COMPONENT>
<COMPONENT type="5103" id="2530" >
-<cdparam x="551" y="315" />
+<cdparam x="2316" y="257" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Send signal" value="to_queue_medium(packet)" />
<TGConnectingPoint num="0" id="2520" />
<TGConnectingPoint num="1" id="2521" />
@@ -6147,10 +6157,10 @@
</COMPONENT>
<COMPONENT type="5103" id="2541" >
-<cdparam x="419" y="271" />
+<cdparam x="2192" y="219" />
<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Send signal" value="to_queue_low(packet)" />
<TGConnectingPoint num="0" id="2531" />
<TGConnectingPoint num="1" id="2532" />
@@ -6165,10 +6175,10 @@
</COMPONENT>
<COMPONENT type="5100" id="2543" >
-<cdparam x="611" y="10" />
+<cdparam x="2377" y="10" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<TGConnectingPoint num="0" id="2542" />
</COMPONENT>
@@ -6682,26 +6692,46 @@
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="Classif2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="2753" >
-<cdparam x="2384" y="30" />
+<AVATARStateMachineDiagramPanel name="Classif0" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="2757" >
+<cdparam x="626" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2752" />
-<P1 x="2384" y="30" id="2948" />
-<P2 x="2389" y="48" id="2840" />
+<TGConnectingPoint num="0" id="2754" />
+<TGConnectingPoint num="1" id="2755" />
+<TGConnectingPoint num="2" id="2756" />
+<P1 x="627" y="340" id="2927" />
+<P2 x="561" y="60" id="2832" />
+<Point x="357" y="309" />
+<Point x="356" y="59" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2751" >
-<father id="2753" num="0" />
-<cdparam x="2382" y="39" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2747" >
+<father id="2757" num="0" />
+<cdparam x="357" y="309" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2748" >
+<father id="2757" num="1" />
+<cdparam x="356" y="59" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2753" >
+<father id="2757" num="2" />
+<cdparam x="593" y="171" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2747" />
-<TGConnectingPoint num="1" id="2748" />
-<TGConnectingPoint num="2" id="2749" />
-<TGConnectingPoint num="3" id="2750" />
+<TGConnectingPoint num="0" id="2749" />
+<TGConnectingPoint num="1" id="2750" />
+<TGConnectingPoint num="2" id="2751" />
+<TGConnectingPoint num="3" id="2752" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -6712,54 +6742,45 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2760" >
-<cdparam x="2395" y="176" />
+<CONNECTOR type="5102" id="2768" >
+<cdparam x="805" y="250" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2759" />
-<P1 x="2393" y="222" id="2869" />
-<P2 x="2392" y="252" id="2926" />
+<TGConnectingPoint num="0" id="2765" />
+<TGConnectingPoint num="1" id="2766" />
+<TGConnectingPoint num="2" id="2767" />
+<P1 x="807" y="313" id="2916" />
+<P2 x="661" y="79" id="2848" />
+<Point x="922" y="246" />
+<Point x="866" y="94" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2758" >
-<father id="2760" num="0" />
-<cdparam x="2393" y="194" />
-<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2768" num="0" />
+<cdparam x="922" y="246" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2754" />
-<TGConnectingPoint num="1" id="2755" />
-<TGConnectingPoint num="2" id="2756" />
-<TGConnectingPoint num="3" id="2757" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="50" />
-<afterMax value="100" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="2767" >
-<cdparam x="2385" y="98" />
+<SUBCOMPONENT type="-1" id="2759" >
+<father id="2768" num="1" />
+<cdparam x="866" y="94" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2766" />
-<P1 x="2383" y="149" id="2905" />
-<P2 x="2380" y="172" id="2880" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2765" >
-<father id="2767" num="0" />
-<cdparam x="2383" y="112" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2764" >
+<father id="2768" num="2" />
+<cdparam x="733" y="164" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2761" />
-<TGConnectingPoint num="1" id="2762" />
-<TGConnectingPoint num="2" id="2763" />
-<TGConnectingPoint num="3" id="2764" />
+<TGConnectingPoint num="0" id="2760" />
+<TGConnectingPoint num="1" id="2761" />
+<TGConnectingPoint num="2" id="2762" />
+<TGConnectingPoint num="3" id="2763" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -6770,25 +6791,45 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2774" >
-<cdparam x="2377" y="98" />
+<CONNECTOR type="5102" id="2779" >
+<cdparam x="489" y="244" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2773" />
-<P1 x="2377" y="98" id="2828" />
-<P2 x="2383" y="119" id="2904" />
+<TGConnectingPoint num="0" id="2776" />
+<TGConnectingPoint num="1" id="2777" />
+<TGConnectingPoint num="2" id="2778" />
+<P1 x="482" y="296" id="2938" />
+<P2 x="561" y="79" id="2846" />
+<Point x="379" y="270" />
+<Point x="384" y="91" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2772" >
-<father id="2774" num="0" />
-<cdparam x="2380" y="108" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2769" >
+<father id="2779" num="0" />
+<cdparam x="379" y="270" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2770" >
+<father id="2779" num="1" />
+<cdparam x="384" y="91" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2775" >
+<father id="2779" num="2" />
+<cdparam x="525" y="161" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2768" />
-<TGConnectingPoint num="1" id="2769" />
-<TGConnectingPoint num="2" id="2770" />
-<TGConnectingPoint num="3" id="2771" />
+<TGConnectingPoint num="0" id="2771" />
+<TGConnectingPoint num="1" id="2772" />
+<TGConnectingPoint num="2" id="2773" />
+<TGConnectingPoint num="3" id="2774" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -6799,25 +6840,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2781" >
-<cdparam x="2343" y="197" />
+<CONNECTOR type="5102" id="2786" >
+<cdparam x="677" y="197" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2780" />
-<P1 x="2343" y="197" id="2866" />
-<P2 x="2255" y="214" id="2937" />
+<TGConnectingPoint num="0" id="2785" />
+<P1 x="681" y="238" id="2867" />
+<P2 x="807" y="283" id="2915" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2779" >
-<father id="2781" num="0" />
-<cdparam x="1327" y="263" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2784" >
+<father id="2786" num="0" />
+<cdparam x="729" y="247" />
<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2775" />
-<TGConnectingPoint num="1" id="2776" />
-<TGConnectingPoint num="2" id="2777" />
-<TGConnectingPoint num="3" id="2778" />
+<TGConnectingPoint num="0" id="2780" />
+<TGConnectingPoint num="1" id="2781" />
+<TGConnectingPoint num="2" id="2782" />
+<TGConnectingPoint num="3" id="2783" />
<extraparam>
<guard value="[ ]" />
<afterMin value="50" />
@@ -6828,25 +6869,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2788" >
-<cdparam x="2443" y="197" />
+<CONNECTOR type="5102" id="2793" >
+<cdparam x="577" y="197" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2787" />
-<P1 x="2443" y="197" id="2867" />
-<P2 x="2571" y="220" id="2915" />
+<TGConnectingPoint num="0" id="2792" />
+<P1 x="581" y="238" id="2866" />
+<P2 x="482" y="266" id="2937" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2786" >
-<father id="2788" num="0" />
-<cdparam x="2507" y="208" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2791" >
+<father id="2793" num="0" />
+<cdparam x="494" y="230" />
<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2782" />
-<TGConnectingPoint num="1" id="2783" />
-<TGConnectingPoint num="2" id="2784" />
-<TGConnectingPoint num="3" id="2785" />
+<TGConnectingPoint num="0" id="2787" />
+<TGConnectingPoint num="1" id="2788" />
+<TGConnectingPoint num="2" id="2789" />
+<TGConnectingPoint num="3" id="2790" />
<extraparam>
<guard value="[ ]" />
<afterMin value="50" />
@@ -6857,45 +6898,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2799" >
-<cdparam x="2255" y="244" />
+<CONNECTOR type="5102" id="2800" >
+<cdparam x="611" y="98" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2796" />
-<TGConnectingPoint num="1" id="2797" />
-<TGConnectingPoint num="2" id="2798" />
-<P1 x="2255" y="244" id="2938" />
-<P2 x="2327" y="79" id="2846" />
-<Point x="2145" y="270" />
-<Point x="2150" y="91" />
+<TGConnectingPoint num="0" id="2799" />
+<P1 x="611" y="98" id="2828" />
+<P2 x="615" y="138" id="2904" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2789" >
-<father id="2799" num="0" />
-<cdparam x="2145" y="270" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2790" >
-<father id="2799" num="1" />
-<cdparam x="2150" y="91" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2795" >
-<father id="2799" num="2" />
-<cdparam x="2291" y="161" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2798" >
+<father id="2800" num="0" />
+<cdparam x="620" y="121" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2791" />
-<TGConnectingPoint num="1" id="2792" />
-<TGConnectingPoint num="2" id="2793" />
-<TGConnectingPoint num="3" id="2794" />
+<TGConnectingPoint num="0" id="2794" />
+<TGConnectingPoint num="1" id="2795" />
+<TGConnectingPoint num="2" id="2796" />
+<TGConnectingPoint num="3" id="2797" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -6906,45 +6927,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2810" >
-<cdparam x="2571" y="250" />
+<CONNECTOR type="5102" id="2807" >
+<cdparam x="619" y="98" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2807" />
-<TGConnectingPoint num="1" id="2808" />
-<TGConnectingPoint num="2" id="2809" />
-<P1 x="2571" y="250" id="2916" />
-<P2 x="2427" y="79" id="2848" />
-<Point x="2688" y="246" />
-<Point x="2632" y="94" />
+<TGConnectingPoint num="0" id="2806" />
+<P1 x="615" y="168" id="2905" />
+<P2 x="618" y="207" id="2880" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2800" >
-<father id="2810" num="0" />
-<cdparam x="2688" y="246" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2801" >
-<father id="2810" num="1" />
-<cdparam x="2632" y="94" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2806" >
-<father id="2810" num="2" />
-<cdparam x="2499" y="164" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2805" >
+<father id="2807" num="0" />
+<cdparam x="631" y="124" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2802" />
-<TGConnectingPoint num="1" id="2803" />
-<TGConnectingPoint num="2" id="2804" />
-<TGConnectingPoint num="3" id="2805" />
+<TGConnectingPoint num="0" id="2801" />
+<TGConnectingPoint num="1" id="2802" />
+<TGConnectingPoint num="2" id="2803" />
+<TGConnectingPoint num="3" id="2804" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -6955,45 +6956,54 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2821" >
-<cdparam x="2392" y="282" />
+<CONNECTOR type="5102" id="2814" >
+<cdparam x="629" y="176" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2818" />
-<TGConnectingPoint num="1" id="2819" />
-<TGConnectingPoint num="2" id="2820" />
-<P1 x="2392" y="282" id="2927" />
-<P2 x="2327" y="60" id="2832" />
-<Point x="2123" y="309" />
-<Point x="2122" y="59" />
+<TGConnectingPoint num="0" id="2813" />
+<P1 x="631" y="270" id="2869" />
+<P2 x="627" y="310" id="2926" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2811" >
-<father id="2821" num="0" />
-<cdparam x="2123" y="309" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2812" >
+<father id="2814" num="0" />
+<cdparam x="645" y="298" />
+<sizeparam width="73" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2808" />
+<TGConnectingPoint num="1" id="2809" />
+<TGConnectingPoint num="2" id="2810" />
+<TGConnectingPoint num="3" id="2811" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="50" />
+<afterMax value="100" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2812" >
-<father id="2821" num="1" />
-<cdparam x="2122" y="59" />
+
+<CONNECTOR type="5102" id="2821" >
+<cdparam x="618" y="30" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2817" >
-<father id="2821" num="2" />
-<cdparam x="2359" y="171" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="2820" />
+<P1 x="618" y="30" id="2948" />
+<P2 x="623" y="48" id="2840" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2819" >
+<father id="2821" num="0" />
+<cdparam x="616" y="39" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2813" />
-<TGConnectingPoint num="1" id="2814" />
-<TGConnectingPoint num="2" id="2815" />
-<TGConnectingPoint num="3" id="2816" />
+<TGConnectingPoint num="0" id="2815" />
+<TGConnectingPoint num="1" id="2816" />
+<TGConnectingPoint num="2" id="2817" />
+<TGConnectingPoint num="3" id="2818" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -7005,10 +7015,10 @@
</SUBCOMPONENT>
<COMPONENT type="5106" id="2862" >
-<cdparam x="2327" y="48" />
+<cdparam x="561" y="48" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="Waiting" />
<TGConnectingPoint num="0" id="2822" />
<TGConnectingPoint num="1" id="2823" />
@@ -7055,10 +7065,10 @@
</COMPONENT>
<COMPONENT type="5106" id="2903" >
-<cdparam x="2343" y="172" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="207" />
+<sizeparam width="100" height="63" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="Classify" />
<TGConnectingPoint num="0" id="2863" />
<TGConnectingPoint num="1" id="2864" />
@@ -7105,10 +7115,10 @@
</COMPONENT>
<COMPONENT type="5104" id="2914" >
-<cdparam x="2320" y="124" />
+<cdparam x="552" y="143" />
<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Receive signal" value="from_classif(packet)" />
<TGConnectingPoint num="0" id="2904" />
<TGConnectingPoint num="1" id="2905" />
@@ -7123,10 +7133,10 @@
</COMPONENT>
<COMPONENT type="5103" id="2925" >
-<cdparam x="2505" y="225" />
+<cdparam x="741" y="288" />
<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="to_queue_high(packet)" />
<TGConnectingPoint num="0" id="2915" />
<TGConnectingPoint num="1" id="2916" />
@@ -7141,10 +7151,10 @@
</COMPONENT>
<COMPONENT type="5103" id="2936" >
-<cdparam x="2316" y="257" />
+<cdparam x="551" y="315" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="to_queue_medium(packet)" />
<TGConnectingPoint num="0" id="2926" />
<TGConnectingPoint num="1" id="2927" />
@@ -7159,10 +7169,10 @@
</COMPONENT>
<COMPONENT type="5103" id="2947" >
-<cdparam x="2192" y="219" />
+<cdparam x="419" y="271" />
<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="to_queue_low(packet)" />
<TGConnectingPoint num="0" id="2937" />
<TGConnectingPoint num="1" id="2938" />
@@ -7177,10 +7187,10 @@
</COMPONENT>
<COMPONENT type="5100" id="2949" >
-<cdparam x="2377" y="10" />
+<cdparam x="611" y="10" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
<TGConnectingPoint num="0" id="2948" />
</COMPONENT>
@@ -7188,57 +7198,48 @@
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="Sched1" minX="10" maxX="1900" minY="10" maxY="1900" >
-<CONNECTOR type="5102" id="2956" >
-<cdparam x="1095" y="316" />
+<AVATARStateMachineDiagramPanel name="Sched0" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="2960" >
+<cdparam x="315" y="522" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2955" />
-<P1 x="1095" y="316" id="3169" />
-<P2 x="1041" y="384" id="3044" />
+<TGConnectingPoint num="0" id="2957" />
+<TGConnectingPoint num="1" id="2958" />
+<TGConnectingPoint num="2" id="2959" />
+<P1 x="315" y="522" id="3301" />
+<P2 x="177" y="62" id="3235" />
+<Point x="22" y="513" />
+<Point x="24" y="55" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2954" >
-<father id="2956" num="0" />
-<cdparam x="972" y="318" />
-<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2950" >
+<father id="2960" num="0" />
+<cdparam x="22" y="513" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2950" />
-<TGConnectingPoint num="1" id="2951" />
-<TGConnectingPoint num="2" id="2952" />
-<TGConnectingPoint num="3" id="2953" />
-<extraparam>
-<guard value="[ packet.date==0]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="2963" >
-<cdparam x="1120" y="341" />
+<SUBCOMPONENT type="-1" id="2951" >
+<father id="2960" num="1" />
+<cdparam x="24" y="55" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2962" />
-<P1 x="1120" y="341" id="3171" />
-<P2 x="1187" y="407" id="3100" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2961" >
-<father id="2963" num="0" />
-<cdparam x="1118" y="351" />
-<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2956" >
+<father id="2960" num="2" />
+<cdparam x="222" y="293" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2957" />
-<TGConnectingPoint num="1" id="2958" />
-<TGConnectingPoint num="2" id="2959" />
-<TGConnectingPoint num="3" id="2960" />
+<TGConnectingPoint num="0" id="2952" />
+<TGConnectingPoint num="1" id="2953" />
+<TGConnectingPoint num="2" id="2954" />
+<TGConnectingPoint num="3" id="2955" />
<extraparam>
-<guard value="[packet.date==1 ]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -7247,17 +7248,47 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2970" >
-<cdparam x="1050" y="39" />
+<CONNECTOR type="5102" id="2973" >
+<cdparam x="559" y="523" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="2969" />
-<P1 x="1160" y="34" id="3263" />
-<P2 x="1132" y="66" id="3239" />
+<TGConnectingPoint num="1" id="2970" />
+<TGConnectingPoint num="2" id="2971" />
+<TGConnectingPoint num="3" id="2972" />
+<P1 x="559" y="523" id="3290" />
+<P2 x="417" y="80" id="3258" />
+<Point x="602" y="539" />
+<Point x="675" y="487" />
+<Point x="661" y="113" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2968" >
-<father id="2970" num="0" />
-<cdparam x="1050" y="54" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2961" >
+<father id="2973" num="0" />
+<cdparam x="602" y="539" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2962" >
+<father id="2973" num="1" />
+<cdparam x="675" y="487" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2963" >
+<father id="2973" num="2" />
+<cdparam x="661" y="113" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2968" >
+<father id="2973" num="3" />
+<cdparam x="464" y="303" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -7276,25 +7307,45 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2977" >
-<cdparam x="1212" y="119" />
+<CONNECTOR type="5102" id="2984" >
+<cdparam x="92" y="500" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2976" />
-<P1 x="1164" y="115" id="3228" />
-<P2 x="1155" y="150" id="3265" />
+<TGConnectingPoint num="0" id="2981" />
+<TGConnectingPoint num="1" id="2982" />
+<TGConnectingPoint num="2" id="2983" />
+<P1 x="112" y="498" id="3312" />
+<P2 x="177" y="86" id="3238" />
+<Point x="49" y="497" />
+<Point x="48" y="107" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2975" >
-<father id="2977" num="0" />
-<cdparam x="1205" y="140" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2974" >
+<father id="2984" num="0" />
+<cdparam x="49" y="497" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2975" >
+<father id="2984" num="1" />
+<cdparam x="48" y="107" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="2980" >
+<father id="2984" num="2" />
+<cdparam x="111" y="294" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2971" />
-<TGConnectingPoint num="1" id="2972" />
-<TGConnectingPoint num="2" id="2973" />
-<TGConnectingPoint num="3" id="2974" />
+<TGConnectingPoint num="0" id="2976" />
+<TGConnectingPoint num="1" id="2977" />
+<TGConnectingPoint num="2" id="2978" />
+<TGConnectingPoint num="3" id="2979" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -7305,47 +7356,18 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2984" >
-<cdparam x="1117" y="179" />
+<CONNECTOR type="5102" id="2991" >
+<cdparam x="593" y="454" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2983" />
-<P1 x="1155" y="180" id="3266" />
-<P2 x="1157" y="223" id="3182" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2982" >
-<father id="2984" num="0" />
-<cdparam x="1118" y="197" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2978" />
-<TGConnectingPoint num="1" id="2979" />
-<TGConnectingPoint num="2" id="2980" />
-<TGConnectingPoint num="3" id="2981" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="2991" >
-<cdparam x="1119" y="266" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2990" />
-<P1 x="1157" y="273" id="3187" />
-<P2 x="1120" y="291" id="3165" />
+<TGConnectingPoint num="0" id="2990" />
+<P1 x="593" y="454" id="3143" />
+<P2 x="559" y="493" id="3289" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2989" >
<father id="2991" num="0" />
-<cdparam x="1119" y="278" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="576" y="473" />
+<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -7355,7 +7377,7 @@
<TGConnectingPoint num="3" id="2988" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="10" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -7364,17 +7386,17 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="2998" >
-<cdparam x="1145" y="316" />
+<cdparam x="341" y="453" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="2997" />
-<P1 x="1145" y="316" id="3167" />
-<P2 x="1460" y="408" id="3125" />
+<P1 x="341" y="453" id="3102" />
+<P2 x="315" y="492" id="3300" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="2996" >
<father id="2998" num="0" />
-<cdparam x="1228" y="349" />
-<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="328" y="472" />
+<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -7383,8 +7405,8 @@
<TGConnectingPoint num="2" id="2994" />
<TGConnectingPoint num="3" id="2995" />
<extraparam>
-<guard value="[packet.date==2 ]" />
-<afterMin value="" />
+<guard value="[ ]" />
+<afterMin value="50" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -7393,16 +7415,16 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="3005" >
-<cdparam x="980" y="434" />
+<cdparam x="113" y="430" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="3004" />
-<P1 x="980" y="434" id="3048" />
-<P2 x="979" y="472" id="3298" />
+<P1 x="113" y="430" id="3061" />
+<P2 x="112" y="468" id="3311" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="3003" >
<father id="3005" num="0" />
-<cdparam x="969" y="454" />
+<cdparam x="102" y="450" />
<sizeparam width="57" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -7422,17 +7444,17 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="3012" >
-<cdparam x="1208" y="457" />
+<cdparam x="278" y="312" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="3011" />
-<P1 x="1208" y="457" id="3089" />
-<P2 x="1182" y="496" id="3287" />
+<P1 x="278" y="312" id="3180" />
+<P2 x="593" y="404" id="3138" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="3010" >
<father id="3012" num="0" />
-<cdparam x="1195" y="476" />
-<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="460" y="349" />
+<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -7441,8 +7463,8 @@
<TGConnectingPoint num="2" id="3008" />
<TGConnectingPoint num="3" id="3009" />
<extraparam>
-<guard value="[ ]" />
-<afterMin value="50" />
+<guard value="[packet.date==2 ]" />
+<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -7451,17 +7473,17 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="3019" >
-<cdparam x="1460" y="458" />
+<cdparam x="252" y="262" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="3018" />
-<P1 x="1460" y="458" id="3130" />
-<P2 x="1426" y="497" id="3276" />
+<P1 x="290" y="269" id="3200" />
+<P2 x="253" y="287" id="3178" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="3017" >
<father id="3019" num="0" />
-<cdparam x="1443" y="477" />
-<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="252" y="274" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -7471,7 +7493,7 @@
<TGConnectingPoint num="3" id="3016" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="10" />
+<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -7479,45 +7501,54 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3030" >
-<cdparam x="959" y="504" />
+<CONNECTOR type="5102" id="3026" >
+<cdparam x="250" y="175" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3027" />
-<TGConnectingPoint num="1" id="3028" />
-<TGConnectingPoint num="2" id="3029" />
-<P1 x="979" y="502" id="3299" />
-<P2 x="1044" y="90" id="3225" />
-<Point x="916" y="501" />
-<Point x="915" y="111" />
+<TGConnectingPoint num="0" id="3025" />
+<P1 x="288" y="176" id="3279" />
+<P2 x="290" y="219" id="3195" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3020" >
-<father id="3030" num="0" />
-<cdparam x="916" y="501" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3024" >
+<father id="3026" num="0" />
+<cdparam x="251" y="193" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3020" />
+<TGConnectingPoint num="1" id="3021" />
+<TGConnectingPoint num="2" id="3022" />
+<TGConnectingPoint num="3" id="3023" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3021" >
-<father id="3030" num="1" />
-<cdparam x="915" y="111" />
+
+<CONNECTOR type="5102" id="3033" >
+<cdparam x="345" y="115" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3026" >
-<father id="3030" num="2" />
-<cdparam x="978" y="298" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3032" />
+<P1 x="297" y="111" id="3241" />
+<P2 x="288" y="146" id="3278" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3031" >
+<father id="3033" num="0" />
+<cdparam x="338" y="136" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3022" />
-<TGConnectingPoint num="1" id="3023" />
-<TGConnectingPoint num="2" id="3024" />
-<TGConnectingPoint num="3" id="3025" />
+<TGConnectingPoint num="0" id="3027" />
+<TGConnectingPoint num="1" id="3028" />
+<TGConnectingPoint num="2" id="3029" />
+<TGConnectingPoint num="3" id="3030" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -7528,47 +7559,85 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3041" >
-<cdparam x="1182" y="526" />
+<CONNECTOR type="5102" id="3040" >
+<cdparam x="183" y="35" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3038" />
-<TGConnectingPoint num="1" id="3039" />
-<TGConnectingPoint num="2" id="3040" />
-<P1 x="1182" y="526" id="3288" />
-<P2 x="1044" y="66" id="3222" />
-<Point x="889" y="517" />
-<Point x="891" y="59" />
+<TGConnectingPoint num="0" id="3039" />
+<P1 x="293" y="30" id="3276" />
+<P2 x="265" y="62" id="3252" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3031" >
-<father id="3041" num="0" />
-<cdparam x="889" y="517" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3038" >
+<father id="3040" num="0" />
+<cdparam x="183" y="50" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3034" />
+<TGConnectingPoint num="1" id="3035" />
+<TGConnectingPoint num="2" id="3036" />
+<TGConnectingPoint num="3" id="3037" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3032" >
-<father id="3041" num="1" />
-<cdparam x="891" y="59" />
+
+<CONNECTOR type="5102" id="3047" >
+<cdparam x="253" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3046" />
+<P1 x="253" y="337" id="3184" />
+<P2 x="320" y="403" id="3113" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3045" >
+<father id="3047" num="0" />
+<cdparam x="295" y="369" />
+<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3041" />
+<TGConnectingPoint num="1" id="3042" />
+<TGConnectingPoint num="2" id="3043" />
+<TGConnectingPoint num="3" id="3044" />
+<extraparam>
+<guard value="[packet.date==1 ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3037" >
-<father id="3041" num="2" />
-<cdparam x="1089" y="297" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<CONNECTOR type="5102" id="3054" >
+<cdparam x="228" y="312" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3053" />
+<P1 x="228" y="312" id="3182" />
+<P2 x="174" y="380" id="3057" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3052" >
+<father id="3054" num="0" />
+<cdparam x="105" y="314" />
+<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3033" />
-<TGConnectingPoint num="1" id="3034" />
-<TGConnectingPoint num="2" id="3035" />
-<TGConnectingPoint num="3" id="3036" />
+<TGConnectingPoint num="0" id="3048" />
+<TGConnectingPoint num="1" id="3049" />
+<TGConnectingPoint num="2" id="3050" />
+<TGConnectingPoint num="3" id="3051" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[ packet.date==0]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -7577,405 +7646,385 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="3082" >
-<cdparam x="920" y="384" />
+<COMPONENT type="5106" id="3095" >
+<cdparam x="53" y="380" />
<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="PriorityLow" />
-<TGConnectingPoint num="0" id="3042" />
-<TGConnectingPoint num="1" id="3043" />
-<TGConnectingPoint num="2" id="3044" />
-<TGConnectingPoint num="3" id="3045" />
-<TGConnectingPoint num="4" id="3046" />
-<TGConnectingPoint num="5" id="3047" />
-<TGConnectingPoint num="6" id="3048" />
-<TGConnectingPoint num="7" id="3049" />
-<TGConnectingPoint num="8" id="3050" />
-<TGConnectingPoint num="9" id="3051" />
-<TGConnectingPoint num="10" id="3052" />
-<TGConnectingPoint num="11" id="3053" />
-<TGConnectingPoint num="12" id="3054" />
-<TGConnectingPoint num="13" id="3055" />
-<TGConnectingPoint num="14" id="3056" />
-<TGConnectingPoint num="15" id="3057" />
-<TGConnectingPoint num="16" id="3058" />
-<TGConnectingPoint num="17" id="3059" />
-<TGConnectingPoint num="18" id="3060" />
-<TGConnectingPoint num="19" id="3061" />
-<TGConnectingPoint num="20" id="3062" />
-<TGConnectingPoint num="21" id="3063" />
-<TGConnectingPoint num="22" id="3064" />
-<TGConnectingPoint num="23" id="3065" />
-<TGConnectingPoint num="24" id="3066" />
-<TGConnectingPoint num="25" id="3067" />
-<TGConnectingPoint num="26" id="3068" />
-<TGConnectingPoint num="27" id="3069" />
-<TGConnectingPoint num="28" id="3070" />
-<TGConnectingPoint num="29" id="3071" />
-<TGConnectingPoint num="30" id="3072" />
-<TGConnectingPoint num="31" id="3073" />
-<TGConnectingPoint num="32" id="3074" />
-<TGConnectingPoint num="33" id="3075" />
-<TGConnectingPoint num="34" id="3076" />
-<TGConnectingPoint num="35" id="3077" />
-<TGConnectingPoint num="36" id="3078" />
-<TGConnectingPoint num="37" id="3079" />
-<TGConnectingPoint num="38" id="3080" />
-<TGConnectingPoint num="39" id="3081" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3123" >
-<cdparam x="1131" y="407" />
+<TGConnectingPoint num="0" id="3055" />
+<TGConnectingPoint num="1" id="3056" />
+<TGConnectingPoint num="2" id="3057" />
+<TGConnectingPoint num="3" id="3058" />
+<TGConnectingPoint num="4" id="3059" />
+<TGConnectingPoint num="5" id="3060" />
+<TGConnectingPoint num="6" id="3061" />
+<TGConnectingPoint num="7" id="3062" />
+<TGConnectingPoint num="8" id="3063" />
+<TGConnectingPoint num="9" id="3064" />
+<TGConnectingPoint num="10" id="3065" />
+<TGConnectingPoint num="11" id="3066" />
+<TGConnectingPoint num="12" id="3067" />
+<TGConnectingPoint num="13" id="3068" />
+<TGConnectingPoint num="14" id="3069" />
+<TGConnectingPoint num="15" id="3070" />
+<TGConnectingPoint num="16" id="3071" />
+<TGConnectingPoint num="17" id="3072" />
+<TGConnectingPoint num="18" id="3073" />
+<TGConnectingPoint num="19" id="3074" />
+<TGConnectingPoint num="20" id="3075" />
+<TGConnectingPoint num="21" id="3076" />
+<TGConnectingPoint num="22" id="3077" />
+<TGConnectingPoint num="23" id="3078" />
+<TGConnectingPoint num="24" id="3079" />
+<TGConnectingPoint num="25" id="3080" />
+<TGConnectingPoint num="26" id="3081" />
+<TGConnectingPoint num="27" id="3082" />
+<TGConnectingPoint num="28" id="3083" />
+<TGConnectingPoint num="29" id="3084" />
+<TGConnectingPoint num="30" id="3085" />
+<TGConnectingPoint num="31" id="3086" />
+<TGConnectingPoint num="32" id="3087" />
+<TGConnectingPoint num="33" id="3088" />
+<TGConnectingPoint num="34" id="3089" />
+<TGConnectingPoint num="35" id="3090" />
+<TGConnectingPoint num="36" id="3091" />
+<TGConnectingPoint num="37" id="3092" />
+<TGConnectingPoint num="38" id="3093" />
+<TGConnectingPoint num="39" id="3094" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3136" >
+<cdparam x="264" y="403" />
<sizeparam width="154" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="PriorityMedium" />
-<TGConnectingPoint num="0" id="3083" />
-<TGConnectingPoint num="1" id="3084" />
-<TGConnectingPoint num="2" id="3085" />
-<TGConnectingPoint num="3" id="3086" />
-<TGConnectingPoint num="4" id="3087" />
-<TGConnectingPoint num="5" id="3088" />
-<TGConnectingPoint num="6" id="3089" />
-<TGConnectingPoint num="7" id="3090" />
-<TGConnectingPoint num="8" id="3091" />
-<TGConnectingPoint num="9" id="3092" />
-<TGConnectingPoint num="10" id="3093" />
-<TGConnectingPoint num="11" id="3094" />
-<TGConnectingPoint num="12" id="3095" />
-<TGConnectingPoint num="13" id="3096" />
-<TGConnectingPoint num="14" id="3097" />
-<TGConnectingPoint num="15" id="3098" />
-<TGConnectingPoint num="16" id="3099" />
-<TGConnectingPoint num="17" id="3100" />
-<TGConnectingPoint num="18" id="3101" />
-<TGConnectingPoint num="19" id="3102" />
-<TGConnectingPoint num="20" id="3103" />
-<TGConnectingPoint num="21" id="3104" />
-<TGConnectingPoint num="22" id="3105" />
-<TGConnectingPoint num="23" id="3106" />
-<TGConnectingPoint num="24" id="3107" />
-<TGConnectingPoint num="25" id="3108" />
-<TGConnectingPoint num="26" id="3109" />
-<TGConnectingPoint num="27" id="3110" />
-<TGConnectingPoint num="28" id="3111" />
-<TGConnectingPoint num="29" id="3112" />
-<TGConnectingPoint num="30" id="3113" />
-<TGConnectingPoint num="31" id="3114" />
-<TGConnectingPoint num="32" id="3115" />
-<TGConnectingPoint num="33" id="3116" />
-<TGConnectingPoint num="34" id="3117" />
-<TGConnectingPoint num="35" id="3118" />
-<TGConnectingPoint num="36" id="3119" />
-<TGConnectingPoint num="37" id="3120" />
-<TGConnectingPoint num="38" id="3121" />
-<TGConnectingPoint num="39" id="3122" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3164" >
-<cdparam x="1394" y="408" />
+<TGConnectingPoint num="0" id="3096" />
+<TGConnectingPoint num="1" id="3097" />
+<TGConnectingPoint num="2" id="3098" />
+<TGConnectingPoint num="3" id="3099" />
+<TGConnectingPoint num="4" id="3100" />
+<TGConnectingPoint num="5" id="3101" />
+<TGConnectingPoint num="6" id="3102" />
+<TGConnectingPoint num="7" id="3103" />
+<TGConnectingPoint num="8" id="3104" />
+<TGConnectingPoint num="9" id="3105" />
+<TGConnectingPoint num="10" id="3106" />
+<TGConnectingPoint num="11" id="3107" />
+<TGConnectingPoint num="12" id="3108" />
+<TGConnectingPoint num="13" id="3109" />
+<TGConnectingPoint num="14" id="3110" />
+<TGConnectingPoint num="15" id="3111" />
+<TGConnectingPoint num="16" id="3112" />
+<TGConnectingPoint num="17" id="3113" />
+<TGConnectingPoint num="18" id="3114" />
+<TGConnectingPoint num="19" id="3115" />
+<TGConnectingPoint num="20" id="3116" />
+<TGConnectingPoint num="21" id="3117" />
+<TGConnectingPoint num="22" id="3118" />
+<TGConnectingPoint num="23" id="3119" />
+<TGConnectingPoint num="24" id="3120" />
+<TGConnectingPoint num="25" id="3121" />
+<TGConnectingPoint num="26" id="3122" />
+<TGConnectingPoint num="27" id="3123" />
+<TGConnectingPoint num="28" id="3124" />
+<TGConnectingPoint num="29" id="3125" />
+<TGConnectingPoint num="30" id="3126" />
+<TGConnectingPoint num="31" id="3127" />
+<TGConnectingPoint num="32" id="3128" />
+<TGConnectingPoint num="33" id="3129" />
+<TGConnectingPoint num="34" id="3130" />
+<TGConnectingPoint num="35" id="3131" />
+<TGConnectingPoint num="36" id="3132" />
+<TGConnectingPoint num="37" id="3133" />
+<TGConnectingPoint num="38" id="3134" />
+<TGConnectingPoint num="39" id="3135" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3177" >
+<cdparam x="527" y="404" />
<sizeparam width="132" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="PriorityHigh" />
-<TGConnectingPoint num="0" id="3124" />
-<TGConnectingPoint num="1" id="3125" />
-<TGConnectingPoint num="2" id="3126" />
-<TGConnectingPoint num="3" id="3127" />
-<TGConnectingPoint num="4" id="3128" />
-<TGConnectingPoint num="5" id="3129" />
-<TGConnectingPoint num="6" id="3130" />
-<TGConnectingPoint num="7" id="3131" />
-<TGConnectingPoint num="8" id="3132" />
-<TGConnectingPoint num="9" id="3133" />
-<TGConnectingPoint num="10" id="3134" />
-<TGConnectingPoint num="11" id="3135" />
-<TGConnectingPoint num="12" id="3136" />
-<TGConnectingPoint num="13" id="3137" />
-<TGConnectingPoint num="14" id="3138" />
-<TGConnectingPoint num="15" id="3139" />
-<TGConnectingPoint num="16" id="3140" />
-<TGConnectingPoint num="17" id="3141" />
-<TGConnectingPoint num="18" id="3142" />
-<TGConnectingPoint num="19" id="3143" />
-<TGConnectingPoint num="20" id="3144" />
-<TGConnectingPoint num="21" id="3145" />
-<TGConnectingPoint num="22" id="3146" />
-<TGConnectingPoint num="23" id="3147" />
-<TGConnectingPoint num="24" id="3148" />
-<TGConnectingPoint num="25" id="3149" />
-<TGConnectingPoint num="26" id="3150" />
-<TGConnectingPoint num="27" id="3151" />
-<TGConnectingPoint num="28" id="3152" />
-<TGConnectingPoint num="29" id="3153" />
-<TGConnectingPoint num="30" id="3154" />
-<TGConnectingPoint num="31" id="3155" />
-<TGConnectingPoint num="32" id="3156" />
-<TGConnectingPoint num="33" id="3157" />
-<TGConnectingPoint num="34" id="3158" />
-<TGConnectingPoint num="35" id="3159" />
-<TGConnectingPoint num="36" id="3160" />
-<TGConnectingPoint num="37" id="3161" />
-<TGConnectingPoint num="38" id="3162" />
-<TGConnectingPoint num="39" id="3163" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="3180" >
-<cdparam x="1105" y="301" />
+<TGConnectingPoint num="0" id="3137" />
+<TGConnectingPoint num="1" id="3138" />
+<TGConnectingPoint num="2" id="3139" />
+<TGConnectingPoint num="3" id="3140" />
+<TGConnectingPoint num="4" id="3141" />
+<TGConnectingPoint num="5" id="3142" />
+<TGConnectingPoint num="6" id="3143" />
+<TGConnectingPoint num="7" id="3144" />
+<TGConnectingPoint num="8" id="3145" />
+<TGConnectingPoint num="9" id="3146" />
+<TGConnectingPoint num="10" id="3147" />
+<TGConnectingPoint num="11" id="3148" />
+<TGConnectingPoint num="12" id="3149" />
+<TGConnectingPoint num="13" id="3150" />
+<TGConnectingPoint num="14" id="3151" />
+<TGConnectingPoint num="15" id="3152" />
+<TGConnectingPoint num="16" id="3153" />
+<TGConnectingPoint num="17" id="3154" />
+<TGConnectingPoint num="18" id="3155" />
+<TGConnectingPoint num="19" id="3156" />
+<TGConnectingPoint num="20" id="3157" />
+<TGConnectingPoint num="21" id="3158" />
+<TGConnectingPoint num="22" id="3159" />
+<TGConnectingPoint num="23" id="3160" />
+<TGConnectingPoint num="24" id="3161" />
+<TGConnectingPoint num="25" id="3162" />
+<TGConnectingPoint num="26" id="3163" />
+<TGConnectingPoint num="27" id="3164" />
+<TGConnectingPoint num="28" id="3165" />
+<TGConnectingPoint num="29" id="3166" />
+<TGConnectingPoint num="30" id="3167" />
+<TGConnectingPoint num="31" id="3168" />
+<TGConnectingPoint num="32" id="3169" />
+<TGConnectingPoint num="33" id="3170" />
+<TGConnectingPoint num="34" id="3171" />
+<TGConnectingPoint num="35" id="3172" />
+<TGConnectingPoint num="36" id="3173" />
+<TGConnectingPoint num="37" id="3174" />
+<TGConnectingPoint num="38" id="3175" />
+<TGConnectingPoint num="39" id="3176" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="3193" >
+<cdparam x="238" y="297" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="3165" />
-<TGConnectingPoint num="1" id="3166" />
-<TGConnectingPoint num="2" id="3167" />
-<TGConnectingPoint num="3" id="3168" />
-<TGConnectingPoint num="4" id="3169" />
-<TGConnectingPoint num="5" id="3170" />
-<TGConnectingPoint num="6" id="3171" />
-<TGConnectingPoint num="7" id="3172" />
-<TGConnectingPoint num="8" id="3173" />
-<TGConnectingPoint num="9" id="3174" />
-<TGConnectingPoint num="10" id="3175" />
-<TGConnectingPoint num="11" id="3176" />
-<TGConnectingPoint num="12" id="3177" />
-<TGConnectingPoint num="13" id="3178" />
-<TGConnectingPoint num="14" id="3179" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3221" >
-<cdparam x="1107" y="223" />
+<TGConnectingPoint num="0" id="3178" />
+<TGConnectingPoint num="1" id="3179" />
+<TGConnectingPoint num="2" id="3180" />
+<TGConnectingPoint num="3" id="3181" />
+<TGConnectingPoint num="4" id="3182" />
+<TGConnectingPoint num="5" id="3183" />
+<TGConnectingPoint num="6" id="3184" />
+<TGConnectingPoint num="7" id="3185" />
+<TGConnectingPoint num="8" id="3186" />
+<TGConnectingPoint num="9" id="3187" />
+<TGConnectingPoint num="10" id="3188" />
+<TGConnectingPoint num="11" id="3189" />
+<TGConnectingPoint num="12" id="3190" />
+<TGConnectingPoint num="13" id="3191" />
+<TGConnectingPoint num="14" id="3192" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3234" >
+<cdparam x="240" y="219" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="Enqueue" />
-<TGConnectingPoint num="0" id="3181" />
-<TGConnectingPoint num="1" id="3182" />
-<TGConnectingPoint num="2" id="3183" />
-<TGConnectingPoint num="3" id="3184" />
-<TGConnectingPoint num="4" id="3185" />
-<TGConnectingPoint num="5" id="3186" />
-<TGConnectingPoint num="6" id="3187" />
-<TGConnectingPoint num="7" id="3188" />
-<TGConnectingPoint num="8" id="3189" />
-<TGConnectingPoint num="9" id="3190" />
-<TGConnectingPoint num="10" id="3191" />
-<TGConnectingPoint num="11" id="3192" />
-<TGConnectingPoint num="12" id="3193" />
-<TGConnectingPoint num="13" id="3194" />
-<TGConnectingPoint num="14" id="3195" />
-<TGConnectingPoint num="15" id="3196" />
-<TGConnectingPoint num="16" id="3197" />
-<TGConnectingPoint num="17" id="3198" />
-<TGConnectingPoint num="18" id="3199" />
-<TGConnectingPoint num="19" id="3200" />
-<TGConnectingPoint num="20" id="3201" />
-<TGConnectingPoint num="21" id="3202" />
-<TGConnectingPoint num="22" id="3203" />
-<TGConnectingPoint num="23" id="3204" />
-<TGConnectingPoint num="24" id="3205" />
-<TGConnectingPoint num="25" id="3206" />
-<TGConnectingPoint num="26" id="3207" />
-<TGConnectingPoint num="27" id="3208" />
-<TGConnectingPoint num="28" id="3209" />
-<TGConnectingPoint num="29" id="3210" />
-<TGConnectingPoint num="30" id="3211" />
-<TGConnectingPoint num="31" id="3212" />
-<TGConnectingPoint num="32" id="3213" />
-<TGConnectingPoint num="33" id="3214" />
-<TGConnectingPoint num="34" id="3215" />
-<TGConnectingPoint num="35" id="3216" />
-<TGConnectingPoint num="36" id="3217" />
-<TGConnectingPoint num="37" id="3218" />
-<TGConnectingPoint num="38" id="3219" />
-<TGConnectingPoint num="39" id="3220" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3262" >
-<cdparam x="1044" y="66" />
+<TGConnectingPoint num="0" id="3194" />
+<TGConnectingPoint num="1" id="3195" />
+<TGConnectingPoint num="2" id="3196" />
+<TGConnectingPoint num="3" id="3197" />
+<TGConnectingPoint num="4" id="3198" />
+<TGConnectingPoint num="5" id="3199" />
+<TGConnectingPoint num="6" id="3200" />
+<TGConnectingPoint num="7" id="3201" />
+<TGConnectingPoint num="8" id="3202" />
+<TGConnectingPoint num="9" id="3203" />
+<TGConnectingPoint num="10" id="3204" />
+<TGConnectingPoint num="11" id="3205" />
+<TGConnectingPoint num="12" id="3206" />
+<TGConnectingPoint num="13" id="3207" />
+<TGConnectingPoint num="14" id="3208" />
+<TGConnectingPoint num="15" id="3209" />
+<TGConnectingPoint num="16" id="3210" />
+<TGConnectingPoint num="17" id="3211" />
+<TGConnectingPoint num="18" id="3212" />
+<TGConnectingPoint num="19" id="3213" />
+<TGConnectingPoint num="20" id="3214" />
+<TGConnectingPoint num="21" id="3215" />
+<TGConnectingPoint num="22" id="3216" />
+<TGConnectingPoint num="23" id="3217" />
+<TGConnectingPoint num="24" id="3218" />
+<TGConnectingPoint num="25" id="3219" />
+<TGConnectingPoint num="26" id="3220" />
+<TGConnectingPoint num="27" id="3221" />
+<TGConnectingPoint num="28" id="3222" />
+<TGConnectingPoint num="29" id="3223" />
+<TGConnectingPoint num="30" id="3224" />
+<TGConnectingPoint num="31" id="3225" />
+<TGConnectingPoint num="32" id="3226" />
+<TGConnectingPoint num="33" id="3227" />
+<TGConnectingPoint num="34" id="3228" />
+<TGConnectingPoint num="35" id="3229" />
+<TGConnectingPoint num="36" id="3230" />
+<TGConnectingPoint num="37" id="3231" />
+<TGConnectingPoint num="38" id="3232" />
+<TGConnectingPoint num="39" id="3233" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3275" >
+<cdparam x="177" y="62" />
<sizeparam width="240" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="State" value="Waiting" />
-<TGConnectingPoint num="0" id="3222" />
-<TGConnectingPoint num="1" id="3223" />
-<TGConnectingPoint num="2" id="3224" />
-<TGConnectingPoint num="3" id="3225" />
-<TGConnectingPoint num="4" id="3226" />
-<TGConnectingPoint num="5" id="3227" />
-<TGConnectingPoint num="6" id="3228" />
-<TGConnectingPoint num="7" id="3229" />
-<TGConnectingPoint num="8" id="3230" />
-<TGConnectingPoint num="9" id="3231" />
-<TGConnectingPoint num="10" id="3232" />
-<TGConnectingPoint num="11" id="3233" />
-<TGConnectingPoint num="12" id="3234" />
-<TGConnectingPoint num="13" id="3235" />
-<TGConnectingPoint num="14" id="3236" />
-<TGConnectingPoint num="15" id="3237" />
-<TGConnectingPoint num="16" id="3238" />
-<TGConnectingPoint num="17" id="3239" />
-<TGConnectingPoint num="18" id="3240" />
-<TGConnectingPoint num="19" id="3241" />
-<TGConnectingPoint num="20" id="3242" />
-<TGConnectingPoint num="21" id="3243" />
-<TGConnectingPoint num="22" id="3244" />
-<TGConnectingPoint num="23" id="3245" />
-<TGConnectingPoint num="24" id="3246" />
-<TGConnectingPoint num="25" id="3247" />
-<TGConnectingPoint num="26" id="3248" />
-<TGConnectingPoint num="27" id="3249" />
-<TGConnectingPoint num="28" id="3250" />
-<TGConnectingPoint num="29" id="3251" />
-<TGConnectingPoint num="30" id="3252" />
-<TGConnectingPoint num="31" id="3253" />
-<TGConnectingPoint num="32" id="3254" />
-<TGConnectingPoint num="33" id="3255" />
-<TGConnectingPoint num="34" id="3256" />
-<TGConnectingPoint num="35" id="3257" />
-<TGConnectingPoint num="36" id="3258" />
-<TGConnectingPoint num="37" id="3259" />
-<TGConnectingPoint num="38" id="3260" />
-<TGConnectingPoint num="39" id="3261" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3264" >
-<cdparam x="1153" y="14" />
+<TGConnectingPoint num="0" id="3235" />
+<TGConnectingPoint num="1" id="3236" />
+<TGConnectingPoint num="2" id="3237" />
+<TGConnectingPoint num="3" id="3238" />
+<TGConnectingPoint num="4" id="3239" />
+<TGConnectingPoint num="5" id="3240" />
+<TGConnectingPoint num="6" id="3241" />
+<TGConnectingPoint num="7" id="3242" />
+<TGConnectingPoint num="8" id="3243" />
+<TGConnectingPoint num="9" id="3244" />
+<TGConnectingPoint num="10" id="3245" />
+<TGConnectingPoint num="11" id="3246" />
+<TGConnectingPoint num="12" id="3247" />
+<TGConnectingPoint num="13" id="3248" />
+<TGConnectingPoint num="14" id="3249" />
+<TGConnectingPoint num="15" id="3250" />
+<TGConnectingPoint num="16" id="3251" />
+<TGConnectingPoint num="17" id="3252" />
+<TGConnectingPoint num="18" id="3253" />
+<TGConnectingPoint num="19" id="3254" />
+<TGConnectingPoint num="20" id="3255" />
+<TGConnectingPoint num="21" id="3256" />
+<TGConnectingPoint num="22" id="3257" />
+<TGConnectingPoint num="23" id="3258" />
+<TGConnectingPoint num="24" id="3259" />
+<TGConnectingPoint num="25" id="3260" />
+<TGConnectingPoint num="26" id="3261" />
+<TGConnectingPoint num="27" id="3262" />
+<TGConnectingPoint num="28" id="3263" />
+<TGConnectingPoint num="29" id="3264" />
+<TGConnectingPoint num="30" id="3265" />
+<TGConnectingPoint num="31" id="3266" />
+<TGConnectingPoint num="32" id="3267" />
+<TGConnectingPoint num="33" id="3268" />
+<TGConnectingPoint num="34" id="3269" />
+<TGConnectingPoint num="35" id="3270" />
+<TGConnectingPoint num="36" id="3271" />
+<TGConnectingPoint num="37" id="3272" />
+<TGConnectingPoint num="38" id="3273" />
+<TGConnectingPoint num="39" id="3274" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3277" >
+<cdparam x="286" y="10" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3263" />
+<TGConnectingPoint num="0" id="3276" />
</COMPONENT>
-<COMPONENT type="5104" id="3275" >
-<cdparam x="1089" y="155" />
+<COMPONENT type="5104" id="3288" >
+<cdparam x="222" y="151" />
<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
-<infoparam name="Receive signal" value="toScheduler1(packet)" />
-<TGConnectingPoint num="0" id="3265" />
-<TGConnectingPoint num="1" id="3266" />
-<TGConnectingPoint num="2" id="3267" />
-<TGConnectingPoint num="3" id="3268" />
-<TGConnectingPoint num="4" id="3269" />
-<TGConnectingPoint num="5" id="3270" />
-<TGConnectingPoint num="6" id="3271" />
-<TGConnectingPoint num="7" id="3272" />
-<TGConnectingPoint num="8" id="3273" />
-<TGConnectingPoint num="9" id="3274" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3286" >
-<cdparam x="1350" y="502" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="toScheduler0(packet)" />
+<TGConnectingPoint num="0" id="3278" />
+<TGConnectingPoint num="1" id="3279" />
+<TGConnectingPoint num="2" id="3280" />
+<TGConnectingPoint num="3" id="3281" />
+<TGConnectingPoint num="4" id="3282" />
+<TGConnectingPoint num="5" id="3283" />
+<TGConnectingPoint num="6" id="3284" />
+<TGConnectingPoint num="7" id="3285" />
+<TGConnectingPoint num="8" id="3286" />
+<TGConnectingPoint num="9" id="3287" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3299" >
+<cdparam x="483" y="498" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="scheduledPacket1(packet)" />
-<TGConnectingPoint num="0" id="3276" />
-<TGConnectingPoint num="1" id="3277" />
-<TGConnectingPoint num="2" id="3278" />
-<TGConnectingPoint num="3" id="3279" />
-<TGConnectingPoint num="4" id="3280" />
-<TGConnectingPoint num="5" id="3281" />
-<TGConnectingPoint num="6" id="3282" />
-<TGConnectingPoint num="7" id="3283" />
-<TGConnectingPoint num="8" id="3284" />
-<TGConnectingPoint num="9" id="3285" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3297" >
-<cdparam x="1106" y="501" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="scheduledPacket0(packet)" />
+<TGConnectingPoint num="0" id="3289" />
+<TGConnectingPoint num="1" id="3290" />
+<TGConnectingPoint num="2" id="3291" />
+<TGConnectingPoint num="3" id="3292" />
+<TGConnectingPoint num="4" id="3293" />
+<TGConnectingPoint num="5" id="3294" />
+<TGConnectingPoint num="6" id="3295" />
+<TGConnectingPoint num="7" id="3296" />
+<TGConnectingPoint num="8" id="3297" />
+<TGConnectingPoint num="9" id="3298" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3310" >
+<cdparam x="239" y="497" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="scheduledPacket1(packet)" />
-<TGConnectingPoint num="0" id="3287" />
-<TGConnectingPoint num="1" id="3288" />
-<TGConnectingPoint num="2" id="3289" />
-<TGConnectingPoint num="3" id="3290" />
-<TGConnectingPoint num="4" id="3291" />
-<TGConnectingPoint num="5" id="3292" />
-<TGConnectingPoint num="6" id="3293" />
-<TGConnectingPoint num="7" id="3294" />
-<TGConnectingPoint num="8" id="3295" />
-<TGConnectingPoint num="9" id="3296" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3308" >
-<cdparam x="903" y="477" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="scheduledPacket0(packet)" />
+<TGConnectingPoint num="0" id="3300" />
+<TGConnectingPoint num="1" id="3301" />
+<TGConnectingPoint num="2" id="3302" />
+<TGConnectingPoint num="3" id="3303" />
+<TGConnectingPoint num="4" id="3304" />
+<TGConnectingPoint num="5" id="3305" />
+<TGConnectingPoint num="6" id="3306" />
+<TGConnectingPoint num="7" id="3307" />
+<TGConnectingPoint num="8" id="3308" />
+<TGConnectingPoint num="9" id="3309" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3321" >
+<cdparam x="36" y="473" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="scheduledPacket1(packet)" />
-<TGConnectingPoint num="0" id="3298" />
-<TGConnectingPoint num="1" id="3299" />
-<TGConnectingPoint num="2" id="3300" />
-<TGConnectingPoint num="3" id="3301" />
-<TGConnectingPoint num="4" id="3302" />
-<TGConnectingPoint num="5" id="3303" />
-<TGConnectingPoint num="6" id="3304" />
-<TGConnectingPoint num="7" id="3305" />
-<TGConnectingPoint num="8" id="3306" />
-<TGConnectingPoint num="9" id="3307" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="scheduledPacket0(packet)" />
+<TGConnectingPoint num="0" id="3311" />
+<TGConnectingPoint num="1" id="3312" />
+<TGConnectingPoint num="2" id="3313" />
+<TGConnectingPoint num="3" id="3314" />
+<TGConnectingPoint num="4" id="3315" />
+<TGConnectingPoint num="5" id="3316" />
+<TGConnectingPoint num="6" id="3317" />
+<TGConnectingPoint num="7" id="3318" />
+<TGConnectingPoint num="8" id="3319" />
+<TGConnectingPoint num="9" id="3320" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="Sched0" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3319" >
-<cdparam x="315" y="522" />
+<AVATARStateMachineDiagramPanel name="Sched1" minX="10" maxX="1900" minY="10" maxY="1900" >
+<CONNECTOR type="5102" id="3328" >
+<cdparam x="1095" y="316" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3316" />
-<TGConnectingPoint num="1" id="3317" />
-<TGConnectingPoint num="2" id="3318" />
-<P1 x="315" y="522" id="3660" />
-<P2 x="177" y="62" id="3594" />
-<Point x="22" y="513" />
-<Point x="24" y="55" />
+<TGConnectingPoint num="0" id="3327" />
+<P1 x="1095" y="316" id="3541" />
+<P2 x="1041" y="384" id="3416" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3309" >
-<father id="3319" num="0" />
-<cdparam x="22" y="513" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3310" >
-<father id="3319" num="1" />
-<cdparam x="24" y="55" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3315" >
-<father id="3319" num="2" />
-<cdparam x="222" y="293" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3326" >
+<father id="3328" num="0" />
+<cdparam x="972" y="318" />
+<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3311" />
-<TGConnectingPoint num="1" id="3312" />
-<TGConnectingPoint num="2" id="3313" />
-<TGConnectingPoint num="3" id="3314" />
+<TGConnectingPoint num="0" id="3322" />
+<TGConnectingPoint num="1" id="3323" />
+<TGConnectingPoint num="2" id="3324" />
+<TGConnectingPoint num="3" id="3325" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[ packet.date==0]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -7984,57 +8033,27 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3332" >
-<cdparam x="559" y="523" />
+<CONNECTOR type="5102" id="3335" >
+<cdparam x="1120" y="341" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3328" />
-<TGConnectingPoint num="1" id="3329" />
-<TGConnectingPoint num="2" id="3330" />
-<TGConnectingPoint num="3" id="3331" />
-<P1 x="559" y="523" id="3649" />
-<P2 x="417" y="80" id="3617" />
-<Point x="602" y="539" />
-<Point x="675" y="487" />
-<Point x="661" y="113" />
+<TGConnectingPoint num="0" id="3334" />
+<P1 x="1120" y="341" id="3543" />
+<P2 x="1187" y="407" id="3472" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3320" >
-<father id="3332" num="0" />
-<cdparam x="602" y="539" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3321" >
-<father id="3332" num="1" />
-<cdparam x="675" y="487" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3322" >
-<father id="3332" num="2" />
-<cdparam x="661" y="113" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3327" >
-<father id="3332" num="3" />
-<cdparam x="464" y="303" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3333" >
+<father id="3335" num="0" />
+<cdparam x="1118" y="351" />
+<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3323" />
-<TGConnectingPoint num="1" id="3324" />
-<TGConnectingPoint num="2" id="3325" />
-<TGConnectingPoint num="3" id="3326" />
+<TGConnectingPoint num="0" id="3329" />
+<TGConnectingPoint num="1" id="3330" />
+<TGConnectingPoint num="2" id="3331" />
+<TGConnectingPoint num="3" id="3332" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[packet.date==1 ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -8043,45 +8062,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3343" >
-<cdparam x="92" y="500" />
+<CONNECTOR type="5102" id="3342" >
+<cdparam x="1050" y="39" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3340" />
-<TGConnectingPoint num="1" id="3341" />
-<TGConnectingPoint num="2" id="3342" />
-<P1 x="112" y="498" id="3671" />
-<P2 x="177" y="86" id="3597" />
-<Point x="49" y="497" />
-<Point x="48" y="107" />
+<TGConnectingPoint num="0" id="3341" />
+<P1 x="1160" y="34" id="3635" />
+<P2 x="1132" y="66" id="3611" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3333" >
-<father id="3343" num="0" />
-<cdparam x="49" y="497" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3334" >
-<father id="3343" num="1" />
-<cdparam x="48" y="107" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3339" >
-<father id="3343" num="2" />
-<cdparam x="111" y="294" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3340" >
+<father id="3342" num="0" />
+<cdparam x="1050" y="54" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3335" />
-<TGConnectingPoint num="1" id="3336" />
-<TGConnectingPoint num="2" id="3337" />
-<TGConnectingPoint num="3" id="3338" />
+<TGConnectingPoint num="0" id="3336" />
+<TGConnectingPoint num="1" id="3337" />
+<TGConnectingPoint num="2" id="3338" />
+<TGConnectingPoint num="3" id="3339" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -8092,28 +8091,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3350" >
-<cdparam x="593" y="454" />
+<CONNECTOR type="5102" id="3349" >
+<cdparam x="1212" y="119" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3349" />
-<P1 x="593" y="454" id="3502" />
-<P2 x="559" y="493" id="3648" />
+<TGConnectingPoint num="0" id="3348" />
+<P1 x="1164" y="115" id="3600" />
+<P2 x="1155" y="150" id="3637" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3348" >
-<father id="3350" num="0" />
-<cdparam x="576" y="473" />
-<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3347" >
+<father id="3349" num="0" />
+<cdparam x="1205" y="140" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3344" />
-<TGConnectingPoint num="1" id="3345" />
-<TGConnectingPoint num="2" id="3346" />
-<TGConnectingPoint num="3" id="3347" />
+<TGConnectingPoint num="0" id="3343" />
+<TGConnectingPoint num="1" id="3344" />
+<TGConnectingPoint num="2" id="3345" />
+<TGConnectingPoint num="3" id="3346" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="10" />
+<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -8121,28 +8120,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3357" >
-<cdparam x="341" y="453" />
+<CONNECTOR type="5102" id="3356" >
+<cdparam x="1117" y="179" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3356" />
-<P1 x="341" y="453" id="3461" />
-<P2 x="315" y="492" id="3659" />
+<TGConnectingPoint num="0" id="3355" />
+<P1 x="1155" y="180" id="3638" />
+<P2 x="1157" y="223" id="3554" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3355" >
-<father id="3357" num="0" />
-<cdparam x="328" y="472" />
-<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3354" >
+<father id="3356" num="0" />
+<cdparam x="1118" y="197" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3351" />
-<TGConnectingPoint num="1" id="3352" />
-<TGConnectingPoint num="2" id="3353" />
-<TGConnectingPoint num="3" id="3354" />
+<TGConnectingPoint num="0" id="3350" />
+<TGConnectingPoint num="1" id="3351" />
+<TGConnectingPoint num="2" id="3352" />
+<TGConnectingPoint num="3" id="3353" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="50" />
+<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -8150,28 +8149,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3364" >
-<cdparam x="113" y="430" />
+<CONNECTOR type="5102" id="3363" >
+<cdparam x="1119" y="266" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3363" />
-<P1 x="113" y="430" id="3420" />
-<P2 x="112" y="468" id="3670" />
+<TGConnectingPoint num="0" id="3362" />
+<P1 x="1157" y="273" id="3559" />
+<P2 x="1120" y="291" id="3537" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3362" >
-<father id="3364" num="0" />
-<cdparam x="102" y="450" />
-<sizeparam width="57" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3361" >
+<father id="3363" num="0" />
+<cdparam x="1119" y="278" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3358" />
-<TGConnectingPoint num="1" id="3359" />
-<TGConnectingPoint num="2" id="3360" />
-<TGConnectingPoint num="3" id="3361" />
+<TGConnectingPoint num="0" id="3357" />
+<TGConnectingPoint num="1" id="3358" />
+<TGConnectingPoint num="2" id="3359" />
+<TGConnectingPoint num="3" id="3360" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="100" />
+<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -8179,25 +8178,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3371" >
-<cdparam x="278" y="312" />
+<CONNECTOR type="5102" id="3370" >
+<cdparam x="1145" y="316" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3370" />
-<P1 x="278" y="312" id="3539" />
-<P2 x="593" y="404" id="3497" />
+<TGConnectingPoint num="0" id="3369" />
+<P1 x="1145" y="316" id="3539" />
+<P2 x="1460" y="408" id="3497" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3369" >
-<father id="3371" num="0" />
-<cdparam x="460" y="349" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3368" >
+<father id="3370" num="0" />
+<cdparam x="1228" y="349" />
<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3365" />
-<TGConnectingPoint num="1" id="3366" />
-<TGConnectingPoint num="2" id="3367" />
-<TGConnectingPoint num="3" id="3368" />
+<TGConnectingPoint num="0" id="3364" />
+<TGConnectingPoint num="1" id="3365" />
+<TGConnectingPoint num="2" id="3366" />
+<TGConnectingPoint num="3" id="3367" />
<extraparam>
<guard value="[packet.date==2 ]" />
<afterMin value="" />
@@ -8208,28 +8207,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3378" >
-<cdparam x="252" y="262" />
+<CONNECTOR type="5102" id="3377" >
+<cdparam x="980" y="434" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3377" />
-<P1 x="290" y="269" id="3559" />
-<P2 x="253" y="287" id="3537" />
+<TGConnectingPoint num="0" id="3376" />
+<P1 x="980" y="434" id="3420" />
+<P2 x="979" y="472" id="3670" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3376" >
-<father id="3378" num="0" />
-<cdparam x="252" y="274" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3375" >
+<father id="3377" num="0" />
+<cdparam x="969" y="454" />
+<sizeparam width="57" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3372" />
-<TGConnectingPoint num="1" id="3373" />
-<TGConnectingPoint num="2" id="3374" />
-<TGConnectingPoint num="3" id="3375" />
+<TGConnectingPoint num="0" id="3371" />
+<TGConnectingPoint num="1" id="3372" />
+<TGConnectingPoint num="2" id="3373" />
+<TGConnectingPoint num="3" id="3374" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="100" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -8237,28 +8236,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3385" >
-<cdparam x="250" y="175" />
+<CONNECTOR type="5102" id="3384" >
+<cdparam x="1208" y="457" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3384" />
-<P1 x="288" y="176" id="3638" />
-<P2 x="290" y="219" id="3554" />
+<TGConnectingPoint num="0" id="3383" />
+<P1 x="1208" y="457" id="3461" />
+<P2 x="1182" y="496" id="3659" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3383" >
-<father id="3385" num="0" />
-<cdparam x="251" y="193" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3382" >
+<father id="3384" num="0" />
+<cdparam x="1195" y="476" />
+<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3379" />
-<TGConnectingPoint num="1" id="3380" />
-<TGConnectingPoint num="2" id="3381" />
-<TGConnectingPoint num="3" id="3382" />
+<TGConnectingPoint num="0" id="3378" />
+<TGConnectingPoint num="1" id="3379" />
+<TGConnectingPoint num="2" id="3380" />
+<TGConnectingPoint num="3" id="3381" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="50" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -8266,28 +8265,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3392" >
-<cdparam x="345" y="115" />
+<CONNECTOR type="5102" id="3391" >
+<cdparam x="1460" y="458" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3391" />
-<P1 x="297" y="111" id="3600" />
-<P2 x="288" y="146" id="3637" />
+<TGConnectingPoint num="0" id="3390" />
+<P1 x="1460" y="458" id="3502" />
+<P2 x="1426" y="497" id="3648" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3390" >
-<father id="3392" num="0" />
-<cdparam x="338" y="136" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3389" >
+<father id="3391" num="0" />
+<cdparam x="1443" y="477" />
+<sizeparam width="50" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3386" />
-<TGConnectingPoint num="1" id="3387" />
-<TGConnectingPoint num="2" id="3388" />
-<TGConnectingPoint num="3" id="3389" />
+<TGConnectingPoint num="0" id="3385" />
+<TGConnectingPoint num="1" id="3386" />
+<TGConnectingPoint num="2" id="3387" />
+<TGConnectingPoint num="3" id="3388" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="10" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -8295,56 +8294,47 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="3399" >
-<cdparam x="183" y="35" />
+<CONNECTOR type="5102" id="3402" >
+<cdparam x="959" y="504" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3398" />
-<P1 x="293" y="30" id="3635" />
-<P2 x="265" y="62" id="3611" />
+<TGConnectingPoint num="0" id="3399" />
+<TGConnectingPoint num="1" id="3400" />
+<TGConnectingPoint num="2" id="3401" />
+<P1 x="979" y="502" id="3671" />
+<P2 x="1044" y="90" id="3597" />
+<Point x="916" y="501" />
+<Point x="915" y="111" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3397" >
-<father id="3399" num="0" />
-<cdparam x="183" y="50" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3392" >
+<father id="3402" num="0" />
+<cdparam x="916" y="501" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3393" />
-<TGConnectingPoint num="1" id="3394" />
-<TGConnectingPoint num="2" id="3395" />
-<TGConnectingPoint num="3" id="3396" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3406" >
-<cdparam x="253" y="337" />
+<SUBCOMPONENT type="-1" id="3393" >
+<father id="3402" num="1" />
+<cdparam x="915" y="111" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3405" />
-<P1 x="253" y="337" id="3543" />
-<P2 x="320" y="403" id="3472" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3404" >
-<father id="3406" num="0" />
-<cdparam x="295" y="369" />
-<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3398" >
+<father id="3402" num="2" />
+<cdparam x="978" y="298" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3400" />
-<TGConnectingPoint num="1" id="3401" />
-<TGConnectingPoint num="2" id="3402" />
-<TGConnectingPoint num="3" id="3403" />
+<TGConnectingPoint num="0" id="3394" />
+<TGConnectingPoint num="1" id="3395" />
+<TGConnectingPoint num="2" id="3396" />
+<TGConnectingPoint num="3" id="3397" />
<extraparam>
-<guard value="[packet.date==1 ]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -8354,26 +8344,46 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="3413" >
-<cdparam x="228" y="312" />
+<cdparam x="1182" y="526" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3412" />
-<P1 x="228" y="312" id="3541" />
-<P2 x="174" y="380" id="3416" />
+<TGConnectingPoint num="0" id="3410" />
+<TGConnectingPoint num="1" id="3411" />
+<TGConnectingPoint num="2" id="3412" />
+<P1 x="1182" y="526" id="3660" />
+<P2 x="1044" y="66" id="3594" />
+<Point x="889" y="517" />
+<Point x="891" y="59" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3411" >
+</CONNECTOR><SUBCOMPONENT type="-1" id="3403" >
<father id="3413" num="0" />
-<cdparam x="105" y="314" />
-<sizeparam width="93" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="889" y="517" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3404" >
+<father id="3413" num="1" />
+<cdparam x="891" y="59" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3409" >
+<father id="3413" num="2" />
+<cdparam x="1089" y="297" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3407" />
-<TGConnectingPoint num="1" id="3408" />
-<TGConnectingPoint num="2" id="3409" />
-<TGConnectingPoint num="3" id="3410" />
+<TGConnectingPoint num="0" id="3405" />
+<TGConnectingPoint num="1" id="3406" />
+<TGConnectingPoint num="2" id="3407" />
+<TGConnectingPoint num="3" id="3408" />
<extraparam>
-<guard value="[ packet.date==0]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -8383,10 +8393,10 @@
</SUBCOMPONENT>
<COMPONENT type="5106" id="3454" >
-<cdparam x="53" y="380" />
+<cdparam x="920" y="384" />
<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="State" value="PriorityLow" />
<TGConnectingPoint num="0" id="3414" />
<TGConnectingPoint num="1" id="3415" />
@@ -8433,10 +8443,10 @@
</COMPONENT>
<COMPONENT type="5106" id="3495" >
-<cdparam x="264" y="403" />
+<cdparam x="1131" y="407" />
<sizeparam width="154" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="State" value="PriorityMedium" />
<TGConnectingPoint num="0" id="3455" />
<TGConnectingPoint num="1" id="3456" />
@@ -8483,10 +8493,10 @@
</COMPONENT>
<COMPONENT type="5106" id="3536" >
-<cdparam x="527" y="404" />
+<cdparam x="1394" y="408" />
<sizeparam width="132" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="State" value="PriorityHigh" />
<TGConnectingPoint num="0" id="3496" />
<TGConnectingPoint num="1" id="3497" />
@@ -8533,10 +8543,10 @@
</COMPONENT>
<COMPONENT type="5107" id="3552" >
-<cdparam x="238" y="297" />
+<cdparam x="1105" y="301" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="choice" value="null" />
<TGConnectingPoint num="0" id="3537" />
<TGConnectingPoint num="1" id="3538" />
@@ -8556,10 +8566,10 @@
</COMPONENT>
<COMPONENT type="5106" id="3593" >
-<cdparam x="240" y="219" />
+<cdparam x="1107" y="223" />
<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="State" value="Enqueue" />
<TGConnectingPoint num="0" id="3553" />
<TGConnectingPoint num="1" id="3554" />
@@ -8606,10 +8616,10 @@
</COMPONENT>
<COMPONENT type="5106" id="3634" >
-<cdparam x="177" y="62" />
+<cdparam x="1044" y="66" />
<sizeparam width="240" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="State" value="Waiting" />
<TGConnectingPoint num="0" id="3594" />
<TGConnectingPoint num="1" id="3595" />
@@ -8656,20 +8666,20 @@
</COMPONENT>
<COMPONENT type="5100" id="3636" >
-<cdparam x="286" y="10" />
+<cdparam x="1153" y="14" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="start state" value="null" />
<TGConnectingPoint num="0" id="3635" />
</COMPONENT>
<COMPONENT type="5104" id="3647" >
-<cdparam x="222" y="151" />
+<cdparam x="1089" y="155" />
<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="toScheduler0(packet)" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<infoparam name="Receive signal" value="toScheduler1(packet)" />
<TGConnectingPoint num="0" id="3637" />
<TGConnectingPoint num="1" id="3638" />
<TGConnectingPoint num="2" id="3639" />
@@ -8683,11 +8693,11 @@
</COMPONENT>
<COMPONENT type="5103" id="3658" >
-<cdparam x="483" y="498" />
+<cdparam x="1350" y="502" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="scheduledPacket0(packet)" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="scheduledPacket1(packet)" />
<TGConnectingPoint num="0" id="3648" />
<TGConnectingPoint num="1" id="3649" />
<TGConnectingPoint num="2" id="3650" />
@@ -8701,11 +8711,11 @@
</COMPONENT>
<COMPONENT type="5103" id="3669" >
-<cdparam x="239" y="497" />
+<cdparam x="1106" y="501" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="scheduledPacket0(packet)" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="scheduledPacket1(packet)" />
<TGConnectingPoint num="0" id="3659" />
<TGConnectingPoint num="1" id="3660" />
<TGConnectingPoint num="2" id="3661" />
@@ -8719,11 +8729,11 @@
</COMPONENT>
<COMPONENT type="5103" id="3680" >
-<cdparam x="36" y="473" />
+<cdparam x="903" y="477" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="scheduledPacket0(packet)" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="scheduledPacket1(packet)" />
<TGConnectingPoint num="0" id="3670" />
<TGConnectingPoint num="1" id="3671" />
<TGConnectingPoint num="2" id="3672" />
@@ -8886,7 +8896,7 @@
<TGConnectingPoint num="23" id="3779" />
<extraparam>
<info stereotype="CROSSBAR" nodeName="Crossbar2" />
- cluster_index="0" cluster_address="0" />
+<attributes cluster_index="2" cluster_address="0" />
</extraparam>
</COMPONENT>
@@ -8922,16 +8932,16 @@
<TGConnectingPoint num="23" id="3831" />
<extraparam>
<info stereotype="RAM" nodeName="Memory2" />
-<attributes byteDataSize="32768" index="2" />
+<attributes byteDataSize="32768" index="2" processCode="" />
</extraparam>
</COMPONENT>
<SUBCOMPONENT type="5362" id="3789" >
<father id="3832" num="0" />
-<cdparam x="1157" y="697" />
-<sizeparam width="196" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1159" y="602" />
+<sizeparam width="176" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="64" minY="0" maxY="146" />
-<infoparam name="TGComponent" value="OutputEngine/out address" />
+<cdrectangleparam minX="0" maxX="84" minY="0" maxY="146" />
+<infoparam name="TGComponent" value="Bootstrap/out address" />
<TGConnectingPoint num="0" id="3781" />
<TGConnectingPoint num="1" id="3782" />
<TGConnectingPoint num="2" id="3783" />
@@ -8941,7 +8951,7 @@
<TGConnectingPoint num="6" id="3787" />
<TGConnectingPoint num="7" id="3788" />
<extraparam>
-<info value="OutputEngine/out address" channelName="OutputEngine/out address(int address) #--# InputEngine/in address(int address)" fullChannelName="AVATAR Design::OutputEngine/out address(int address) #--# InputEngine/in address(int address)" referenceDiagram="AVATAR Design" />
+<info value="Bootstrap/out address" channelName="Bootstrap/out address(int address) #--# InputEngine/in bootstrap(int address)" fullChannelName="AVATAR Design::Bootstrap/out address(int address) #--# InputEngine/in bootstrap(int address)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="3798" >
@@ -8965,11 +8975,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="3807" >
<father id="3832" num="2" />
-<cdparam x="1159" y="602" />
-<sizeparam width="176" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1157" y="697" />
+<sizeparam width="196" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="84" minY="0" maxY="146" />
-<infoparam name="TGComponent" value="Bootstrap/out address" />
+<cdrectangleparam minX="0" maxX="64" minY="0" maxY="146" />
+<infoparam name="TGComponent" value="OutputEngine/out address" />
<TGConnectingPoint num="0" id="3799" />
<TGConnectingPoint num="1" id="3800" />
<TGConnectingPoint num="2" id="3801" />
@@ -8979,7 +8989,7 @@
<TGConnectingPoint num="6" id="3805" />
<TGConnectingPoint num="7" id="3806" />
<extraparam>
-<info value="Bootstrap/out address" channelName="Bootstrap/out address(int address) #--# InputEngine/in bootstrap(int address)" fullChannelName="AVATAR Design::Bootstrap/out address(int address) #--# InputEngine/in bootstrap(int address)" referenceDiagram="AVATAR Design" />
+<info value="OutputEngine/out address" channelName="OutputEngine/out address(int address) #--# InputEngine/in address(int address)" fullChannelName="AVATAR Design::OutputEngine/out address(int address) #--# InputEngine/in address(int address)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
@@ -9015,7 +9025,7 @@
<TGConnectingPoint num="23" id="3856" />
<extraparam>
<info stereotype="CROSSBAR" nodeName="Crossbar1" />
- cluster_index="0" cluster_address="0" />
+<attributes cluster_index="1" cluster_address="0" />
</extraparam>
</COMPONENT>
@@ -9051,7 +9061,7 @@
<TGConnectingPoint num="23" id="3881" />
<extraparam>
<info stereotype="CROSSBAR" nodeName="Crossbar0" />
- cluster_index="0" cluster_address="0" />
+<attributes cluster_index="0" cluster_address="0" />
</extraparam>
</COMPONENT>
@@ -9183,11 +9193,11 @@
</COMPONENT>
<SUBCOMPONENT type="5352" id="3950" >
<father id="3984" num="0" />
-<cdparam x="790" y="181" />
-<sizeparam width="181" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="784" y="134" />
+<sizeparam width="201" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="41" minY="0" maxY="90" />
-<infoparam name="TGComponent" value="AVATAR Design::Sched0" />
+<cdrectangleparam minX="0" maxX="21" minY="0" maxY="90" />
+<infoparam name="TGComponent" value="AVATAR Design::Scheduling" />
<TGConnectingPoint num="0" id="3942" />
<TGConnectingPoint num="1" id="3943" />
<TGConnectingPoint num="2" id="3944" />
@@ -9197,16 +9207,16 @@
<TGConnectingPoint num="6" id="3948" />
<TGConnectingPoint num="7" id="3949" />
<extraparam>
-<info value="AVATAR Design::Sched0" taskName="Sched0" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::Scheduling" taskName="Scheduling" referenceTaskName="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5352" id="3959" >
<father id="3984" num="1" />
-<cdparam x="784" y="134" />
-<sizeparam width="201" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="790" y="181" />
+<sizeparam width="181" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="21" minY="0" maxY="90" />
-<infoparam name="TGComponent" value="AVATAR Design::Scheduling" />
+<cdrectangleparam minX="0" maxX="41" minY="0" maxY="90" />
+<infoparam name="TGComponent" value="AVATAR Design::Sched0" />
<TGConnectingPoint num="0" id="3951" />
<TGConnectingPoint num="1" id="3952" />
<TGConnectingPoint num="2" id="3953" />
@@ -9216,7 +9226,7 @@
<TGConnectingPoint num="6" id="3957" />
<TGConnectingPoint num="7" id="3958" />
<extraparam>
-<info value="AVATAR Design::Scheduling" taskName="Scheduling" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::Sched0" taskName="Sched0" referenceTaskName="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
@@ -9252,16 +9262,16 @@
<TGConnectingPoint num="23" id="4053" />
<extraparam>
<info stereotype="RAM" nodeName="Memory1" />
-<attributes byteDataSize="32768" index="1" />
+<attributes byteDataSize="32768" index="1" processCode="" />
</extraparam>
</COMPONENT>
<SUBCOMPONENT type="5362" id="3993" >
<father id="4054" num="0" />
-<cdparam x="1132" y="457" />
-<sizeparam width="179" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="856" y="399" />
+<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="328" minY="0" maxY="109" />
-<infoparam name="TGComponent" value="Sched1/in toScheduler1" />
+<cdrectangleparam minX="0" maxX="366" minY="0" maxY="109" />
+<infoparam name="TGComponent" value="Sched1/in packet" />
<TGConnectingPoint num="0" id="3985" />
<TGConnectingPoint num="1" id="3986" />
<TGConnectingPoint num="2" id="3987" />
@@ -9271,16 +9281,16 @@
<TGConnectingPoint num="6" id="3991" />
<TGConnectingPoint num="7" id="3992" />
<extraparam>
-<info value="Sched1/in toScheduler1" channelName="Sched1/in toScheduler1(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" fullChannelName="AVATAR Design::Sched1/in toScheduler1(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Sched1/in packet" channelName="Sched1/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" fullChannelName="AVATAR Design::Sched1/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="4002" >
<father id="4054" num="1" />
-<cdparam x="1127" y="407" />
-<sizeparam width="181" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="856" y="442" />
+<sizeparam width="142" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="326" minY="0" maxY="109" />
-<infoparam name="TGComponent" value="Sched0/in toScheduler0" />
+<cdrectangleparam minX="0" maxX="365" minY="0" maxY="109" />
+<infoparam name="TGComponent" value="Sched0/in packet" />
<TGConnectingPoint num="0" id="3994" />
<TGConnectingPoint num="1" id="3995" />
<TGConnectingPoint num="2" id="3996" />
@@ -9290,7 +9300,7 @@
<TGConnectingPoint num="6" id="4000" />
<TGConnectingPoint num="7" id="4001" />
<extraparam>
-<info value="Sched0/in toScheduler0" channelName="Sched0/in toScheduler0(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" fullChannelName="AVATAR Design::Sched0/in toScheduler0(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Sched0/in packet" channelName="Sched0/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" fullChannelName="AVATAR Design::Sched0/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="4011" >
@@ -9314,11 +9324,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="4020" >
<father id="4054" num="3" />
-<cdparam x="856" y="442" />
-<sizeparam width="142" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1127" y="407" />
+<sizeparam width="181" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="365" minY="0" maxY="109" />
-<infoparam name="TGComponent" value="Sched0/in packet" />
+<cdrectangleparam minX="0" maxX="326" minY="0" maxY="109" />
+<infoparam name="TGComponent" value="Sched0/in toScheduler0" />
<TGConnectingPoint num="0" id="4012" />
<TGConnectingPoint num="1" id="4013" />
<TGConnectingPoint num="2" id="4014" />
@@ -9328,16 +9338,16 @@
<TGConnectingPoint num="6" id="4018" />
<TGConnectingPoint num="7" id="4019" />
<extraparam>
-<info value="Sched0/in packet" channelName="Sched0/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" fullChannelName="AVATAR Design::Sched0/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Sched0/in toScheduler0" channelName="Sched0/in toScheduler0(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" fullChannelName="AVATAR Design::Sched0/in toScheduler0(PacketDesc packet) #--# Scheduling/out to_scheduler0(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="4029" >
<father id="4054" num="4" />
-<cdparam x="856" y="399" />
-<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1132" y="457" />
+<sizeparam width="179" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="366" minY="0" maxY="109" />
-<infoparam name="TGComponent" value="Sched1/in packet" />
+<cdrectangleparam minX="0" maxX="328" minY="0" maxY="109" />
+<infoparam name="TGComponent" value="Sched1/in toScheduler1" />
<TGConnectingPoint num="0" id="4021" />
<TGConnectingPoint num="1" id="4022" />
<TGConnectingPoint num="2" id="4023" />
@@ -9347,7 +9357,7 @@
<TGConnectingPoint num="6" id="4027" />
<TGConnectingPoint num="7" id="4028" />
<extraparam>
-<info value="Sched1/in packet" channelName="Sched1/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" fullChannelName="AVATAR Design::Sched1/in packet(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Sched1/in toScheduler1" channelName="Sched1/in toScheduler1(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" fullChannelName="AVATAR Design::Sched1/in toScheduler1(PacketDesc packet) #--# Scheduling/out to_scheduler1(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
@@ -9383,16 +9393,16 @@
<TGConnectingPoint num="23" id="4114" />
<extraparam>
<info stereotype="RAM" nodeName="Memory0" />
-<attributes byteDataSize="32768" index="0" />
+<attributes byteDataSize="32768" index="0" processCode="" />
</extraparam>
</COMPONENT>
<SUBCOMPONENT type="5362" id="4063" >
<father id="4115" num="0" />
-<cdparam x="43" y="450" />
-<sizeparam width="175" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="44" y="406" />
+<sizeparam width="210" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="145" minY="0" maxY="196" />
-<infoparam name="TGComponent" value="Classif0/in from_classif" />
+<cdrectangleparam minX="0" maxX="110" minY="0" maxY="196" />
+<infoparam name="TGComponent" value="Classification/out queue_low" />
<TGConnectingPoint num="0" id="4055" />
<TGConnectingPoint num="1" id="4056" />
<TGConnectingPoint num="2" id="4057" />
@@ -9402,16 +9412,16 @@
<TGConnectingPoint num="6" id="4061" />
<TGConnectingPoint num="7" id="4062" />
<extraparam>
-<info value="Classif0/in from_classif" channelName="Classif0/in from_classif(PacketDesc packet) #--# Classification/out to_c0(PacketDesc packet)" fullChannelName="AVATAR Design::Classif0/in from_classif(PacketDesc packet) #--# Classification/out to_c0(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Classification/out queue_low" channelName="Classification/out queue_low(PacketDesc packet) #--# Scheduling/in from_queue_low(PacketDesc packet)" fullChannelName="AVATAR Design::Classification/out queue_low(PacketDesc packet) #--# Scheduling/in from_queue_low(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="4072" >
<father id="4115" num="1" />
-<cdparam x="41" y="540" />
+<cdparam x="42" y="494" />
<sizeparam width="174" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="146" minY="0" maxY="196" />
-<infoparam name="TGComponent" value="Classif2/in from_classif" />
+<infoparam name="TGComponent" value="Classif1/in from_classif" />
<TGConnectingPoint num="0" id="4064" />
<TGConnectingPoint num="1" id="4065" />
<TGConnectingPoint num="2" id="4066" />
@@ -9421,16 +9431,16 @@
<TGConnectingPoint num="6" id="4070" />
<TGConnectingPoint num="7" id="4071" />
<extraparam>
-<info value="Classif2/in from_classif" channelName="Classif2/in from_classif(PacketDesc packet) #--# Classification/out to_c2(PacketDesc packet)" fullChannelName="AVATAR Design::Classif2/in from_classif(PacketDesc packet) #--# Classification/out to_c2(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Classif1/in from_classif" channelName="Classif1/in from_classif(PacketDesc packet) #--# Classification/out to_c1(PacketDesc packet)" fullChannelName="AVATAR Design::Classif1/in from_classif(PacketDesc packet) #--# Classification/out to_c1(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="4081" >
<father id="4115" num="2" />
-<cdparam x="42" y="494" />
+<cdparam x="41" y="540" />
<sizeparam width="174" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="146" minY="0" maxY="196" />
-<infoparam name="TGComponent" value="Classif1/in from_classif" />
+<infoparam name="TGComponent" value="Classif2/in from_classif" />
<TGConnectingPoint num="0" id="4073" />
<TGConnectingPoint num="1" id="4074" />
<TGConnectingPoint num="2" id="4075" />
@@ -9440,16 +9450,16 @@
<TGConnectingPoint num="6" id="4079" />
<TGConnectingPoint num="7" id="4080" />
<extraparam>
-<info value="Classif1/in from_classif" channelName="Classif1/in from_classif(PacketDesc packet) #--# Classification/out to_c1(PacketDesc packet)" fullChannelName="AVATAR Design::Classif1/in from_classif(PacketDesc packet) #--# Classification/out to_c1(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Classif2/in from_classif" channelName="Classif2/in from_classif(PacketDesc packet) #--# Classification/out to_c2(PacketDesc packet)" fullChannelName="AVATAR Design::Classif2/in from_classif(PacketDesc packet) #--# Classification/out to_c2(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5362" id="4090" >
<father id="4115" num="3" />
-<cdparam x="44" y="406" />
-<sizeparam width="210" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="43" y="450" />
+<sizeparam width="175" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="110" minY="0" maxY="196" />
-<infoparam name="TGComponent" value="Classification/out queue_low" />
+<cdrectangleparam minX="0" maxX="145" minY="0" maxY="196" />
+<infoparam name="TGComponent" value="Classif0/in from_classif" />
<TGConnectingPoint num="0" id="4082" />
<TGConnectingPoint num="1" id="4083" />
<TGConnectingPoint num="2" id="4084" />
@@ -9459,7 +9469,7 @@
<TGConnectingPoint num="6" id="4088" />
<TGConnectingPoint num="7" id="4089" />
<extraparam>
-<info value="Classification/out queue_low" channelName="Classification/out queue_low(PacketDesc packet) #--# Scheduling/in from_queue_low(PacketDesc packet)" fullChannelName="AVATAR Design::Classification/out queue_low(PacketDesc packet) #--# Scheduling/in from_queue_low(PacketDesc packet)" referenceDiagram="AVATAR Design" />
+<info value="Classif0/in from_classif" channelName="Classif0/in from_classif(PacketDesc packet) #--# Classification/out to_c0(PacketDesc packet)" fullChannelName="AVATAR Design::Classif0/in from_classif(PacketDesc packet) #--# Classification/out to_c0(PacketDesc packet)" referenceDiagram="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
@@ -9572,11 +9582,11 @@
</COMPONENT>
<SUBCOMPONENT type="5352" id="4174" >
<father id="4217" num="0" />
-<cdparam x="398" y="753" />
-<sizeparam width="205" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="384" y="638" />
+<sizeparam width="197" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="27" minY="0" maxY="165" />
-<infoparam name="TGComponent" value="AVATAR Design::InputEngine" />
+<cdrectangleparam minX="0" maxX="35" minY="0" maxY="165" />
+<infoparam name="TGComponent" value="AVATAR Design::Bootstrap" />
<TGConnectingPoint num="0" id="4166" />
<TGConnectingPoint num="1" id="4167" />
<TGConnectingPoint num="2" id="4168" />
@@ -9586,7 +9596,7 @@
<TGConnectingPoint num="6" id="4172" />
<TGConnectingPoint num="7" id="4173" />
<extraparam>
-<info value="AVATAR Design::InputEngine" taskName="InputEngine" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::Bootstrap" taskName="Bootstrap" referenceTaskName="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5352" id="4183" >
@@ -9610,11 +9620,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5352" id="4192" >
<father id="4217" num="2" />
-<cdparam x="384" y="638" />
-<sizeparam width="197" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="398" y="753" />
+<sizeparam width="205" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="35" minY="0" maxY="165" />
-<infoparam name="TGComponent" value="AVATAR Design::Bootstrap" />
+<cdrectangleparam minX="0" maxX="27" minY="0" maxY="165" />
+<infoparam name="TGComponent" value="AVATAR Design::InputEngine" />
<TGConnectingPoint num="0" id="4184" />
<TGConnectingPoint num="1" id="4185" />
<TGConnectingPoint num="2" id="4186" />
@@ -9624,7 +9634,7 @@
<TGConnectingPoint num="6" id="4190" />
<TGConnectingPoint num="7" id="4191" />
<extraparam>
-<info value="AVATAR Design::Bootstrap" taskName="Bootstrap" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::InputEngine" taskName="InputEngine" referenceTaskName="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
@@ -9665,11 +9675,11 @@
</COMPONENT>
<SUBCOMPONENT type="5352" id="4226" >
<father id="4260" num="0" />
-<cdparam x="25" y="121" />
-<sizeparam width="217" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="26" y="167" />
+<sizeparam width="184" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="25" minY="0" maxY="106" />
-<infoparam name="TGComponent" value="AVATAR Design::Classification" />
+<cdrectangleparam minX="0" maxX="58" minY="0" maxY="106" />
+<infoparam name="TGComponent" value="AVATAR Design::Classif0" />
<TGConnectingPoint num="0" id="4218" />
<TGConnectingPoint num="1" id="4219" />
<TGConnectingPoint num="2" id="4220" />
@@ -9679,16 +9689,16 @@
<TGConnectingPoint num="6" id="4224" />
<TGConnectingPoint num="7" id="4225" />
<extraparam>
-<info value="AVATAR Design::Classification" taskName="Classification" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::Classif0" taskName="Classif0" referenceTaskName="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5352" id="4235" >
<father id="4260" num="1" />
-<cdparam x="26" y="167" />
-<sizeparam width="184" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="25" y="121" />
+<sizeparam width="217" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="58" minY="0" maxY="106" />
-<infoparam name="TGComponent" value="AVATAR Design::Classif0" />
+<cdrectangleparam minX="0" maxX="25" minY="0" maxY="106" />
+<infoparam name="TGComponent" value="AVATAR Design::Classification" />
<TGConnectingPoint num="0" id="4227" />
<TGConnectingPoint num="1" id="4228" />
<TGConnectingPoint num="2" id="4229" />
@@ -9698,7 +9708,7 @@
<TGConnectingPoint num="6" id="4233" />
<TGConnectingPoint num="7" id="4234" />
<extraparam>
-<info value="AVATAR Design::Classif0" taskName="Classif0" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::Classification" taskName="Classification" referenceTaskName="AVATAR Design" />
</extraparam>
</SUBCOMPONENT>
@@ -10024,15 +10034,15 @@
<cdparam x="370" y="391" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="370" y="391" id="4567" />
-<P2 x="508" y="264" id="4513" />
+<P1 x="370" y="391" id="4558" />
+<P2 x="508" y="264" id="4509" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4348" >
<cdparam x="302" y="415" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="315" y="402" id="4565" />
+<P1 x="315" y="402" id="4560" />
<P2 x="425" y="182" id="4526" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -10040,32 +10050,32 @@
<cdparam x="339" y="391" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="339" y="391" id="4551" />
-<P2 x="336" y="160" id="4379" />
+<P1 x="339" y="391" id="4574" />
+<P2 x="336" y="160" id="4375" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4350" >
<cdparam x="282" y="683" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="282" y="683" id="4415" />
-<P2 x="357" y="541" id="4563" />
+<P1 x="282" y="683" id="4405" />
+<P2 x="357" y="541" id="4562" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4351" >
<cdparam x="513" y="391" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="515" y="391" id="4561" />
-<P2 x="570" y="343" id="4509" />
+<P1 x="515" y="391" id="4564" />
+<P2 x="570" y="343" id="4513" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4353" >
<cdparam x="490" y="208" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="490" y="182" id="4524" />
-<P2 x="429" y="391" id="4559" />
+<P1 x="490" y="182" id="4528" />
+<P2 x="429" y="391" id="4566" />
<Point x="433" y="388" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="4352" >
@@ -10082,55 +10092,55 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="508" y="302" id="4511" />
-<P2 x="480" y="391" id="4555" />
+<P2 x="480" y="391" id="4570" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4355" >
<cdparam x="534" y="208" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="454" y="182" id="4528" />
-<P2 x="400" y="391" id="4557" />
+<P1 x="454" y="182" id="4524" />
+<P2 x="400" y="391" id="4568" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4356" >
<cdparam x="433" y="419" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="490" y="541" id="4539" />
-<P2 x="1067" y="544" id="4439" />
+<P1 x="490" y="541" id="4586" />
+<P2 x="1067" y="544" id="4489" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4357" >
<cdparam x="471" y="381" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="515" y="510" id="4541" />
-<P2 x="1067" y="508" id="4443" />
+<P1 x="515" y="510" id="4584" />
+<P2 x="1067" y="508" id="4485" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4358" >
<cdparam x="471" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="515" y="472" id="4543" />
-<P2 x="1067" y="473" id="4441" />
+<P1 x="515" y="472" id="4582" />
+<P2 x="1067" y="473" id="4487" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4359" >
<cdparam x="471" y="294" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="515" y="429" id="4545" />
-<P2 x="1067" y="434" id="4453" />
+<P1 x="515" y="429" id="4580" />
+<P2 x="1067" y="434" id="4475" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4360" >
<cdparam x="134" y="210" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="179" y="248" id="4375" />
-<P2 x="315" y="525" id="4547" />
+<P1 x="179" y="248" id="4379" />
+<P2 x="315" y="525" id="4578" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4361" >
@@ -10138,71 +10148,71 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="262" y="248" id="4377" />
-<P2 x="315" y="476" id="4549" />
+<P2 x="315" y="476" id="4576" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4362" >
<cdparam x="1273" y="365" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1267" y="464" id="4447" />
-<P2 x="1375" y="189" id="4470" />
+<P1 x="1267" y="464" id="4481" />
+<P2 x="1375" y="189" id="4458" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4363" >
<cdparam x="1047" y="294" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1067" y="393" id="4445" />
-<P2 x="949" y="183" id="4485" />
+<P1 x="1067" y="393" id="4483" />
+<P2 x="949" y="183" id="4443" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4364" >
<cdparam x="1202" y="126" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1217" y="167" id="4472" />
-<P2 x="1218" y="384" id="4449" />
+<P1 x="1217" y="167" id="4456" />
+<P2 x="1218" y="384" id="4479" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4365" >
<cdparam x="1104" y="148" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1093" y="133" id="4487" />
-<P2 x="1150" y="384" id="4451" />
+<P1 x="1093" y="133" id="4441" />
+<P2 x="1150" y="384" id="4477" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4366" >
<cdparam x="1307" y="217" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1309" y="189" id="4474" />
-<P2 x="1267" y="426" id="4455" />
+<P1 x="1309" y="189" id="4454" />
+<P2 x="1267" y="426" id="4473" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4367" >
<cdparam x="969" y="213" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1039" y="183" id="4489" />
-<P2 x="1101" y="384" id="4457" />
+<P1 x="1039" y="183" id="4439" />
+<P2 x="1101" y="384" id="4471" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4368" >
<cdparam x="351" y="437" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="399" y="602" id="4583" />
-<P2 x="407" y="541" id="4553" />
+<P1 x="399" y="602" id="4544" />
+<P2 x="407" y="541" id="4572" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4369" >
<cdparam x="319" y="528" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="352" y="683" id="4409" />
-<P2 x="399" y="576" id="4578" />
+<P1 x="352" y="683" id="4411" />
+<P2 x="399" y="576" id="4539" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4370" >
@@ -10210,39 +10220,39 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1009" y="834" id="4392" />
-<P2 x="408" y="833" id="4405" />
+<P2 x="408" y="833" id="4415" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4371" >
<cdparam x="551" y="559" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="619" y="740" id="4426" />
-<P2 x="435" y="741" id="4407" />
+<P1 x="619" y="740" id="4428" />
+<P2 x="435" y="741" id="4413" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4372" >
<cdparam x="914" y="310" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1148" y="581" id="4459" />
-<P2 x="1137" y="757" id="4390" />
+<P1 x="1148" y="581" id="4469" />
+<P2 x="1137" y="757" id="4394" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4373" >
<cdparam x="549" y="562" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="619" y="703" id="4428" />
-<P2 x="435" y="695" id="4413" />
+<P1 x="619" y="703" id="4426" />
+<P2 x="435" y="695" id="4407" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4374" >
<cdparam x="841" y="657" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="937" y="807" id="4394" />
-<P2 x="435" y="798" id="4411" />
+<P1 x="937" y="807" id="4390" />
+<P2 x="435" y="798" id="4409" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="4389" >
@@ -10266,14 +10276,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="4376" >
<father id="4389" num="0" />
-<cdparam x="166" y="248" />
+<cdparam x="323" y="160" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classifPacket" />
+<infoparam name="Primitive port" value="Channel classif" />
<TGConnectingPoint num="0" id="4375" />
<extraparam>
-<Prop commName="classifPacket" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classif" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10300,14 +10310,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4380" >
<father id="4389" num="2" />
-<cdparam x="323" y="160" />
+<cdparam x="166" y="248" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classif" />
+<infoparam name="Primitive port" value="Channel classifPacket" />
<TGConnectingPoint num="0" id="4379" />
<extraparam>
-<Prop commName="classif" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classifPacket" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10336,14 +10346,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="4391" >
<father id="4404" num="0" />
-<cdparam x="1124" y="757" />
+<cdparam x="924" y="807" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel schedPacket" />
+<infoparam name="Primitive port" value="Channel address" />
<TGConnectingPoint num="0" id="4390" />
<extraparam>
-<Prop commName="schedPacket" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="address" commType="0" origin="true" finite="false" blocking="true" maxSamples="32" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10370,14 +10380,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4395" >
<father id="4404" num="2" />
-<cdparam x="924" y="807" />
+<cdparam x="1124" y="757" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel address" />
+<infoparam name="Primitive port" value="Channel schedPacket" />
<TGConnectingPoint num="0" id="4394" />
<extraparam>
-<Prop commName="address" commType="0" origin="true" finite="false" blocking="true" maxSamples="32" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="schedPacket" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10406,14 +10416,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="4406" >
<father id="4425" num="0" />
-<cdparam x="395" y="833" />
+<cdparam x="269" y="683" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newAddr" />
+<infoparam name="Primitive port" value="Event newPacket" />
<TGConnectingPoint num="0" id="4405" />
<extraparam>
-<Prop commName="newAddr" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newPacket" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10423,14 +10433,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4408" >
<father id="4425" num="1" />
-<cdparam x="422" y="741" />
+<cdparam x="422" y="695" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newBoot" />
+<infoparam name="Primitive port" value="Channel bootstrapaddress" />
<TGConnectingPoint num="0" id="4407" />
<extraparam>
-<Prop commName="newBoot" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="bootstrapaddress" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10440,14 +10450,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4410" >
<father id="4425" num="2" />
-<cdparam x="339" y="683" />
+<cdparam x="422" y="798" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel packet" />
+<infoparam name="Primitive port" value="Channel address" />
<TGConnectingPoint num="0" id="4409" />
<extraparam>
-<Prop commName="packet" commType="0" origin="true" finite="false" blocking="true" maxSamples="32" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="address" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10457,14 +10467,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4412" >
<father id="4425" num="3" />
-<cdparam x="422" y="798" />
+<cdparam x="339" y="683" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel address" />
+<infoparam name="Primitive port" value="Channel packet" />
<TGConnectingPoint num="0" id="4411" />
<extraparam>
-<Prop commName="address" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="packet" commType="0" origin="true" finite="false" blocking="true" maxSamples="32" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10474,14 +10484,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4414" >
<father id="4425" num="4" />
-<cdparam x="422" y="695" />
+<cdparam x="422" y="741" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel bootstrapaddress" />
+<infoparam name="Primitive port" value="Event newBoot" />
<TGConnectingPoint num="0" id="4413" />
<extraparam>
-<Prop commName="bootstrapaddress" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newBoot" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10491,14 +10501,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4416" >
<father id="4425" num="5" />
-<cdparam x="269" y="683" />
+<cdparam x="395" y="833" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newPacket" />
+<infoparam name="Primitive port" value="Event newAddr" />
<TGConnectingPoint num="0" id="4415" />
<extraparam>
-<Prop commName="newPacket" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newAddr" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10528,14 +10538,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="4427" >
<father id="4438" num="0" />
-<cdparam x="606" y="740" />
+<cdparam x="606" y="703" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newBoot" />
+<infoparam name="Primitive port" value="Channel bootstrapaddress" />
<TGConnectingPoint num="0" id="4426" />
<extraparam>
-<Prop commName="newBoot" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="bootstrapaddress" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10545,14 +10555,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4429" >
<father id="4438" num="1" />
-<cdparam x="606" y="703" />
+<cdparam x="606" y="740" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel bootstrapaddress" />
+<infoparam name="Primitive port" value="Event newBoot" />
<TGConnectingPoint num="0" id="4428" />
<extraparam>
-<Prop commName="bootstrapaddress" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newBoot" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10579,35 +10589,35 @@
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1202" id="4469" >
+<SUBCOMPONENT type="1202" id="4453" >
<father id="4508" num="0" />
-<cdparam x="1067" y="397" />
-<sizeparam width="200" height="197" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="893" y="46" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="421" minY="0" maxY="403" />
-<infoparam name="Primitive component" value="Scheduling" />
-<TGConnectingPoint num="0" id="4461" />
-<TGConnectingPoint num="1" id="4462" />
-<TGConnectingPoint num="2" id="4463" />
-<TGConnectingPoint num="3" id="4464" />
-<TGConnectingPoint num="4" id="4465" />
-<TGConnectingPoint num="5" id="4466" />
-<TGConnectingPoint num="6" id="4467" />
-<TGConnectingPoint num="7" id="4468" />
+<cdrectangleparam minX="0" maxX="421" minY="0" maxY="450" />
+<infoparam name="Primitive component" value="Sched0" />
+<TGConnectingPoint num="0" id="4445" />
+<TGConnectingPoint num="1" id="4446" />
+<TGConnectingPoint num="2" id="4447" />
+<TGConnectingPoint num="3" id="4448" />
+<TGConnectingPoint num="4" id="4449" />
+<TGConnectingPoint num="5" id="4450" />
+<TGConnectingPoint num="6" id="4451" />
+<TGConnectingPoint num="7" id="4452" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4440" >
-<father id="4469" num="0" />
-<cdparam x="1054" y="544" />
+<father id="4453" num="0" />
+<cdparam x="1026" y="183" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Channel toSchedPacket" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event newSchedPacket0" />
<TGConnectingPoint num="0" id="4439" />
<extraparam>
-<Prop commName="toSchedPacket" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newSchedPacket0" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10616,15 +10626,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4442" >
-<father id="4469" num="1" />
-<cdparam x="1054" y="473" />
+<father id="4453" num="1" />
+<cdparam x="1080" y="133" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Event newQueueMedium" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel schedPacket0" />
<TGConnectingPoint num="0" id="4441" />
<extraparam>
-<Prop commName="newQueueMedium" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="schedPacket0" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10633,15 +10643,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4444" >
-<father id="4469" num="2" />
-<cdparam x="1054" y="508" />
+<father id="4453" num="2" />
+<cdparam x="936" y="183" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Event newQueueLow" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel toSched0" />
<TGConnectingPoint num="0" id="4443" />
<extraparam>
-<Prop commName="newQueueLow" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toSched0" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10649,16 +10659,35 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4446" >
-<father id="4469" num="3" />
-<cdparam x="1054" y="393" />
+<SUBCOMPONENT type="1202" id="4468" >
+<father id="4508" num="1" />
+<cdparam x="1217" y="52" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="421" minY="0" maxY="450" />
+<infoparam name="Primitive component" value="Sched1" />
+<TGConnectingPoint num="0" id="4460" />
+<TGConnectingPoint num="1" id="4461" />
+<TGConnectingPoint num="2" id="4462" />
+<TGConnectingPoint num="3" id="4463" />
+<TGConnectingPoint num="4" id="4464" />
+<TGConnectingPoint num="5" id="4465" />
+<TGConnectingPoint num="6" id="4466" />
+<TGConnectingPoint num="7" id="4467" />
+<extraparam>
+<Data isAttacker="No" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="4455" >
+<father id="4468" num="0" />
+<cdparam x="1296" y="189" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Channel toSched0" />
-<TGConnectingPoint num="0" id="4445" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event newSchedPacket1" />
+<TGConnectingPoint num="0" id="4454" />
<extraparam>
-<Prop commName="toSched0" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newSchedPacket1" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10666,16 +10695,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4448" >
-<father id="4469" num="4" />
-<cdparam x="1254" y="464" />
+<SUBCOMPONENT type="1203" id="4457" >
+<father id="4468" num="1" />
+<cdparam x="1204" y="167" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Channel toSched1" />
-<TGConnectingPoint num="0" id="4447" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel schedPacket1" />
+<TGConnectingPoint num="0" id="4456" />
<extraparam>
-<Prop commName="toSched1" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="schedPacket1" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10683,16 +10712,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4450" >
-<father id="4469" num="5" />
-<cdparam x="1205" y="384" />
+<SUBCOMPONENT type="1203" id="4459" >
+<father id="4468" num="2" />
+<cdparam x="1362" y="189" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Channel schedPacket1" />
-<TGConnectingPoint num="0" id="4449" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel toSched1" />
+<TGConnectingPoint num="0" id="4458" />
<extraparam>
-<Prop commName="schedPacket1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toSched1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10700,16 +10729,35 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4452" >
-<father id="4469" num="6" />
-<cdparam x="1137" y="384" />
+<SUBCOMPONENT type="1202" id="4499" >
+<father id="4508" num="2" />
+<cdparam x="1067" y="397" />
+<sizeparam width="200" height="197" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="421" minY="0" maxY="403" />
+<infoparam name="Primitive component" value="Scheduling" />
+<TGConnectingPoint num="0" id="4491" />
+<TGConnectingPoint num="1" id="4492" />
+<TGConnectingPoint num="2" id="4493" />
+<TGConnectingPoint num="3" id="4494" />
+<TGConnectingPoint num="4" id="4495" />
+<TGConnectingPoint num="5" id="4496" />
+<TGConnectingPoint num="6" id="4497" />
+<TGConnectingPoint num="7" id="4498" />
+<extraparam>
+<Data isAttacker="No" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="4470" >
+<father id="4499" num="0" />
+<cdparam x="1135" y="581" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Channel schedPacket0" />
-<TGConnectingPoint num="0" id="4451" />
+<infoparam name="Primitive port" value="Channel schedPacket" />
+<TGConnectingPoint num="0" id="4469" />
<extraparam>
-<Prop commName="schedPacket0" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="schedPacket" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10717,16 +10765,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4454" >
-<father id="4469" num="7" />
-<cdparam x="1054" y="434" />
+<SUBCOMPONENT type="1203" id="4472" >
+<father id="4499" num="1" />
+<cdparam x="1088" y="384" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Event newQueueHigh" />
-<TGConnectingPoint num="0" id="4453" />
+<infoparam name="Primitive port" value="Event newSchedPacket0" />
+<TGConnectingPoint num="0" id="4471" />
<extraparam>
-<Prop commName="newQueueHigh" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newSchedPacket0" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10734,14 +10782,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4456" >
-<father id="4469" num="8" />
+<SUBCOMPONENT type="1203" id="4474" >
+<father id="4499" num="2" />
<cdparam x="1254" y="426" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
<infoparam name="Primitive port" value="Event newSchedPacket1" />
-<TGConnectingPoint num="0" id="4455" />
+<TGConnectingPoint num="0" id="4473" />
<extraparam>
<Prop commName="newSchedPacket1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -10751,16 +10799,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4458" >
-<father id="4469" num="9" />
-<cdparam x="1088" y="384" />
+<SUBCOMPONENT type="1203" id="4476" >
+<father id="4499" num="3" />
+<cdparam x="1054" y="434" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Event newSchedPacket0" />
-<TGConnectingPoint num="0" id="4457" />
+<infoparam name="Primitive port" value="Event newQueueHigh" />
+<TGConnectingPoint num="0" id="4475" />
<extraparam>
-<Prop commName="newSchedPacket0" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newQueueHigh" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10768,16 +10816,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4460" >
-<father id="4469" num="10" />
-<cdparam x="1135" y="581" />
+<SUBCOMPONENT type="1203" id="4478" >
+<father id="4499" num="4" />
+<cdparam x="1137" y="384" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
-<infoparam name="Primitive port" value="Channel schedPacket" />
-<TGConnectingPoint num="0" id="4459" />
+<infoparam name="Primitive port" value="Channel schedPacket0" />
+<TGConnectingPoint num="0" id="4477" />
<extraparam>
-<Prop commName="schedPacket" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="schedPacket0" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10785,35 +10833,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="4484" >
-<father id="4508" num="1" />
-<cdparam x="1217" y="52" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="421" minY="0" maxY="450" />
-<infoparam name="Primitive component" value="Sched1" />
-<TGConnectingPoint num="0" id="4476" />
-<TGConnectingPoint num="1" id="4477" />
-<TGConnectingPoint num="2" id="4478" />
-<TGConnectingPoint num="3" id="4479" />
-<TGConnectingPoint num="4" id="4480" />
-<TGConnectingPoint num="5" id="4481" />
-<TGConnectingPoint num="6" id="4482" />
-<TGConnectingPoint num="7" id="4483" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4471" >
-<father id="4484" num="0" />
-<cdparam x="1362" y="189" />
+<SUBCOMPONENT type="1203" id="4480" >
+<father id="4499" num="5" />
+<cdparam x="1205" y="384" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel toSched1" />
-<TGConnectingPoint num="0" id="4470" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
+<infoparam name="Primitive port" value="Channel schedPacket1" />
+<TGConnectingPoint num="0" id="4479" />
<extraparam>
-<Prop commName="toSched1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="schedPacket1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10821,16 +10850,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4473" >
-<father id="4484" num="1" />
-<cdparam x="1204" y="167" />
+<SUBCOMPONENT type="1203" id="4482" >
+<father id="4499" num="6" />
+<cdparam x="1254" y="464" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel schedPacket1" />
-<TGConnectingPoint num="0" id="4472" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
+<infoparam name="Primitive port" value="Channel toSched1" />
+<TGConnectingPoint num="0" id="4481" />
<extraparam>
-<Prop commName="schedPacket1" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toSched1" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10838,16 +10867,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4475" >
-<father id="4484" num="2" />
-<cdparam x="1296" y="189" />
+<SUBCOMPONENT type="1203" id="4484" >
+<father id="4499" num="7" />
+<cdparam x="1054" y="393" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newSchedPacket1" />
-<TGConnectingPoint num="0" id="4474" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
+<infoparam name="Primitive port" value="Channel toSched0" />
+<TGConnectingPoint num="0" id="4483" />
<extraparam>
-<Prop commName="newSchedPacket1" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toSched0" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10855,35 +10884,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="4499" >
-<father id="4508" num="2" />
-<cdparam x="893" y="46" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="421" minY="0" maxY="450" />
-<infoparam name="Primitive component" value="Sched0" />
-<TGConnectingPoint num="0" id="4491" />
-<TGConnectingPoint num="1" id="4492" />
-<TGConnectingPoint num="2" id="4493" />
-<TGConnectingPoint num="3" id="4494" />
-<TGConnectingPoint num="4" id="4495" />
-<TGConnectingPoint num="5" id="4496" />
-<TGConnectingPoint num="6" id="4497" />
-<TGConnectingPoint num="7" id="4498" />
-<extraparam>
-<Data isAttacker="No" />
-</extraparam>
-</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4486" >
-<father id="4499" num="0" />
-<cdparam x="936" y="183" />
+<father id="4499" num="8" />
+<cdparam x="1054" y="508" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel toSched0" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
+<infoparam name="Primitive port" value="Event newQueueLow" />
<TGConnectingPoint num="0" id="4485" />
<extraparam>
-<Prop commName="toSched0" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newQueueLow" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10892,15 +10902,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4488" >
-<father id="4499" num="1" />
-<cdparam x="1080" y="133" />
+<father id="4499" num="9" />
+<cdparam x="1054" y="473" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel schedPacket0" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
+<infoparam name="Primitive port" value="Event newQueueMedium" />
<TGConnectingPoint num="0" id="4487" />
<extraparam>
-<Prop commName="schedPacket0" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newQueueMedium" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10909,15 +10919,15 @@
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4490" >
-<father id="4499" num="2" />
-<cdparam x="1026" y="183" />
+<father id="4499" num="10" />
+<cdparam x="1054" y="544" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newSchedPacket0" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="184" />
+<infoparam name="Primitive port" value="Channel toSchedPacket" />
<TGConnectingPoint num="0" id="4489" />
<extraparam>
-<Prop commName="newSchedPacket0" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toSchedPacket" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10947,14 +10957,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="4510" >
<father id="4523" num="0" />
-<cdparam x="557" y="343" />
+<cdparam x="495" y="264" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classifPacket2" />
+<infoparam name="Primitive port" value="Channel classif2" />
<TGConnectingPoint num="0" id="4509" />
<extraparam>
-<Prop commName="classifPacket2" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classif2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -10981,14 +10991,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4514" >
<father id="4523" num="2" />
-<cdparam x="495" y="264" />
+<cdparam x="557" y="343" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classif2" />
+<infoparam name="Primitive port" value="Channel classifPacket2" />
<TGConnectingPoint num="0" id="4513" />
<extraparam>
-<Prop commName="classif2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classifPacket2" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11018,15 +11028,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="4525" >
<father id="4538" num="0" />
-<cdparam x="477" y="182" />
+<cdparam x="441" y="182" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="128" />
-<infoparam name="Primitive port" value="Channel classifPacket1" />
+<infoparam name="Primitive port" value="Event toQueue1" />
<TGConnectingPoint num="0" id="4524" />
<extraparam>
-<Prop commName="classifPacket1" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="toQueue1" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11052,15 +11062,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="4529" >
<father id="4538" num="2" />
-<cdparam x="441" y="182" />
+<cdparam x="477" y="182" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="128" />
-<infoparam name="Primitive port" value="Event toQueue1" />
+<infoparam name="Primitive port" value="Channel classifPacket1" />
<TGConnectingPoint num="0" id="4528" />
<extraparam>
-<Prop commName="toQueue1" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="classifPacket1" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11086,21 +11096,47 @@
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1202" id="4577" >
+<SUBCOMPONENT type="1201" id="4557" >
<father id="4605" num="0" />
+<cdparam x="386" y="576" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="566" minY="-13" maxY="564" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="4539" />
+<TGConnectingPoint num="1" id="4540" />
+<TGConnectingPoint num="2" id="4541" />
+<TGConnectingPoint num="3" id="4542" />
+<TGConnectingPoint num="4" id="4543" />
+<TGConnectingPoint num="5" id="4544" />
+<TGConnectingPoint num="6" id="4545" />
+<TGConnectingPoint num="7" id="4546" />
+<TGConnectingPoint num="8" id="4547" />
+<TGConnectingPoint num="9" id="4548" />
+<TGConnectingPoint num="10" id="4549" />
+<TGConnectingPoint num="11" id="4550" />
+<TGConnectingPoint num="12" id="4551" />
+<TGConnectingPoint num="13" id="4552" />
+<TGConnectingPoint num="14" id="4553" />
+<TGConnectingPoint num="15" id="4554" />
+<TGConnectingPoint num="16" id="4555" />
+<TGConnectingPoint num="17" id="4556" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="4596" >
+<father id="4605" num="1" />
<cdparam x="315" y="404" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="379" minY="0" maxY="427" />
<infoparam name="Primitive component" value="Classifier" />
-<TGConnectingPoint num="0" id="4569" />
-<TGConnectingPoint num="1" id="4570" />
-<TGConnectingPoint num="2" id="4571" />
-<TGConnectingPoint num="3" id="4572" />
-<TGConnectingPoint num="4" id="4573" />
-<TGConnectingPoint num="5" id="4574" />
-<TGConnectingPoint num="6" id="4575" />
-<TGConnectingPoint num="7" id="4576" />
+<TGConnectingPoint num="0" id="4588" />
+<TGConnectingPoint num="1" id="4589" />
+<TGConnectingPoint num="2" id="4590" />
+<TGConnectingPoint num="3" id="4591" />
+<TGConnectingPoint num="4" id="4592" />
+<TGConnectingPoint num="5" id="4593" />
+<TGConnectingPoint num="6" id="4594" />
+<TGConnectingPoint num="7" id="4595" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="queueType" value="" type="0" typeOther="" />
@@ -11109,16 +11145,16 @@
<Attribute access="2" id="f0" value="true" type="4" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4540" >
-<father id="4577" num="0" />
-<cdparam x="477" y="541" />
+<SUBCOMPONENT type="1203" id="4559" >
+<father id="4596" num="0" />
+<cdparam x="357" y="391" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel toSchedPacket" />
-<TGConnectingPoint num="0" id="4539" />
+<infoparam name="Primitive port" value="Channel classif2" />
+<TGConnectingPoint num="0" id="4558" />
<extraparam>
-<Prop commName="toSchedPacket" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classif2" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11126,16 +11162,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4542" >
-<father id="4577" num="1" />
-<cdparam x="502" y="510" />
+<SUBCOMPONENT type="1203" id="4561" >
+<father id="4596" num="1" />
+<cdparam x="302" y="402" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newQueueLow" />
-<TGConnectingPoint num="0" id="4541" />
+<infoparam name="Primitive port" value="Channel classif1" />
+<TGConnectingPoint num="0" id="4560" />
<extraparam>
-<Prop commName="newQueueLow" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classif1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11143,16 +11179,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4544" >
-<father id="4577" num="2" />
-<cdparam x="502" y="472" />
+<SUBCOMPONENT type="1203" id="4563" >
+<father id="4596" num="2" />
+<cdparam x="344" y="541" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newQueueMedium" />
-<TGConnectingPoint num="0" id="4543" />
+<infoparam name="Primitive port" value="Event newPacket" />
+<TGConnectingPoint num="0" id="4562" />
<extraparam>
-<Prop commName="newQueueMedium" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newPacket" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11160,16 +11196,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4546" >
-<father id="4577" num="3" />
-<cdparam x="502" y="429" />
+<SUBCOMPONENT type="1203" id="4565" >
+<father id="4596" num="3" />
+<cdparam x="502" y="391" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newQueueHigh" />
-<TGConnectingPoint num="0" id="4545" />
+<infoparam name="Primitive port" value="Channel classifPacket2" />
+<TGConnectingPoint num="0" id="4564" />
<extraparam>
-<Prop commName="newQueueHigh" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="31" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classifPacket2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11177,16 +11213,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4548" >
-<father id="4577" num="4" />
-<cdparam x="302" y="525" />
+<SUBCOMPONENT type="1203" id="4567" >
+<father id="4596" num="4" />
+<cdparam x="416" y="391" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classifPacket" />
-<TGConnectingPoint num="0" id="4547" />
+<infoparam name="Primitive port" value="Channel classifPacket1" />
+<TGConnectingPoint num="0" id="4566" />
<extraparam>
-<Prop commName="classifPacket" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classifPacket1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11194,16 +11230,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4550" >
-<father id="4577" num="5" />
-<cdparam x="302" y="476" />
+<SUBCOMPONENT type="1203" id="4569" >
+<father id="4596" num="5" />
+<cdparam x="387" y="391" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event toQueue" />
-<TGConnectingPoint num="0" id="4549" />
+<infoparam name="Primitive port" value="Event toQueue1" />
+<TGConnectingPoint num="0" id="4568" />
<extraparam>
-<Prop commName="toQueue" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toQueue1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11211,31 +11247,31 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4552" >
-<father id="4577" num="6" />
-<cdparam x="326" y="391" />
+<SUBCOMPONENT type="1203" id="4571" >
+<father id="4596" num="6" />
+<cdparam x="467" y="391" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classif" />
-<TGConnectingPoint num="0" id="4551" />
+<infoparam name="Primitive port" value="Event toQueue2" />
+<TGConnectingPoint num="0" id="4570" />
<extraparam>
-<Prop commName="classif" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="toQueue2" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4554" >
-<father id="4577" num="7" />
+<SUBCOMPONENT type="1203" id="4573" >
+<father id="4596" num="7" />
<cdparam x="394" y="541" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel packet" />
-<TGConnectingPoint num="0" id="4553" />
+<TGConnectingPoint num="0" id="4572" />
<extraparam>
<Prop commName="packet" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -11245,33 +11281,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4556" >
-<father id="4577" num="8" />
-<cdparam x="467" y="391" />
+<SUBCOMPONENT type="1203" id="4575" >
+<father id="4596" num="8" />
+<cdparam x="326" y="391" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event toQueue2" />
-<TGConnectingPoint num="0" id="4555" />
+<infoparam name="Primitive port" value="Channel classif" />
+<TGConnectingPoint num="0" id="4574" />
<extraparam>
-<Prop commName="toQueue2" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="classif" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4558" >
-<father id="4577" num="9" />
-<cdparam x="387" y="391" />
+<SUBCOMPONENT type="1203" id="4577" >
+<father id="4596" num="9" />
+<cdparam x="302" y="476" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event toQueue1" />
-<TGConnectingPoint num="0" id="4557" />
+<infoparam name="Primitive port" value="Event toQueue" />
+<TGConnectingPoint num="0" id="4576" />
<extraparam>
-<Prop commName="toQueue1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toQueue" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11279,16 +11315,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4560" >
-<father id="4577" num="10" />
-<cdparam x="416" y="391" />
+<SUBCOMPONENT type="1203" id="4579" >
+<father id="4596" num="10" />
+<cdparam x="302" y="525" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classifPacket1" />
-<TGConnectingPoint num="0" id="4559" />
+<infoparam name="Primitive port" value="Channel classifPacket" />
+<TGConnectingPoint num="0" id="4578" />
<extraparam>
-<Prop commName="classifPacket1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="classifPacket" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11296,16 +11332,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4562" >
-<father id="4577" num="11" />
-<cdparam x="502" y="391" />
+<SUBCOMPONENT type="1203" id="4581" >
+<father id="4596" num="11" />
+<cdparam x="502" y="429" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classifPacket2" />
-<TGConnectingPoint num="0" id="4561" />
+<infoparam name="Primitive port" value="Event newQueueHigh" />
+<TGConnectingPoint num="0" id="4580" />
<extraparam>
-<Prop commName="classifPacket2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newQueueHigh" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="31" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11313,16 +11349,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4564" >
-<father id="4577" num="12" />
-<cdparam x="344" y="541" />
+<SUBCOMPONENT type="1203" id="4583" >
+<father id="4596" num="12" />
+<cdparam x="502" y="472" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event newPacket" />
-<TGConnectingPoint num="0" id="4563" />
+<infoparam name="Primitive port" value="Event newQueueMedium" />
+<TGConnectingPoint num="0" id="4582" />
<extraparam>
-<Prop commName="newPacket" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newQueueMedium" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11330,16 +11366,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4566" >
-<father id="4577" num="13" />
-<cdparam x="302" y="402" />
+<SUBCOMPONENT type="1203" id="4585" >
+<father id="4596" num="13" />
+<cdparam x="502" y="510" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classif1" />
-<TGConnectingPoint num="0" id="4565" />
+<infoparam name="Primitive port" value="Event newQueueLow" />
+<TGConnectingPoint num="0" id="4584" />
<extraparam>
-<Prop commName="classif1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="newQueueLow" commType="1" origin="true" finite="true" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11347,16 +11383,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="4568" >
-<father id="4577" num="14" />
-<cdparam x="357" y="391" />
+<SUBCOMPONENT type="1203" id="4587" >
+<father id="4596" num="14" />
+<cdparam x="477" y="541" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel classif2" />
-<TGConnectingPoint num="0" id="4567" />
+<infoparam name="Primitive port" value="Channel toSchedPacket" />
+<TGConnectingPoint num="0" id="4586" />
<extraparam>
-<Prop commName="classif2" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="toSchedPacket" commType="0" origin="true" finite="false" blocking="true" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -11364,32 +11400,6 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="4596" >
-<father id="4605" num="1" />
-<cdparam x="386" y="576" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="566" minY="-13" maxY="564" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="4578" />
-<TGConnectingPoint num="1" id="4579" />
-<TGConnectingPoint num="2" id="4580" />
-<TGConnectingPoint num="3" id="4581" />
-<TGConnectingPoint num="4" id="4582" />
-<TGConnectingPoint num="5" id="4583" />
-<TGConnectingPoint num="6" id="4584" />
-<TGConnectingPoint num="7" id="4585" />
-<TGConnectingPoint num="8" id="4586" />
-<TGConnectingPoint num="9" id="4587" />
-<TGConnectingPoint num="10" id="4588" />
-<TGConnectingPoint num="11" id="4589" />
-<TGConnectingPoint num="12" id="4590" />
-<TGConnectingPoint num="13" id="4591" />
-<TGConnectingPoint num="14" id="4592" />
-<TGConnectingPoint num="15" id="4593" />
-<TGConnectingPoint num="16" id="4594" />
-<TGConnectingPoint num="17" id="4595" />
-</SUBCOMPONENT>
</TMLComponentTaskDiagramPanel>
@@ -11434,7 +11444,7 @@
<TGConnectingPoint num="0" id="4612" />
<TGConnectingPoint num="1" id="4613" />
<extraparam>
-<Data channelName="classifPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -11474,7 +11484,7 @@
<TGConnectingPoint num="0" id="4621" />
<TGConnectingPoint num="1" id="4622" />
<extraparam>
-<Data channelName="classif" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classif" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -11593,7 +11603,7 @@
<TGConnectingPoint num="0" id="4642" />
<TGConnectingPoint num="1" id="4643" />
<extraparam>
-<Data channelName="address" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="address" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -11620,7 +11630,7 @@
<TGConnectingPoint num="1" id="4649" />
<latencyCheck />
<extraparam>
-<Data channelName="schedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="schedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -11791,7 +11801,7 @@
<TGConnectingPoint num="1" id="4681" />
<latencyCheck />
<extraparam>
-<Data channelName="packet" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="packet" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -11804,7 +11814,7 @@
<TGConnectingPoint num="0" id="4683" />
<TGConnectingPoint num="1" id="4684" />
<extraparam>
-<Data channelName="packet" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="packet" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -11880,7 +11890,7 @@
<TGConnectingPoint num="0" id="4708" />
<TGConnectingPoint num="1" id="4709" />
<extraparam>
-<Data channelName="bootstrapaddress" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="bootstrapaddress" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -11894,7 +11904,7 @@
<TGConnectingPoint num="1" id="4712" />
<latencyCheck />
<extraparam>
-<Data channelName="address" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="address" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -12054,7 +12064,7 @@
<TGConnectingPoint num="0" id="4735" />
<TGConnectingPoint num="1" id="4736" />
<extraparam>
-<Data channelName="bootstrapaddress" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="bootstrapaddress" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -12164,7 +12174,7 @@
<TGConnectingPoint num="0" id="4755" />
<TGConnectingPoint num="1" id="4756" />
<extraparam>
-<Data channelName="classifPacket2" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -12204,7 +12214,7 @@
<TGConnectingPoint num="0" id="4764" />
<TGConnectingPoint num="1" id="4765" />
<extraparam>
-<Data channelName="classif2" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classif2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -12236,610 +12246,327 @@
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="4773" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="4770" />
-<P2 x="408" y="71" id="4767" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4774" >
-<cdparam x="452" y="116" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="448" y="90" id="4768" />
-<P2 x="502" y="103" id="4750" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4775" >
-<cdparam x="502" y="195" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="502" y="195" id="4765" />
-<P2 x="512" y="233" id="4761" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4776" >
-<cdparam x="512" y="263" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="512" y="263" id="4762" />
-<P2 x="517" y="294" id="4758" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4777" >
-<cdparam x="517" y="324" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="517" y="324" id="4759" />
-<P2 x="530" y="338" id="4755" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4778" >
-<cdparam x="530" y="368" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="530" y="368" id="4756" />
-<P2 x="519" y="396" id="4753" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="Classif1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1015" id="4782" >
-<cdparam x="494" y="119" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="execIInterval" value="null" />
-<TGConnectingPoint num="0" id="4780" />
-<TGConnectingPoint num="1" id="4781" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4779" >
-<father id="4782" num="0" />
-<cdparam x="509" y="139" />
-<sizeparam width="47" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the time interval" value="[20, 100]" />
-<extraparam>
-<Interval minDelay="20" maxDelay="100" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1001" id="4784" >
-<cdparam x="509" y="401" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4783" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="4787" >
-<cdparam x="478" y="343" />
-<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="write channel" value="classifPacket1(1)" />
-<TGConnectingPoint num="0" id="4785" />
-<TGConnectingPoint num="1" id="4786" />
-<extraparam>
-<Data channelName="classifPacket1" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4790" >
-<cdparam x="453" y="299" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="send event" value="toQueue1(queueType)" />
-<TGConnectingPoint num="0" id="4788" />
-<TGConnectingPoint num="1" id="4789" />
-<extraparam>
-<Data eventName="toQueue1" nbOfParams="5" />
-<Param index="0" value="queueType" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1024" id="4793" >
-<cdparam x="429" y="238" />
-<sizeparam width="166" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="4791" />
-<TGConnectingPoint num="1" id="4792" />
-<extraparam>
-<Data variable="queueType" minValue="0" maxValue="2" functionId="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="4796" >
-<cdparam x="467" y="170" />
-<sizeparam width="70" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="read channel" value="classif1(1) " />
-<TGConnectingPoint num="0" id="4794" />
-<TGConnectingPoint num="1" id="4795" />
-<extraparam>
-<Data channelName="classif1" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1030" id="4799" >
-<cdparam x="366" y="102" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="4797" />
-<TGConnectingPoint num="1" id="4798" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="4801" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4800" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="4803" >
-<cdparam x="499" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="499" y="154" id="4781" />
-<P2 x="502" y="165" id="4794" />
-<Point x="504" y="158" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4802" >
-<father id="4803" num="0" />
-<cdparam x="504" y="158" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="115" id="4804" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="4800" />
-<P2 x="406" y="97" id="4797" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4805" >
-<cdparam x="452" y="116" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="446" y="116" id="4798" />
-<P2 x="499" y="114" id="4780" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4806" >
-<cdparam x="502" y="195" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="502" y="195" id="4795" />
-<P2 x="512" y="233" id="4791" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4807" >
-<cdparam x="512" y="263" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="512" y="263" id="4792" />
-<P2 x="517" y="294" id="4788" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4808" >
-<cdparam x="517" y="324" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="517" y="324" id="4789" />
-<P2 x="530" y="338" id="4785" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="4809" >
-<cdparam x="530" y="368" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="530" y="368" id="4786" />
-<P2 x="519" y="396" id="4783" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="Sched0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1013" id="4813" >
-<cdparam x="523" y="192" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4811" />
-<TGConnectingPoint num="1" id="4812" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="4810" >
-<father id="4813" num="0" />
-<cdparam x="538" y="212" />
-<sizeparam width="14" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="50" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1001" id="4815" >
-<cdparam x="512" y="360" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4814" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="4818" >
-<cdparam x="475" y="295" />
-<sizeparam width="101" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="write channel" value="schedPacket0(1)" />
-<TGConnectingPoint num="0" id="4816" />
-<TGConnectingPoint num="1" id="4817" />
-<extraparam>
-<Data channelName="schedPacket0" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="4821" >
-<cdparam x="468" y="254" />
-<sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="send event" value="newSchedPacket0()" />
-<TGConnectingPoint num="0" id="4819" />
-<TGConnectingPoint num="1" id="4820" />
-<extraparam>
-<Data eventName="newSchedPacket0" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="4824" >
-<cdparam x="462" y="158" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="read channel" value="toSched0(1) " />
-<TGConnectingPoint num="0" id="4822" />
-<TGConnectingPoint num="1" id="4823" />
-<extraparam>
-<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1030" id="4827" >
-<cdparam x="368" y="110" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="4825" />
-<TGConnectingPoint num="1" id="4826" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="4829" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4828" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="4831" >
-<cdparam x="528" y="227" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="528" y="227" id="4812" />
-<P2 x="526" y="249" id="4819" />
-<Point x="529" y="226" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4830" >
-<father id="4831" num="0" />
-<cdparam x="529" y="226" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<CONNECTOR type="115" id="4832" >
-<cdparam x="501" y="183" />
+<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="501" y="183" id="4823" />
-<P2 x="528" y="187" id="4811" />
+<P1 x="407" y="70" id="4770" />
+<P2 x="408" y="71" id="4767" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4833" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="115" id="4774" >
+<cdparam x="452" y="116" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="4828" />
-<P2 x="408" y="105" id="4825" />
+<P1 x="448" y="90" id="4768" />
+<P2 x="502" y="103" id="4750" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4834" >
-<cdparam x="454" y="124" />
+<CONNECTOR type="115" id="4775" >
+<cdparam x="502" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="448" y="124" id="4826" />
-<P2 x="501" y="153" id="4822" />
+<P1 x="502" y="195" id="4765" />
+<P2 x="512" y="233" id="4761" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4835" >
-<cdparam x="521" y="255" />
+<CONNECTOR type="115" id="4776" >
+<cdparam x="512" y="263" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="526" y="279" id="4820" />
-<P2 x="525" y="290" id="4816" />
+<P1 x="512" y="263" id="4762" />
+<P2 x="517" y="294" id="4758" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4836" >
-<cdparam x="525" y="320" />
+<CONNECTOR type="115" id="4777" >
+<cdparam x="517" y="324" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="517" y="324" id="4759" />
+<P2 x="530" y="338" id="4755" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4778" >
+<cdparam x="530" y="368" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="525" y="320" id="4817" />
-<P2 x="522" y="355" id="4814" />
+<P1 x="530" y="368" id="4756" />
+<P2 x="519" y="396" id="4753" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="Sched1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1013" id="4840" >
-<cdparam x="677" y="307" />
+<TMLActivityDiagramPanel name="Classif1" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1015" id="4782" >
+<cdparam x="494" y="119" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="4838" />
-<TGConnectingPoint num="1" id="4839" />
+<infoparam name="execIInterval" value="null" />
+<TGConnectingPoint num="0" id="4780" />
+<TGConnectingPoint num="1" id="4781" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="4837" >
-<father id="4840" num="0" />
-<cdparam x="692" y="327" />
-<sizeparam width="14" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="4779" >
+<father id="4782" num="0" />
+<cdparam x="509" y="139" />
+<sizeparam width="47" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="50" />
+<infoparam name="value of the time interval" value="[20, 100]" />
+<extraparam>
+<Interval minDelay="20" maxDelay="100" />
+</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1001" id="4842" >
-<cdparam x="670" y="479" />
+<COMPONENT type="1001" id="4784" >
+<cdparam x="509" y="401" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4841" />
+<TGConnectingPoint num="0" id="4783" />
</COMPONENT>
-<COMPONENT type="1006" id="4845" >
-<cdparam x="633" y="414" />
-<sizeparam width="101" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="4787" >
+<cdparam x="478" y="343" />
+<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="write channel" value="schedPacket1(1)" />
-<TGConnectingPoint num="0" id="4843" />
-<TGConnectingPoint num="1" id="4844" />
+<infoparam name="write channel" value="classifPacket1(1)" />
+<TGConnectingPoint num="0" id="4785" />
+<TGConnectingPoint num="1" id="4786" />
<extraparam>
-<Data channelName="schedPacket1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="4848" >
-<cdparam x="624" y="363" />
-<sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="4790" >
+<cdparam x="453" y="299" />
+<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="send event" value="newSchedPacket1()" />
-<TGConnectingPoint num="0" id="4846" />
-<TGConnectingPoint num="1" id="4847" />
+<infoparam name="send event" value="toQueue1(queueType)" />
+<TGConnectingPoint num="0" id="4788" />
+<TGConnectingPoint num="1" id="4789" />
<extraparam>
-<Data eventName="newSchedPacket1" nbOfParams="5" />
+<Data eventName="toQueue1" nbOfParams="5" />
+<Param index="0" value="queueType" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="4851" >
-<cdparam x="620" y="277" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1024" id="4793" >
+<cdparam x="429" y="238" />
+<sizeparam width="166" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="read channel" value="toSched1(1) " />
-<TGConnectingPoint num="0" id="4849" />
-<TGConnectingPoint num="1" id="4850" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="4791" />
+<TGConnectingPoint num="1" id="4792" />
<extraparam>
-<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data variable="queueType" minValue="0" maxValue="2" functionId="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1030" id="4854" >
-<cdparam x="526" y="229" />
+<COMPONENT type="1009" id="4796" >
+<cdparam x="467" y="170" />
+<sizeparam width="70" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="classif1(1) " />
+<TGConnectingPoint num="0" id="4794" />
+<TGConnectingPoint num="1" id="4795" />
+<extraparam>
+<Data channelName="classif1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1030" id="4799" >
+<cdparam x="366" y="102" />
<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="4852" />
-<TGConnectingPoint num="1" id="4853" />
+<TGConnectingPoint num="0" id="4797" />
+<TGConnectingPoint num="1" id="4798" />
</COMPONENT>
-<COMPONENT type="1000" id="4856" >
-<cdparam x="558" y="169" />
+<COMPONENT type="1000" id="4801" >
+<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4855" />
+<TGConnectingPoint num="0" id="4800" />
</COMPONENT>
-<CONNECTOR type="115" id="4857" >
-<cdparam x="682" y="342" />
+<CONNECTOR type="115" id="4803" >
+<cdparam x="499" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="499" y="154" id="4781" />
+<P2 x="502" y="165" id="4794" />
+<Point x="504" y="158" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4802" >
+<father id="4803" num="0" />
+<cdparam x="504" y="158" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="115" id="4804" >
+<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="682" y="342" id="4839" />
-<P2 x="682" y="358" id="4846" />
+<P1 x="407" y="70" id="4800" />
+<P2 x="406" y="97" id="4797" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4858" >
-<cdparam x="565" y="189" />
+<CONNECTOR type="115" id="4805" >
+<cdparam x="452" y="116" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="565" y="189" id="4855" />
-<P2 x="566" y="224" id="4852" />
+<P1 x="446" y="116" id="4798" />
+<P2 x="499" y="114" id="4780" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4859" >
-<cdparam x="612" y="243" />
+<CONNECTOR type="115" id="4806" >
+<cdparam x="502" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="606" y="243" id="4853" />
-<P2 x="659" y="272" id="4849" />
+<P1 x="502" y="195" id="4795" />
+<P2 x="512" y="233" id="4791" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4860" >
-<cdparam x="679" y="374" />
+<CONNECTOR type="115" id="4807" >
+<cdparam x="512" y="263" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="682" y="388" id="4847" />
-<P2 x="683" y="409" id="4843" />
+<P1 x="512" y="263" id="4792" />
+<P2 x="517" y="294" id="4788" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4861" >
-<cdparam x="683" y="439" />
+<CONNECTOR type="115" id="4808" >
+<cdparam x="517" y="324" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="683" y="439" id="4844" />
-<P2 x="680" y="474" id="4841" />
+<P1 x="517" y="324" id="4789" />
+<P2 x="530" y="338" id="4785" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4862" >
-<cdparam x="659" y="302" />
+<CONNECTOR type="115" id="4809" >
+<cdparam x="530" y="368" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="659" y="302" id="4850" />
-<P2 x="682" y="302" id="4838" />
+<P1 x="530" y="368" id="4786" />
+<P2 x="519" y="396" id="4783" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="Scheduling" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1006" id="4865" >
+<COMPONENT type="1006" id="4812" >
<cdparam x="1020" y="413" />
<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="schedPacket(1)" />
-<TGConnectingPoint num="0" id="4863" />
-<TGConnectingPoint num="1" id="4864" />
+<TGConnectingPoint num="0" id="4810" />
+<TGConnectingPoint num="1" id="4811" />
<extraparam>
-<Data channelName="schedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="schedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="4868" >
+<COMPONENT type="1006" id="4815" >
<cdparam x="829" y="417" />
<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="schedPacket(1)" />
-<TGConnectingPoint num="0" id="4866" />
-<TGConnectingPoint num="1" id="4867" />
+<TGConnectingPoint num="0" id="4813" />
+<TGConnectingPoint num="1" id="4814" />
<extraparam>
-<Data channelName="schedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="schedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="4870" >
+<COMPONENT type="1001" id="4817" >
<cdparam x="1056" y="475" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4869" />
+<TGConnectingPoint num="0" id="4816" />
</COMPONENT>
-<COMPONENT type="1001" id="4872" >
+<COMPONENT type="1001" id="4819" >
<cdparam x="866" y="477" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4871" />
+<TGConnectingPoint num="0" id="4818" />
</COMPONENT>
-<COMPONENT type="1009" id="4875" >
+<COMPONENT type="1009" id="4822" >
<cdparam x="1010" y="346" />
<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="schedPacket1(1) " />
-<TGConnectingPoint num="0" id="4873" />
-<TGConnectingPoint num="1" id="4874" />
+<TGConnectingPoint num="0" id="4820" />
+<TGConnectingPoint num="1" id="4821" />
<extraparam>
-<Data channelName="schedPacket1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="schedPacket1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="4878" >
+<COMPONENT type="1009" id="4825" >
<cdparam x="825" y="348" />
<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="schedPacket0(1) " />
-<TGConnectingPoint num="0" id="4876" />
-<TGConnectingPoint num="1" id="4877" />
+<TGConnectingPoint num="0" id="4823" />
+<TGConnectingPoint num="1" id="4824" />
<extraparam>
-<Data channelName="schedPacket0" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="schedPacket0" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="4886" >
+<COMPONENT type="1012" id="4833" >
<cdparam x="640" y="457" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4882" />
-<TGConnectingPoint num="1" id="4883" />
-<TGConnectingPoint num="2" id="4884" />
-<TGConnectingPoint num="3" id="4885" />
+<TGConnectingPoint num="0" id="4829" />
+<TGConnectingPoint num="1" id="4830" />
+<TGConnectingPoint num="2" id="4831" />
+<TGConnectingPoint num="3" id="4832" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="4879" >
-<father id="4886" num="0" />
+<SUBCOMPONENT type="-1" id="4826" >
+<father id="4833" num="0" />
<cdparam x="615" y="467" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4880" >
-<father id="4886" num="1" />
+<SUBCOMPONENT type="-1" id="4827" >
+<father id="4833" num="1" />
<cdparam x="675" y="467" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4881" >
-<father id="4886" num="2" />
+<SUBCOMPONENT type="-1" id="4828" >
+<father id="4833" num="2" />
<cdparam x="660" y="502" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -12847,35 +12574,35 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="4894" >
+<COMPONENT type="1012" id="4841" >
<cdparam x="360" y="512" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4890" />
-<TGConnectingPoint num="1" id="4891" />
-<TGConnectingPoint num="2" id="4892" />
-<TGConnectingPoint num="3" id="4893" />
+<TGConnectingPoint num="0" id="4837" />
+<TGConnectingPoint num="1" id="4838" />
+<TGConnectingPoint num="2" id="4839" />
+<TGConnectingPoint num="3" id="4840" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="4887" >
-<father id="4894" num="0" />
+<SUBCOMPONENT type="-1" id="4834" >
+<father id="4841" num="0" />
<cdparam x="335" y="522" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4888" >
-<father id="4894" num="1" />
+<SUBCOMPONENT type="-1" id="4835" >
+<father id="4841" num="1" />
<cdparam x="395" y="522" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4889" >
-<father id="4894" num="2" />
+<SUBCOMPONENT type="-1" id="4836" >
+<father id="4841" num="2" />
<cdparam x="380" y="557" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -12883,79 +12610,79 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1001" id="4896" >
+<COMPONENT type="1001" id="4843" >
<cdparam x="212" y="617" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4895" />
+<TGConnectingPoint num="0" id="4842" />
</COMPONENT>
-<COMPONENT type="1001" id="4898" >
+<COMPONENT type="1001" id="4845" >
<cdparam x="63" y="605" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4897" />
+<TGConnectingPoint num="0" id="4844" />
</COMPONENT>
-<COMPONENT type="1006" id="4901" >
+<COMPONENT type="1006" id="4848" >
<cdparam x="180" y="538" />
<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="toSched1(1)" />
-<TGConnectingPoint num="0" id="4899" />
-<TGConnectingPoint num="1" id="4900" />
+<TGConnectingPoint num="0" id="4846" />
+<TGConnectingPoint num="1" id="4847" />
<extraparam>
-<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="4904" >
+<COMPONENT type="1006" id="4851" >
<cdparam x="37" y="543" />
<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="toSched0(1)" />
-<TGConnectingPoint num="0" id="4902" />
-<TGConnectingPoint num="1" id="4903" />
+<TGConnectingPoint num="0" id="4849" />
+<TGConnectingPoint num="1" id="4850" />
<extraparam>
-<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="4912" >
+<COMPONENT type="1012" id="4859" >
<cdparam x="143" y="486" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4908" />
-<TGConnectingPoint num="1" id="4909" />
-<TGConnectingPoint num="2" id="4910" />
-<TGConnectingPoint num="3" id="4911" />
+<TGConnectingPoint num="0" id="4855" />
+<TGConnectingPoint num="1" id="4856" />
+<TGConnectingPoint num="2" id="4857" />
+<TGConnectingPoint num="3" id="4858" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="4905" >
-<father id="4912" num="0" />
+<SUBCOMPONENT type="-1" id="4852" >
+<father id="4859" num="0" />
<cdparam x="118" y="496" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4906" >
-<father id="4912" num="1" />
+<SUBCOMPONENT type="-1" id="4853" >
+<father id="4859" num="1" />
<cdparam x="178" y="496" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4907" >
-<father id="4912" num="2" />
+<SUBCOMPONENT type="-1" id="4854" >
+<father id="4859" num="2" />
<cdparam x="163" y="531" />
<sizeparam width="9" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -12963,56 +12690,56 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="4915" >
+<COMPONENT type="1009" id="4862" >
<cdparam x="600" y="384" />
<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="toSchedPacket(1) " />
-<TGConnectingPoint num="0" id="4913" />
-<TGConnectingPoint num="1" id="4914" />
+<TGConnectingPoint num="0" id="4860" />
+<TGConnectingPoint num="1" id="4861" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="4918" >
+<COMPONENT type="1009" id="4865" >
<cdparam x="320" y="450" />
<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="toSchedPacket(1) " />
-<TGConnectingPoint num="0" id="4916" />
-<TGConnectingPoint num="1" id="4917" />
+<TGConnectingPoint num="0" id="4863" />
+<TGConnectingPoint num="1" id="4864" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="4921" >
+<COMPONENT type="1009" id="4868" >
<cdparam x="105" y="400" />
<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="toSchedPacket(1) " />
-<TGConnectingPoint num="0" id="4919" />
-<TGConnectingPoint num="1" id="4920" />
+<TGConnectingPoint num="0" id="4866" />
+<TGConnectingPoint num="1" id="4867" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1015" id="4925" >
+<COMPONENT type="1015" id="4872" >
<cdparam x="646" y="320" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="execIInterval" value="null" />
-<TGConnectingPoint num="0" id="4923" />
-<TGConnectingPoint num="1" id="4924" />
+<TGConnectingPoint num="0" id="4870" />
+<TGConnectingPoint num="1" id="4871" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="4922" >
-<father id="4925" num="0" />
+<SUBCOMPONENT type="-1" id="4869" >
+<father id="4872" num="0" />
<cdparam x="661" y="340" />
<sizeparam width="54" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -13023,17 +12750,17 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1015" id="4929" >
+<COMPONENT type="1015" id="4876" >
<cdparam x="368" y="382" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="execIInterval" value="null" />
-<TGConnectingPoint num="0" id="4927" />
-<TGConnectingPoint num="1" id="4928" />
+<TGConnectingPoint num="0" id="4874" />
+<TGConnectingPoint num="1" id="4875" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="4926" >
-<father id="4929" num="0" />
+<SUBCOMPONENT type="-1" id="4873" >
+<father id="4876" num="0" />
<cdparam x="383" y="402" />
<sizeparam width="47" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -13044,17 +12771,17 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1015" id="4933" >
+<COMPONENT type="1015" id="4880" >
<cdparam x="158" y="316" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="execIInterval" value="null" />
-<TGConnectingPoint num="0" id="4931" />
-<TGConnectingPoint num="1" id="4932" />
+<TGConnectingPoint num="0" id="4878" />
+<TGConnectingPoint num="1" id="4879" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="4930" >
-<father id="4933" num="0" />
+<SUBCOMPONENT type="-1" id="4877" >
+<father id="4880" num="0" />
<cdparam x="173" y="336" />
<sizeparam width="40" height="17" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -13065,466 +12792,749 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1010" id="4936" >
+<COMPONENT type="1010" id="4883" >
<cdparam x="600" y="249" />
<sizeparam width="99" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="newQueueLow() " />
-<TGConnectingPoint num="0" id="4934" />
-<TGConnectingPoint num="1" id="4935" />
+<TGConnectingPoint num="0" id="4881" />
+<TGConnectingPoint num="1" id="4882" />
<extraparam>
<Data eventName="newQueueLow" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="4939" >
+<COMPONENT type="1010" id="4886" >
<cdparam x="313" y="323" />
<sizeparam width="121" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="newQueueMedium() " />
-<TGConnectingPoint num="0" id="4937" />
-<TGConnectingPoint num="1" id="4938" />
+<TGConnectingPoint num="0" id="4884" />
+<TGConnectingPoint num="1" id="4885" />
<extraparam>
<Data eventName="newQueueMedium" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="4942" >
+<COMPONENT type="1010" id="4889" >
<cdparam x="1001" y="286" />
<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="newSchedPacket1() " />
-<TGConnectingPoint num="0" id="4940" />
-<TGConnectingPoint num="1" id="4941" />
+<TGConnectingPoint num="0" id="4887" />
+<TGConnectingPoint num="1" id="4888" />
<extraparam>
<Data eventName="newSchedPacket1" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="4945" >
+<COMPONENT type="1010" id="4892" >
<cdparam x="820" y="290" />
<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="newSchedPacket0() " />
-<TGConnectingPoint num="0" id="4943" />
-<TGConnectingPoint num="1" id="4944" />
+<TGConnectingPoint num="0" id="4890" />
+<TGConnectingPoint num="1" id="4891" />
<extraparam>
<Data eventName="newSchedPacket0" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="4948" >
+<COMPONENT type="1010" id="4895" >
<cdparam x="123" y="253" />
<sizeparam width="103" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="newQueueHigh() " />
-<TGConnectingPoint num="0" id="4946" />
-<TGConnectingPoint num="1" id="4947" />
+<TGConnectingPoint num="0" id="4893" />
+<TGConnectingPoint num="1" id="4894" />
<extraparam>
<Data eventName="newQueueHigh" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1018" id="4959" >
+<COMPONENT type="1018" id="4906" >
<cdparam x="481" y="174" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="4949" />
-<TGConnectingPoint num="1" id="4950" />
-<TGConnectingPoint num="2" id="4951" />
-<TGConnectingPoint num="3" id="4952" />
-<TGConnectingPoint num="4" id="4953" />
-<TGConnectingPoint num="5" id="4954" />
-<TGConnectingPoint num="6" id="4955" />
-<TGConnectingPoint num="7" id="4956" />
-<TGConnectingPoint num="8" id="4957" />
-<TGConnectingPoint num="9" id="4958" />
-</COMPONENT>
-
-<COMPONENT type="1030" id="4962" >
+<TGConnectingPoint num="0" id="4896" />
+<TGConnectingPoint num="1" id="4897" />
+<TGConnectingPoint num="2" id="4898" />
+<TGConnectingPoint num="3" id="4899" />
+<TGConnectingPoint num="4" id="4900" />
+<TGConnectingPoint num="5" id="4901" />
+<TGConnectingPoint num="6" id="4902" />
+<TGConnectingPoint num="7" id="4903" />
+<TGConnectingPoint num="8" id="4904" />
+<TGConnectingPoint num="9" id="4905" />
+</COMPONENT>
+
+<COMPONENT type="1030" id="4909" >
<cdparam x="368" y="98" />
<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="4960" />
-<TGConnectingPoint num="1" id="4961" />
+<TGConnectingPoint num="0" id="4907" />
+<TGConnectingPoint num="1" id="4908" />
</COMPONENT>
-<COMPONENT type="1000" id="4964" >
+<COMPONENT type="1000" id="4911" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4963" />
+<TGConnectingPoint num="0" id="4910" />
</COMPONENT>
-<COMPONENT type="1001" id="4966" >
+<COMPONENT type="1001" id="4913" >
<cdparam x="441" y="632" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4965" />
+<TGConnectingPoint num="0" id="4912" />
</COMPONENT>
-<COMPONENT type="1001" id="4968" >
+<COMPONENT type="1001" id="4915" >
<cdparam x="282" y="630" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4967" />
+<TGConnectingPoint num="0" id="4914" />
</COMPONENT>
-<COMPONENT type="1006" id="4971" >
+<COMPONENT type="1006" id="4918" >
<cdparam x="413" y="566" />
<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="toSched1(1)" />
-<TGConnectingPoint num="0" id="4969" />
-<TGConnectingPoint num="1" id="4970" />
+<TGConnectingPoint num="0" id="4916" />
+<TGConnectingPoint num="1" id="4917" />
<extraparam>
-<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="4974" >
+<COMPONENT type="1006" id="4921" >
<cdparam x="254" y="569" />
<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="toSched0(1)" />
-<TGConnectingPoint num="0" id="4972" />
-<TGConnectingPoint num="1" id="4973" />
+<TGConnectingPoint num="0" id="4919" />
+<TGConnectingPoint num="1" id="4920" />
<extraparam>
-<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="4976" >
+<COMPONENT type="1001" id="4923" >
<cdparam x="718" y="610" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4975" />
+<TGConnectingPoint num="0" id="4922" />
</COMPONENT>
-<COMPONENT type="1001" id="4978" >
+<COMPONENT type="1001" id="4925" >
<cdparam x="559" y="601" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4977" />
+<TGConnectingPoint num="0" id="4924" />
</COMPONENT>
-<COMPONENT type="1006" id="4981" >
+<COMPONENT type="1006" id="4928" >
<cdparam x="690" y="544" />
<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="toSched1(1)" />
-<TGConnectingPoint num="0" id="4979" />
-<TGConnectingPoint num="1" id="4980" />
+<TGConnectingPoint num="0" id="4926" />
+<TGConnectingPoint num="1" id="4927" />
<extraparam>
-<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="4984" >
+<COMPONENT type="1006" id="4931" >
<cdparam x="531" y="540" />
<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="toSched0(1)" />
-<TGConnectingPoint num="0" id="4982" />
-<TGConnectingPoint num="1" id="4983" />
+<TGConnectingPoint num="0" id="4929" />
+<TGConnectingPoint num="1" id="4930" />
<extraparam>
-<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="4985" >
+<CONNECTOR type="115" id="4932" >
<cdparam x="1075" y="445" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="1067" y="438" id="4864" />
-<P2 x="1066" y="470" id="4869" />
+<P1 x="1067" y="438" id="4811" />
+<P2 x="1066" y="470" id="4816" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4986" >
+<CONNECTOR type="115" id="4933" >
<cdparam x="950" y="447" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="876" y="442" id="4867" />
-<P2 x="876" y="472" id="4871" />
+<P1 x="876" y="442" id="4814" />
+<P2 x="876" y="472" id="4818" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4987" >
+<CONNECTOR type="115" id="4934" >
<cdparam x="474" y="426" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="654" y="409" id="4914" />
-<P2 x="655" y="447" id="4882" />
+<P1 x="654" y="409" id="4861" />
+<P2 x="655" y="447" id="4829" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4988" >
+<CONNECTOR type="115" id="4935" >
<cdparam x="314" y="464" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="374" y="475" id="4917" />
-<P2 x="375" y="502" id="4890" />
+<P1 x="374" y="475" id="4864" />
+<P2 x="375" y="502" id="4837" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4989" >
+<CONNECTOR type="115" id="4936" >
<cdparam x="858" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="536" y="189" id="4954" />
-<P2 x="1061" y="281" id="4940" />
+<P1 x="536" y="189" id="4901" />
+<P2 x="1061" y="281" id="4887" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4990" >
+<CONNECTOR type="115" id="4937" >
<cdparam x="858" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="536" y="189" id="4951" />
-<P2 x="880" y="285" id="4943" />
+<P1 x="536" y="189" id="4898" />
+<P2 x="880" y="285" id="4890" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4991" >
+<CONNECTOR type="115" id="4938" >
<cdparam x="456" y="189" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="456" y="189" id="4953" />
-<P2 x="174" y="248" id="4946" />
+<P1 x="456" y="189" id="4900" />
+<P2 x="174" y="248" id="4893" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4992" >
+<CONNECTOR type="115" id="4939" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="4963" />
-<P2 x="408" y="93" id="4960" />
+<P1 x="407" y="70" id="4910" />
+<P2 x="408" y="93" id="4907" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4993" >
+<CONNECTOR type="115" id="4940" >
<cdparam x="454" y="112" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="448" y="112" id="4961" />
-<P2 x="496" y="164" id="4949" />
+<P1 x="448" y="112" id="4908" />
+<P2 x="496" y="164" id="4896" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4994" >
+<CONNECTOR type="115" id="4941" >
<cdparam x="270" y="250" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="456" y="189" id="4950" />
-<P2 x="373" y="318" id="4937" />
+<P1 x="456" y="189" id="4897" />
+<P2 x="373" y="318" id="4884" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4995" >
+<CONNECTOR type="115" id="4942" >
<cdparam x="496" y="229" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="496" y="229" id="4952" />
-<P2 x="649" y="244" id="4934" />
+<P1 x="496" y="229" id="4899" />
+<P2 x="649" y="244" id="4881" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4996" >
+<CONNECTOR type="115" id="4943" >
<cdparam x="270" y="250" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="174" y="278" id="4947" />
-<P2 x="163" y="311" id="4931" />
+<P1 x="174" y="278" id="4894" />
+<P2 x="163" y="311" id="4878" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4944" >
+<cdparam x="381" y="356" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="373" y="348" id="4885" />
+<P2 x="373" y="377" id="4874" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4945" >
+<cdparam x="448" y="310" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="649" y="274" id="4882" />
+<P2 x="651" y="315" id="4870" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4946" >
+<cdparam x="192" y="300" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="163" y="351" id="4879" />
+<P2 x="159" y="395" id="4866" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4947" >
+<cdparam x="366" y="409" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="373" y="417" id="4875" />
+<P2 x="374" y="445" id="4863" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4948" >
+<cdparam x="456" y="376" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="651" y="355" id="4871" />
+<P2 x="654" y="379" id="4860" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4949" >
+<cdparam x="186" y="401" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="159" y="425" id="4867" />
+<P2 x="158" y="476" id="4855" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4950" >
+<cdparam x="118" y="501" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="118" y="501" id="4856" />
+<P2 x="75" y="538" id="4849" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4951" >
+<cdparam x="198" y="501" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="198" y="501" id="4857" />
+<P2 x="218" y="533" id="4846" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4952" >
+<cdparam x="75" y="568" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="75" y="568" id="4850" />
+<P2 x="73" y="600" id="4844" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4953" >
+<cdparam x="218" y="557" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="218" y="563" id="4847" />
+<P2 x="222" y="612" id="4842" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4954" >
+<cdparam x="335" y="527" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="335" y="527" id="4838" />
+<P2 x="292" y="564" id="4919" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="4955" >
+<cdparam x="415" y="527" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="415" y="527" id="4839" />
+<P2 x="451" y="561" id="4916" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4997" >
-<cdparam x="381" y="356" />
+<CONNECTOR type="115" id="4956" >
+<cdparam x="292" y="594" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="373" y="348" id="4938" />
-<P2 x="373" y="377" id="4927" />
+<P1 x="292" y="594" id="4920" />
+<P2 x="292" y="625" id="4914" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4998" >
-<cdparam x="448" y="310" />
+<CONNECTOR type="115" id="4957" >
+<cdparam x="481" y="581" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="649" y="274" id="4935" />
-<P2 x="651" y="315" id="4923" />
+<P1 x="451" y="591" id="4917" />
+<P2 x="451" y="627" id="4912" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="4999" >
-<cdparam x="192" y="300" />
+<CONNECTOR type="115" id="4958" >
+<cdparam x="566" y="500" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="163" y="351" id="4932" />
-<P2 x="159" y="395" id="4919" />
+<P1 x="615" y="472" id="4830" />
+<P2 x="569" y="535" id="4929" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5000" >
-<cdparam x="366" y="409" />
+<CONNECTOR type="115" id="4959" >
+<cdparam x="968" y="494" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="373" y="417" id="4928" />
-<P2 x="374" y="445" id="4916" />
+<P1 x="695" y="472" id="4831" />
+<P2 x="728" y="539" id="4926" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5001" >
-<cdparam x="456" y="376" />
+<CONNECTOR type="115" id="4960" >
+<cdparam x="569" y="565" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="651" y="355" id="4924" />
-<P2 x="654" y="379" id="4913" />
+<P1 x="569" y="565" id="4930" />
+<P2 x="569" y="596" id="4924" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5002" >
-<cdparam x="186" y="401" />
+<CONNECTOR type="115" id="4961" >
+<cdparam x="712" y="561" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="159" y="425" id="4920" />
-<P2 x="158" y="476" id="4908" />
+<P1 x="728" y="569" id="4927" />
+<P2 x="728" y="605" id="4922" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5003" >
-<cdparam x="118" y="501" />
+<CONNECTOR type="115" id="4962" >
+<cdparam x="919" y="321" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="118" y="501" id="4909" />
-<P2 x="75" y="538" id="4902" />
+<P1 x="880" y="315" id="4891" />
+<P2 x="877" y="343" id="4823" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5004" >
-<cdparam x="198" y="501" />
+<CONNECTOR type="115" id="4963" >
+<cdparam x="1061" y="311" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="198" y="501" id="4910" />
-<P2 x="218" y="533" id="4899" />
+<P1 x="1061" y="311" id="4888" />
+<P2 x="1062" y="341" id="4820" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5005" >
-<cdparam x="75" y="568" />
+<CONNECTOR type="115" id="4964" >
+<cdparam x="930" y="370" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="75" y="568" id="4903" />
-<P2 x="73" y="600" id="4897" />
+<P1 x="877" y="373" id="4824" />
+<P2 x="876" y="412" id="4813" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5006" >
-<cdparam x="218" y="557" />
+<CONNECTOR type="115" id="4965" >
+<cdparam x="1078" y="363" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="218" y="563" id="4900" />
-<P2 x="222" y="612" id="4895" />
+<P1 x="1062" y="371" id="4821" />
+<P2 x="1067" y="408" id="4810" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5007" >
-<cdparam x="335" y="527" />
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="Sched1" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1013" id="4969" >
+<cdparam x="677" y="307" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="4967" />
+<TGConnectingPoint num="1" id="4968" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="4966" >
+<father id="4969" num="0" />
+<cdparam x="692" y="327" />
+<sizeparam width="14" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="50" />
+</SUBCOMPONENT>
+
+<COMPONENT type="1001" id="4971" >
+<cdparam x="670" y="479" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="4970" />
+</COMPONENT>
+
+<COMPONENT type="1006" id="4974" >
+<cdparam x="633" y="414" />
+<sizeparam width="101" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="write channel" value="schedPacket1(1)" />
+<TGConnectingPoint num="0" id="4972" />
+<TGConnectingPoint num="1" id="4973" />
+<extraparam>
+<Data channelName="schedPacket1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="4977" >
+<cdparam x="624" y="363" />
+<sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="send event" value="newSchedPacket1()" />
+<TGConnectingPoint num="0" id="4975" />
+<TGConnectingPoint num="1" id="4976" />
+<extraparam>
+<Data eventName="newSchedPacket1" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1009" id="4980" >
+<cdparam x="620" y="277" />
+<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="toSched1(1) " />
+<TGConnectingPoint num="0" id="4978" />
+<TGConnectingPoint num="1" id="4979" />
+<extraparam>
+<Data channelName="toSched1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1030" id="4983" >
+<cdparam x="526" y="229" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="for ever loop" value="Loop for ever" />
+<TGConnectingPoint num="0" id="4981" />
+<TGConnectingPoint num="1" id="4982" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="4985" >
+<cdparam x="558" y="169" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="4984" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="4986" >
+<cdparam x="682" y="342" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="335" y="527" id="4891" />
-<P2 x="292" y="564" id="4972" />
+<P1 x="682" y="342" id="4968" />
+<P2 x="682" y="358" id="4975" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5008" >
-<cdparam x="415" y="527" />
+<CONNECTOR type="115" id="4987" >
+<cdparam x="565" y="189" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="415" y="527" id="4892" />
-<P2 x="451" y="561" id="4969" />
+<P1 x="565" y="189" id="4984" />
+<P2 x="566" y="224" id="4981" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5009" >
-<cdparam x="292" y="594" />
+<CONNECTOR type="115" id="4988" >
+<cdparam x="612" y="243" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="292" y="594" id="4973" />
-<P2 x="292" y="625" id="4967" />
+<P1 x="606" y="243" id="4982" />
+<P2 x="659" y="272" id="4978" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5010" >
-<cdparam x="481" y="581" />
+<CONNECTOR type="115" id="4989" >
+<cdparam x="679" y="374" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="451" y="591" id="4970" />
-<P2 x="451" y="627" id="4965" />
+<P1 x="682" y="388" id="4976" />
+<P2 x="683" y="409" id="4972" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5011" >
-<cdparam x="566" y="500" />
+<CONNECTOR type="115" id="4990" >
+<cdparam x="683" y="439" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="615" y="472" id="4883" />
-<P2 x="569" y="535" id="4982" />
+<P1 x="683" y="439" id="4973" />
+<P2 x="680" y="474" id="4970" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="5012" >
-<cdparam x="968" y="494" />
+<CONNECTOR type="115" id="4991" >
+<cdparam x="659" y="302" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="695" y="472" id="4884" />
-<P2 x="728" y="539" id="4979" />
+<P1 x="659" y="302" id="4979" />
+<P2 x="682" y="302" id="4967" />
<AutomaticDrawing data="true" />
</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="Sched0" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1013" id="4995" >
+<cdparam x="523" y="192" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="4993" />
+<TGConnectingPoint num="1" id="4994" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="4992" >
+<father id="4995" num="0" />
+<cdparam x="538" y="212" />
+<sizeparam width="14" height="17" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="50" />
+</SUBCOMPONENT>
+
+<COMPONENT type="1001" id="4997" >
+<cdparam x="512" y="360" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="4996" />
+</COMPONENT>
+
+<COMPONENT type="1006" id="5000" >
+<cdparam x="475" y="295" />
+<sizeparam width="101" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="write channel" value="schedPacket0(1)" />
+<TGConnectingPoint num="0" id="4998" />
+<TGConnectingPoint num="1" id="4999" />
+<extraparam>
+<Data channelName="schedPacket0" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="5003" >
+<cdparam x="468" y="254" />
+<sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="send event" value="newSchedPacket0()" />
+<TGConnectingPoint num="0" id="5001" />
+<TGConnectingPoint num="1" id="5002" />
+<extraparam>
+<Data eventName="newSchedPacket0" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1009" id="5006" >
+<cdparam x="462" y="158" />
+<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="toSched0(1) " />
+<TGConnectingPoint num="0" id="5004" />
+<TGConnectingPoint num="1" id="5005" />
+<extraparam>
+<Data channelName="toSched0" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1030" id="5009" >
+<cdparam x="368" y="110" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="for ever loop" value="Loop for ever" />
+<TGConnectingPoint num="0" id="5007" />
+<TGConnectingPoint num="1" id="5008" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="5011" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="5010" />
+</COMPONENT>
+
<CONNECTOR type="115" id="5013" >
-<cdparam x="569" y="565" />
+<cdparam x="528" y="227" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="569" y="565" id="4983" />
-<P2 x="569" y="596" id="4977" />
+<P1 x="528" y="227" id="4994" />
+<P2 x="526" y="249" id="5001" />
+<Point x="529" y="226" />
<AutomaticDrawing data="true" />
-</CONNECTOR>
+</CONNECTOR><SUBCOMPONENT type="-1" id="5012" >
+<father id="5013" num="0" />
+<cdparam x="529" y="226" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
<CONNECTOR type="115" id="5014" >
-<cdparam x="712" y="561" />
+<cdparam x="501" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="728" y="569" id="4980" />
-<P2 x="728" y="605" id="4975" />
+<P1 x="501" y="183" id="5005" />
+<P2 x="528" y="187" id="4993" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="5015" >
-<cdparam x="919" y="321" />
+<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="880" y="315" id="4944" />
-<P2 x="877" y="343" id="4876" />
+<P1 x="407" y="70" id="5010" />
+<P2 x="408" y="105" id="5007" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="5016" >
-<cdparam x="1061" y="311" />
+<cdparam x="454" y="124" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="1061" y="311" id="4941" />
-<P2 x="1062" y="341" id="4873" />
+<P1 x="448" y="124" id="5008" />
+<P2 x="501" y="153" id="5004" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="5017" >
-<cdparam x="930" y="370" />
+<cdparam x="521" y="255" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="877" y="373" id="4877" />
-<P2 x="876" y="412" id="4866" />
+<P1 x="526" y="279" id="5002" />
+<P2 x="525" y="290" id="4998" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="115" id="5018" >
-<cdparam x="1078" y="363" />
+<cdparam x="525" y="320" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="1062" y="371" id="4874" />
-<P2 x="1067" y="408" id="4863" />
+<P1 x="525" y="320" id="4999" />
+<P2 x="522" y="355" id="4996" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -13705,7 +13715,7 @@
<TGConnectingPoint num="0" id="5058" />
<TGConnectingPoint num="1" id="5059" />
<extraparam>
-<Data channelName="classif1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classif1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -13718,7 +13728,7 @@
<TGConnectingPoint num="0" id="5061" />
<TGConnectingPoint num="1" id="5062" />
<extraparam>
-<Data channelName="classif" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classif" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -13963,7 +13973,7 @@
<TGConnectingPoint num="0" id="5125" />
<TGConnectingPoint num="1" id="5126" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -13976,7 +13986,7 @@
<TGConnectingPoint num="0" id="5128" />
<TGConnectingPoint num="1" id="5129" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -13989,7 +13999,7 @@
<TGConnectingPoint num="0" id="5131" />
<TGConnectingPoint num="1" id="5132" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14041,7 +14051,7 @@
<TGConnectingPoint num="0" id="5143" />
<TGConnectingPoint num="1" id="5144" />
<extraparam>
-<Data channelName="classifPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14104,7 +14114,7 @@
<TGConnectingPoint num="0" id="5157" />
<TGConnectingPoint num="1" id="5158" />
<extraparam>
-<Data channelName="classif2" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classif2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14138,7 +14148,7 @@
<TGConnectingPoint num="0" id="5164" />
<TGConnectingPoint num="1" id="5165" />
<extraparam>
-<Data channelName="packet" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="packet" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14197,7 +14207,7 @@
<TGConnectingPoint num="0" id="5178" />
<TGConnectingPoint num="1" id="5179" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14210,7 +14220,7 @@
<TGConnectingPoint num="0" id="5181" />
<TGConnectingPoint num="1" id="5182" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14223,7 +14233,7 @@
<TGConnectingPoint num="0" id="5184" />
<TGConnectingPoint num="1" id="5185" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14275,7 +14285,7 @@
<TGConnectingPoint num="0" id="5196" />
<TGConnectingPoint num="1" id="5197" />
<extraparam>
-<Data channelName="classifPacket1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14329,7 +14339,7 @@
<TGConnectingPoint num="0" id="5208" />
<TGConnectingPoint num="1" id="5209" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14342,7 +14352,7 @@
<TGConnectingPoint num="0" id="5211" />
<TGConnectingPoint num="1" id="5212" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14355,7 +14365,7 @@
<TGConnectingPoint num="0" id="5214" />
<TGConnectingPoint num="1" id="5215" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14407,7 +14417,7 @@
<TGConnectingPoint num="0" id="5226" />
<TGConnectingPoint num="1" id="5227" />
<extraparam>
-<Data channelName="classifPacket2" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14509,7 +14519,7 @@
<TGConnectingPoint num="0" id="5258" />
<TGConnectingPoint num="1" id="5259" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14522,7 +14532,7 @@
<TGConnectingPoint num="0" id="5261" />
<TGConnectingPoint num="1" id="5262" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14535,7 +14545,7 @@
<TGConnectingPoint num="0" id="5264" />
<TGConnectingPoint num="1" id="5265" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14587,7 +14597,7 @@
<TGConnectingPoint num="0" id="5276" />
<TGConnectingPoint num="1" id="5277" />
<extraparam>
-<Data channelName="classifPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14641,7 +14651,7 @@
<TGConnectingPoint num="0" id="5288" />
<TGConnectingPoint num="1" id="5289" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14654,7 +14664,7 @@
<TGConnectingPoint num="0" id="5291" />
<TGConnectingPoint num="1" id="5292" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14667,7 +14677,7 @@
<TGConnectingPoint num="0" id="5294" />
<TGConnectingPoint num="1" id="5295" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14719,7 +14729,7 @@
<TGConnectingPoint num="0" id="5306" />
<TGConnectingPoint num="1" id="5307" />
<extraparam>
-<Data channelName="classifPacket1" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14773,7 +14783,7 @@
<TGConnectingPoint num="0" id="5318" />
<TGConnectingPoint num="1" id="5319" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14786,7 +14796,7 @@
<TGConnectingPoint num="0" id="5321" />
<TGConnectingPoint num="1" id="5322" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14799,7 +14809,7 @@
<TGConnectingPoint num="0" id="5324" />
<TGConnectingPoint num="1" id="5325" />
<extraparam>
-<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="toSchedPacket" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -14851,7 +14861,7 @@
<TGConnectingPoint num="0" id="5336" />
<TGConnectingPoint num="1" id="5337" />
<extraparam>
-<Data channelName="classifPacket2" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="classifPacket2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
@@ -15803,11 +15813,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="5529" >
<father id="5563" num="0" />
-<cdparam x="1008" y="68" />
-<sizeparam width="129" height="41" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1010" y="129" />
+<sizeparam width="149" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="121" minY="0" maxY="159" />
-<infoparam name="TGComponent" value="Design::Sched0" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Design::Scheduling" />
<TGConnectingPoint num="0" id="5521" />
<TGConnectingPoint num="1" id="5522" />
<TGConnectingPoint num="2" id="5523" />
@@ -15817,16 +15827,16 @@
<TGConnectingPoint num="6" id="5527" />
<TGConnectingPoint num="7" id="5528" />
<extraparam>
-<info value="Design::Sched0" taskName="Sched0" referenceTaskName="Design" priority="0" operation="Sched0" fatherComponentMECType="0" />
+<info value="Design::Scheduling" taskName="Scheduling" referenceTaskName="Design" priority="0" operation="Scheduling" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5538" >
<father id="5563" num="1" />
-<cdparam x="1010" y="129" />
-<sizeparam width="149" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1008" y="68" />
+<sizeparam width="129" height="41" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="101" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design::Scheduling" />
+<cdrectangleparam minX="0" maxX="121" minY="0" maxY="159" />
+<infoparam name="TGComponent" value="Design::Sched0" />
<TGConnectingPoint num="0" id="5530" />
<TGConnectingPoint num="1" id="5531" />
<TGConnectingPoint num="2" id="5532" />
@@ -15836,7 +15846,7 @@
<TGConnectingPoint num="6" id="5536" />
<TGConnectingPoint num="7" id="5537" />
<extraparam>
-<info value="Design::Scheduling" taskName="Scheduling" referenceTaskName="Design" priority="0" operation="Scheduling" fatherComponentMECType="0" />
+<info value="Design::Sched0" taskName="Sched0" referenceTaskName="Design" priority="0" operation="Sched0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -16021,11 +16031,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="5672" >
<father id="5715" num="0" />
-<cdparam x="556" y="509" />
-<sizeparam width="145" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="553" y="462" />
+<sizeparam width="165" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="105" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design::Bootstrap" />
+<cdrectangleparam minX="0" maxX="85" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Design::OutputEngine" />
<TGConnectingPoint num="0" id="5664" />
<TGConnectingPoint num="1" id="5665" />
<TGConnectingPoint num="2" id="5666" />
@@ -16035,7 +16045,7 @@
<TGConnectingPoint num="6" id="5670" />
<TGConnectingPoint num="7" id="5671" />
<extraparam>
-<info value="Design::Bootstrap" taskName="Bootstrap" referenceTaskName="Design" priority="0" operation="Bootstrap" fatherComponentMECType="0" />
+<info value="Design::OutputEngine" taskName="OutputEngine" referenceTaskName="Design" priority="0" operation="OutputEngine" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5681" >
@@ -16059,11 +16069,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5690" >
<father id="5715" num="2" />
-<cdparam x="553" y="462" />
-<sizeparam width="165" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="556" y="509" />
+<sizeparam width="145" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="85" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design::OutputEngine" />
+<cdrectangleparam minX="0" maxX="105" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Design::Bootstrap" />
<TGConnectingPoint num="0" id="5682" />
<TGConnectingPoint num="1" id="5683" />
<TGConnectingPoint num="2" id="5684" />
@@ -16073,7 +16083,7 @@
<TGConnectingPoint num="6" id="5688" />
<TGConnectingPoint num="7" id="5689" />
<extraparam>
-<info value="Design::OutputEngine" taskName="OutputEngine" referenceTaskName="Design" priority="0" operation="OutputEngine" fatherComponentMECType="0" />
+<info value="Design::Bootstrap" taskName="Bootstrap" referenceTaskName="Design" priority="0" operation="Bootstrap" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -16186,11 +16196,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="5774" >
<father id="5808" num="0" />
-<cdparam x="25" y="180" />
-<sizeparam width="132" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="104" y="235" />
+<sizeparam width="140" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="149" minY="0" maxY="108" />
-<infoparam name="TGComponent" value="Design::Classif0" />
+<cdrectangleparam minX="0" maxX="141" minY="0" maxY="108" />
+<infoparam name="TGComponent" value="Design::Classifier" />
<TGConnectingPoint num="0" id="5766" />
<TGConnectingPoint num="1" id="5767" />
<TGConnectingPoint num="2" id="5768" />
@@ -16200,16 +16210,16 @@
<TGConnectingPoint num="6" id="5772" />
<TGConnectingPoint num="7" id="5773" />
<extraparam>
-<info value="Design::Classif0" taskName="Classif0" referenceTaskName="Design" priority="0" operation="Classif0" fatherComponentMECType="0" />
+<info value="Design::Classifier" taskName="Classifier" referenceTaskName="Design" priority="0" operation="Classifier" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="5783" >
<father id="5808" num="1" />
-<cdparam x="104" y="235" />
-<sizeparam width="140" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="25" y="180" />
+<sizeparam width="132" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="141" minY="0" maxY="108" />
-<infoparam name="TGComponent" value="Design::Classifier" />
+<cdrectangleparam minX="0" maxX="149" minY="0" maxY="108" />
+<infoparam name="TGComponent" value="Design::Classif0" />
<TGConnectingPoint num="0" id="5775" />
<TGConnectingPoint num="1" id="5776" />
<TGConnectingPoint num="2" id="5777" />
@@ -16219,7 +16229,7 @@
<TGConnectingPoint num="6" id="5781" />
<TGConnectingPoint num="7" id="5782" />
<extraparam>
-<info value="Design::Classifier" taskName="Classifier" referenceTaskName="Design" priority="0" operation="Classifier" fatherComponentMECType="0" />
+<info value="Design::Classif0" taskName="Classif0" referenceTaskName="Design" priority="0" operation="Classif0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
diff --git a/modeling/SysMLSec/DSE_KDP.xml b/modeling/SysMLSec/DSE_KDP.xml
index d4c141f53df11f420158993f5cb4bba93957d274..80704bb9788a27aa2d0473c6b7b34453daeed588 100644
--- a/modeling/SysMLSec/DSE_KDP.xml
+++ b/modeling/SysMLSec/DSE_KDP.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="0.98-beta3">
+<TURTLEGMODELING version="1.0beta">
<Modeling type="Requirement" nameTab="General Requirements" >
<TRequirementDiagramPanel name="AvailabilityRequirements" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0000000000000002" >
-<COMPONENT type="900" id="2394" >
+<COMPONENT type="900" id="32" >
<cdparam x="470" y="532" />
<sizeparam width="333" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="317" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
<infoparam name="Requirement" value="EnsureHighestAvalabilityForHighestPriorityFunctions" />
-<TGConnectingPoint num="0" id="2363" />
-<TGConnectingPoint num="1" id="2364" />
-<TGConnectingPoint num="2" id="2365" />
-<TGConnectingPoint num="3" id="2366" />
-<TGConnectingPoint num="4" id="2367" />
-<TGConnectingPoint num="5" id="2368" />
-<TGConnectingPoint num="6" id="2369" />
-<TGConnectingPoint num="7" id="2370" />
-<TGConnectingPoint num="8" id="2371" />
-<TGConnectingPoint num="9" id="2372" />
-<TGConnectingPoint num="10" id="2373" />
-<TGConnectingPoint num="11" id="2374" />
-<TGConnectingPoint num="12" id="2375" />
-<TGConnectingPoint num="13" id="2376" />
-<TGConnectingPoint num="14" id="2377" />
-<TGConnectingPoint num="15" id="2378" />
-<TGConnectingPoint num="16" id="2379" />
-<TGConnectingPoint num="17" id="2380" />
-<TGConnectingPoint num="18" id="2381" />
-<TGConnectingPoint num="19" id="2382" />
-<TGConnectingPoint num="20" id="2383" />
-<TGConnectingPoint num="21" id="2384" />
-<TGConnectingPoint num="22" id="2385" />
-<TGConnectingPoint num="23" id="2386" />
-<TGConnectingPoint num="24" id="2387" />
-<TGConnectingPoint num="25" id="2388" />
-<TGConnectingPoint num="26" id="2389" />
-<TGConnectingPoint num="27" id="2390" />
-<TGConnectingPoint num="28" id="2391" />
-<TGConnectingPoint num="29" id="2392" />
-<TGConnectingPoint num="30" id="2393" />
+<TGConnectingPoint num="0" id="1" />
+<TGConnectingPoint num="1" id="2" />
+<TGConnectingPoint num="2" id="3" />
+<TGConnectingPoint num="3" id="4" />
+<TGConnectingPoint num="4" id="5" />
+<TGConnectingPoint num="5" id="6" />
+<TGConnectingPoint num="6" id="7" />
+<TGConnectingPoint num="7" id="8" />
+<TGConnectingPoint num="8" id="9" />
+<TGConnectingPoint num="9" id="10" />
+<TGConnectingPoint num="10" id="11" />
+<TGConnectingPoint num="11" id="12" />
+<TGConnectingPoint num="12" id="13" />
+<TGConnectingPoint num="13" id="14" />
+<TGConnectingPoint num="14" id="15" />
+<TGConnectingPoint num="15" id="16" />
+<TGConnectingPoint num="16" id="17" />
+<TGConnectingPoint num="17" id="18" />
+<TGConnectingPoint num="18" id="19" />
+<TGConnectingPoint num="19" id="20" />
+<TGConnectingPoint num="20" id="21" />
+<TGConnectingPoint num="21" id="22" />
+<TGConnectingPoint num="22" id="23" />
+<TGConnectingPoint num="23" id="24" />
+<TGConnectingPoint num="24" id="25" />
+<TGConnectingPoint num="25" id="26" />
+<TGConnectingPoint num="26" id="27" />
+<TGConnectingPoint num="27" id="28" />
+<TGConnectingPoint num="28" id="29" />
+<TGConnectingPoint num="29" id="30" />
+<TGConnectingPoint num="30" id="31" />
<extraparam>
<type data="0" />
<textline data="Requirement description:" />
@@ -55,43 +55,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2426" >
+<COMPONENT type="900" id="64" >
<cdparam x="196" y="535" />
<sizeparam width="213" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="196" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
<infoparam name="Requirement" value="EnsureAvailabilityRadioMedium" />
-<TGConnectingPoint num="0" id="2395" />
-<TGConnectingPoint num="1" id="2396" />
-<TGConnectingPoint num="2" id="2397" />
-<TGConnectingPoint num="3" id="2398" />
-<TGConnectingPoint num="4" id="2399" />
-<TGConnectingPoint num="5" id="2400" />
-<TGConnectingPoint num="6" id="2401" />
-<TGConnectingPoint num="7" id="2402" />
-<TGConnectingPoint num="8" id="2403" />
-<TGConnectingPoint num="9" id="2404" />
-<TGConnectingPoint num="10" id="2405" />
-<TGConnectingPoint num="11" id="2406" />
-<TGConnectingPoint num="12" id="2407" />
-<TGConnectingPoint num="13" id="2408" />
-<TGConnectingPoint num="14" id="2409" />
-<TGConnectingPoint num="15" id="2410" />
-<TGConnectingPoint num="16" id="2411" />
-<TGConnectingPoint num="17" id="2412" />
-<TGConnectingPoint num="18" id="2413" />
-<TGConnectingPoint num="19" id="2414" />
-<TGConnectingPoint num="20" id="2415" />
-<TGConnectingPoint num="21" id="2416" />
-<TGConnectingPoint num="22" id="2417" />
-<TGConnectingPoint num="23" id="2418" />
-<TGConnectingPoint num="24" id="2419" />
-<TGConnectingPoint num="25" id="2420" />
-<TGConnectingPoint num="26" id="2421" />
-<TGConnectingPoint num="27" id="2422" />
-<TGConnectingPoint num="28" id="2423" />
-<TGConnectingPoint num="29" id="2424" />
-<TGConnectingPoint num="30" id="2425" />
+<TGConnectingPoint num="0" id="33" />
+<TGConnectingPoint num="1" id="34" />
+<TGConnectingPoint num="2" id="35" />
+<TGConnectingPoint num="3" id="36" />
+<TGConnectingPoint num="4" id="37" />
+<TGConnectingPoint num="5" id="38" />
+<TGConnectingPoint num="6" id="39" />
+<TGConnectingPoint num="7" id="40" />
+<TGConnectingPoint num="8" id="41" />
+<TGConnectingPoint num="9" id="42" />
+<TGConnectingPoint num="10" id="43" />
+<TGConnectingPoint num="11" id="44" />
+<TGConnectingPoint num="12" id="45" />
+<TGConnectingPoint num="13" id="46" />
+<TGConnectingPoint num="14" id="47" />
+<TGConnectingPoint num="15" id="48" />
+<TGConnectingPoint num="16" id="49" />
+<TGConnectingPoint num="17" id="50" />
+<TGConnectingPoint num="18" id="51" />
+<TGConnectingPoint num="19" id="52" />
+<TGConnectingPoint num="20" id="53" />
+<TGConnectingPoint num="21" id="54" />
+<TGConnectingPoint num="22" id="55" />
+<TGConnectingPoint num="23" id="56" />
+<TGConnectingPoint num="24" id="57" />
+<TGConnectingPoint num="25" id="58" />
+<TGConnectingPoint num="26" id="59" />
+<TGConnectingPoint num="27" id="60" />
+<TGConnectingPoint num="28" id="61" />
+<TGConnectingPoint num="29" id="62" />
+<TGConnectingPoint num="30" id="63" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -106,43 +106,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2458" >
+<COMPONENT type="900" id="96" >
<cdparam x="764" y="331" />
<sizeparam width="310" height="102" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="288" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
<infoparam name="Requirement" value="EnsureExternalCommunicationDeviceAvailability" />
-<TGConnectingPoint num="0" id="2427" />
-<TGConnectingPoint num="1" id="2428" />
-<TGConnectingPoint num="2" id="2429" />
-<TGConnectingPoint num="3" id="2430" />
-<TGConnectingPoint num="4" id="2431" />
-<TGConnectingPoint num="5" id="2432" />
-<TGConnectingPoint num="6" id="2433" />
-<TGConnectingPoint num="7" id="2434" />
-<TGConnectingPoint num="8" id="2435" />
-<TGConnectingPoint num="9" id="2436" />
-<TGConnectingPoint num="10" id="2437" />
-<TGConnectingPoint num="11" id="2438" />
-<TGConnectingPoint num="12" id="2439" />
-<TGConnectingPoint num="13" id="2440" />
-<TGConnectingPoint num="14" id="2441" />
-<TGConnectingPoint num="15" id="2442" />
-<TGConnectingPoint num="16" id="2443" />
-<TGConnectingPoint num="17" id="2444" />
-<TGConnectingPoint num="18" id="2445" />
-<TGConnectingPoint num="19" id="2446" />
-<TGConnectingPoint num="20" id="2447" />
-<TGConnectingPoint num="21" id="2448" />
-<TGConnectingPoint num="22" id="2449" />
-<TGConnectingPoint num="23" id="2450" />
-<TGConnectingPoint num="24" id="2451" />
-<TGConnectingPoint num="25" id="2452" />
-<TGConnectingPoint num="26" id="2453" />
-<TGConnectingPoint num="27" id="2454" />
-<TGConnectingPoint num="28" id="2455" />
-<TGConnectingPoint num="29" id="2456" />
-<TGConnectingPoint num="30" id="2457" />
+<TGConnectingPoint num="0" id="65" />
+<TGConnectingPoint num="1" id="66" />
+<TGConnectingPoint num="2" id="67" />
+<TGConnectingPoint num="3" id="68" />
+<TGConnectingPoint num="4" id="69" />
+<TGConnectingPoint num="5" id="70" />
+<TGConnectingPoint num="6" id="71" />
+<TGConnectingPoint num="7" id="72" />
+<TGConnectingPoint num="8" id="73" />
+<TGConnectingPoint num="9" id="74" />
+<TGConnectingPoint num="10" id="75" />
+<TGConnectingPoint num="11" id="76" />
+<TGConnectingPoint num="12" id="77" />
+<TGConnectingPoint num="13" id="78" />
+<TGConnectingPoint num="14" id="79" />
+<TGConnectingPoint num="15" id="80" />
+<TGConnectingPoint num="16" id="81" />
+<TGConnectingPoint num="17" id="82" />
+<TGConnectingPoint num="18" id="83" />
+<TGConnectingPoint num="19" id="84" />
+<TGConnectingPoint num="20" id="85" />
+<TGConnectingPoint num="21" id="86" />
+<TGConnectingPoint num="22" id="87" />
+<TGConnectingPoint num="23" id="88" />
+<TGConnectingPoint num="24" id="89" />
+<TGConnectingPoint num="25" id="90" />
+<TGConnectingPoint num="26" id="91" />
+<TGConnectingPoint num="27" id="92" />
+<TGConnectingPoint num="28" id="93" />
+<TGConnectingPoint num="29" id="94" />
+<TGConnectingPoint num="30" id="95" />
<extraparam>
<type data="2" />
<textline data="Communication buffer overflow" />
@@ -156,43 +156,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2490" >
+<COMPONENT type="900" id="128" >
<cdparam x="527" y="329" />
<sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="144" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
<infoparam name="Requirement" value="EnsureRAMAvailability" />
-<TGConnectingPoint num="0" id="2459" />
-<TGConnectingPoint num="1" id="2460" />
-<TGConnectingPoint num="2" id="2461" />
-<TGConnectingPoint num="3" id="2462" />
-<TGConnectingPoint num="4" id="2463" />
-<TGConnectingPoint num="5" id="2464" />
-<TGConnectingPoint num="6" id="2465" />
-<TGConnectingPoint num="7" id="2466" />
-<TGConnectingPoint num="8" id="2467" />
-<TGConnectingPoint num="9" id="2468" />
-<TGConnectingPoint num="10" id="2469" />
-<TGConnectingPoint num="11" id="2470" />
-<TGConnectingPoint num="12" id="2471" />
-<TGConnectingPoint num="13" id="2472" />
-<TGConnectingPoint num="14" id="2473" />
-<TGConnectingPoint num="15" id="2474" />
-<TGConnectingPoint num="16" id="2475" />
-<TGConnectingPoint num="17" id="2476" />
-<TGConnectingPoint num="18" id="2477" />
-<TGConnectingPoint num="19" id="2478" />
-<TGConnectingPoint num="20" id="2479" />
-<TGConnectingPoint num="21" id="2480" />
-<TGConnectingPoint num="22" id="2481" />
-<TGConnectingPoint num="23" id="2482" />
-<TGConnectingPoint num="24" id="2483" />
-<TGConnectingPoint num="25" id="2484" />
-<TGConnectingPoint num="26" id="2485" />
-<TGConnectingPoint num="27" id="2486" />
-<TGConnectingPoint num="28" id="2487" />
-<TGConnectingPoint num="29" id="2488" />
-<TGConnectingPoint num="30" id="2489" />
+<TGConnectingPoint num="0" id="97" />
+<TGConnectingPoint num="1" id="98" />
+<TGConnectingPoint num="2" id="99" />
+<TGConnectingPoint num="3" id="100" />
+<TGConnectingPoint num="4" id="101" />
+<TGConnectingPoint num="5" id="102" />
+<TGConnectingPoint num="6" id="103" />
+<TGConnectingPoint num="7" id="104" />
+<TGConnectingPoint num="8" id="105" />
+<TGConnectingPoint num="9" id="106" />
+<TGConnectingPoint num="10" id="107" />
+<TGConnectingPoint num="11" id="108" />
+<TGConnectingPoint num="12" id="109" />
+<TGConnectingPoint num="13" id="110" />
+<TGConnectingPoint num="14" id="111" />
+<TGConnectingPoint num="15" id="112" />
+<TGConnectingPoint num="16" id="113" />
+<TGConnectingPoint num="17" id="114" />
+<TGConnectingPoint num="18" id="115" />
+<TGConnectingPoint num="19" id="116" />
+<TGConnectingPoint num="20" id="117" />
+<TGConnectingPoint num="21" id="118" />
+<TGConnectingPoint num="22" id="119" />
+<TGConnectingPoint num="23" id="120" />
+<TGConnectingPoint num="24" id="121" />
+<TGConnectingPoint num="25" id="122" />
+<TGConnectingPoint num="26" id="123" />
+<TGConnectingPoint num="27" id="124" />
+<TGConnectingPoint num="28" id="125" />
+<TGConnectingPoint num="29" id="126" />
+<TGConnectingPoint num="30" id="127" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -207,43 +207,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2522" >
+<COMPONENT type="900" id="160" >
<cdparam x="303" y="331" />
<sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="145" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
<infoparam name="Requirement" value="EnsureCPUAvailability" />
-<TGConnectingPoint num="0" id="2491" />
-<TGConnectingPoint num="1" id="2492" />
-<TGConnectingPoint num="2" id="2493" />
-<TGConnectingPoint num="3" id="2494" />
-<TGConnectingPoint num="4" id="2495" />
-<TGConnectingPoint num="5" id="2496" />
-<TGConnectingPoint num="6" id="2497" />
-<TGConnectingPoint num="7" id="2498" />
-<TGConnectingPoint num="8" id="2499" />
-<TGConnectingPoint num="9" id="2500" />
-<TGConnectingPoint num="10" id="2501" />
-<TGConnectingPoint num="11" id="2502" />
-<TGConnectingPoint num="12" id="2503" />
-<TGConnectingPoint num="13" id="2504" />
-<TGConnectingPoint num="14" id="2505" />
-<TGConnectingPoint num="15" id="2506" />
-<TGConnectingPoint num="16" id="2507" />
-<TGConnectingPoint num="17" id="2508" />
-<TGConnectingPoint num="18" id="2509" />
-<TGConnectingPoint num="19" id="2510" />
-<TGConnectingPoint num="20" id="2511" />
-<TGConnectingPoint num="21" id="2512" />
-<TGConnectingPoint num="22" id="2513" />
-<TGConnectingPoint num="23" id="2514" />
-<TGConnectingPoint num="24" id="2515" />
-<TGConnectingPoint num="25" id="2516" />
-<TGConnectingPoint num="26" id="2517" />
-<TGConnectingPoint num="27" id="2518" />
-<TGConnectingPoint num="28" id="2519" />
-<TGConnectingPoint num="29" id="2520" />
-<TGConnectingPoint num="30" id="2521" />
+<TGConnectingPoint num="0" id="129" />
+<TGConnectingPoint num="1" id="130" />
+<TGConnectingPoint num="2" id="131" />
+<TGConnectingPoint num="3" id="132" />
+<TGConnectingPoint num="4" id="133" />
+<TGConnectingPoint num="5" id="134" />
+<TGConnectingPoint num="6" id="135" />
+<TGConnectingPoint num="7" id="136" />
+<TGConnectingPoint num="8" id="137" />
+<TGConnectingPoint num="9" id="138" />
+<TGConnectingPoint num="10" id="139" />
+<TGConnectingPoint num="11" id="140" />
+<TGConnectingPoint num="12" id="141" />
+<TGConnectingPoint num="13" id="142" />
+<TGConnectingPoint num="14" id="143" />
+<TGConnectingPoint num="15" id="144" />
+<TGConnectingPoint num="16" id="145" />
+<TGConnectingPoint num="17" id="146" />
+<TGConnectingPoint num="18" id="147" />
+<TGConnectingPoint num="19" id="148" />
+<TGConnectingPoint num="20" id="149" />
+<TGConnectingPoint num="21" id="150" />
+<TGConnectingPoint num="22" id="151" />
+<TGConnectingPoint num="23" id="152" />
+<TGConnectingPoint num="24" id="153" />
+<TGConnectingPoint num="25" id="154" />
+<TGConnectingPoint num="26" id="155" />
+<TGConnectingPoint num="27" id="156" />
+<TGConnectingPoint num="28" id="157" />
+<TGConnectingPoint num="29" id="158" />
+<TGConnectingPoint num="30" id="159" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -258,43 +258,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2554" >
+<COMPONENT type="900" id="192" >
<cdparam x="72" y="334" />
<sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="141" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
<infoparam name="Requirement" value="EnsureBusAvailability" />
-<TGConnectingPoint num="0" id="2523" />
-<TGConnectingPoint num="1" id="2524" />
-<TGConnectingPoint num="2" id="2525" />
-<TGConnectingPoint num="3" id="2526" />
-<TGConnectingPoint num="4" id="2527" />
-<TGConnectingPoint num="5" id="2528" />
-<TGConnectingPoint num="6" id="2529" />
-<TGConnectingPoint num="7" id="2530" />
-<TGConnectingPoint num="8" id="2531" />
-<TGConnectingPoint num="9" id="2532" />
-<TGConnectingPoint num="10" id="2533" />
-<TGConnectingPoint num="11" id="2534" />
-<TGConnectingPoint num="12" id="2535" />
-<TGConnectingPoint num="13" id="2536" />
-<TGConnectingPoint num="14" id="2537" />
-<TGConnectingPoint num="15" id="2538" />
-<TGConnectingPoint num="16" id="2539" />
-<TGConnectingPoint num="17" id="2540" />
-<TGConnectingPoint num="18" id="2541" />
-<TGConnectingPoint num="19" id="2542" />
-<TGConnectingPoint num="20" id="2543" />
-<TGConnectingPoint num="21" id="2544" />
-<TGConnectingPoint num="22" id="2545" />
-<TGConnectingPoint num="23" id="2546" />
-<TGConnectingPoint num="24" id="2547" />
-<TGConnectingPoint num="25" id="2548" />
-<TGConnectingPoint num="26" id="2549" />
-<TGConnectingPoint num="27" id="2550" />
-<TGConnectingPoint num="28" id="2551" />
-<TGConnectingPoint num="29" id="2552" />
-<TGConnectingPoint num="30" id="2553" />
+<TGConnectingPoint num="0" id="161" />
+<TGConnectingPoint num="1" id="162" />
+<TGConnectingPoint num="2" id="163" />
+<TGConnectingPoint num="3" id="164" />
+<TGConnectingPoint num="4" id="165" />
+<TGConnectingPoint num="5" id="166" />
+<TGConnectingPoint num="6" id="167" />
+<TGConnectingPoint num="7" id="168" />
+<TGConnectingPoint num="8" id="169" />
+<TGConnectingPoint num="9" id="170" />
+<TGConnectingPoint num="10" id="171" />
+<TGConnectingPoint num="11" id="172" />
+<TGConnectingPoint num="12" id="173" />
+<TGConnectingPoint num="13" id="174" />
+<TGConnectingPoint num="14" id="175" />
+<TGConnectingPoint num="15" id="176" />
+<TGConnectingPoint num="16" id="177" />
+<TGConnectingPoint num="17" id="178" />
+<TGConnectingPoint num="18" id="179" />
+<TGConnectingPoint num="19" id="180" />
+<TGConnectingPoint num="20" id="181" />
+<TGConnectingPoint num="21" id="182" />
+<TGConnectingPoint num="22" id="183" />
+<TGConnectingPoint num="23" id="184" />
+<TGConnectingPoint num="24" id="185" />
+<TGConnectingPoint num="25" id="186" />
+<TGConnectingPoint num="26" id="187" />
+<TGConnectingPoint num="27" id="188" />
+<TGConnectingPoint num="28" id="189" />
+<TGConnectingPoint num="29" id="190" />
+<TGConnectingPoint num="30" id="191" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -309,43 +309,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2586" >
+<COMPONENT type="900" id="224" >
<cdparam x="467" y="123" />
<sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="164" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
<infoparam name="Requirement" value="EnsureAvailabilityOfECUs" />
-<TGConnectingPoint num="0" id="2555" />
-<TGConnectingPoint num="1" id="2556" />
-<TGConnectingPoint num="2" id="2557" />
-<TGConnectingPoint num="3" id="2558" />
-<TGConnectingPoint num="4" id="2559" />
-<TGConnectingPoint num="5" id="2560" />
-<TGConnectingPoint num="6" id="2561" />
-<TGConnectingPoint num="7" id="2562" />
-<TGConnectingPoint num="8" id="2563" />
-<TGConnectingPoint num="9" id="2564" />
-<TGConnectingPoint num="10" id="2565" />
-<TGConnectingPoint num="11" id="2566" />
-<TGConnectingPoint num="12" id="2567" />
-<TGConnectingPoint num="13" id="2568" />
-<TGConnectingPoint num="14" id="2569" />
-<TGConnectingPoint num="15" id="2570" />
-<TGConnectingPoint num="16" id="2571" />
-<TGConnectingPoint num="17" id="2572" />
-<TGConnectingPoint num="18" id="2573" />
-<TGConnectingPoint num="19" id="2574" />
-<TGConnectingPoint num="20" id="2575" />
-<TGConnectingPoint num="21" id="2576" />
-<TGConnectingPoint num="22" id="2577" />
-<TGConnectingPoint num="23" id="2578" />
-<TGConnectingPoint num="24" id="2579" />
-<TGConnectingPoint num="25" id="2580" />
-<TGConnectingPoint num="26" id="2581" />
-<TGConnectingPoint num="27" id="2582" />
-<TGConnectingPoint num="28" id="2583" />
-<TGConnectingPoint num="29" id="2584" />
-<TGConnectingPoint num="30" id="2585" />
+<TGConnectingPoint num="0" id="193" />
+<TGConnectingPoint num="1" id="194" />
+<TGConnectingPoint num="2" id="195" />
+<TGConnectingPoint num="3" id="196" />
+<TGConnectingPoint num="4" id="197" />
+<TGConnectingPoint num="5" id="198" />
+<TGConnectingPoint num="6" id="199" />
+<TGConnectingPoint num="7" id="200" />
+<TGConnectingPoint num="8" id="201" />
+<TGConnectingPoint num="9" id="202" />
+<TGConnectingPoint num="10" id="203" />
+<TGConnectingPoint num="11" id="204" />
+<TGConnectingPoint num="12" id="205" />
+<TGConnectingPoint num="13" id="206" />
+<TGConnectingPoint num="14" id="207" />
+<TGConnectingPoint num="15" id="208" />
+<TGConnectingPoint num="16" id="209" />
+<TGConnectingPoint num="17" id="210" />
+<TGConnectingPoint num="18" id="211" />
+<TGConnectingPoint num="19" id="212" />
+<TGConnectingPoint num="20" id="213" />
+<TGConnectingPoint num="21" id="214" />
+<TGConnectingPoint num="22" id="215" />
+<TGConnectingPoint num="23" id="216" />
+<TGConnectingPoint num="24" id="217" />
+<TGConnectingPoint num="25" id="218" />
+<TGConnectingPoint num="26" id="219" />
+<TGConnectingPoint num="27" id="220" />
+<TGConnectingPoint num="28" id="221" />
+<TGConnectingPoint num="29" id="222" />
+<TGConnectingPoint num="30" id="223" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -360,79 +360,79 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="129" id="2587" >
+<CONNECTOR type="129" id="225" >
<cdparam x="889" y="343" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="841" y="331" id="2433" />
-<P2 x="557" y="237" id="2581" />
+<P1 x="841" y="331" id="71" />
+<P2 x="557" y="237" id="219" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="2588" >
+<CONNECTOR type="129" id="226" >
<cdparam x="669" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="617" y="329" id="2466" />
-<P2 x="557" y="237" id="2580" />
+<P1 x="617" y="329" id="104" />
+<P2 x="557" y="237" id="218" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="2589" >
+<CONNECTOR type="129" id="227" >
<cdparam x="440" y="335" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="393" y="331" id="2498" />
-<P2 x="557" y="237" id="2565" />
+<P1 x="393" y="331" id="136" />
+<P2 x="557" y="237" id="203" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="2590" >
+<CONNECTOR type="129" id="228" >
<cdparam x="160" y="332" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="162" y="334" id="2530" />
-<P2 x="557" y="237" id="2579" />
+<P1 x="162" y="334" id="168" />
+<P2 x="557" y="237" id="217" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TRequirementDiagramPanel>
<TRequirementDiagramPanel name="Privacy requirements" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="900" id="2622" >
+<COMPONENT type="900" id="260" >
<cdparam x="658" y="137" />
<sizeparam width="351" height="150" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="259" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="ControlledAccessToEServiceMessageData" />
-<TGConnectingPoint num="0" id="2591" />
-<TGConnectingPoint num="1" id="2592" />
-<TGConnectingPoint num="2" id="2593" />
-<TGConnectingPoint num="3" id="2594" />
-<TGConnectingPoint num="4" id="2595" />
-<TGConnectingPoint num="5" id="2596" />
-<TGConnectingPoint num="6" id="2597" />
-<TGConnectingPoint num="7" id="2598" />
-<TGConnectingPoint num="8" id="2599" />
-<TGConnectingPoint num="9" id="2600" />
-<TGConnectingPoint num="10" id="2601" />
-<TGConnectingPoint num="11" id="2602" />
-<TGConnectingPoint num="12" id="2603" />
-<TGConnectingPoint num="13" id="2604" />
-<TGConnectingPoint num="14" id="2605" />
-<TGConnectingPoint num="15" id="2606" />
-<TGConnectingPoint num="16" id="2607" />
-<TGConnectingPoint num="17" id="2608" />
-<TGConnectingPoint num="18" id="2609" />
-<TGConnectingPoint num="19" id="2610" />
-<TGConnectingPoint num="20" id="2611" />
-<TGConnectingPoint num="21" id="2612" />
-<TGConnectingPoint num="22" id="2613" />
-<TGConnectingPoint num="23" id="2614" />
-<TGConnectingPoint num="24" id="2615" />
-<TGConnectingPoint num="25" id="2616" />
-<TGConnectingPoint num="26" id="2617" />
-<TGConnectingPoint num="27" id="2618" />
-<TGConnectingPoint num="28" id="2619" />
-<TGConnectingPoint num="29" id="2620" />
-<TGConnectingPoint num="30" id="2621" />
+<TGConnectingPoint num="0" id="229" />
+<TGConnectingPoint num="1" id="230" />
+<TGConnectingPoint num="2" id="231" />
+<TGConnectingPoint num="3" id="232" />
+<TGConnectingPoint num="4" id="233" />
+<TGConnectingPoint num="5" id="234" />
+<TGConnectingPoint num="6" id="235" />
+<TGConnectingPoint num="7" id="236" />
+<TGConnectingPoint num="8" id="237" />
+<TGConnectingPoint num="9" id="238" />
+<TGConnectingPoint num="10" id="239" />
+<TGConnectingPoint num="11" id="240" />
+<TGConnectingPoint num="12" id="241" />
+<TGConnectingPoint num="13" id="242" />
+<TGConnectingPoint num="14" id="243" />
+<TGConnectingPoint num="15" id="244" />
+<TGConnectingPoint num="16" id="245" />
+<TGConnectingPoint num="17" id="246" />
+<TGConnectingPoint num="18" id="247" />
+<TGConnectingPoint num="19" id="248" />
+<TGConnectingPoint num="20" id="249" />
+<TGConnectingPoint num="21" id="250" />
+<TGConnectingPoint num="22" id="251" />
+<TGConnectingPoint num="23" id="252" />
+<TGConnectingPoint num="24" id="253" />
+<TGConnectingPoint num="25" id="254" />
+<TGConnectingPoint num="26" id="255" />
+<TGConnectingPoint num="27" id="256" />
+<TGConnectingPoint num="28" id="257" />
+<TGConnectingPoint num="29" id="258" />
+<TGConnectingPoint num="30" id="259" />
<extraparam>
<type data="2" />
<textline data="An EServiceMessage is a message sent from a car to" />
@@ -451,43 +451,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2654" >
+<COMPONENT type="900" id="292" >
<cdparam x="462" y="472" />
<sizeparam width="299" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="271" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="UnlikableDriverIdentificationBetweenServices" />
-<TGConnectingPoint num="0" id="2623" />
-<TGConnectingPoint num="1" id="2624" />
-<TGConnectingPoint num="2" id="2625" />
-<TGConnectingPoint num="3" id="2626" />
-<TGConnectingPoint num="4" id="2627" />
-<TGConnectingPoint num="5" id="2628" />
-<TGConnectingPoint num="6" id="2629" />
-<TGConnectingPoint num="7" id="2630" />
-<TGConnectingPoint num="8" id="2631" />
-<TGConnectingPoint num="9" id="2632" />
-<TGConnectingPoint num="10" id="2633" />
-<TGConnectingPoint num="11" id="2634" />
-<TGConnectingPoint num="12" id="2635" />
-<TGConnectingPoint num="13" id="2636" />
-<TGConnectingPoint num="14" id="2637" />
-<TGConnectingPoint num="15" id="2638" />
-<TGConnectingPoint num="16" id="2639" />
-<TGConnectingPoint num="17" id="2640" />
-<TGConnectingPoint num="18" id="2641" />
-<TGConnectingPoint num="19" id="2642" />
-<TGConnectingPoint num="20" id="2643" />
-<TGConnectingPoint num="21" id="2644" />
-<TGConnectingPoint num="22" id="2645" />
-<TGConnectingPoint num="23" id="2646" />
-<TGConnectingPoint num="24" id="2647" />
-<TGConnectingPoint num="25" id="2648" />
-<TGConnectingPoint num="26" id="2649" />
-<TGConnectingPoint num="27" id="2650" />
-<TGConnectingPoint num="28" id="2651" />
-<TGConnectingPoint num="29" id="2652" />
-<TGConnectingPoint num="30" id="2653" />
+<TGConnectingPoint num="0" id="261" />
+<TGConnectingPoint num="1" id="262" />
+<TGConnectingPoint num="2" id="263" />
+<TGConnectingPoint num="3" id="264" />
+<TGConnectingPoint num="4" id="265" />
+<TGConnectingPoint num="5" id="266" />
+<TGConnectingPoint num="6" id="267" />
+<TGConnectingPoint num="7" id="268" />
+<TGConnectingPoint num="8" id="269" />
+<TGConnectingPoint num="9" id="270" />
+<TGConnectingPoint num="10" id="271" />
+<TGConnectingPoint num="11" id="272" />
+<TGConnectingPoint num="12" id="273" />
+<TGConnectingPoint num="13" id="274" />
+<TGConnectingPoint num="14" id="275" />
+<TGConnectingPoint num="15" id="276" />
+<TGConnectingPoint num="16" id="277" />
+<TGConnectingPoint num="17" id="278" />
+<TGConnectingPoint num="18" id="279" />
+<TGConnectingPoint num="19" id="280" />
+<TGConnectingPoint num="20" id="281" />
+<TGConnectingPoint num="21" id="282" />
+<TGConnectingPoint num="22" id="283" />
+<TGConnectingPoint num="23" id="284" />
+<TGConnectingPoint num="24" id="285" />
+<TGConnectingPoint num="25" id="286" />
+<TGConnectingPoint num="26" id="287" />
+<TGConnectingPoint num="27" id="288" />
+<TGConnectingPoint num="28" id="289" />
+<TGConnectingPoint num="29" id="290" />
+<TGConnectingPoint num="30" id="291" />
<extraparam>
<type data="2" />
<textline data="Prevent two different services from linking " />
@@ -502,43 +502,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2686" >
+<COMPONENT type="900" id="324" >
<cdparam x="248" y="159" />
<sizeparam width="309" height="126" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="155" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="UserDrivenPrivacyPolicy" />
-<TGConnectingPoint num="0" id="2655" />
-<TGConnectingPoint num="1" id="2656" />
-<TGConnectingPoint num="2" id="2657" />
-<TGConnectingPoint num="3" id="2658" />
-<TGConnectingPoint num="4" id="2659" />
-<TGConnectingPoint num="5" id="2660" />
-<TGConnectingPoint num="6" id="2661" />
-<TGConnectingPoint num="7" id="2662" />
-<TGConnectingPoint num="8" id="2663" />
-<TGConnectingPoint num="9" id="2664" />
-<TGConnectingPoint num="10" id="2665" />
-<TGConnectingPoint num="11" id="2666" />
-<TGConnectingPoint num="12" id="2667" />
-<TGConnectingPoint num="13" id="2668" />
-<TGConnectingPoint num="14" id="2669" />
-<TGConnectingPoint num="15" id="2670" />
-<TGConnectingPoint num="16" id="2671" />
-<TGConnectingPoint num="17" id="2672" />
-<TGConnectingPoint num="18" id="2673" />
-<TGConnectingPoint num="19" id="2674" />
-<TGConnectingPoint num="20" id="2675" />
-<TGConnectingPoint num="21" id="2676" />
-<TGConnectingPoint num="22" id="2677" />
-<TGConnectingPoint num="23" id="2678" />
-<TGConnectingPoint num="24" id="2679" />
-<TGConnectingPoint num="25" id="2680" />
-<TGConnectingPoint num="26" id="2681" />
-<TGConnectingPoint num="27" id="2682" />
-<TGConnectingPoint num="28" id="2683" />
-<TGConnectingPoint num="29" id="2684" />
-<TGConnectingPoint num="30" id="2685" />
+<TGConnectingPoint num="0" id="293" />
+<TGConnectingPoint num="1" id="294" />
+<TGConnectingPoint num="2" id="295" />
+<TGConnectingPoint num="3" id="296" />
+<TGConnectingPoint num="4" id="297" />
+<TGConnectingPoint num="5" id="298" />
+<TGConnectingPoint num="6" id="299" />
+<TGConnectingPoint num="7" id="300" />
+<TGConnectingPoint num="8" id="301" />
+<TGConnectingPoint num="9" id="302" />
+<TGConnectingPoint num="10" id="303" />
+<TGConnectingPoint num="11" id="304" />
+<TGConnectingPoint num="12" id="305" />
+<TGConnectingPoint num="13" id="306" />
+<TGConnectingPoint num="14" id="307" />
+<TGConnectingPoint num="15" id="308" />
+<TGConnectingPoint num="16" id="309" />
+<TGConnectingPoint num="17" id="310" />
+<TGConnectingPoint num="18" id="311" />
+<TGConnectingPoint num="19" id="312" />
+<TGConnectingPoint num="20" id="313" />
+<TGConnectingPoint num="21" id="314" />
+<TGConnectingPoint num="22" id="315" />
+<TGConnectingPoint num="23" id="316" />
+<TGConnectingPoint num="24" id="317" />
+<TGConnectingPoint num="25" id="318" />
+<TGConnectingPoint num="26" id="319" />
+<TGConnectingPoint num="27" id="320" />
+<TGConnectingPoint num="28" id="321" />
+<TGConnectingPoint num="29" id="322" />
+<TGConnectingPoint num="30" id="323" />
<extraparam>
<type data="2" />
<textline data="Users shall be able to settle disclosure of" />
@@ -554,43 +554,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2718" >
+<COMPONENT type="900" id="356" >
<cdparam x="771" y="474" />
<sizeparam width="247" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="228" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="UnlinkableTimeOrderingOfMessages" />
-<TGConnectingPoint num="0" id="2687" />
-<TGConnectingPoint num="1" id="2688" />
-<TGConnectingPoint num="2" id="2689" />
-<TGConnectingPoint num="3" id="2690" />
-<TGConnectingPoint num="4" id="2691" />
-<TGConnectingPoint num="5" id="2692" />
-<TGConnectingPoint num="6" id="2693" />
-<TGConnectingPoint num="7" id="2694" />
-<TGConnectingPoint num="8" id="2695" />
-<TGConnectingPoint num="9" id="2696" />
-<TGConnectingPoint num="10" id="2697" />
-<TGConnectingPoint num="11" id="2698" />
-<TGConnectingPoint num="12" id="2699" />
-<TGConnectingPoint num="13" id="2700" />
-<TGConnectingPoint num="14" id="2701" />
-<TGConnectingPoint num="15" id="2702" />
-<TGConnectingPoint num="16" id="2703" />
-<TGConnectingPoint num="17" id="2704" />
-<TGConnectingPoint num="18" id="2705" />
-<TGConnectingPoint num="19" id="2706" />
-<TGConnectingPoint num="20" id="2707" />
-<TGConnectingPoint num="21" id="2708" />
-<TGConnectingPoint num="22" id="2709" />
-<TGConnectingPoint num="23" id="2710" />
-<TGConnectingPoint num="24" id="2711" />
-<TGConnectingPoint num="25" id="2712" />
-<TGConnectingPoint num="26" id="2713" />
-<TGConnectingPoint num="27" id="2714" />
-<TGConnectingPoint num="28" id="2715" />
-<TGConnectingPoint num="29" id="2716" />
-<TGConnectingPoint num="30" id="2717" />
+<TGConnectingPoint num="0" id="325" />
+<TGConnectingPoint num="1" id="326" />
+<TGConnectingPoint num="2" id="327" />
+<TGConnectingPoint num="3" id="328" />
+<TGConnectingPoint num="4" id="329" />
+<TGConnectingPoint num="5" id="330" />
+<TGConnectingPoint num="6" id="331" />
+<TGConnectingPoint num="7" id="332" />
+<TGConnectingPoint num="8" id="333" />
+<TGConnectingPoint num="9" id="334" />
+<TGConnectingPoint num="10" id="335" />
+<TGConnectingPoint num="11" id="336" />
+<TGConnectingPoint num="12" id="337" />
+<TGConnectingPoint num="13" id="338" />
+<TGConnectingPoint num="14" id="339" />
+<TGConnectingPoint num="15" id="340" />
+<TGConnectingPoint num="16" id="341" />
+<TGConnectingPoint num="17" id="342" />
+<TGConnectingPoint num="18" id="343" />
+<TGConnectingPoint num="19" id="344" />
+<TGConnectingPoint num="20" id="345" />
+<TGConnectingPoint num="21" id="346" />
+<TGConnectingPoint num="22" id="347" />
+<TGConnectingPoint num="23" id="348" />
+<TGConnectingPoint num="24" id="349" />
+<TGConnectingPoint num="25" id="350" />
+<TGConnectingPoint num="26" id="351" />
+<TGConnectingPoint num="27" id="352" />
+<TGConnectingPoint num="28" id="353" />
+<TGConnectingPoint num="29" id="354" />
+<TGConnectingPoint num="30" id="355" />
<extraparam>
<type data="2" />
<textline data="Prevent or limit the possibility " />
@@ -606,43 +606,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2750" >
+<COMPONENT type="900" id="388" >
<cdparam x="455" y="296" />
<sizeparam width="339" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="219" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="EServiceCriticalMessageUnlikability" />
-<TGConnectingPoint num="0" id="2719" />
-<TGConnectingPoint num="1" id="2720" />
-<TGConnectingPoint num="2" id="2721" />
-<TGConnectingPoint num="3" id="2722" />
-<TGConnectingPoint num="4" id="2723" />
-<TGConnectingPoint num="5" id="2724" />
-<TGConnectingPoint num="6" id="2725" />
-<TGConnectingPoint num="7" id="2726" />
-<TGConnectingPoint num="8" id="2727" />
-<TGConnectingPoint num="9" id="2728" />
-<TGConnectingPoint num="10" id="2729" />
-<TGConnectingPoint num="11" id="2730" />
-<TGConnectingPoint num="12" id="2731" />
-<TGConnectingPoint num="13" id="2732" />
-<TGConnectingPoint num="14" id="2733" />
-<TGConnectingPoint num="15" id="2734" />
-<TGConnectingPoint num="16" id="2735" />
-<TGConnectingPoint num="17" id="2736" />
-<TGConnectingPoint num="18" id="2737" />
-<TGConnectingPoint num="19" id="2738" />
-<TGConnectingPoint num="20" id="2739" />
-<TGConnectingPoint num="21" id="2740" />
-<TGConnectingPoint num="22" id="2741" />
-<TGConnectingPoint num="23" id="2742" />
-<TGConnectingPoint num="24" id="2743" />
-<TGConnectingPoint num="25" id="2744" />
-<TGConnectingPoint num="26" id="2745" />
-<TGConnectingPoint num="27" id="2746" />
-<TGConnectingPoint num="28" id="2747" />
-<TGConnectingPoint num="29" id="2748" />
-<TGConnectingPoint num="30" id="2749" />
+<TGConnectingPoint num="0" id="357" />
+<TGConnectingPoint num="1" id="358" />
+<TGConnectingPoint num="2" id="359" />
+<TGConnectingPoint num="3" id="360" />
+<TGConnectingPoint num="4" id="361" />
+<TGConnectingPoint num="5" id="362" />
+<TGConnectingPoint num="6" id="363" />
+<TGConnectingPoint num="7" id="364" />
+<TGConnectingPoint num="8" id="365" />
+<TGConnectingPoint num="9" id="366" />
+<TGConnectingPoint num="10" id="367" />
+<TGConnectingPoint num="11" id="368" />
+<TGConnectingPoint num="12" id="369" />
+<TGConnectingPoint num="13" id="370" />
+<TGConnectingPoint num="14" id="371" />
+<TGConnectingPoint num="15" id="372" />
+<TGConnectingPoint num="16" id="373" />
+<TGConnectingPoint num="17" id="374" />
+<TGConnectingPoint num="18" id="375" />
+<TGConnectingPoint num="19" id="376" />
+<TGConnectingPoint num="20" id="377" />
+<TGConnectingPoint num="21" id="378" />
+<TGConnectingPoint num="22" id="379" />
+<TGConnectingPoint num="23" id="380" />
+<TGConnectingPoint num="24" id="381" />
+<TGConnectingPoint num="25" id="382" />
+<TGConnectingPoint num="26" id="383" />
+<TGConnectingPoint num="27" id="384" />
+<TGConnectingPoint num="28" id="385" />
+<TGConnectingPoint num="29" id="386" />
+<TGConnectingPoint num="30" id="387" />
<extraparam>
<type data="2" />
<textline data="Prevent some critical messages, for instance, " />
@@ -659,43 +659,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2782" >
+<COMPONENT type="900" id="420" >
<cdparam x="259" y="471" />
<sizeparam width="189" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="163" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="Car2XMessageAnonymity" />
-<TGConnectingPoint num="0" id="2751" />
-<TGConnectingPoint num="1" id="2752" />
-<TGConnectingPoint num="2" id="2753" />
-<TGConnectingPoint num="3" id="2754" />
-<TGConnectingPoint num="4" id="2755" />
-<TGConnectingPoint num="5" id="2756" />
-<TGConnectingPoint num="6" id="2757" />
-<TGConnectingPoint num="7" id="2758" />
-<TGConnectingPoint num="8" id="2759" />
-<TGConnectingPoint num="9" id="2760" />
-<TGConnectingPoint num="10" id="2761" />
-<TGConnectingPoint num="11" id="2762" />
-<TGConnectingPoint num="12" id="2763" />
-<TGConnectingPoint num="13" id="2764" />
-<TGConnectingPoint num="14" id="2765" />
-<TGConnectingPoint num="15" id="2766" />
-<TGConnectingPoint num="16" id="2767" />
-<TGConnectingPoint num="17" id="2768" />
-<TGConnectingPoint num="18" id="2769" />
-<TGConnectingPoint num="19" id="2770" />
-<TGConnectingPoint num="20" id="2771" />
-<TGConnectingPoint num="21" id="2772" />
-<TGConnectingPoint num="22" id="2773" />
-<TGConnectingPoint num="23" id="2774" />
-<TGConnectingPoint num="24" id="2775" />
-<TGConnectingPoint num="25" id="2776" />
-<TGConnectingPoint num="26" id="2777" />
-<TGConnectingPoint num="27" id="2778" />
-<TGConnectingPoint num="28" id="2779" />
-<TGConnectingPoint num="29" id="2780" />
-<TGConnectingPoint num="30" id="2781" />
+<TGConnectingPoint num="0" id="389" />
+<TGConnectingPoint num="1" id="390" />
+<TGConnectingPoint num="2" id="391" />
+<TGConnectingPoint num="3" id="392" />
+<TGConnectingPoint num="4" id="393" />
+<TGConnectingPoint num="5" id="394" />
+<TGConnectingPoint num="6" id="395" />
+<TGConnectingPoint num="7" id="396" />
+<TGConnectingPoint num="8" id="397" />
+<TGConnectingPoint num="9" id="398" />
+<TGConnectingPoint num="10" id="399" />
+<TGConnectingPoint num="11" id="400" />
+<TGConnectingPoint num="12" id="401" />
+<TGConnectingPoint num="13" id="402" />
+<TGConnectingPoint num="14" id="403" />
+<TGConnectingPoint num="15" id="404" />
+<TGConnectingPoint num="16" id="405" />
+<TGConnectingPoint num="17" id="406" />
+<TGConnectingPoint num="18" id="407" />
+<TGConnectingPoint num="19" id="408" />
+<TGConnectingPoint num="20" id="409" />
+<TGConnectingPoint num="21" id="410" />
+<TGConnectingPoint num="22" id="411" />
+<TGConnectingPoint num="23" id="412" />
+<TGConnectingPoint num="24" id="413" />
+<TGConnectingPoint num="25" id="414" />
+<TGConnectingPoint num="26" id="415" />
+<TGConnectingPoint num="27" id="416" />
+<TGConnectingPoint num="28" id="417" />
+<TGConnectingPoint num="29" id="418" />
+<TGConnectingPoint num="30" id="419" />
<extraparam>
<type data="2" />
<textline data="The sending of a critical message should not " />
@@ -712,43 +712,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2814" >
+<COMPONENT type="900" id="452" >
<cdparam x="524" y="66" />
<sizeparam width="201" height="52" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="131" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="ProtectDriverPrivacy" />
-<TGConnectingPoint num="0" id="2783" />
-<TGConnectingPoint num="1" id="2784" />
-<TGConnectingPoint num="2" id="2785" />
-<TGConnectingPoint num="3" id="2786" />
-<TGConnectingPoint num="4" id="2787" />
-<TGConnectingPoint num="5" id="2788" />
-<TGConnectingPoint num="6" id="2789" />
-<TGConnectingPoint num="7" id="2790" />
-<TGConnectingPoint num="8" id="2791" />
-<TGConnectingPoint num="9" id="2792" />
-<TGConnectingPoint num="10" id="2793" />
-<TGConnectingPoint num="11" id="2794" />
-<TGConnectingPoint num="12" id="2795" />
-<TGConnectingPoint num="13" id="2796" />
-<TGConnectingPoint num="14" id="2797" />
-<TGConnectingPoint num="15" id="2798" />
-<TGConnectingPoint num="16" id="2799" />
-<TGConnectingPoint num="17" id="2800" />
-<TGConnectingPoint num="18" id="2801" />
-<TGConnectingPoint num="19" id="2802" />
-<TGConnectingPoint num="20" id="2803" />
-<TGConnectingPoint num="21" id="2804" />
-<TGConnectingPoint num="22" id="2805" />
-<TGConnectingPoint num="23" id="2806" />
-<TGConnectingPoint num="24" id="2807" />
-<TGConnectingPoint num="25" id="2808" />
-<TGConnectingPoint num="26" id="2809" />
-<TGConnectingPoint num="27" id="2810" />
-<TGConnectingPoint num="28" id="2811" />
-<TGConnectingPoint num="29" id="2812" />
-<TGConnectingPoint num="30" id="2813" />
+<TGConnectingPoint num="0" id="421" />
+<TGConnectingPoint num="1" id="422" />
+<TGConnectingPoint num="2" id="423" />
+<TGConnectingPoint num="3" id="424" />
+<TGConnectingPoint num="4" id="425" />
+<TGConnectingPoint num="5" id="426" />
+<TGConnectingPoint num="6" id="427" />
+<TGConnectingPoint num="7" id="428" />
+<TGConnectingPoint num="8" id="429" />
+<TGConnectingPoint num="9" id="430" />
+<TGConnectingPoint num="10" id="431" />
+<TGConnectingPoint num="11" id="432" />
+<TGConnectingPoint num="12" id="433" />
+<TGConnectingPoint num="13" id="434" />
+<TGConnectingPoint num="14" id="435" />
+<TGConnectingPoint num="15" id="436" />
+<TGConnectingPoint num="16" id="437" />
+<TGConnectingPoint num="17" id="438" />
+<TGConnectingPoint num="18" id="439" />
+<TGConnectingPoint num="19" id="440" />
+<TGConnectingPoint num="20" id="441" />
+<TGConnectingPoint num="21" id="442" />
+<TGConnectingPoint num="22" id="443" />
+<TGConnectingPoint num="23" id="444" />
+<TGConnectingPoint num="24" id="445" />
+<TGConnectingPoint num="25" id="446" />
+<TGConnectingPoint num="26" id="447" />
+<TGConnectingPoint num="27" id="448" />
+<TGConnectingPoint num="28" id="449" />
+<TGConnectingPoint num="29" id="450" />
+<TGConnectingPoint num="30" id="451" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -763,40 +763,40 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="129" id="2815" >
+<CONNECTOR type="129" id="453" >
<cdparam x="1026" y="495" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<P1 x="832" y="474" id="2693" />
-<P2 x="709" y="410" id="2730" />
+<P1 x="832" y="474" id="331" />
+<P2 x="709" y="410" id="368" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="2816" >
+<CONNECTOR type="129" id="454" >
<cdparam x="729" y="493" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<P1 x="611" y="472" id="2630" />
-<P2 x="624" y="410" id="2729" />
+<P1 x="611" y="472" id="268" />
+<P2 x="624" y="410" id="367" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="2817" >
+<CONNECTOR type="129" id="455" >
<cdparam x="384" y="463" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<P1 x="400" y="471" id="2759" />
-<P2 x="539" y="410" id="2728" />
+<P1 x="400" y="471" id="397" />
+<P2 x="539" y="410" id="366" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="2819" >
+<CONNECTOR type="129" id="457" >
<cdparam x="828" y="134" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<P1 x="833" y="137" id="2598" />
-<P2 x="725" y="92" id="2787" />
+<P1 x="833" y="137" id="236" />
+<P2 x="725" y="92" id="425" />
<Point x="833" y="92" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2818" >
-<father id="2819" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="456" >
+<father id="457" num="0" />
<cdparam x="833" y="92" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -804,24 +804,24 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="129" id="2820" >
+<CONNECTOR type="129" id="458" >
<cdparam x="586" y="326" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<P1 x="624" y="296" id="2726" />
-<P2 x="624" y="118" id="2793" />
+<P1 x="624" y="296" id="364" />
+<P2 x="624" y="118" id="431" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="2822" >
+<CONNECTOR type="129" id="460" >
<cdparam x="413" y="167" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<P1 x="402" y="159" id="2662" />
-<P2 x="524" y="105" id="2785" />
+<P1 x="402" y="159" id="300" />
+<P2 x="524" y="105" id="423" />
<Point x="451" y="105" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2821" >
-<father id="2822" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="459" >
+<father id="460" num="0" />
<cdparam x="451" y="105" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -833,70 +833,70 @@
</TRequirementDiagramPanel>
<TRequirementDiagramPanel name="Fake commands requirements" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="901" id="2838" >
+<COMPONENT type="901" id="476" >
<cdparam x="66" y="670" />
<sizeparam width="484" height="66" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="165" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="RequirementObserver" value="PreventHeadUnitSpoofing" />
-<TGConnectingPoint num="0" id="2823" />
-<TGConnectingPoint num="1" id="2824" />
-<TGConnectingPoint num="2" id="2825" />
-<TGConnectingPoint num="3" id="2826" />
-<TGConnectingPoint num="4" id="2827" />
-<TGConnectingPoint num="5" id="2828" />
-<TGConnectingPoint num="6" id="2829" />
-<TGConnectingPoint num="7" id="2830" />
-<TGConnectingPoint num="8" id="2831" />
-<TGConnectingPoint num="9" id="2832" />
-<TGConnectingPoint num="10" id="2833" />
-<TGConnectingPoint num="11" id="2834" />
-<TGConnectingPoint num="12" id="2835" />
-<TGConnectingPoint num="13" id="2836" />
-<TGConnectingPoint num="14" id="2837" />
+<TGConnectingPoint num="0" id="461" />
+<TGConnectingPoint num="1" id="462" />
+<TGConnectingPoint num="2" id="463" />
+<TGConnectingPoint num="3" id="464" />
+<TGConnectingPoint num="4" id="465" />
+<TGConnectingPoint num="5" id="466" />
+<TGConnectingPoint num="6" id="467" />
+<TGConnectingPoint num="7" id="468" />
+<TGConnectingPoint num="8" id="469" />
+<TGConnectingPoint num="9" id="470" />
+<TGConnectingPoint num="10" id="471" />
+<TGConnectingPoint num="11" id="472" />
+<TGConnectingPoint num="12" id="473" />
+<TGConnectingPoint num="13" id="474" />
+<TGConnectingPoint num="14" id="475" />
<extraparam>
<diagramText data="EmergencyBrake message may be sent by HU pretending to be CU" />
<violated data="noAction" />
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2870" >
+<COMPONENT type="900" id="508" >
<cdparam x="1400" y="524" />
<sizeparam width="201" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="190" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="FlashingCommandFreshness" />
-<TGConnectingPoint num="0" id="2839" />
-<TGConnectingPoint num="1" id="2840" />
-<TGConnectingPoint num="2" id="2841" />
-<TGConnectingPoint num="3" id="2842" />
-<TGConnectingPoint num="4" id="2843" />
-<TGConnectingPoint num="5" id="2844" />
-<TGConnectingPoint num="6" id="2845" />
-<TGConnectingPoint num="7" id="2846" />
-<TGConnectingPoint num="8" id="2847" />
-<TGConnectingPoint num="9" id="2848" />
-<TGConnectingPoint num="10" id="2849" />
-<TGConnectingPoint num="11" id="2850" />
-<TGConnectingPoint num="12" id="2851" />
-<TGConnectingPoint num="13" id="2852" />
-<TGConnectingPoint num="14" id="2853" />
-<TGConnectingPoint num="15" id="2854" />
-<TGConnectingPoint num="16" id="2855" />
-<TGConnectingPoint num="17" id="2856" />
-<TGConnectingPoint num="18" id="2857" />
-<TGConnectingPoint num="19" id="2858" />
-<TGConnectingPoint num="20" id="2859" />
-<TGConnectingPoint num="21" id="2860" />
-<TGConnectingPoint num="22" id="2861" />
-<TGConnectingPoint num="23" id="2862" />
-<TGConnectingPoint num="24" id="2863" />
-<TGConnectingPoint num="25" id="2864" />
-<TGConnectingPoint num="26" id="2865" />
-<TGConnectingPoint num="27" id="2866" />
-<TGConnectingPoint num="28" id="2867" />
-<TGConnectingPoint num="29" id="2868" />
-<TGConnectingPoint num="30" id="2869" />
+<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" />
+<TGConnectingPoint num="24" id="501" />
+<TGConnectingPoint num="25" id="502" />
+<TGConnectingPoint num="26" id="503" />
+<TGConnectingPoint num="27" id="504" />
+<TGConnectingPoint num="28" id="505" />
+<TGConnectingPoint num="29" id="506" />
+<TGConnectingPoint num="30" id="507" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -911,43 +911,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2902" >
+<COMPONENT type="900" id="540" >
<cdparam x="1197" y="521" />
<sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="95" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="CodeIntegrity" />
-<TGConnectingPoint num="0" id="2871" />
-<TGConnectingPoint num="1" id="2872" />
-<TGConnectingPoint num="2" id="2873" />
-<TGConnectingPoint num="3" id="2874" />
-<TGConnectingPoint num="4" id="2875" />
-<TGConnectingPoint num="5" id="2876" />
-<TGConnectingPoint num="6" id="2877" />
-<TGConnectingPoint num="7" id="2878" />
-<TGConnectingPoint num="8" id="2879" />
-<TGConnectingPoint num="9" id="2880" />
-<TGConnectingPoint num="10" id="2881" />
-<TGConnectingPoint num="11" id="2882" />
-<TGConnectingPoint num="12" id="2883" />
-<TGConnectingPoint num="13" id="2884" />
-<TGConnectingPoint num="14" id="2885" />
-<TGConnectingPoint num="15" id="2886" />
-<TGConnectingPoint num="16" id="2887" />
-<TGConnectingPoint num="17" id="2888" />
-<TGConnectingPoint num="18" id="2889" />
-<TGConnectingPoint num="19" id="2890" />
-<TGConnectingPoint num="20" id="2891" />
-<TGConnectingPoint num="21" id="2892" />
-<TGConnectingPoint num="22" id="2893" />
-<TGConnectingPoint num="23" id="2894" />
-<TGConnectingPoint num="24" id="2895" />
-<TGConnectingPoint num="25" id="2896" />
-<TGConnectingPoint num="26" id="2897" />
-<TGConnectingPoint num="27" id="2898" />
-<TGConnectingPoint num="28" id="2899" />
-<TGConnectingPoint num="29" id="2900" />
-<TGConnectingPoint num="30" id="2901" />
+<TGConnectingPoint num="0" id="509" />
+<TGConnectingPoint num="1" id="510" />
+<TGConnectingPoint num="2" id="511" />
+<TGConnectingPoint num="3" id="512" />
+<TGConnectingPoint num="4" id="513" />
+<TGConnectingPoint num="5" id="514" />
+<TGConnectingPoint num="6" id="515" />
+<TGConnectingPoint num="7" id="516" />
+<TGConnectingPoint num="8" id="517" />
+<TGConnectingPoint num="9" id="518" />
+<TGConnectingPoint num="10" id="519" />
+<TGConnectingPoint num="11" id="520" />
+<TGConnectingPoint num="12" id="521" />
+<TGConnectingPoint num="13" id="522" />
+<TGConnectingPoint num="14" id="523" />
+<TGConnectingPoint num="15" id="524" />
+<TGConnectingPoint num="16" id="525" />
+<TGConnectingPoint num="17" id="526" />
+<TGConnectingPoint num="18" id="527" />
+<TGConnectingPoint num="19" id="528" />
+<TGConnectingPoint num="20" id="529" />
+<TGConnectingPoint num="21" id="530" />
+<TGConnectingPoint num="22" id="531" />
+<TGConnectingPoint num="23" id="532" />
+<TGConnectingPoint num="24" id="533" />
+<TGConnectingPoint num="25" id="534" />
+<TGConnectingPoint num="26" id="535" />
+<TGConnectingPoint num="27" id="536" />
+<TGConnectingPoint num="28" id="537" />
+<TGConnectingPoint num="29" id="538" />
+<TGConnectingPoint num="30" id="539" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -962,43 +962,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2934" >
+<COMPONENT type="900" id="572" >
<cdparam x="992" y="521" />
<sizeparam width="197" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="163" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="CodeOriginAuthentication" />
-<TGConnectingPoint num="0" id="2903" />
-<TGConnectingPoint num="1" id="2904" />
-<TGConnectingPoint num="2" id="2905" />
-<TGConnectingPoint num="3" id="2906" />
-<TGConnectingPoint num="4" id="2907" />
-<TGConnectingPoint num="5" id="2908" />
-<TGConnectingPoint num="6" id="2909" />
-<TGConnectingPoint num="7" id="2910" />
-<TGConnectingPoint num="8" id="2911" />
-<TGConnectingPoint num="9" id="2912" />
-<TGConnectingPoint num="10" id="2913" />
-<TGConnectingPoint num="11" id="2914" />
-<TGConnectingPoint num="12" id="2915" />
-<TGConnectingPoint num="13" id="2916" />
-<TGConnectingPoint num="14" id="2917" />
-<TGConnectingPoint num="15" id="2918" />
-<TGConnectingPoint num="16" id="2919" />
-<TGConnectingPoint num="17" id="2920" />
-<TGConnectingPoint num="18" id="2921" />
-<TGConnectingPoint num="19" id="2922" />
-<TGConnectingPoint num="20" id="2923" />
-<TGConnectingPoint num="21" id="2924" />
-<TGConnectingPoint num="22" id="2925" />
-<TGConnectingPoint num="23" id="2926" />
-<TGConnectingPoint num="24" id="2927" />
-<TGConnectingPoint num="25" id="2928" />
-<TGConnectingPoint num="26" id="2929" />
-<TGConnectingPoint num="27" id="2930" />
-<TGConnectingPoint num="28" id="2931" />
-<TGConnectingPoint num="29" id="2932" />
-<TGConnectingPoint num="30" id="2933" />
+<TGConnectingPoint num="0" id="541" />
+<TGConnectingPoint num="1" id="542" />
+<TGConnectingPoint num="2" id="543" />
+<TGConnectingPoint num="3" id="544" />
+<TGConnectingPoint num="4" id="545" />
+<TGConnectingPoint num="5" id="546" />
+<TGConnectingPoint num="6" id="547" />
+<TGConnectingPoint num="7" id="548" />
+<TGConnectingPoint num="8" id="549" />
+<TGConnectingPoint num="9" id="550" />
+<TGConnectingPoint num="10" id="551" />
+<TGConnectingPoint num="11" id="552" />
+<TGConnectingPoint num="12" id="553" />
+<TGConnectingPoint num="13" id="554" />
+<TGConnectingPoint num="14" id="555" />
+<TGConnectingPoint num="15" id="556" />
+<TGConnectingPoint num="16" id="557" />
+<TGConnectingPoint num="17" id="558" />
+<TGConnectingPoint num="18" id="559" />
+<TGConnectingPoint num="19" id="560" />
+<TGConnectingPoint num="20" id="561" />
+<TGConnectingPoint num="21" id="562" />
+<TGConnectingPoint num="22" id="563" />
+<TGConnectingPoint num="23" id="564" />
+<TGConnectingPoint num="24" id="565" />
+<TGConnectingPoint num="25" id="566" />
+<TGConnectingPoint num="26" id="567" />
+<TGConnectingPoint num="27" id="568" />
+<TGConnectingPoint num="28" id="569" />
+<TGConnectingPoint num="29" id="570" />
+<TGConnectingPoint num="30" id="571" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1013,43 +1013,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2966" >
+<COMPONENT type="900" id="604" >
<cdparam x="1189" y="342" />
<sizeparam width="196" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="181" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="ProtectECUFlashingProcess" />
-<TGConnectingPoint num="0" id="2935" />
-<TGConnectingPoint num="1" id="2936" />
-<TGConnectingPoint num="2" id="2937" />
-<TGConnectingPoint num="3" id="2938" />
-<TGConnectingPoint num="4" id="2939" />
-<TGConnectingPoint num="5" id="2940" />
-<TGConnectingPoint num="6" id="2941" />
-<TGConnectingPoint num="7" id="2942" />
-<TGConnectingPoint num="8" id="2943" />
-<TGConnectingPoint num="9" id="2944" />
-<TGConnectingPoint num="10" id="2945" />
-<TGConnectingPoint num="11" id="2946" />
-<TGConnectingPoint num="12" id="2947" />
-<TGConnectingPoint num="13" id="2948" />
-<TGConnectingPoint num="14" id="2949" />
-<TGConnectingPoint num="15" id="2950" />
-<TGConnectingPoint num="16" id="2951" />
-<TGConnectingPoint num="17" id="2952" />
-<TGConnectingPoint num="18" id="2953" />
-<TGConnectingPoint num="19" id="2954" />
-<TGConnectingPoint num="20" id="2955" />
-<TGConnectingPoint num="21" id="2956" />
-<TGConnectingPoint num="22" id="2957" />
-<TGConnectingPoint num="23" id="2958" />
-<TGConnectingPoint num="24" id="2959" />
-<TGConnectingPoint num="25" id="2960" />
-<TGConnectingPoint num="26" id="2961" />
-<TGConnectingPoint num="27" id="2962" />
-<TGConnectingPoint num="28" id="2963" />
-<TGConnectingPoint num="29" id="2964" />
-<TGConnectingPoint num="30" id="2965" />
+<TGConnectingPoint num="0" id="573" />
+<TGConnectingPoint num="1" id="574" />
+<TGConnectingPoint num="2" id="575" />
+<TGConnectingPoint num="3" id="576" />
+<TGConnectingPoint num="4" id="577" />
+<TGConnectingPoint num="5" id="578" />
+<TGConnectingPoint num="6" id="579" />
+<TGConnectingPoint num="7" id="580" />
+<TGConnectingPoint num="8" id="581" />
+<TGConnectingPoint num="9" id="582" />
+<TGConnectingPoint num="10" id="583" />
+<TGConnectingPoint num="11" id="584" />
+<TGConnectingPoint num="12" id="585" />
+<TGConnectingPoint num="13" id="586" />
+<TGConnectingPoint num="14" id="587" />
+<TGConnectingPoint num="15" id="588" />
+<TGConnectingPoint num="16" id="589" />
+<TGConnectingPoint num="17" id="590" />
+<TGConnectingPoint num="18" id="591" />
+<TGConnectingPoint num="19" id="592" />
+<TGConnectingPoint num="20" id="593" />
+<TGConnectingPoint num="21" id="594" />
+<TGConnectingPoint num="22" id="595" />
+<TGConnectingPoint num="23" id="596" />
+<TGConnectingPoint num="24" id="597" />
+<TGConnectingPoint num="25" id="598" />
+<TGConnectingPoint num="26" id="599" />
+<TGConnectingPoint num="27" id="600" />
+<TGConnectingPoint num="28" id="601" />
+<TGConnectingPoint num="29" id="602" />
+<TGConnectingPoint num="30" id="603" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1064,43 +1064,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="2998" >
+<COMPONENT type="900" id="636" >
<cdparam x="31" y="517" />
<sizeparam width="315" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="194" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="AuthenticationOfFunctionalPath" />
-<TGConnectingPoint num="0" id="2967" />
-<TGConnectingPoint num="1" id="2968" />
-<TGConnectingPoint num="2" id="2969" />
-<TGConnectingPoint num="3" id="2970" />
-<TGConnectingPoint num="4" id="2971" />
-<TGConnectingPoint num="5" id="2972" />
-<TGConnectingPoint num="6" id="2973" />
-<TGConnectingPoint num="7" id="2974" />
-<TGConnectingPoint num="8" id="2975" />
-<TGConnectingPoint num="9" id="2976" />
-<TGConnectingPoint num="10" id="2977" />
-<TGConnectingPoint num="11" id="2978" />
-<TGConnectingPoint num="12" id="2979" />
-<TGConnectingPoint num="13" id="2980" />
-<TGConnectingPoint num="14" id="2981" />
-<TGConnectingPoint num="15" id="2982" />
-<TGConnectingPoint num="16" id="2983" />
-<TGConnectingPoint num="17" id="2984" />
-<TGConnectingPoint num="18" id="2985" />
-<TGConnectingPoint num="19" id="2986" />
-<TGConnectingPoint num="20" id="2987" />
-<TGConnectingPoint num="21" id="2988" />
-<TGConnectingPoint num="22" id="2989" />
-<TGConnectingPoint num="23" id="2990" />
-<TGConnectingPoint num="24" id="2991" />
-<TGConnectingPoint num="25" id="2992" />
-<TGConnectingPoint num="26" id="2993" />
-<TGConnectingPoint num="27" id="2994" />
-<TGConnectingPoint num="28" id="2995" />
-<TGConnectingPoint num="29" id="2996" />
-<TGConnectingPoint num="30" id="2997" />
+<TGConnectingPoint num="0" id="605" />
+<TGConnectingPoint num="1" id="606" />
+<TGConnectingPoint num="2" id="607" />
+<TGConnectingPoint num="3" id="608" />
+<TGConnectingPoint num="4" id="609" />
+<TGConnectingPoint num="5" id="610" />
+<TGConnectingPoint num="6" id="611" />
+<TGConnectingPoint num="7" id="612" />
+<TGConnectingPoint num="8" id="613" />
+<TGConnectingPoint num="9" id="614" />
+<TGConnectingPoint num="10" id="615" />
+<TGConnectingPoint num="11" id="616" />
+<TGConnectingPoint num="12" id="617" />
+<TGConnectingPoint num="13" id="618" />
+<TGConnectingPoint num="14" id="619" />
+<TGConnectingPoint num="15" id="620" />
+<TGConnectingPoint num="16" id="621" />
+<TGConnectingPoint num="17" id="622" />
+<TGConnectingPoint num="18" id="623" />
+<TGConnectingPoint num="19" id="624" />
+<TGConnectingPoint num="20" id="625" />
+<TGConnectingPoint num="21" id="626" />
+<TGConnectingPoint num="22" id="627" />
+<TGConnectingPoint num="23" id="628" />
+<TGConnectingPoint num="24" id="629" />
+<TGConnectingPoint num="25" id="630" />
+<TGConnectingPoint num="26" id="631" />
+<TGConnectingPoint num="27" id="632" />
+<TGConnectingPoint num="28" id="633" />
+<TGConnectingPoint num="29" id="634" />
+<TGConnectingPoint num="30" id="635" />
<extraparam>
<type data="2" />
<textline data="This includes the authentication of functions," />
@@ -1115,43 +1115,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3030" >
+<COMPONENT type="900" id="668" >
<cdparam x="649" y="361" />
<sizeparam width="314" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="272" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="PreventReplacementOfChipsOnLocalBusses" />
-<TGConnectingPoint num="0" id="2999" />
-<TGConnectingPoint num="1" id="3000" />
-<TGConnectingPoint num="2" id="3001" />
-<TGConnectingPoint num="3" id="3002" />
-<TGConnectingPoint num="4" id="3003" />
-<TGConnectingPoint num="5" id="3004" />
-<TGConnectingPoint num="6" id="3005" />
-<TGConnectingPoint num="7" id="3006" />
-<TGConnectingPoint num="8" id="3007" />
-<TGConnectingPoint num="9" id="3008" />
-<TGConnectingPoint num="10" id="3009" />
-<TGConnectingPoint num="11" id="3010" />
-<TGConnectingPoint num="12" id="3011" />
-<TGConnectingPoint num="13" id="3012" />
-<TGConnectingPoint num="14" id="3013" />
-<TGConnectingPoint num="15" id="3014" />
-<TGConnectingPoint num="16" id="3015" />
-<TGConnectingPoint num="17" id="3016" />
-<TGConnectingPoint num="18" id="3017" />
-<TGConnectingPoint num="19" id="3018" />
-<TGConnectingPoint num="20" id="3019" />
-<TGConnectingPoint num="21" id="3020" />
-<TGConnectingPoint num="22" id="3021" />
-<TGConnectingPoint num="23" id="3022" />
-<TGConnectingPoint num="24" id="3023" />
-<TGConnectingPoint num="25" id="3024" />
-<TGConnectingPoint num="26" id="3025" />
-<TGConnectingPoint num="27" id="3026" />
-<TGConnectingPoint num="28" id="3027" />
-<TGConnectingPoint num="29" id="3028" />
-<TGConnectingPoint num="30" id="3029" />
+<TGConnectingPoint num="0" id="637" />
+<TGConnectingPoint num="1" id="638" />
+<TGConnectingPoint num="2" id="639" />
+<TGConnectingPoint num="3" id="640" />
+<TGConnectingPoint num="4" id="641" />
+<TGConnectingPoint num="5" id="642" />
+<TGConnectingPoint num="6" id="643" />
+<TGConnectingPoint num="7" id="644" />
+<TGConnectingPoint num="8" id="645" />
+<TGConnectingPoint num="9" id="646" />
+<TGConnectingPoint num="10" id="647" />
+<TGConnectingPoint num="11" id="648" />
+<TGConnectingPoint num="12" id="649" />
+<TGConnectingPoint num="13" id="650" />
+<TGConnectingPoint num="14" id="651" />
+<TGConnectingPoint num="15" id="652" />
+<TGConnectingPoint num="16" id="653" />
+<TGConnectingPoint num="17" id="654" />
+<TGConnectingPoint num="18" id="655" />
+<TGConnectingPoint num="19" id="656" />
+<TGConnectingPoint num="20" id="657" />
+<TGConnectingPoint num="21" id="658" />
+<TGConnectingPoint num="22" id="659" />
+<TGConnectingPoint num="23" id="660" />
+<TGConnectingPoint num="24" id="661" />
+<TGConnectingPoint num="25" id="662" />
+<TGConnectingPoint num="26" id="663" />
+<TGConnectingPoint num="27" id="664" />
+<TGConnectingPoint num="28" id="665" />
+<TGConnectingPoint num="29" id="666" />
+<TGConnectingPoint num="30" id="667" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1166,43 +1166,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3062" >
+<COMPONENT type="900" id="700" >
<cdparam x="372" y="363" />
<sizeparam width="239" height="102" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="186" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="PreventManInTheMiddleAttack" />
-<TGConnectingPoint num="0" id="3031" />
-<TGConnectingPoint num="1" id="3032" />
-<TGConnectingPoint num="2" id="3033" />
-<TGConnectingPoint num="3" id="3034" />
-<TGConnectingPoint num="4" id="3035" />
-<TGConnectingPoint num="5" id="3036" />
-<TGConnectingPoint num="6" id="3037" />
-<TGConnectingPoint num="7" id="3038" />
-<TGConnectingPoint num="8" id="3039" />
-<TGConnectingPoint num="9" id="3040" />
-<TGConnectingPoint num="10" id="3041" />
-<TGConnectingPoint num="11" id="3042" />
-<TGConnectingPoint num="12" id="3043" />
-<TGConnectingPoint num="13" id="3044" />
-<TGConnectingPoint num="14" id="3045" />
-<TGConnectingPoint num="15" id="3046" />
-<TGConnectingPoint num="16" id="3047" />
-<TGConnectingPoint num="17" id="3048" />
-<TGConnectingPoint num="18" id="3049" />
-<TGConnectingPoint num="19" id="3050" />
-<TGConnectingPoint num="20" id="3051" />
-<TGConnectingPoint num="21" id="3052" />
-<TGConnectingPoint num="22" id="3053" />
-<TGConnectingPoint num="23" id="3054" />
-<TGConnectingPoint num="24" id="3055" />
-<TGConnectingPoint num="25" id="3056" />
-<TGConnectingPoint num="26" id="3057" />
-<TGConnectingPoint num="27" id="3058" />
-<TGConnectingPoint num="28" id="3059" />
-<TGConnectingPoint num="29" id="3060" />
-<TGConnectingPoint num="30" id="3061" />
+<TGConnectingPoint num="0" id="669" />
+<TGConnectingPoint num="1" id="670" />
+<TGConnectingPoint num="2" id="671" />
+<TGConnectingPoint num="3" id="672" />
+<TGConnectingPoint num="4" id="673" />
+<TGConnectingPoint num="5" id="674" />
+<TGConnectingPoint num="6" id="675" />
+<TGConnectingPoint num="7" id="676" />
+<TGConnectingPoint num="8" id="677" />
+<TGConnectingPoint num="9" id="678" />
+<TGConnectingPoint num="10" id="679" />
+<TGConnectingPoint num="11" id="680" />
+<TGConnectingPoint num="12" id="681" />
+<TGConnectingPoint num="13" id="682" />
+<TGConnectingPoint num="14" id="683" />
+<TGConnectingPoint num="15" id="684" />
+<TGConnectingPoint num="16" id="685" />
+<TGConnectingPoint num="17" id="686" />
+<TGConnectingPoint num="18" id="687" />
+<TGConnectingPoint num="19" id="688" />
+<TGConnectingPoint num="20" id="689" />
+<TGConnectingPoint num="21" id="690" />
+<TGConnectingPoint num="22" id="691" />
+<TGConnectingPoint num="23" id="692" />
+<TGConnectingPoint num="24" id="693" />
+<TGConnectingPoint num="25" id="694" />
+<TGConnectingPoint num="26" id="695" />
+<TGConnectingPoint num="27" id="696" />
+<TGConnectingPoint num="28" id="697" />
+<TGConnectingPoint num="29" id="698" />
+<TGConnectingPoint num="30" id="699" />
<extraparam>
<type data="2" />
<textline data="Internal attack" />
@@ -1216,43 +1216,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3094" >
+<COMPONENT type="900" id="732" >
<cdparam x="354" y="518" />
<sizeparam width="275" height="117" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="247" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="MessageFreshnessAlongFunctionalPath" />
-<TGConnectingPoint num="0" id="3063" />
-<TGConnectingPoint num="1" id="3064" />
-<TGConnectingPoint num="2" id="3065" />
-<TGConnectingPoint num="3" id="3066" />
-<TGConnectingPoint num="4" id="3067" />
-<TGConnectingPoint num="5" id="3068" />
-<TGConnectingPoint num="6" id="3069" />
-<TGConnectingPoint num="7" id="3070" />
-<TGConnectingPoint num="8" id="3071" />
-<TGConnectingPoint num="9" id="3072" />
-<TGConnectingPoint num="10" id="3073" />
-<TGConnectingPoint num="11" id="3074" />
-<TGConnectingPoint num="12" id="3075" />
-<TGConnectingPoint num="13" id="3076" />
-<TGConnectingPoint num="14" id="3077" />
-<TGConnectingPoint num="15" id="3078" />
-<TGConnectingPoint num="16" id="3079" />
-<TGConnectingPoint num="17" id="3080" />
-<TGConnectingPoint num="18" id="3081" />
-<TGConnectingPoint num="19" id="3082" />
-<TGConnectingPoint num="20" id="3083" />
-<TGConnectingPoint num="21" id="3084" />
-<TGConnectingPoint num="22" id="3085" />
-<TGConnectingPoint num="23" id="3086" />
-<TGConnectingPoint num="24" id="3087" />
-<TGConnectingPoint num="25" id="3088" />
-<TGConnectingPoint num="26" id="3089" />
-<TGConnectingPoint num="27" id="3090" />
-<TGConnectingPoint num="28" id="3091" />
-<TGConnectingPoint num="29" id="3092" />
-<TGConnectingPoint num="30" id="3093" />
+<TGConnectingPoint num="0" id="701" />
+<TGConnectingPoint num="1" id="702" />
+<TGConnectingPoint num="2" id="703" />
+<TGConnectingPoint num="3" id="704" />
+<TGConnectingPoint num="4" id="705" />
+<TGConnectingPoint num="5" id="706" />
+<TGConnectingPoint num="6" id="707" />
+<TGConnectingPoint num="7" id="708" />
+<TGConnectingPoint num="8" id="709" />
+<TGConnectingPoint num="9" id="710" />
+<TGConnectingPoint num="10" id="711" />
+<TGConnectingPoint num="11" id="712" />
+<TGConnectingPoint num="12" id="713" />
+<TGConnectingPoint num="13" id="714" />
+<TGConnectingPoint num="14" id="715" />
+<TGConnectingPoint num="15" id="716" />
+<TGConnectingPoint num="16" id="717" />
+<TGConnectingPoint num="17" id="718" />
+<TGConnectingPoint num="18" id="719" />
+<TGConnectingPoint num="19" id="720" />
+<TGConnectingPoint num="20" id="721" />
+<TGConnectingPoint num="21" id="722" />
+<TGConnectingPoint num="22" id="723" />
+<TGConnectingPoint num="23" id="724" />
+<TGConnectingPoint num="24" id="725" />
+<TGConnectingPoint num="25" id="726" />
+<TGConnectingPoint num="26" id="727" />
+<TGConnectingPoint num="27" id="728" />
+<TGConnectingPoint num="28" id="729" />
+<TGConnectingPoint num="29" id="730" />
+<TGConnectingPoint num="30" id="731" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1267,43 +1267,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3126" >
+<COMPONENT type="900" id="764" >
<cdparam x="637" y="518" />
<sizeparam width="319" height="116" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="292" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="IntegrityOfMessageAttributesAlongFunctionalPath" />
-<TGConnectingPoint num="0" id="3095" />
-<TGConnectingPoint num="1" id="3096" />
-<TGConnectingPoint num="2" id="3097" />
-<TGConnectingPoint num="3" id="3098" />
-<TGConnectingPoint num="4" id="3099" />
-<TGConnectingPoint num="5" id="3100" />
-<TGConnectingPoint num="6" id="3101" />
-<TGConnectingPoint num="7" id="3102" />
-<TGConnectingPoint num="8" id="3103" />
-<TGConnectingPoint num="9" id="3104" />
-<TGConnectingPoint num="10" id="3105" />
-<TGConnectingPoint num="11" id="3106" />
-<TGConnectingPoint num="12" id="3107" />
-<TGConnectingPoint num="13" id="3108" />
-<TGConnectingPoint num="14" id="3109" />
-<TGConnectingPoint num="15" id="3110" />
-<TGConnectingPoint num="16" id="3111" />
-<TGConnectingPoint num="17" id="3112" />
-<TGConnectingPoint num="18" id="3113" />
-<TGConnectingPoint num="19" id="3114" />
-<TGConnectingPoint num="20" id="3115" />
-<TGConnectingPoint num="21" id="3116" />
-<TGConnectingPoint num="22" id="3117" />
-<TGConnectingPoint num="23" id="3118" />
-<TGConnectingPoint num="24" id="3119" />
-<TGConnectingPoint num="25" id="3120" />
-<TGConnectingPoint num="26" id="3121" />
-<TGConnectingPoint num="27" id="3122" />
-<TGConnectingPoint num="28" id="3123" />
-<TGConnectingPoint num="29" id="3124" />
-<TGConnectingPoint num="30" id="3125" />
+<TGConnectingPoint num="0" id="733" />
+<TGConnectingPoint num="1" id="734" />
+<TGConnectingPoint num="2" id="735" />
+<TGConnectingPoint num="3" id="736" />
+<TGConnectingPoint num="4" id="737" />
+<TGConnectingPoint num="5" id="738" />
+<TGConnectingPoint num="6" id="739" />
+<TGConnectingPoint num="7" id="740" />
+<TGConnectingPoint num="8" id="741" />
+<TGConnectingPoint num="9" id="742" />
+<TGConnectingPoint num="10" id="743" />
+<TGConnectingPoint num="11" id="744" />
+<TGConnectingPoint num="12" id="745" />
+<TGConnectingPoint num="13" id="746" />
+<TGConnectingPoint num="14" id="747" />
+<TGConnectingPoint num="15" id="748" />
+<TGConnectingPoint num="16" id="749" />
+<TGConnectingPoint num="17" id="750" />
+<TGConnectingPoint num="18" id="751" />
+<TGConnectingPoint num="19" id="752" />
+<TGConnectingPoint num="20" id="753" />
+<TGConnectingPoint num="21" id="754" />
+<TGConnectingPoint num="22" id="755" />
+<TGConnectingPoint num="23" id="756" />
+<TGConnectingPoint num="24" id="757" />
+<TGConnectingPoint num="25" id="758" />
+<TGConnectingPoint num="26" id="759" />
+<TGConnectingPoint num="27" id="760" />
+<TGConnectingPoint num="28" id="761" />
+<TGConnectingPoint num="29" id="762" />
+<TGConnectingPoint num="30" id="763" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1318,43 +1318,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3158" >
+<COMPONENT type="900" id="796" >
<cdparam x="667" y="175" />
<sizeparam width="278" height="113" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="196" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="PreventSendingFakeCommand" />
-<TGConnectingPoint num="0" id="3127" />
-<TGConnectingPoint num="1" id="3128" />
-<TGConnectingPoint num="2" id="3129" />
-<TGConnectingPoint num="3" id="3130" />
-<TGConnectingPoint num="4" id="3131" />
-<TGConnectingPoint num="5" id="3132" />
-<TGConnectingPoint num="6" id="3133" />
-<TGConnectingPoint num="7" id="3134" />
-<TGConnectingPoint num="8" id="3135" />
-<TGConnectingPoint num="9" id="3136" />
-<TGConnectingPoint num="10" id="3137" />
-<TGConnectingPoint num="11" id="3138" />
-<TGConnectingPoint num="12" id="3139" />
-<TGConnectingPoint num="13" id="3140" />
-<TGConnectingPoint num="14" id="3141" />
-<TGConnectingPoint num="15" id="3142" />
-<TGConnectingPoint num="16" id="3143" />
-<TGConnectingPoint num="17" id="3144" />
-<TGConnectingPoint num="18" id="3145" />
-<TGConnectingPoint num="19" id="3146" />
-<TGConnectingPoint num="20" id="3147" />
-<TGConnectingPoint num="21" id="3148" />
-<TGConnectingPoint num="22" id="3149" />
-<TGConnectingPoint num="23" id="3150" />
-<TGConnectingPoint num="24" id="3151" />
-<TGConnectingPoint num="25" id="3152" />
-<TGConnectingPoint num="26" id="3153" />
-<TGConnectingPoint num="27" id="3154" />
-<TGConnectingPoint num="28" id="3155" />
-<TGConnectingPoint num="29" id="3156" />
-<TGConnectingPoint num="30" id="3157" />
+<TGConnectingPoint num="0" id="765" />
+<TGConnectingPoint num="1" id="766" />
+<TGConnectingPoint num="2" id="767" />
+<TGConnectingPoint num="3" id="768" />
+<TGConnectingPoint num="4" id="769" />
+<TGConnectingPoint num="5" id="770" />
+<TGConnectingPoint num="6" id="771" />
+<TGConnectingPoint num="7" id="772" />
+<TGConnectingPoint num="8" id="773" />
+<TGConnectingPoint num="9" id="774" />
+<TGConnectingPoint num="10" id="775" />
+<TGConnectingPoint num="11" id="776" />
+<TGConnectingPoint num="12" id="777" />
+<TGConnectingPoint num="13" id="778" />
+<TGConnectingPoint num="14" id="779" />
+<TGConnectingPoint num="15" id="780" />
+<TGConnectingPoint num="16" id="781" />
+<TGConnectingPoint num="17" id="782" />
+<TGConnectingPoint num="18" id="783" />
+<TGConnectingPoint num="19" id="784" />
+<TGConnectingPoint num="20" id="785" />
+<TGConnectingPoint num="21" id="786" />
+<TGConnectingPoint num="22" id="787" />
+<TGConnectingPoint num="23" id="788" />
+<TGConnectingPoint num="24" id="789" />
+<TGConnectingPoint num="25" id="790" />
+<TGConnectingPoint num="26" id="791" />
+<TGConnectingPoint num="27" id="792" />
+<TGConnectingPoint num="28" id="793" />
+<TGConnectingPoint num="29" id="794" />
+<TGConnectingPoint num="30" id="795" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1369,16 +1369,16 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="129" id="3160" >
+<CONNECTOR type="129" id="798" >
<cdparam x="501" y="293" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="491" y="363" id="3038" />
-<P2 x="806" y="288" id="3152" />
+<P1 x="491" y="363" id="676" />
+<P2 x="806" y="288" id="790" />
<Point x="683" y="316" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3159" >
-<father id="3160" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="797" >
+<father id="798" num="0" />
<cdparam x="683" y="316" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1386,16 +1386,16 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="129" id="3162" >
+<CONNECTOR type="129" id="800" >
<cdparam x="1219" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="1238" y="342" id="2941" />
-<P2 x="806" y="288" id="3151" />
+<P1 x="1238" y="342" id="579" />
+<P2 x="806" y="288" id="789" />
<Point x="919" y="330" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3161" >
-<father id="3162" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="799" >
+<father id="800" num="0" />
<cdparam x="919" y="330" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1403,111 +1403,111 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="120" id="3163" >
+<CONNECTOR type="120" id="801" >
<cdparam x="301" y="736" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from RequirementObserver to Requirement" value="<<verify>>" />
-<P1 x="187" y="670" id="2829" />
-<P2 x="188" y="631" id="2989" />
+<P1 x="187" y="670" id="467" />
+<P2 x="188" y="631" id="627" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3164" >
+<CONNECTOR type="129" id="802" >
<cdparam x="1387" y="520" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="1450" y="524" id="2845" />
-<P2 x="1336" y="456" id="2946" />
+<P1 x="1450" y="524" id="483" />
+<P2 x="1336" y="456" id="584" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3165" >
+<CONNECTOR type="129" id="803" >
<cdparam x="1200" y="520" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="1287" y="521" id="2878" />
-<P2 x="1287" y="456" id="2945" />
+<P1 x="1287" y="521" id="516" />
+<P2 x="1287" y="456" id="583" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3166" >
+<CONNECTOR type="129" id="804" >
<cdparam x="970" y="520" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="1090" y="521" id="2910" />
-<P2 x="1238" y="456" id="2944" />
+<P1 x="1090" y="521" id="548" />
+<P2 x="1238" y="456" id="582" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3167" >
+<CONNECTOR type="129" id="805" >
<cdparam x="890" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="806" y="361" id="3006" />
-<P2 x="806" y="288" id="3137" />
+<P1 x="806" y="361" id="644" />
+<P2 x="806" y="288" id="775" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3168" >
+<CONNECTOR type="129" id="806" >
<cdparam x="675" y="521" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="716" y="518" id="3101" />
-<P2 x="491" y="465" id="3055" />
+<P1 x="716" y="518" id="739" />
+<P2 x="491" y="465" id="693" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3169" >
+<CONNECTOR type="129" id="807" >
<cdparam x="501" y="522" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="491" y="518" id="3070" />
-<P2 x="491" y="465" id="3041" />
+<P1 x="491" y="518" id="708" />
+<P2 x="491" y="465" id="679" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3170" >
+<CONNECTOR type="129" id="808" >
<cdparam x="269" y="520" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="188" y="517" id="2974" />
-<P2 x="491" y="465" id="3056" />
+<P1 x="188" y="517" id="612" />
+<P2 x="491" y="465" id="694" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TRequirementDiagramPanel>
<TRequirementDiagramPanel name="Environment related requirements" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="900" id="3202" >
+<COMPONENT type="900" id="840" >
<cdparam x="796" y="171" />
<sizeparam width="325" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="221" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="EnvironmentRelatedDataFreshness" />
-<TGConnectingPoint num="0" id="3171" />
-<TGConnectingPoint num="1" id="3172" />
-<TGConnectingPoint num="2" id="3173" />
-<TGConnectingPoint num="3" id="3174" />
-<TGConnectingPoint num="4" id="3175" />
-<TGConnectingPoint num="5" id="3176" />
-<TGConnectingPoint num="6" id="3177" />
-<TGConnectingPoint num="7" id="3178" />
-<TGConnectingPoint num="8" id="3179" />
-<TGConnectingPoint num="9" id="3180" />
-<TGConnectingPoint num="10" id="3181" />
-<TGConnectingPoint num="11" id="3182" />
-<TGConnectingPoint num="12" id="3183" />
-<TGConnectingPoint num="13" id="3184" />
-<TGConnectingPoint num="14" id="3185" />
-<TGConnectingPoint num="15" id="3186" />
-<TGConnectingPoint num="16" id="3187" />
-<TGConnectingPoint num="17" id="3188" />
-<TGConnectingPoint num="18" id="3189" />
-<TGConnectingPoint num="19" id="3190" />
-<TGConnectingPoint num="20" id="3191" />
-<TGConnectingPoint num="21" id="3192" />
-<TGConnectingPoint num="22" id="3193" />
-<TGConnectingPoint num="23" id="3194" />
-<TGConnectingPoint num="24" id="3195" />
-<TGConnectingPoint num="25" id="3196" />
-<TGConnectingPoint num="26" id="3197" />
-<TGConnectingPoint num="27" id="3198" />
-<TGConnectingPoint num="28" id="3199" />
-<TGConnectingPoint num="29" id="3200" />
-<TGConnectingPoint num="30" id="3201" />
+<TGConnectingPoint num="0" id="809" />
+<TGConnectingPoint num="1" id="810" />
+<TGConnectingPoint num="2" id="811" />
+<TGConnectingPoint num="3" id="812" />
+<TGConnectingPoint num="4" id="813" />
+<TGConnectingPoint num="5" id="814" />
+<TGConnectingPoint num="6" id="815" />
+<TGConnectingPoint num="7" id="816" />
+<TGConnectingPoint num="8" id="817" />
+<TGConnectingPoint num="9" id="818" />
+<TGConnectingPoint num="10" id="819" />
+<TGConnectingPoint num="11" id="820" />
+<TGConnectingPoint num="12" id="821" />
+<TGConnectingPoint num="13" id="822" />
+<TGConnectingPoint num="14" id="823" />
+<TGConnectingPoint num="15" id="824" />
+<TGConnectingPoint num="16" id="825" />
+<TGConnectingPoint num="17" id="826" />
+<TGConnectingPoint num="18" id="827" />
+<TGConnectingPoint num="19" id="828" />
+<TGConnectingPoint num="20" id="829" />
+<TGConnectingPoint num="21" id="830" />
+<TGConnectingPoint num="22" id="831" />
+<TGConnectingPoint num="23" id="832" />
+<TGConnectingPoint num="24" id="833" />
+<TGConnectingPoint num="25" id="834" />
+<TGConnectingPoint num="26" id="835" />
+<TGConnectingPoint num="27" id="836" />
+<TGConnectingPoint num="28" id="837" />
+<TGConnectingPoint num="29" id="838" />
+<TGConnectingPoint num="30" id="839" />
<extraparam>
<type data="2" />
<textline data="It is already ensured for internal events in the " />
@@ -1524,43 +1524,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3234" >
+<COMPONENT type="900" id="872" >
<cdparam x="469" y="184" />
<sizeparam width="302" height="96" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="197" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="AuthenticatingMessageSources" />
-<TGConnectingPoint num="0" id="3203" />
-<TGConnectingPoint num="1" id="3204" />
-<TGConnectingPoint num="2" id="3205" />
-<TGConnectingPoint num="3" id="3206" />
-<TGConnectingPoint num="4" id="3207" />
-<TGConnectingPoint num="5" id="3208" />
-<TGConnectingPoint num="6" id="3209" />
-<TGConnectingPoint num="7" id="3210" />
-<TGConnectingPoint num="8" id="3211" />
-<TGConnectingPoint num="9" id="3212" />
-<TGConnectingPoint num="10" id="3213" />
-<TGConnectingPoint num="11" id="3214" />
-<TGConnectingPoint num="12" id="3215" />
-<TGConnectingPoint num="13" id="3216" />
-<TGConnectingPoint num="14" id="3217" />
-<TGConnectingPoint num="15" id="3218" />
-<TGConnectingPoint num="16" id="3219" />
-<TGConnectingPoint num="17" id="3220" />
-<TGConnectingPoint num="18" id="3221" />
-<TGConnectingPoint num="19" id="3222" />
-<TGConnectingPoint num="20" id="3223" />
-<TGConnectingPoint num="21" id="3224" />
-<TGConnectingPoint num="22" id="3225" />
-<TGConnectingPoint num="23" id="3226" />
-<TGConnectingPoint num="24" id="3227" />
-<TGConnectingPoint num="25" id="3228" />
-<TGConnectingPoint num="26" id="3229" />
-<TGConnectingPoint num="27" id="3230" />
-<TGConnectingPoint num="28" id="3231" />
-<TGConnectingPoint num="29" id="3232" />
-<TGConnectingPoint num="30" id="3233" />
+<TGConnectingPoint num="0" id="841" />
+<TGConnectingPoint num="1" id="842" />
+<TGConnectingPoint num="2" id="843" />
+<TGConnectingPoint num="3" id="844" />
+<TGConnectingPoint num="4" id="845" />
+<TGConnectingPoint num="5" id="846" />
+<TGConnectingPoint num="6" id="847" />
+<TGConnectingPoint num="7" id="848" />
+<TGConnectingPoint num="8" id="849" />
+<TGConnectingPoint num="9" id="850" />
+<TGConnectingPoint num="10" id="851" />
+<TGConnectingPoint num="11" id="852" />
+<TGConnectingPoint num="12" id="853" />
+<TGConnectingPoint num="13" id="854" />
+<TGConnectingPoint num="14" id="855" />
+<TGConnectingPoint num="15" id="856" />
+<TGConnectingPoint num="16" id="857" />
+<TGConnectingPoint num="17" id="858" />
+<TGConnectingPoint num="18" id="859" />
+<TGConnectingPoint num="19" id="860" />
+<TGConnectingPoint num="20" id="861" />
+<TGConnectingPoint num="21" id="862" />
+<TGConnectingPoint num="22" id="863" />
+<TGConnectingPoint num="23" id="864" />
+<TGConnectingPoint num="24" id="865" />
+<TGConnectingPoint num="25" id="866" />
+<TGConnectingPoint num="26" id="867" />
+<TGConnectingPoint num="27" id="868" />
+<TGConnectingPoint num="28" id="869" />
+<TGConnectingPoint num="29" id="870" />
+<TGConnectingPoint num="30" id="871" />
<extraparam>
<type data="2" />
<textline data="Authenticating changes sent from other cars" />
@@ -1575,43 +1575,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3266" >
+<COMPONENT type="900" id="904" >
<cdparam x="516" y="67" />
<sizeparam width="482" height="82" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="379" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="PreventMaliciousModificationsOnTheEnvironmentRepresentation" />
-<TGConnectingPoint num="0" id="3235" />
-<TGConnectingPoint num="1" id="3236" />
-<TGConnectingPoint num="2" id="3237" />
-<TGConnectingPoint num="3" id="3238" />
-<TGConnectingPoint num="4" id="3239" />
-<TGConnectingPoint num="5" id="3240" />
-<TGConnectingPoint num="6" id="3241" />
-<TGConnectingPoint num="7" id="3242" />
-<TGConnectingPoint num="8" id="3243" />
-<TGConnectingPoint num="9" id="3244" />
-<TGConnectingPoint num="10" id="3245" />
-<TGConnectingPoint num="11" id="3246" />
-<TGConnectingPoint num="12" id="3247" />
-<TGConnectingPoint num="13" id="3248" />
-<TGConnectingPoint num="14" id="3249" />
-<TGConnectingPoint num="15" id="3250" />
-<TGConnectingPoint num="16" id="3251" />
-<TGConnectingPoint num="17" id="3252" />
-<TGConnectingPoint num="18" id="3253" />
-<TGConnectingPoint num="19" id="3254" />
-<TGConnectingPoint num="20" id="3255" />
-<TGConnectingPoint num="21" id="3256" />
-<TGConnectingPoint num="22" id="3257" />
-<TGConnectingPoint num="23" id="3258" />
-<TGConnectingPoint num="24" id="3259" />
-<TGConnectingPoint num="25" id="3260" />
-<TGConnectingPoint num="26" id="3261" />
-<TGConnectingPoint num="27" id="3262" />
-<TGConnectingPoint num="28" id="3263" />
-<TGConnectingPoint num="29" id="3264" />
-<TGConnectingPoint num="30" id="3265" />
+<TGConnectingPoint num="0" id="873" />
+<TGConnectingPoint num="1" id="874" />
+<TGConnectingPoint num="2" id="875" />
+<TGConnectingPoint num="3" id="876" />
+<TGConnectingPoint num="4" id="877" />
+<TGConnectingPoint num="5" id="878" />
+<TGConnectingPoint num="6" id="879" />
+<TGConnectingPoint num="7" id="880" />
+<TGConnectingPoint num="8" id="881" />
+<TGConnectingPoint num="9" id="882" />
+<TGConnectingPoint num="10" id="883" />
+<TGConnectingPoint num="11" id="884" />
+<TGConnectingPoint num="12" id="885" />
+<TGConnectingPoint num="13" id="886" />
+<TGConnectingPoint num="14" id="887" />
+<TGConnectingPoint num="15" id="888" />
+<TGConnectingPoint num="16" id="889" />
+<TGConnectingPoint num="17" id="890" />
+<TGConnectingPoint num="18" id="891" />
+<TGConnectingPoint num="19" id="892" />
+<TGConnectingPoint num="20" id="893" />
+<TGConnectingPoint num="21" id="894" />
+<TGConnectingPoint num="22" id="895" />
+<TGConnectingPoint num="23" id="896" />
+<TGConnectingPoint num="24" id="897" />
+<TGConnectingPoint num="25" id="898" />
+<TGConnectingPoint num="26" id="899" />
+<TGConnectingPoint num="27" id="900" />
+<TGConnectingPoint num="28" id="901" />
+<TGConnectingPoint num="29" id="902" />
+<TGConnectingPoint num="30" id="903" />
<extraparam>
<type data="2" />
<textline data="Try to prevent attackerscfrom feeding wrong information to gateways" />
@@ -1625,43 +1625,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3298" >
+<COMPONENT type="900" id="936" >
<cdparam x="461" y="311" />
<sizeparam width="321" height="99" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="184" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="EnforceTrustedAuthentication" />
-<TGConnectingPoint num="0" id="3267" />
-<TGConnectingPoint num="1" id="3268" />
-<TGConnectingPoint num="2" id="3269" />
-<TGConnectingPoint num="3" id="3270" />
-<TGConnectingPoint num="4" id="3271" />
-<TGConnectingPoint num="5" id="3272" />
-<TGConnectingPoint num="6" id="3273" />
-<TGConnectingPoint num="7" id="3274" />
-<TGConnectingPoint num="8" id="3275" />
-<TGConnectingPoint num="9" id="3276" />
-<TGConnectingPoint num="10" id="3277" />
-<TGConnectingPoint num="11" id="3278" />
-<TGConnectingPoint num="12" id="3279" />
-<TGConnectingPoint num="13" id="3280" />
-<TGConnectingPoint num="14" id="3281" />
-<TGConnectingPoint num="15" id="3282" />
-<TGConnectingPoint num="16" id="3283" />
-<TGConnectingPoint num="17" id="3284" />
-<TGConnectingPoint num="18" id="3285" />
-<TGConnectingPoint num="19" id="3286" />
-<TGConnectingPoint num="20" id="3287" />
-<TGConnectingPoint num="21" id="3288" />
-<TGConnectingPoint num="22" id="3289" />
-<TGConnectingPoint num="23" id="3290" />
-<TGConnectingPoint num="24" id="3291" />
-<TGConnectingPoint num="25" id="3292" />
-<TGConnectingPoint num="26" id="3293" />
-<TGConnectingPoint num="27" id="3294" />
-<TGConnectingPoint num="28" id="3295" />
-<TGConnectingPoint num="29" id="3296" />
-<TGConnectingPoint num="30" id="3297" />
+<TGConnectingPoint num="0" id="905" />
+<TGConnectingPoint num="1" id="906" />
+<TGConnectingPoint num="2" id="907" />
+<TGConnectingPoint num="3" id="908" />
+<TGConnectingPoint num="4" id="909" />
+<TGConnectingPoint num="5" id="910" />
+<TGConnectingPoint num="6" id="911" />
+<TGConnectingPoint num="7" id="912" />
+<TGConnectingPoint num="8" id="913" />
+<TGConnectingPoint num="9" id="914" />
+<TGConnectingPoint num="10" id="915" />
+<TGConnectingPoint num="11" id="916" />
+<TGConnectingPoint num="12" id="917" />
+<TGConnectingPoint num="13" id="918" />
+<TGConnectingPoint num="14" id="919" />
+<TGConnectingPoint num="15" id="920" />
+<TGConnectingPoint num="16" id="921" />
+<TGConnectingPoint num="17" id="922" />
+<TGConnectingPoint num="18" id="923" />
+<TGConnectingPoint num="19" id="924" />
+<TGConnectingPoint num="20" id="925" />
+<TGConnectingPoint num="21" id="926" />
+<TGConnectingPoint num="22" id="927" />
+<TGConnectingPoint num="23" id="928" />
+<TGConnectingPoint num="24" id="929" />
+<TGConnectingPoint num="25" id="930" />
+<TGConnectingPoint num="26" id="931" />
+<TGConnectingPoint num="27" id="932" />
+<TGConnectingPoint num="28" id="933" />
+<TGConnectingPoint num="29" id="934" />
+<TGConnectingPoint num="30" id="935" />
<extraparam>
<type data="0" />
<textline data="Roots of trust for authentication should not be" />
@@ -1676,43 +1676,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3330" >
+<COMPONENT type="900" id="968" >
<cdparam x="822" y="330" />
<sizeparam width="275" height="75" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="240" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Requirement" value="EnforceCorrectAndUpdatedTimeSource" />
-<TGConnectingPoint num="0" id="3299" />
-<TGConnectingPoint num="1" id="3300" />
-<TGConnectingPoint num="2" id="3301" />
-<TGConnectingPoint num="3" id="3302" />
-<TGConnectingPoint num="4" id="3303" />
-<TGConnectingPoint num="5" id="3304" />
-<TGConnectingPoint num="6" id="3305" />
-<TGConnectingPoint num="7" id="3306" />
-<TGConnectingPoint num="8" id="3307" />
-<TGConnectingPoint num="9" id="3308" />
-<TGConnectingPoint num="10" id="3309" />
-<TGConnectingPoint num="11" id="3310" />
-<TGConnectingPoint num="12" id="3311" />
-<TGConnectingPoint num="13" id="3312" />
-<TGConnectingPoint num="14" id="3313" />
-<TGConnectingPoint num="15" id="3314" />
-<TGConnectingPoint num="16" id="3315" />
-<TGConnectingPoint num="17" id="3316" />
-<TGConnectingPoint num="18" id="3317" />
-<TGConnectingPoint num="19" id="3318" />
-<TGConnectingPoint num="20" id="3319" />
-<TGConnectingPoint num="21" id="3320" />
-<TGConnectingPoint num="22" id="3321" />
-<TGConnectingPoint num="23" id="3322" />
-<TGConnectingPoint num="24" id="3323" />
-<TGConnectingPoint num="25" id="3324" />
-<TGConnectingPoint num="26" id="3325" />
-<TGConnectingPoint num="27" id="3326" />
-<TGConnectingPoint num="28" id="3327" />
-<TGConnectingPoint num="29" id="3328" />
-<TGConnectingPoint num="30" id="3329" />
+<TGConnectingPoint num="0" id="937" />
+<TGConnectingPoint num="1" id="938" />
+<TGConnectingPoint num="2" id="939" />
+<TGConnectingPoint num="3" id="940" />
+<TGConnectingPoint num="4" id="941" />
+<TGConnectingPoint num="5" id="942" />
+<TGConnectingPoint num="6" id="943" />
+<TGConnectingPoint num="7" id="944" />
+<TGConnectingPoint num="8" id="945" />
+<TGConnectingPoint num="9" id="946" />
+<TGConnectingPoint num="10" id="947" />
+<TGConnectingPoint num="11" id="948" />
+<TGConnectingPoint num="12" id="949" />
+<TGConnectingPoint num="13" id="950" />
+<TGConnectingPoint num="14" id="951" />
+<TGConnectingPoint num="15" id="952" />
+<TGConnectingPoint num="16" id="953" />
+<TGConnectingPoint num="17" id="954" />
+<TGConnectingPoint num="18" id="955" />
+<TGConnectingPoint num="19" id="956" />
+<TGConnectingPoint num="20" id="957" />
+<TGConnectingPoint num="21" id="958" />
+<TGConnectingPoint num="22" id="959" />
+<TGConnectingPoint num="23" id="960" />
+<TGConnectingPoint num="24" id="961" />
+<TGConnectingPoint num="25" id="962" />
+<TGConnectingPoint num="26" id="963" />
+<TGConnectingPoint num="27" id="964" />
+<TGConnectingPoint num="28" id="965" />
+<TGConnectingPoint num="29" id="966" />
+<TGConnectingPoint num="30" id="967" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1727,36 +1727,36 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="129" id="3331" >
+<CONNECTOR type="129" id="969" >
<cdparam x="567" y="211" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<P1 x="620" y="184" id="3210" />
-<P2 x="636" y="149" id="3244" />
+<P1 x="620" y="184" id="848" />
+<P2 x="636" y="149" id="882" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="119" id="3332" >
+<CONNECTOR type="119" id="970" >
<cdparam x="1421" y="528" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<deriveReqt>>" />
-<P1 x="959" y="330" id="3306" />
-<P2 x="958" y="291" id="3181" />
+<P1 x="959" y="330" id="944" />
+<P2 x="958" y="291" id="819" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="119" id="3333" >
+<CONNECTOR type="119" id="971" >
<cdparam x="571" y="425" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<deriveReqt>>" />
-<P1 x="621" y="311" id="3274" />
-<P2 x="620" y="280" id="3213" />
+<P1 x="621" y="311" id="912" />
+<P2 x="620" y="280" id="851" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3334" >
+<CONNECTOR type="129" id="972" >
<cdparam x="1192" y="279" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="958" y="171" id="3178" />
-<P2 x="877" y="149" id="3246" />
+<P1 x="958" y="171" id="816" />
+<P2 x="877" y="149" id="884" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1769,70 +1769,70 @@
<Modeling type="Requirement" nameTab="Reqs of Local Danger Warning" >
<TRequirementDiagramPanel name="Requirement diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="901" id="3612" >
+<COMPONENT type="901" id="988" >
<cdparam x="523" y="741" />
<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="120" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="RequirementObserver" value="DisplayAvailability" />
-<TGConnectingPoint num="0" id="3597" />
-<TGConnectingPoint num="1" id="3598" />
-<TGConnectingPoint num="2" id="3599" />
-<TGConnectingPoint num="3" id="3600" />
-<TGConnectingPoint num="4" id="3601" />
-<TGConnectingPoint num="5" id="3602" />
-<TGConnectingPoint num="6" id="3603" />
-<TGConnectingPoint num="7" id="3604" />
-<TGConnectingPoint num="8" id="3605" />
-<TGConnectingPoint num="9" id="3606" />
-<TGConnectingPoint num="10" id="3607" />
-<TGConnectingPoint num="11" id="3608" />
-<TGConnectingPoint num="12" id="3609" />
-<TGConnectingPoint num="13" id="3610" />
-<TGConnectingPoint num="14" id="3611" />
+<TGConnectingPoint num="0" id="973" />
+<TGConnectingPoint num="1" id="974" />
+<TGConnectingPoint num="2" id="975" />
+<TGConnectingPoint num="3" id="976" />
+<TGConnectingPoint num="4" id="977" />
+<TGConnectingPoint num="5" id="978" />
+<TGConnectingPoint num="6" id="979" />
+<TGConnectingPoint num="7" id="980" />
+<TGConnectingPoint num="8" id="981" />
+<TGConnectingPoint num="9" id="982" />
+<TGConnectingPoint num="10" id="983" />
+<TGConnectingPoint num="11" id="984" />
+<TGConnectingPoint num="12" id="985" />
+<TGConnectingPoint num="13" id="986" />
+<TGConnectingPoint num="14" id="987" />
<extraparam>
<diagramText data="" />
<violated data="noAction" />
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3644" >
+<COMPONENT type="900" id="1020" >
<cdparam x="502" y="540" />
<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="164" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="EnsureAvailabilityOfECUs" />
-<TGConnectingPoint num="0" id="3613" />
-<TGConnectingPoint num="1" id="3614" />
-<TGConnectingPoint num="2" id="3615" />
-<TGConnectingPoint num="3" id="3616" />
-<TGConnectingPoint num="4" id="3617" />
-<TGConnectingPoint num="5" id="3618" />
-<TGConnectingPoint num="6" id="3619" />
-<TGConnectingPoint num="7" id="3620" />
-<TGConnectingPoint num="8" id="3621" />
-<TGConnectingPoint num="9" id="3622" />
-<TGConnectingPoint num="10" id="3623" />
-<TGConnectingPoint num="11" id="3624" />
-<TGConnectingPoint num="12" id="3625" />
-<TGConnectingPoint num="13" id="3626" />
-<TGConnectingPoint num="14" id="3627" />
-<TGConnectingPoint num="15" id="3628" />
-<TGConnectingPoint num="16" id="3629" />
-<TGConnectingPoint num="17" id="3630" />
-<TGConnectingPoint num="18" id="3631" />
-<TGConnectingPoint num="19" id="3632" />
-<TGConnectingPoint num="20" id="3633" />
-<TGConnectingPoint num="21" id="3634" />
-<TGConnectingPoint num="22" id="3635" />
-<TGConnectingPoint num="23" id="3636" />
-<TGConnectingPoint num="24" id="3637" />
-<TGConnectingPoint num="25" id="3638" />
-<TGConnectingPoint num="26" id="3639" />
-<TGConnectingPoint num="27" id="3640" />
-<TGConnectingPoint num="28" id="3641" />
-<TGConnectingPoint num="29" id="3642" />
-<TGConnectingPoint num="30" id="3643" />
+<TGConnectingPoint num="0" id="989" />
+<TGConnectingPoint num="1" id="990" />
+<TGConnectingPoint num="2" id="991" />
+<TGConnectingPoint num="3" id="992" />
+<TGConnectingPoint num="4" id="993" />
+<TGConnectingPoint num="5" id="994" />
+<TGConnectingPoint num="6" id="995" />
+<TGConnectingPoint num="7" id="996" />
+<TGConnectingPoint num="8" id="997" />
+<TGConnectingPoint num="9" id="998" />
+<TGConnectingPoint num="10" id="999" />
+<TGConnectingPoint num="11" id="1000" />
+<TGConnectingPoint num="12" id="1001" />
+<TGConnectingPoint num="13" id="1002" />
+<TGConnectingPoint num="14" id="1003" />
+<TGConnectingPoint num="15" id="1004" />
+<TGConnectingPoint num="16" id="1005" />
+<TGConnectingPoint num="17" id="1006" />
+<TGConnectingPoint num="18" id="1007" />
+<TGConnectingPoint num="19" id="1008" />
+<TGConnectingPoint num="20" id="1009" />
+<TGConnectingPoint num="21" id="1010" />
+<TGConnectingPoint num="22" id="1011" />
+<TGConnectingPoint num="23" id="1012" />
+<TGConnectingPoint num="24" id="1013" />
+<TGConnectingPoint num="25" id="1014" />
+<TGConnectingPoint num="26" id="1015" />
+<TGConnectingPoint num="27" id="1016" />
+<TGConnectingPoint num="28" id="1017" />
+<TGConnectingPoint num="29" id="1018" />
+<TGConnectingPoint num="30" id="1019" />
<extraparam>
<type data="0" />
<textline data="Requirement description:" />
@@ -1847,97 +1847,97 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="901" id="3660" >
+<COMPONENT type="901" id="1036" >
<cdparam x="112" y="312" />
<sizeparam width="443" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="391" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="RequirementObserver" value="PreventSendingFakeCooperativeAwarenessMessageToDSRCRxTx" />
-<TGConnectingPoint num="0" id="3645" />
-<TGConnectingPoint num="1" id="3646" />
-<TGConnectingPoint num="2" id="3647" />
-<TGConnectingPoint num="3" id="3648" />
-<TGConnectingPoint num="4" id="3649" />
-<TGConnectingPoint num="5" id="3650" />
-<TGConnectingPoint num="6" id="3651" />
-<TGConnectingPoint num="7" id="3652" />
-<TGConnectingPoint num="8" id="3653" />
-<TGConnectingPoint num="9" id="3654" />
-<TGConnectingPoint num="10" id="3655" />
-<TGConnectingPoint num="11" id="3656" />
-<TGConnectingPoint num="12" id="3657" />
-<TGConnectingPoint num="13" id="3658" />
-<TGConnectingPoint num="14" id="3659" />
+<TGConnectingPoint num="0" id="1021" />
+<TGConnectingPoint num="1" id="1022" />
+<TGConnectingPoint num="2" id="1023" />
+<TGConnectingPoint num="3" id="1024" />
+<TGConnectingPoint num="4" id="1025" />
+<TGConnectingPoint num="5" id="1026" />
+<TGConnectingPoint num="6" id="1027" />
+<TGConnectingPoint num="7" id="1028" />
+<TGConnectingPoint num="8" id="1029" />
+<TGConnectingPoint num="9" id="1030" />
+<TGConnectingPoint num="10" id="1031" />
+<TGConnectingPoint num="11" id="1032" />
+<TGConnectingPoint num="12" id="1033" />
+<TGConnectingPoint num="13" id="1034" />
+<TGConnectingPoint num="14" id="1035" />
<extraparam>
<diagramText data="no diagram" />
<violated data="noAction" />
</extraparam>
</COMPONENT>
-<COMPONENT type="901" id="3676" >
+<COMPONENT type="901" id="1052" >
<cdparam x="663" y="316" />
<sizeparam width="554" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="408" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="RequirementObserver" value="PreventSendFakeLocalDangerWarningCommandToBEM_Instruments" />
-<TGConnectingPoint num="0" id="3661" />
-<TGConnectingPoint num="1" id="3662" />
-<TGConnectingPoint num="2" id="3663" />
-<TGConnectingPoint num="3" id="3664" />
-<TGConnectingPoint num="4" id="3665" />
-<TGConnectingPoint num="5" id="3666" />
-<TGConnectingPoint num="6" id="3667" />
-<TGConnectingPoint num="7" id="3668" />
-<TGConnectingPoint num="8" id="3669" />
-<TGConnectingPoint num="9" id="3670" />
-<TGConnectingPoint num="10" id="3671" />
-<TGConnectingPoint num="11" id="3672" />
-<TGConnectingPoint num="12" id="3673" />
-<TGConnectingPoint num="13" id="3674" />
-<TGConnectingPoint num="14" id="3675" />
+<TGConnectingPoint num="0" id="1037" />
+<TGConnectingPoint num="1" id="1038" />
+<TGConnectingPoint num="2" id="1039" />
+<TGConnectingPoint num="3" id="1040" />
+<TGConnectingPoint num="4" id="1041" />
+<TGConnectingPoint num="5" id="1042" />
+<TGConnectingPoint num="6" id="1043" />
+<TGConnectingPoint num="7" id="1044" />
+<TGConnectingPoint num="8" id="1045" />
+<TGConnectingPoint num="9" id="1046" />
+<TGConnectingPoint num="10" id="1047" />
+<TGConnectingPoint num="11" id="1048" />
+<TGConnectingPoint num="12" id="1049" />
+<TGConnectingPoint num="13" id="1050" />
+<TGConnectingPoint num="14" id="1051" />
<extraparam>
<diagramText data="i.e. prevent sending of doDisplay command to BEM_Instruments" />
<violated data="noAction" />
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3708" >
+<COMPONENT type="900" id="1084" >
<cdparam x="591" y="75" />
<sizeparam width="282" height="138" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="196" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Requirement" value="PreventSendingFakeCommand" />
-<TGConnectingPoint num="0" id="3677" />
-<TGConnectingPoint num="1" id="3678" />
-<TGConnectingPoint num="2" id="3679" />
-<TGConnectingPoint num="3" id="3680" />
-<TGConnectingPoint num="4" id="3681" />
-<TGConnectingPoint num="5" id="3682" />
-<TGConnectingPoint num="6" id="3683" />
-<TGConnectingPoint num="7" id="3684" />
-<TGConnectingPoint num="8" id="3685" />
-<TGConnectingPoint num="9" id="3686" />
-<TGConnectingPoint num="10" id="3687" />
-<TGConnectingPoint num="11" id="3688" />
-<TGConnectingPoint num="12" id="3689" />
-<TGConnectingPoint num="13" id="3690" />
-<TGConnectingPoint num="14" id="3691" />
-<TGConnectingPoint num="15" id="3692" />
-<TGConnectingPoint num="16" id="3693" />
-<TGConnectingPoint num="17" id="3694" />
-<TGConnectingPoint num="18" id="3695" />
-<TGConnectingPoint num="19" id="3696" />
-<TGConnectingPoint num="20" id="3697" />
-<TGConnectingPoint num="21" id="3698" />
-<TGConnectingPoint num="22" id="3699" />
-<TGConnectingPoint num="23" id="3700" />
-<TGConnectingPoint num="24" id="3701" />
-<TGConnectingPoint num="25" id="3702" />
-<TGConnectingPoint num="26" id="3703" />
-<TGConnectingPoint num="27" id="3704" />
-<TGConnectingPoint num="28" id="3705" />
-<TGConnectingPoint num="29" id="3706" />
-<TGConnectingPoint num="30" id="3707" />
+<TGConnectingPoint num="0" id="1053" />
+<TGConnectingPoint num="1" id="1054" />
+<TGConnectingPoint num="2" id="1055" />
+<TGConnectingPoint num="3" id="1056" />
+<TGConnectingPoint num="4" id="1057" />
+<TGConnectingPoint num="5" id="1058" />
+<TGConnectingPoint num="6" id="1059" />
+<TGConnectingPoint num="7" id="1060" />
+<TGConnectingPoint num="8" id="1061" />
+<TGConnectingPoint num="9" id="1062" />
+<TGConnectingPoint num="10" id="1063" />
+<TGConnectingPoint num="11" id="1064" />
+<TGConnectingPoint num="12" id="1065" />
+<TGConnectingPoint num="13" id="1066" />
+<TGConnectingPoint num="14" id="1067" />
+<TGConnectingPoint num="15" id="1068" />
+<TGConnectingPoint num="16" id="1069" />
+<TGConnectingPoint num="17" id="1070" />
+<TGConnectingPoint num="18" id="1071" />
+<TGConnectingPoint num="19" id="1072" />
+<TGConnectingPoint num="20" id="1073" />
+<TGConnectingPoint num="21" id="1074" />
+<TGConnectingPoint num="22" id="1075" />
+<TGConnectingPoint num="23" id="1076" />
+<TGConnectingPoint num="24" id="1077" />
+<TGConnectingPoint num="25" id="1078" />
+<TGConnectingPoint num="26" id="1079" />
+<TGConnectingPoint num="27" id="1080" />
+<TGConnectingPoint num="28" id="1081" />
+<TGConnectingPoint num="29" id="1082" />
+<TGConnectingPoint num="30" id="1083" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -1952,28 +1952,28 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="120" id="3709" >
+<CONNECTOR type="120" id="1085" >
<cdparam x="620" y="759" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from RequirementObserver to Requirement" value="<<verify>>" />
-<P1 x="623" y="741" id="3604" />
-<P2 x="602" y="660" id="3635" />
+<P1 x="623" y="741" id="980" />
+<P2 x="602" y="660" id="1011" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="120" id="3710" >
+<CONNECTOR type="120" id="1086" >
<cdparam x="333" y="312" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from RequirementObserver to Requirement" value="<<verify>>" />
-<P1 x="333" y="312" id="3652" />
-<P2 x="591" y="178" id="3691" />
+<P1 x="333" y="312" id="1028" />
+<P2 x="591" y="178" id="1067" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="120" id="3711" >
+<CONNECTOR type="120" id="1087" >
<cdparam x="755" y="258" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from RequirementObserver to Requirement" value="<<verify>>" />
-<P1 x="940" y="316" id="3668" />
-<P2 x="732" y="213" id="3699" />
+<P1 x="940" y="316" id="1044" />
+<P2 x="732" y="213" id="1075" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1986,43 +1986,43 @@
<Modeling type="Requirement" nameTab="Reqs of Flashing per OBD Use Case" >
<TRequirementDiagramPanel name="Requirement diagram" minX="10" maxX="1900" minY="10" maxY="1900" zoom="1.0000000000000007" >
-<COMPONENT type="900" id="3366" >
+<COMPONENT type="900" id="1119" >
<cdparam x="702" y="236" />
<sizeparam width="262" height="85" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="224" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="ControlledAccessToReadFromFlash" />
-<TGConnectingPoint num="0" id="3335" />
-<TGConnectingPoint num="1" id="3336" />
-<TGConnectingPoint num="2" id="3337" />
-<TGConnectingPoint num="3" id="3338" />
-<TGConnectingPoint num="4" id="3339" />
-<TGConnectingPoint num="5" id="3340" />
-<TGConnectingPoint num="6" id="3341" />
-<TGConnectingPoint num="7" id="3342" />
-<TGConnectingPoint num="8" id="3343" />
-<TGConnectingPoint num="9" id="3344" />
-<TGConnectingPoint num="10" id="3345" />
-<TGConnectingPoint num="11" id="3346" />
-<TGConnectingPoint num="12" id="3347" />
-<TGConnectingPoint num="13" id="3348" />
-<TGConnectingPoint num="14" id="3349" />
-<TGConnectingPoint num="15" id="3350" />
-<TGConnectingPoint num="16" id="3351" />
-<TGConnectingPoint num="17" id="3352" />
-<TGConnectingPoint num="18" id="3353" />
-<TGConnectingPoint num="19" id="3354" />
-<TGConnectingPoint num="20" id="3355" />
-<TGConnectingPoint num="21" id="3356" />
-<TGConnectingPoint num="22" id="3357" />
-<TGConnectingPoint num="23" id="3358" />
-<TGConnectingPoint num="24" id="3359" />
-<TGConnectingPoint num="25" id="3360" />
-<TGConnectingPoint num="26" id="3361" />
-<TGConnectingPoint num="27" id="3362" />
-<TGConnectingPoint num="28" id="3363" />
-<TGConnectingPoint num="29" id="3364" />
-<TGConnectingPoint num="30" id="3365" />
+<TGConnectingPoint num="0" id="1088" />
+<TGConnectingPoint num="1" id="1089" />
+<TGConnectingPoint num="2" id="1090" />
+<TGConnectingPoint num="3" id="1091" />
+<TGConnectingPoint num="4" id="1092" />
+<TGConnectingPoint num="5" id="1093" />
+<TGConnectingPoint num="6" id="1094" />
+<TGConnectingPoint num="7" id="1095" />
+<TGConnectingPoint num="8" id="1096" />
+<TGConnectingPoint num="9" id="1097" />
+<TGConnectingPoint num="10" id="1098" />
+<TGConnectingPoint num="11" id="1099" />
+<TGConnectingPoint num="12" id="1100" />
+<TGConnectingPoint num="13" id="1101" />
+<TGConnectingPoint num="14" id="1102" />
+<TGConnectingPoint num="15" id="1103" />
+<TGConnectingPoint num="16" id="1104" />
+<TGConnectingPoint num="17" id="1105" />
+<TGConnectingPoint num="18" id="1106" />
+<TGConnectingPoint num="19" id="1107" />
+<TGConnectingPoint num="20" id="1108" />
+<TGConnectingPoint num="21" id="1109" />
+<TGConnectingPoint num="22" id="1110" />
+<TGConnectingPoint num="23" id="1111" />
+<TGConnectingPoint num="24" id="1112" />
+<TGConnectingPoint num="25" id="1113" />
+<TGConnectingPoint num="26" id="1114" />
+<TGConnectingPoint num="27" id="1115" />
+<TGConnectingPoint num="28" id="1116" />
+<TGConnectingPoint num="29" id="1117" />
+<TGConnectingPoint num="30" id="1118" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -2037,43 +2037,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3398" >
+<COMPONENT type="900" id="1151" >
<cdparam x="975" y="117" />
<sizeparam width="243" height="87" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="215" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="FirmwareAuthenticatedByCarMaker" />
-<TGConnectingPoint num="0" id="3367" />
-<TGConnectingPoint num="1" id="3368" />
-<TGConnectingPoint num="2" id="3369" />
-<TGConnectingPoint num="3" id="3370" />
-<TGConnectingPoint num="4" id="3371" />
-<TGConnectingPoint num="5" id="3372" />
-<TGConnectingPoint num="6" id="3373" />
-<TGConnectingPoint num="7" id="3374" />
-<TGConnectingPoint num="8" id="3375" />
-<TGConnectingPoint num="9" id="3376" />
-<TGConnectingPoint num="10" id="3377" />
-<TGConnectingPoint num="11" id="3378" />
-<TGConnectingPoint num="12" id="3379" />
-<TGConnectingPoint num="13" id="3380" />
-<TGConnectingPoint num="14" id="3381" />
-<TGConnectingPoint num="15" id="3382" />
-<TGConnectingPoint num="16" id="3383" />
-<TGConnectingPoint num="17" id="3384" />
-<TGConnectingPoint num="18" id="3385" />
-<TGConnectingPoint num="19" id="3386" />
-<TGConnectingPoint num="20" id="3387" />
-<TGConnectingPoint num="21" id="3388" />
-<TGConnectingPoint num="22" id="3389" />
-<TGConnectingPoint num="23" id="3390" />
-<TGConnectingPoint num="24" id="3391" />
-<TGConnectingPoint num="25" id="3392" />
-<TGConnectingPoint num="26" id="3393" />
-<TGConnectingPoint num="27" id="3394" />
-<TGConnectingPoint num="28" id="3395" />
-<TGConnectingPoint num="29" id="3396" />
-<TGConnectingPoint num="30" id="3397" />
+<TGConnectingPoint num="0" id="1120" />
+<TGConnectingPoint num="1" id="1121" />
+<TGConnectingPoint num="2" id="1122" />
+<TGConnectingPoint num="3" id="1123" />
+<TGConnectingPoint num="4" id="1124" />
+<TGConnectingPoint num="5" id="1125" />
+<TGConnectingPoint num="6" id="1126" />
+<TGConnectingPoint num="7" id="1127" />
+<TGConnectingPoint num="8" id="1128" />
+<TGConnectingPoint num="9" id="1129" />
+<TGConnectingPoint num="10" id="1130" />
+<TGConnectingPoint num="11" id="1131" />
+<TGConnectingPoint num="12" id="1132" />
+<TGConnectingPoint num="13" id="1133" />
+<TGConnectingPoint num="14" id="1134" />
+<TGConnectingPoint num="15" id="1135" />
+<TGConnectingPoint num="16" id="1136" />
+<TGConnectingPoint num="17" id="1137" />
+<TGConnectingPoint num="18" id="1138" />
+<TGConnectingPoint num="19" id="1139" />
+<TGConnectingPoint num="20" id="1140" />
+<TGConnectingPoint num="21" id="1141" />
+<TGConnectingPoint num="22" id="1142" />
+<TGConnectingPoint num="23" id="1143" />
+<TGConnectingPoint num="24" id="1144" />
+<TGConnectingPoint num="25" id="1145" />
+<TGConnectingPoint num="26" id="1146" />
+<TGConnectingPoint num="27" id="1147" />
+<TGConnectingPoint num="28" id="1148" />
+<TGConnectingPoint num="29" id="1149" />
+<TGConnectingPoint num="30" id="1150" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -2088,43 +2088,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3430" >
+<COMPONENT type="900" id="1183" >
<cdparam x="442" y="61" />
<sizeparam width="417" height="113" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="208" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="ControlledAccessToFlashMemory" />
-<TGConnectingPoint num="0" id="3399" />
-<TGConnectingPoint num="1" id="3400" />
-<TGConnectingPoint num="2" id="3401" />
-<TGConnectingPoint num="3" id="3402" />
-<TGConnectingPoint num="4" id="3403" />
-<TGConnectingPoint num="5" id="3404" />
-<TGConnectingPoint num="6" id="3405" />
-<TGConnectingPoint num="7" id="3406" />
-<TGConnectingPoint num="8" id="3407" />
-<TGConnectingPoint num="9" id="3408" />
-<TGConnectingPoint num="10" id="3409" />
-<TGConnectingPoint num="11" id="3410" />
-<TGConnectingPoint num="12" id="3411" />
-<TGConnectingPoint num="13" id="3412" />
-<TGConnectingPoint num="14" id="3413" />
-<TGConnectingPoint num="15" id="3414" />
-<TGConnectingPoint num="16" id="3415" />
-<TGConnectingPoint num="17" id="3416" />
-<TGConnectingPoint num="18" id="3417" />
-<TGConnectingPoint num="19" id="3418" />
-<TGConnectingPoint num="20" id="3419" />
-<TGConnectingPoint num="21" id="3420" />
-<TGConnectingPoint num="22" id="3421" />
-<TGConnectingPoint num="23" id="3422" />
-<TGConnectingPoint num="24" id="3423" />
-<TGConnectingPoint num="25" id="3424" />
-<TGConnectingPoint num="26" id="3425" />
-<TGConnectingPoint num="27" id="3426" />
-<TGConnectingPoint num="28" id="3427" />
-<TGConnectingPoint num="29" id="3428" />
-<TGConnectingPoint num="30" id="3429" />
+<TGConnectingPoint num="0" id="1152" />
+<TGConnectingPoint num="1" id="1153" />
+<TGConnectingPoint num="2" id="1154" />
+<TGConnectingPoint num="3" id="1155" />
+<TGConnectingPoint num="4" id="1156" />
+<TGConnectingPoint num="5" id="1157" />
+<TGConnectingPoint num="6" id="1158" />
+<TGConnectingPoint num="7" id="1159" />
+<TGConnectingPoint num="8" id="1160" />
+<TGConnectingPoint num="9" id="1161" />
+<TGConnectingPoint num="10" id="1162" />
+<TGConnectingPoint num="11" id="1163" />
+<TGConnectingPoint num="12" id="1164" />
+<TGConnectingPoint num="13" id="1165" />
+<TGConnectingPoint num="14" id="1166" />
+<TGConnectingPoint num="15" id="1167" />
+<TGConnectingPoint num="16" id="1168" />
+<TGConnectingPoint num="17" id="1169" />
+<TGConnectingPoint num="18" id="1170" />
+<TGConnectingPoint num="19" id="1171" />
+<TGConnectingPoint num="20" id="1172" />
+<TGConnectingPoint num="21" id="1173" />
+<TGConnectingPoint num="22" id="1174" />
+<TGConnectingPoint num="23" id="1175" />
+<TGConnectingPoint num="24" id="1176" />
+<TGConnectingPoint num="25" id="1177" />
+<TGConnectingPoint num="26" id="1178" />
+<TGConnectingPoint num="27" id="1179" />
+<TGConnectingPoint num="28" id="1180" />
+<TGConnectingPoint num="29" id="1181" />
+<TGConnectingPoint num="30" id="1182" />
<extraparam>
<type data="2" />
<textline data="Flash memory should be paired with their ECU" />
@@ -2139,43 +2139,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3462" >
+<COMPONENT type="900" id="1215" >
<cdparam x="389" y="237" />
<sizeparam width="267" height="85" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="229" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="ControlledAccessToFlashingFunction" />
-<TGConnectingPoint num="0" id="3431" />
-<TGConnectingPoint num="1" id="3432" />
-<TGConnectingPoint num="2" id="3433" />
-<TGConnectingPoint num="3" id="3434" />
-<TGConnectingPoint num="4" id="3435" />
-<TGConnectingPoint num="5" id="3436" />
-<TGConnectingPoint num="6" id="3437" />
-<TGConnectingPoint num="7" id="3438" />
-<TGConnectingPoint num="8" id="3439" />
-<TGConnectingPoint num="9" id="3440" />
-<TGConnectingPoint num="10" id="3441" />
-<TGConnectingPoint num="11" id="3442" />
-<TGConnectingPoint num="12" id="3443" />
-<TGConnectingPoint num="13" id="3444" />
-<TGConnectingPoint num="14" id="3445" />
-<TGConnectingPoint num="15" id="3446" />
-<TGConnectingPoint num="16" id="3447" />
-<TGConnectingPoint num="17" id="3448" />
-<TGConnectingPoint num="18" id="3449" />
-<TGConnectingPoint num="19" id="3450" />
-<TGConnectingPoint num="20" id="3451" />
-<TGConnectingPoint num="21" id="3452" />
-<TGConnectingPoint num="22" id="3453" />
-<TGConnectingPoint num="23" id="3454" />
-<TGConnectingPoint num="24" id="3455" />
-<TGConnectingPoint num="25" id="3456" />
-<TGConnectingPoint num="26" id="3457" />
-<TGConnectingPoint num="27" id="3458" />
-<TGConnectingPoint num="28" id="3459" />
-<TGConnectingPoint num="29" id="3460" />
-<TGConnectingPoint num="30" id="3461" />
+<TGConnectingPoint num="0" id="1184" />
+<TGConnectingPoint num="1" id="1185" />
+<TGConnectingPoint num="2" id="1186" />
+<TGConnectingPoint num="3" id="1187" />
+<TGConnectingPoint num="4" id="1188" />
+<TGConnectingPoint num="5" id="1189" />
+<TGConnectingPoint num="6" id="1190" />
+<TGConnectingPoint num="7" id="1191" />
+<TGConnectingPoint num="8" id="1192" />
+<TGConnectingPoint num="9" id="1193" />
+<TGConnectingPoint num="10" id="1194" />
+<TGConnectingPoint num="11" id="1195" />
+<TGConnectingPoint num="12" id="1196" />
+<TGConnectingPoint num="13" id="1197" />
+<TGConnectingPoint num="14" id="1198" />
+<TGConnectingPoint num="15" id="1199" />
+<TGConnectingPoint num="16" id="1200" />
+<TGConnectingPoint num="17" id="1201" />
+<TGConnectingPoint num="18" id="1202" />
+<TGConnectingPoint num="19" id="1203" />
+<TGConnectingPoint num="20" id="1204" />
+<TGConnectingPoint num="21" id="1205" />
+<TGConnectingPoint num="22" id="1206" />
+<TGConnectingPoint num="23" id="1207" />
+<TGConnectingPoint num="24" id="1208" />
+<TGConnectingPoint num="25" id="1209" />
+<TGConnectingPoint num="26" id="1210" />
+<TGConnectingPoint num="27" id="1211" />
+<TGConnectingPoint num="28" id="1212" />
+<TGConnectingPoint num="29" id="1213" />
+<TGConnectingPoint num="30" id="1214" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -2190,43 +2190,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3494" >
+<COMPONENT type="900" id="1247" >
<cdparam x="1096" y="232" />
<sizeparam width="216" height="83" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="190" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="ConfidentialityOfFirmwareData" />
-<TGConnectingPoint num="0" id="3463" />
-<TGConnectingPoint num="1" id="3464" />
-<TGConnectingPoint num="2" id="3465" />
-<TGConnectingPoint num="3" id="3466" />
-<TGConnectingPoint num="4" id="3467" />
-<TGConnectingPoint num="5" id="3468" />
-<TGConnectingPoint num="6" id="3469" />
-<TGConnectingPoint num="7" id="3470" />
-<TGConnectingPoint num="8" id="3471" />
-<TGConnectingPoint num="9" id="3472" />
-<TGConnectingPoint num="10" id="3473" />
-<TGConnectingPoint num="11" id="3474" />
-<TGConnectingPoint num="12" id="3475" />
-<TGConnectingPoint num="13" id="3476" />
-<TGConnectingPoint num="14" id="3477" />
-<TGConnectingPoint num="15" id="3478" />
-<TGConnectingPoint num="16" id="3479" />
-<TGConnectingPoint num="17" id="3480" />
-<TGConnectingPoint num="18" id="3481" />
-<TGConnectingPoint num="19" id="3482" />
-<TGConnectingPoint num="20" id="3483" />
-<TGConnectingPoint num="21" id="3484" />
-<TGConnectingPoint num="22" id="3485" />
-<TGConnectingPoint num="23" id="3486" />
-<TGConnectingPoint num="24" id="3487" />
-<TGConnectingPoint num="25" id="3488" />
-<TGConnectingPoint num="26" id="3489" />
-<TGConnectingPoint num="27" id="3490" />
-<TGConnectingPoint num="28" id="3491" />
-<TGConnectingPoint num="29" id="3492" />
-<TGConnectingPoint num="30" id="3493" />
+<TGConnectingPoint num="0" id="1216" />
+<TGConnectingPoint num="1" id="1217" />
+<TGConnectingPoint num="2" id="1218" />
+<TGConnectingPoint num="3" id="1219" />
+<TGConnectingPoint num="4" id="1220" />
+<TGConnectingPoint num="5" id="1221" />
+<TGConnectingPoint num="6" id="1222" />
+<TGConnectingPoint num="7" id="1223" />
+<TGConnectingPoint num="8" id="1224" />
+<TGConnectingPoint num="9" id="1225" />
+<TGConnectingPoint num="10" id="1226" />
+<TGConnectingPoint num="11" id="1227" />
+<TGConnectingPoint num="12" id="1228" />
+<TGConnectingPoint num="13" id="1229" />
+<TGConnectingPoint num="14" id="1230" />
+<TGConnectingPoint num="15" id="1231" />
+<TGConnectingPoint num="16" id="1232" />
+<TGConnectingPoint num="17" id="1233" />
+<TGConnectingPoint num="18" id="1234" />
+<TGConnectingPoint num="19" id="1235" />
+<TGConnectingPoint num="20" id="1236" />
+<TGConnectingPoint num="21" id="1237" />
+<TGConnectingPoint num="22" id="1238" />
+<TGConnectingPoint num="23" id="1239" />
+<TGConnectingPoint num="24" id="1240" />
+<TGConnectingPoint num="25" id="1241" />
+<TGConnectingPoint num="26" id="1242" />
+<TGConnectingPoint num="27" id="1243" />
+<TGConnectingPoint num="28" id="1244" />
+<TGConnectingPoint num="29" id="1245" />
+<TGConnectingPoint num="30" id="1246" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -2241,43 +2241,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3526" >
+<COMPONENT type="900" id="1279" >
<cdparam x="1069" y="358" />
<sizeparam width="223" height="86" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="204" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="ConfidentialityOfFirmwareUpdate" />
-<TGConnectingPoint num="0" id="3495" />
-<TGConnectingPoint num="1" id="3496" />
-<TGConnectingPoint num="2" id="3497" />
-<TGConnectingPoint num="3" id="3498" />
-<TGConnectingPoint num="4" id="3499" />
-<TGConnectingPoint num="5" id="3500" />
-<TGConnectingPoint num="6" id="3501" />
-<TGConnectingPoint num="7" id="3502" />
-<TGConnectingPoint num="8" id="3503" />
-<TGConnectingPoint num="9" id="3504" />
-<TGConnectingPoint num="10" id="3505" />
-<TGConnectingPoint num="11" id="3506" />
-<TGConnectingPoint num="12" id="3507" />
-<TGConnectingPoint num="13" id="3508" />
-<TGConnectingPoint num="14" id="3509" />
-<TGConnectingPoint num="15" id="3510" />
-<TGConnectingPoint num="16" id="3511" />
-<TGConnectingPoint num="17" id="3512" />
-<TGConnectingPoint num="18" id="3513" />
-<TGConnectingPoint num="19" id="3514" />
-<TGConnectingPoint num="20" id="3515" />
-<TGConnectingPoint num="21" id="3516" />
-<TGConnectingPoint num="22" id="3517" />
-<TGConnectingPoint num="23" id="3518" />
-<TGConnectingPoint num="24" id="3519" />
-<TGConnectingPoint num="25" id="3520" />
-<TGConnectingPoint num="26" id="3521" />
-<TGConnectingPoint num="27" id="3522" />
-<TGConnectingPoint num="28" id="3523" />
-<TGConnectingPoint num="29" id="3524" />
-<TGConnectingPoint num="30" id="3525" />
+<TGConnectingPoint num="0" id="1248" />
+<TGConnectingPoint num="1" id="1249" />
+<TGConnectingPoint num="2" id="1250" />
+<TGConnectingPoint num="3" id="1251" />
+<TGConnectingPoint num="4" id="1252" />
+<TGConnectingPoint num="5" id="1253" />
+<TGConnectingPoint num="6" id="1254" />
+<TGConnectingPoint num="7" id="1255" />
+<TGConnectingPoint num="8" id="1256" />
+<TGConnectingPoint num="9" id="1257" />
+<TGConnectingPoint num="10" id="1258" />
+<TGConnectingPoint num="11" id="1259" />
+<TGConnectingPoint num="12" id="1260" />
+<TGConnectingPoint num="13" id="1261" />
+<TGConnectingPoint num="14" id="1262" />
+<TGConnectingPoint num="15" id="1263" />
+<TGConnectingPoint num="16" id="1264" />
+<TGConnectingPoint num="17" id="1265" />
+<TGConnectingPoint num="18" id="1266" />
+<TGConnectingPoint num="19" id="1267" />
+<TGConnectingPoint num="20" id="1268" />
+<TGConnectingPoint num="21" id="1269" />
+<TGConnectingPoint num="22" id="1270" />
+<TGConnectingPoint num="23" id="1271" />
+<TGConnectingPoint num="24" id="1272" />
+<TGConnectingPoint num="25" id="1273" />
+<TGConnectingPoint num="26" id="1274" />
+<TGConnectingPoint num="27" id="1275" />
+<TGConnectingPoint num="28" id="1276" />
+<TGConnectingPoint num="29" id="1277" />
+<TGConnectingPoint num="30" id="1278" />
<extraparam>
<type data="2" />
<textline data="Requirement description:" />
@@ -2292,43 +2292,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3558" >
+<COMPONENT type="900" id="1311" >
<cdparam x="369" y="392" />
<sizeparam width="308" height="121" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="95" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="CodeIntegrity" />
-<TGConnectingPoint num="0" id="3527" />
-<TGConnectingPoint num="1" id="3528" />
-<TGConnectingPoint num="2" id="3529" />
-<TGConnectingPoint num="3" id="3530" />
-<TGConnectingPoint num="4" id="3531" />
-<TGConnectingPoint num="5" id="3532" />
-<TGConnectingPoint num="6" id="3533" />
-<TGConnectingPoint num="7" id="3534" />
-<TGConnectingPoint num="8" id="3535" />
-<TGConnectingPoint num="9" id="3536" />
-<TGConnectingPoint num="10" id="3537" />
-<TGConnectingPoint num="11" id="3538" />
-<TGConnectingPoint num="12" id="3539" />
-<TGConnectingPoint num="13" id="3540" />
-<TGConnectingPoint num="14" id="3541" />
-<TGConnectingPoint num="15" id="3542" />
-<TGConnectingPoint num="16" id="3543" />
-<TGConnectingPoint num="17" id="3544" />
-<TGConnectingPoint num="18" id="3545" />
-<TGConnectingPoint num="19" id="3546" />
-<TGConnectingPoint num="20" id="3547" />
-<TGConnectingPoint num="21" id="3548" />
-<TGConnectingPoint num="22" id="3549" />
-<TGConnectingPoint num="23" id="3550" />
-<TGConnectingPoint num="24" id="3551" />
-<TGConnectingPoint num="25" id="3552" />
-<TGConnectingPoint num="26" id="3553" />
-<TGConnectingPoint num="27" id="3554" />
-<TGConnectingPoint num="28" id="3555" />
-<TGConnectingPoint num="29" id="3556" />
-<TGConnectingPoint num="30" id="3557" />
+<TGConnectingPoint num="0" id="1280" />
+<TGConnectingPoint num="1" id="1281" />
+<TGConnectingPoint num="2" id="1282" />
+<TGConnectingPoint num="3" id="1283" />
+<TGConnectingPoint num="4" id="1284" />
+<TGConnectingPoint num="5" id="1285" />
+<TGConnectingPoint num="6" id="1286" />
+<TGConnectingPoint num="7" id="1287" />
+<TGConnectingPoint num="8" id="1288" />
+<TGConnectingPoint num="9" id="1289" />
+<TGConnectingPoint num="10" id="1290" />
+<TGConnectingPoint num="11" id="1291" />
+<TGConnectingPoint num="12" id="1292" />
+<TGConnectingPoint num="13" id="1293" />
+<TGConnectingPoint num="14" id="1294" />
+<TGConnectingPoint num="15" id="1295" />
+<TGConnectingPoint num="16" id="1296" />
+<TGConnectingPoint num="17" id="1297" />
+<TGConnectingPoint num="18" id="1298" />
+<TGConnectingPoint num="19" id="1299" />
+<TGConnectingPoint num="20" id="1300" />
+<TGConnectingPoint num="21" id="1301" />
+<TGConnectingPoint num="22" id="1302" />
+<TGConnectingPoint num="23" id="1303" />
+<TGConnectingPoint num="24" id="1304" />
+<TGConnectingPoint num="25" id="1305" />
+<TGConnectingPoint num="26" id="1306" />
+<TGConnectingPoint num="27" id="1307" />
+<TGConnectingPoint num="28" id="1308" />
+<TGConnectingPoint num="29" id="1309" />
+<TGConnectingPoint num="30" id="1310" />
<extraparam>
<type data="2" />
<textline data="the firmware update integrity should be protected" />
@@ -2346,43 +2346,43 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="900" id="3590" >
+<COMPONENT type="900" id="1343" >
<cdparam x="778" y="347" />
<sizeparam width="280" height="100" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="169" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
<infoparam name="Requirement" value="IntegrityOfFirmwareUpdate" />
-<TGConnectingPoint num="0" id="3559" />
-<TGConnectingPoint num="1" id="3560" />
-<TGConnectingPoint num="2" id="3561" />
-<TGConnectingPoint num="3" id="3562" />
-<TGConnectingPoint num="4" id="3563" />
-<TGConnectingPoint num="5" id="3564" />
-<TGConnectingPoint num="6" id="3565" />
-<TGConnectingPoint num="7" id="3566" />
-<TGConnectingPoint num="8" id="3567" />
-<TGConnectingPoint num="9" id="3568" />
-<TGConnectingPoint num="10" id="3569" />
-<TGConnectingPoint num="11" id="3570" />
-<TGConnectingPoint num="12" id="3571" />
-<TGConnectingPoint num="13" id="3572" />
-<TGConnectingPoint num="14" id="3573" />
-<TGConnectingPoint num="15" id="3574" />
-<TGConnectingPoint num="16" id="3575" />
-<TGConnectingPoint num="17" id="3576" />
-<TGConnectingPoint num="18" id="3577" />
-<TGConnectingPoint num="19" id="3578" />
-<TGConnectingPoint num="20" id="3579" />
-<TGConnectingPoint num="21" id="3580" />
-<TGConnectingPoint num="22" id="3581" />
-<TGConnectingPoint num="23" id="3582" />
-<TGConnectingPoint num="24" id="3583" />
-<TGConnectingPoint num="25" id="3584" />
-<TGConnectingPoint num="26" id="3585" />
-<TGConnectingPoint num="27" id="3586" />
-<TGConnectingPoint num="28" id="3587" />
-<TGConnectingPoint num="29" id="3588" />
-<TGConnectingPoint num="30" id="3589" />
+<TGConnectingPoint num="0" id="1312" />
+<TGConnectingPoint num="1" id="1313" />
+<TGConnectingPoint num="2" id="1314" />
+<TGConnectingPoint num="3" id="1315" />
+<TGConnectingPoint num="4" id="1316" />
+<TGConnectingPoint num="5" id="1317" />
+<TGConnectingPoint num="6" id="1318" />
+<TGConnectingPoint num="7" id="1319" />
+<TGConnectingPoint num="8" id="1320" />
+<TGConnectingPoint num="9" id="1321" />
+<TGConnectingPoint num="10" id="1322" />
+<TGConnectingPoint num="11" id="1323" />
+<TGConnectingPoint num="12" id="1324" />
+<TGConnectingPoint num="13" id="1325" />
+<TGConnectingPoint num="14" id="1326" />
+<TGConnectingPoint num="15" id="1327" />
+<TGConnectingPoint num="16" id="1328" />
+<TGConnectingPoint num="17" id="1329" />
+<TGConnectingPoint num="18" id="1330" />
+<TGConnectingPoint num="19" id="1331" />
+<TGConnectingPoint num="20" id="1332" />
+<TGConnectingPoint num="21" id="1333" />
+<TGConnectingPoint num="22" id="1334" />
+<TGConnectingPoint num="23" id="1335" />
+<TGConnectingPoint num="24" id="1336" />
+<TGConnectingPoint num="25" id="1337" />
+<TGConnectingPoint num="26" id="1338" />
+<TGConnectingPoint num="27" id="1339" />
+<TGConnectingPoint num="28" id="1340" />
+<TGConnectingPoint num="29" id="1341" />
+<TGConnectingPoint num="30" id="1342" />
<extraparam>
<type data="2" />
<textline data="This refers to the normal completion of the" />
@@ -2398,52 +2398,52 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="119" id="3591" >
+<CONNECTOR type="119" id="1344" >
<cdparam x="1192" y="424" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<deriveReqt>>" />
-<P1 x="964" y="278" id="3339" />
-<P2 x="1096" y="252" id="3463" />
+<P1 x="964" y="278" id="1092" />
+<P2 x="1096" y="252" id="1216" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="119" id="3592" >
+<CONNECTOR type="119" id="1345" >
<cdparam x="1140" y="702" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<deriveReqt>>" />
-<P1 x="1236" y="358" id="3503" />
-<P2 x="1204" y="315" id="3473" />
+<P1 x="1236" y="358" id="1256" />
+<P2 x="1204" y="315" id="1226" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="119" id="3593" >
+<CONNECTOR type="119" id="1346" >
<cdparam x="732" y="791" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<deriveReqt>>" />
-<P1 x="778" y="422" id="3561" />
-<P2 x="677" y="422" id="3530" />
+<P1 x="778" y="422" id="1314" />
+<P2 x="677" y="422" id="1283" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="119" id="3594" >
+<CONNECTOR type="119" id="1347" >
<cdparam x="658" y="429" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<deriveReqt>>" />
-<P1 x="522" y="322" id="3441" />
-<P2 x="523" y="392" id="3534" />
+<P1 x="522" y="322" id="1194" />
+<P2 x="523" y="392" id="1287" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3595" >
+<CONNECTOR type="129" id="1348" >
<cdparam x="1192" y="304" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="833" y="236" id="3342" />
-<P2 x="650" y="174" id="3423" />
+<P1 x="833" y="236" id="1095" />
+<P2 x="650" y="174" id="1176" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="129" id="3596" >
+<CONNECTOR type="129" id="1349" >
<cdparam x="770" y="308" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<P1 x="522" y="237" id="3438" />
-<P2 x="650" y="174" id="3409" />
+<P1 x="522" y="237" id="1191" />
+<P2 x="650" y="174" id="1162" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -2456,81 +2456,81 @@
<Modeling type="AttackTree" nameTab="Attack Trees" >
<AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="133" id="2" >
+<CONNECTOR type="133" id="1351" >
<cdparam x="923" y="482" />
<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="938" y="534" id="244" />
-<P2 x="866" y="534" id="237" />
+<TGConnectingPoint num="0" id="1350" />
+<P1 x="938" y="534" id="1563" />
+<P2 x="866" y="534" id="1594" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="4" >
+<CONNECTOR type="133" id="1353" >
<cdparam x="677" y="168" />
<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="772" y="275" id="152" />
-<P2 x="772" y="211" id="41" />
+<TGConnectingPoint num="0" id="1352" />
+<P1 x="772" y="275" id="1549" />
+<P2 x="776" y="211" id="1402" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="6" >
+<CONNECTOR type="133" id="1355" >
<cdparam x="802" y="302" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="4" />
-<TGConnectingPoint num="0" id="5" />
-<P1 x="965" y="312" id="26" />
-<P2 x="847" y="312" id="161" />
+<TGConnectingPoint num="0" id="1354" />
+<P1 x="965" y="312" id="1375" />
+<P2 x="847" y="312" id="1558" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="8" >
+<CONNECTOR type="133" id="1357" >
<cdparam x="800" y="638" />
<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="753" y="522" id="234" />
-<P2 x="753" y="491" id="214" />
+<TGConnectingPoint num="0" id="1356" />
+<P1 x="753" y="522" id="1591" />
+<P2 x="753" y="491" id="1635" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="10" >
+<CONNECTOR type="133" id="1359" >
<cdparam x="711" y="741" />
<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="9" />
-<P1 x="664" y="466" id="219" />
-<P2 x="716" y="466" id="205" />
+<TGConnectingPoint num="0" id="1358" />
+<P1 x="675" y="466" id="1602" />
+<P2 x="716" y="466" id="1626" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="12" >
+<CONNECTOR type="133" id="1361" >
<cdparam x="678" y="630" />
<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="11" />
-<P1 x="679" y="601" id="53" />
-<P2 x="716" y="547" id="231" />
+<TGConnectingPoint num="0" id="1360" />
+<P1 x="693" y="601" id="1426" />
+<P2 x="716" y="547" id="1588" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="14" >
+<CONNECTOR type="133" id="1363" >
<cdparam x="920" y="646" />
<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="903" y="623" id="114" />
-<P2 x="866" y="547" id="232" />
+<TGConnectingPoint num="0" id="1362" />
+<P1 x="910" y="623" id="1499" />
+<P2 x="866" y="547" id="1589" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="18" >
+<CONNECTOR type="133" id="1367" >
<cdparam x="804" y="529" />
<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="16" />
-<TGConnectingPoint num="1" id="17" />
-<P1 x="753" y="441" id="208" />
-<P2 x="617" y="332" id="189" />
+<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="1" id="1366" />
+<P1 x="753" y="441" id="1629" />
+<P2 x="629" y="332" id="1674" />
<Point x="617" y="410" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="15" >
-<father id="18" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1364" >
+<father id="1367" num="0" />
<cdparam x="617" y="410" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2538,444 +2538,552 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="20" >
+<CONNECTOR type="133" id="1369" >
<cdparam x="1062" y="461" />
<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="19" />
-<P1 x="734" y="344" id="191" />
-<P2 x="734" y="325" id="162" />
+<TGConnectingPoint num="0" id="1368" />
+<P1 x="742" y="344" id="1638" />
+<P2 x="734" y="325" id="1559" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="22" >
+<CONNECTOR type="133" id="1371" >
<cdparam x="841" y="463" />
<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="21" />
-<P1 x="656" y="312" id="180" />
-<P2 x="697" y="312" id="160" />
+<TGConnectingPoint num="0" id="1370" />
+<P1 x="672" y="312" id="1665" />
+<P2 x="697" y="312" id="1557" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="24" >
+<CONNECTOR type="133" id="1373" >
<cdparam x="639" y="270" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="3" />
-<TGConnectingPoint num="0" id="23" />
-<P1 x="1018" y="387" id="170" />
-<P2 x="772" y="325" id="155" />
+<TGConnectingPoint num="0" id="1372" />
+<P1 x="1023" y="387" id="1693" />
+<P2 x="772" y="325" id="1552" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1401" id="37" >
+<COMPONENT type="1401" id="1398" >
<cdparam x="965" y="292" />
<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="TGComponent" value="Start_engine" />
-<TGConnectingPoint num="0" id="25" />
-<TGConnectingPoint num="1" id="26" />
-<TGConnectingPoint num="2" id="27" />
-<TGConnectingPoint num="3" id="28" />
-<TGConnectingPoint num="4" id="29" />
-<TGConnectingPoint num="5" id="30" />
-<TGConnectingPoint num="6" id="31" />
-<TGConnectingPoint num="7" id="32" />
-<TGConnectingPoint num="8" id="33" />
-<TGConnectingPoint num="9" id="34" />
-<TGConnectingPoint num="10" id="35" />
-<TGConnectingPoint num="11" id="36" />
+<TGConnectingPoint num="0" id="1374" />
+<TGConnectingPoint num="1" id="1375" />
+<TGConnectingPoint num="2" id="1376" />
+<TGConnectingPoint num="3" id="1377" />
+<TGConnectingPoint num="4" id="1378" />
+<TGConnectingPoint num="5" id="1379" />
+<TGConnectingPoint num="6" id="1380" />
+<TGConnectingPoint num="7" id="1381" />
+<TGConnectingPoint num="8" id="1382" />
+<TGConnectingPoint num="9" id="1383" />
+<TGConnectingPoint num="10" id="1384" />
+<TGConnectingPoint num="11" id="1385" />
+<TGConnectingPoint num="12" id="1386" />
+<TGConnectingPoint num="13" id="1387" />
+<TGConnectingPoint num="14" id="1388" />
+<TGConnectingPoint num="15" id="1389" />
+<TGConnectingPoint num="16" id="1390" />
+<TGConnectingPoint num="17" id="1391" />
+<TGConnectingPoint num="18" id="1392" />
+<TGConnectingPoint num="19" id="1393" />
+<TGConnectingPoint num="20" id="1394" />
+<TGConnectingPoint num="21" id="1395" />
+<TGConnectingPoint num="22" id="1396" />
+<TGConnectingPoint num="23" id="1397" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="50" >
+<COMPONENT type="1401" id="1423" >
<cdparam x="711" y="171" />
-<sizeparam width="122" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="130" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="TGComponent" value="Steal_Car" />
-<TGConnectingPoint num="0" id="38" />
-<TGConnectingPoint num="1" id="39" />
-<TGConnectingPoint num="2" id="40" />
-<TGConnectingPoint num="3" id="41" />
-<TGConnectingPoint num="4" id="42" />
-<TGConnectingPoint num="5" id="43" />
-<TGConnectingPoint num="6" id="44" />
-<TGConnectingPoint num="7" id="45" />
-<TGConnectingPoint num="8" id="46" />
-<TGConnectingPoint num="9" id="47" />
-<TGConnectingPoint num="10" id="48" />
-<TGConnectingPoint num="11" id="49" />
+<TGConnectingPoint num="0" id="1399" />
+<TGConnectingPoint num="1" id="1400" />
+<TGConnectingPoint num="2" id="1401" />
+<TGConnectingPoint num="3" id="1402" />
+<TGConnectingPoint num="4" id="1403" />
+<TGConnectingPoint num="5" id="1404" />
+<TGConnectingPoint num="6" id="1405" />
+<TGConnectingPoint num="7" id="1406" />
+<TGConnectingPoint num="8" id="1407" />
+<TGConnectingPoint num="9" id="1408" />
+<TGConnectingPoint num="10" id="1409" />
+<TGConnectingPoint num="11" id="1410" />
+<TGConnectingPoint num="12" id="1411" />
+<TGConnectingPoint num="13" id="1412" />
+<TGConnectingPoint num="14" id="1413" />
+<TGConnectingPoint num="15" id="1414" />
+<TGConnectingPoint num="16" id="1415" />
+<TGConnectingPoint num="17" id="1416" />
+<TGConnectingPoint num="18" id="1417" />
+<TGConnectingPoint num="19" id="1418" />
+<TGConnectingPoint num="20" id="1419" />
+<TGConnectingPoint num="21" id="1420" />
+<TGConnectingPoint num="22" id="1421" />
+<TGConnectingPoint num="23" id="1422" />
<accessibility />
<extraparam>
<info description="blah blah blah" root="true" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1400" id="88" >
+<COMPONENT type="1400" id="1473" >
<cdparam x="522" y="534" />
<sizeparam width="171" height="127" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block1" value="Bluetooth" />
-<TGConnectingPoint num="0" id="64" />
-<TGConnectingPoint num="1" id="65" />
-<TGConnectingPoint num="2" id="66" />
-<TGConnectingPoint num="3" id="67" />
-<TGConnectingPoint num="4" id="68" />
-<TGConnectingPoint num="5" id="69" />
-<TGConnectingPoint num="6" id="70" />
-<TGConnectingPoint num="7" id="71" />
-<TGConnectingPoint num="8" id="72" />
-<TGConnectingPoint num="9" id="73" />
-<TGConnectingPoint num="10" id="74" />
-<TGConnectingPoint num="11" id="75" />
-<TGConnectingPoint num="12" id="76" />
-<TGConnectingPoint num="13" id="77" />
-<TGConnectingPoint num="14" id="78" />
-<TGConnectingPoint num="15" id="79" />
-<TGConnectingPoint num="16" id="80" />
-<TGConnectingPoint num="17" id="81" />
-<TGConnectingPoint num="18" id="82" />
-<TGConnectingPoint num="19" id="83" />
-<TGConnectingPoint num="20" id="84" />
-<TGConnectingPoint num="21" id="85" />
-<TGConnectingPoint num="22" id="86" />
-<TGConnectingPoint num="23" id="87" />
-</COMPONENT>
-<SUBCOMPONENT type="1401" id="63" >
-<father id="88" num="0" />
-<cdparam x="537" y="581" />
-<sizeparam width="142" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1449" />
+<TGConnectingPoint num="1" id="1450" />
+<TGConnectingPoint num="2" id="1451" />
+<TGConnectingPoint num="3" id="1452" />
+<TGConnectingPoint num="4" id="1453" />
+<TGConnectingPoint num="5" id="1454" />
+<TGConnectingPoint num="6" id="1455" />
+<TGConnectingPoint num="7" id="1456" />
+<TGConnectingPoint num="8" id="1457" />
+<TGConnectingPoint num="9" id="1458" />
+<TGConnectingPoint num="10" id="1459" />
+<TGConnectingPoint num="11" id="1460" />
+<TGConnectingPoint num="12" id="1461" />
+<TGConnectingPoint num="13" id="1462" />
+<TGConnectingPoint num="14" id="1463" />
+<TGConnectingPoint num="15" id="1464" />
+<TGConnectingPoint num="16" id="1465" />
+<TGConnectingPoint num="17" id="1466" />
+<TGConnectingPoint num="18" id="1467" />
+<TGConnectingPoint num="19" id="1468" />
+<TGConnectingPoint num="20" id="1469" />
+<TGConnectingPoint num="21" id="1470" />
+<TGConnectingPoint num="22" id="1471" />
+<TGConnectingPoint num="23" id="1472" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="1448" >
+<father id="1473" num="0" />
+<cdparam x="535" y="581" />
+<sizeparam width="158" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="87" />
+<cdrectangleparam minX="0" maxX="13" minY="0" maxY="87" />
<infoparam name="TGComponent" value="Connect_to_Bluetooth" />
-<TGConnectingPoint num="0" id="51" />
-<TGConnectingPoint num="1" id="52" />
-<TGConnectingPoint num="2" id="53" />
-<TGConnectingPoint num="3" id="54" />
-<TGConnectingPoint num="4" id="55" />
-<TGConnectingPoint num="5" id="56" />
-<TGConnectingPoint num="6" id="57" />
-<TGConnectingPoint num="7" id="58" />
-<TGConnectingPoint num="8" id="59" />
-<TGConnectingPoint num="9" id="60" />
-<TGConnectingPoint num="10" id="61" />
-<TGConnectingPoint num="11" id="62" />
+<TGConnectingPoint num="0" id="1424" />
+<TGConnectingPoint num="1" id="1425" />
+<TGConnectingPoint num="2" id="1426" />
+<TGConnectingPoint num="3" id="1427" />
+<TGConnectingPoint num="4" id="1428" />
+<TGConnectingPoint num="5" id="1429" />
+<TGConnectingPoint num="6" id="1430" />
+<TGConnectingPoint num="7" id="1431" />
+<TGConnectingPoint num="8" id="1432" />
+<TGConnectingPoint num="9" id="1433" />
+<TGConnectingPoint num="10" id="1434" />
+<TGConnectingPoint num="11" id="1435" />
+<TGConnectingPoint num="12" id="1436" />
+<TGConnectingPoint num="13" id="1437" />
+<TGConnectingPoint num="14" id="1438" />
+<TGConnectingPoint num="15" id="1439" />
+<TGConnectingPoint num="16" id="1440" />
+<TGConnectingPoint num="17" id="1441" />
+<TGConnectingPoint num="18" id="1442" />
+<TGConnectingPoint num="19" id="1443" />
+<TGConnectingPoint num="20" id="1444" />
+<TGConnectingPoint num="21" id="1445" />
+<TGConnectingPoint num="22" id="1446" />
+<TGConnectingPoint num="23" id="1447" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="113" >
+<COMPONENT type="1400" id="1498" >
<cdparam x="503" y="496" />
<sizeparam width="201" height="179" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block0" value="HeadUnit" />
-<TGConnectingPoint num="0" id="89" />
-<TGConnectingPoint num="1" id="90" />
-<TGConnectingPoint num="2" id="91" />
-<TGConnectingPoint num="3" id="92" />
-<TGConnectingPoint num="4" id="93" />
-<TGConnectingPoint num="5" id="94" />
-<TGConnectingPoint num="6" id="95" />
-<TGConnectingPoint num="7" id="96" />
-<TGConnectingPoint num="8" id="97" />
-<TGConnectingPoint num="9" id="98" />
-<TGConnectingPoint num="10" id="99" />
-<TGConnectingPoint num="11" id="100" />
-<TGConnectingPoint num="12" id="101" />
-<TGConnectingPoint num="13" id="102" />
-<TGConnectingPoint num="14" id="103" />
-<TGConnectingPoint num="15" id="104" />
-<TGConnectingPoint num="16" id="105" />
-<TGConnectingPoint num="17" id="106" />
-<TGConnectingPoint num="18" id="107" />
-<TGConnectingPoint num="19" id="108" />
-<TGConnectingPoint num="20" id="109" />
-<TGConnectingPoint num="21" id="110" />
-<TGConnectingPoint num="22" id="111" />
-<TGConnectingPoint num="23" id="112" />
-</COMPONENT>
-
-<COMPONENT type="1400" id="151" >
+<TGConnectingPoint num="0" id="1474" />
+<TGConnectingPoint num="1" id="1475" />
+<TGConnectingPoint num="2" id="1476" />
+<TGConnectingPoint num="3" id="1477" />
+<TGConnectingPoint num="4" id="1478" />
+<TGConnectingPoint num="5" id="1479" />
+<TGConnectingPoint num="6" id="1480" />
+<TGConnectingPoint num="7" id="1481" />
+<TGConnectingPoint num="8" id="1482" />
+<TGConnectingPoint num="9" id="1483" />
+<TGConnectingPoint num="10" id="1484" />
+<TGConnectingPoint num="11" id="1485" />
+<TGConnectingPoint num="12" id="1486" />
+<TGConnectingPoint num="13" id="1487" />
+<TGConnectingPoint num="14" id="1488" />
+<TGConnectingPoint num="15" id="1489" />
+<TGConnectingPoint num="16" id="1490" />
+<TGConnectingPoint num="17" id="1491" />
+<TGConnectingPoint num="18" id="1492" />
+<TGConnectingPoint num="19" id="1493" />
+<TGConnectingPoint num="20" id="1494" />
+<TGConnectingPoint num="21" id="1495" />
+<TGConnectingPoint num="22" id="1496" />
+<TGConnectingPoint num="23" id="1497" />
+</COMPONENT>
+
+<COMPONENT type="1400" id="1548" >
<cdparam x="741" y="586" />
<sizeparam width="333" height="89" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block2" value="CommunicationUnit" />
-<TGConnectingPoint num="0" id="127" />
-<TGConnectingPoint num="1" id="128" />
-<TGConnectingPoint num="2" id="129" />
-<TGConnectingPoint num="3" id="130" />
-<TGConnectingPoint num="4" id="131" />
-<TGConnectingPoint num="5" id="132" />
-<TGConnectingPoint num="6" id="133" />
-<TGConnectingPoint num="7" id="134" />
-<TGConnectingPoint num="8" id="135" />
-<TGConnectingPoint num="9" id="136" />
-<TGConnectingPoint num="10" id="137" />
-<TGConnectingPoint num="11" id="138" />
-<TGConnectingPoint num="12" id="139" />
-<TGConnectingPoint num="13" id="140" />
-<TGConnectingPoint num="14" id="141" />
-<TGConnectingPoint num="15" id="142" />
-<TGConnectingPoint num="16" id="143" />
-<TGConnectingPoint num="17" id="144" />
-<TGConnectingPoint num="18" id="145" />
-<TGConnectingPoint num="19" id="146" />
-<TGConnectingPoint num="20" id="147" />
-<TGConnectingPoint num="21" id="148" />
-<TGConnectingPoint num="22" id="149" />
-<TGConnectingPoint num="23" id="150" />
-</COMPONENT>
-<SUBCOMPONENT type="1401" id="126" >
-<father id="151" num="0" />
-<cdparam x="752" y="623" />
-<sizeparam width="303" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1524" />
+<TGConnectingPoint num="1" id="1525" />
+<TGConnectingPoint num="2" id="1526" />
+<TGConnectingPoint num="3" id="1527" />
+<TGConnectingPoint num="4" id="1528" />
+<TGConnectingPoint num="5" id="1529" />
+<TGConnectingPoint num="6" id="1530" />
+<TGConnectingPoint num="7" id="1531" />
+<TGConnectingPoint num="8" id="1532" />
+<TGConnectingPoint num="9" id="1533" />
+<TGConnectingPoint num="10" id="1534" />
+<TGConnectingPoint num="11" id="1535" />
+<TGConnectingPoint num="12" id="1536" />
+<TGConnectingPoint num="13" id="1537" />
+<TGConnectingPoint num="14" id="1538" />
+<TGConnectingPoint num="15" id="1539" />
+<TGConnectingPoint num="16" id="1540" />
+<TGConnectingPoint num="17" id="1541" />
+<TGConnectingPoint num="18" id="1542" />
+<TGConnectingPoint num="19" id="1543" />
+<TGConnectingPoint num="20" id="1544" />
+<TGConnectingPoint num="21" id="1545" />
+<TGConnectingPoint num="22" id="1546" />
+<TGConnectingPoint num="23" id="1547" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="1523" >
+<father id="1548" num="0" />
+<cdparam x="746" y="623" />
+<sizeparam width="328" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="30" minY="0" maxY="49" />
+<cdrectangleparam minX="0" maxX="5" minY="0" maxY="49" />
<infoparam name="TGComponent" value="CompromisedCommunicationUnitThroughInternet" />
-<TGConnectingPoint num="0" id="114" />
-<TGConnectingPoint num="1" id="115" />
-<TGConnectingPoint num="2" id="116" />
-<TGConnectingPoint num="3" id="117" />
-<TGConnectingPoint num="4" id="118" />
-<TGConnectingPoint num="5" id="119" />
-<TGConnectingPoint num="6" id="120" />
-<TGConnectingPoint num="7" id="121" />
-<TGConnectingPoint num="8" id="122" />
-<TGConnectingPoint num="9" id="123" />
-<TGConnectingPoint num="10" id="124" />
-<TGConnectingPoint num="11" id="125" />
+<TGConnectingPoint num="0" id="1499" />
+<TGConnectingPoint num="1" id="1500" />
+<TGConnectingPoint num="2" id="1501" />
+<TGConnectingPoint num="3" id="1502" />
+<TGConnectingPoint num="4" id="1503" />
+<TGConnectingPoint num="5" id="1504" />
+<TGConnectingPoint num="6" id="1505" />
+<TGConnectingPoint num="7" id="1506" />
+<TGConnectingPoint num="8" id="1507" />
+<TGConnectingPoint num="9" id="1508" />
+<TGConnectingPoint num="10" id="1509" />
+<TGConnectingPoint num="11" id="1510" />
+<TGConnectingPoint num="12" id="1511" />
+<TGConnectingPoint num="13" id="1512" />
+<TGConnectingPoint num="14" id="1513" />
+<TGConnectingPoint num="15" id="1514" />
+<TGConnectingPoint num="16" id="1515" />
+<TGConnectingPoint num="17" id="1516" />
+<TGConnectingPoint num="18" id="1517" />
+<TGConnectingPoint num="19" id="1518" />
+<TGConnectingPoint num="20" id="1519" />
+<TGConnectingPoint num="21" id="1520" />
+<TGConnectingPoint num="22" id="1521" />
+<TGConnectingPoint num="23" id="1522" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1402" id="164" >
+<COMPONENT type="1402" id="1561" >
<cdparam x="697" y="275" />
<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="152" />
-<TGConnectingPoint num="1" id="153" />
-<TGConnectingPoint num="2" id="154" />
-<TGConnectingPoint num="3" id="155" />
-<TGConnectingPoint num="4" id="156" />
-<TGConnectingPoint num="5" id="157" />
-<TGConnectingPoint num="6" id="158" />
-<TGConnectingPoint num="7" id="159" />
-<TGConnectingPoint num="8" id="160" />
-<TGConnectingPoint num="9" id="161" />
-<TGConnectingPoint num="10" id="162" />
-<TGConnectingPoint num="11" id="163" />
+<TGConnectingPoint num="0" id="1549" />
+<TGConnectingPoint num="1" id="1550" />
+<TGConnectingPoint num="2" id="1551" />
+<TGConnectingPoint num="3" id="1552" />
+<TGConnectingPoint num="4" id="1553" />
+<TGConnectingPoint num="5" id="1554" />
+<TGConnectingPoint num="6" id="1555" />
+<TGConnectingPoint num="7" id="1556" />
+<TGConnectingPoint num="8" id="1557" />
+<TGConnectingPoint num="9" id="1558" />
+<TGConnectingPoint num="10" id="1559" />
+<TGConnectingPoint num="11" id="1560" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1400" id="280" >
+<COMPONENT type="1400" id="1737" >
<cdparam x="491" y="238" />
<sizeparam width="595" height="446" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Block3" value="AutomotiveECUsAndBuses" />
-<TGConnectingPoint num="0" id="256" />
-<TGConnectingPoint num="1" id="257" />
-<TGConnectingPoint num="2" id="258" />
-<TGConnectingPoint num="3" id="259" />
-<TGConnectingPoint num="4" id="260" />
-<TGConnectingPoint num="5" id="261" />
-<TGConnectingPoint num="6" id="262" />
-<TGConnectingPoint num="7" id="263" />
-<TGConnectingPoint num="8" id="264" />
-<TGConnectingPoint num="9" id="265" />
-<TGConnectingPoint num="10" id="266" />
-<TGConnectingPoint num="11" id="267" />
-<TGConnectingPoint num="12" id="268" />
-<TGConnectingPoint num="13" id="269" />
-<TGConnectingPoint num="14" id="270" />
-<TGConnectingPoint num="15" id="271" />
-<TGConnectingPoint num="16" id="272" />
-<TGConnectingPoint num="17" id="273" />
-<TGConnectingPoint num="18" id="274" />
-<TGConnectingPoint num="19" id="275" />
-<TGConnectingPoint num="20" id="276" />
-<TGConnectingPoint num="21" id="277" />
-<TGConnectingPoint num="22" id="278" />
-<TGConnectingPoint num="23" id="279" />
-</COMPONENT>
-<SUBCOMPONENT type="1401" id="177" >
-<father id="280" num="0" />
-<cdparam x="842" y="387" />
-<sizeparam width="235" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1713" />
+<TGConnectingPoint num="1" id="1714" />
+<TGConnectingPoint num="2" id="1715" />
+<TGConnectingPoint num="3" id="1716" />
+<TGConnectingPoint num="4" id="1717" />
+<TGConnectingPoint num="5" id="1718" />
+<TGConnectingPoint num="6" id="1719" />
+<TGConnectingPoint num="7" id="1720" />
+<TGConnectingPoint num="8" id="1721" />
+<TGConnectingPoint num="9" id="1722" />
+<TGConnectingPoint num="10" id="1723" />
+<TGConnectingPoint num="11" id="1724" />
+<TGConnectingPoint num="12" id="1725" />
+<TGConnectingPoint num="13" id="1726" />
+<TGConnectingPoint num="14" id="1727" />
+<TGConnectingPoint num="15" id="1728" />
+<TGConnectingPoint num="16" id="1729" />
+<TGConnectingPoint num="17" id="1730" />
+<TGConnectingPoint num="18" id="1731" />
+<TGConnectingPoint num="19" id="1732" />
+<TGConnectingPoint num="20" id="1733" />
+<TGConnectingPoint num="21" id="1734" />
+<TGConnectingPoint num="22" id="1735" />
+<TGConnectingPoint num="23" id="1736" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="1586" >
+<father id="1737" num="0" />
+<cdparam x="938" y="514" />
+<sizeparam width="101" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="360" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Inject_or_Replay_OpenDoor_Message" />
-<TGConnectingPoint num="0" id="165" />
-<TGConnectingPoint num="1" id="166" />
-<TGConnectingPoint num="2" id="167" />
-<TGConnectingPoint num="3" id="168" />
-<TGConnectingPoint num="4" id="169" />
-<TGConnectingPoint num="5" id="170" />
-<TGConnectingPoint num="6" id="171" />
-<TGConnectingPoint num="7" id="172" />
-<TGConnectingPoint num="8" id="173" />
-<TGConnectingPoint num="9" id="174" />
-<TGConnectingPoint num="10" id="175" />
-<TGConnectingPoint num="11" id="176" />
+<cdrectangleparam minX="0" maxX="494" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Plug_on_OBD" />
+<TGConnectingPoint num="0" id="1562" />
+<TGConnectingPoint num="1" id="1563" />
+<TGConnectingPoint num="2" id="1564" />
+<TGConnectingPoint num="3" id="1565" />
+<TGConnectingPoint num="4" id="1566" />
+<TGConnectingPoint num="5" id="1567" />
+<TGConnectingPoint num="6" id="1568" />
+<TGConnectingPoint num="7" id="1569" />
+<TGConnectingPoint num="8" id="1570" />
+<TGConnectingPoint num="9" id="1571" />
+<TGConnectingPoint num="10" id="1572" />
+<TGConnectingPoint num="11" id="1573" />
+<TGConnectingPoint num="12" id="1574" />
+<TGConnectingPoint num="13" id="1575" />
+<TGConnectingPoint num="14" id="1576" />
+<TGConnectingPoint num="15" id="1577" />
+<TGConnectingPoint num="16" id="1578" />
+<TGConnectingPoint num="17" id="1579" />
+<TGConnectingPoint num="18" id="1580" />
+<TGConnectingPoint num="19" id="1581" />
+<TGConnectingPoint num="20" id="1582" />
+<TGConnectingPoint num="21" id="1583" />
+<TGConnectingPoint num="22" id="1584" />
+<TGConnectingPoint num="23" id="1585" />
+<accessibility />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="190" >
-<father id="280" num="1" />
-<cdparam x="501" y="292" />
-<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1402" id="1599" >
+<father id="1737" num="1" />
+<cdparam x="716" y="522" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="440" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Connect_to_System_Bus" />
-<TGConnectingPoint num="0" id="178" />
-<TGConnectingPoint num="1" id="179" />
-<TGConnectingPoint num="2" id="180" />
-<TGConnectingPoint num="3" id="181" />
-<TGConnectingPoint num="4" id="182" />
-<TGConnectingPoint num="5" id="183" />
-<TGConnectingPoint num="6" id="184" />
-<TGConnectingPoint num="7" id="185" />
-<TGConnectingPoint num="8" id="186" />
-<TGConnectingPoint num="9" id="187" />
-<TGConnectingPoint num="10" id="188" />
-<TGConnectingPoint num="11" id="189" />
+<cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
+<infoparam name="TGComponent" value="<<XOR>>" />
+<TGConnectingPoint num="0" id="1587" />
+<TGConnectingPoint num="1" id="1588" />
+<TGConnectingPoint num="2" id="1589" />
+<TGConnectingPoint num="3" id="1590" />
+<TGConnectingPoint num="4" id="1591" />
+<TGConnectingPoint num="5" id="1592" />
+<TGConnectingPoint num="6" id="1593" />
+<TGConnectingPoint num="7" id="1594" />
+<TGConnectingPoint num="8" id="1595" />
+<TGConnectingPoint num="9" id="1596" />
+<TGConnectingPoint num="10" id="1597" />
+<TGConnectingPoint num="11" id="1598" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="203" >
-<father id="280" num="2" />
-<cdparam x="635" y="344" />
-<sizeparam width="198" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1624" >
+<father id="1737" num="2" />
+<cdparam x="508" y="446" />
+<sizeparam width="167" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="397" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Listen_to_OpenDoor_messages" />
-<TGConnectingPoint num="0" id="191" />
-<TGConnectingPoint num="1" id="192" />
-<TGConnectingPoint num="2" id="193" />
-<TGConnectingPoint num="3" id="194" />
-<TGConnectingPoint num="4" id="195" />
-<TGConnectingPoint num="5" id="196" />
-<TGConnectingPoint num="6" id="197" />
-<TGConnectingPoint num="7" id="198" />
-<TGConnectingPoint num="8" id="199" />
-<TGConnectingPoint num="9" id="200" />
-<TGConnectingPoint num="10" id="201" />
-<TGConnectingPoint num="11" id="202" />
+<cdrectangleparam minX="0" maxX="428" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Bypass_internal_firewall" />
+<TGConnectingPoint num="0" id="1600" />
+<TGConnectingPoint num="1" id="1601" />
+<TGConnectingPoint num="2" id="1602" />
+<TGConnectingPoint num="3" id="1603" />
+<TGConnectingPoint num="4" id="1604" />
+<TGConnectingPoint num="5" id="1605" />
+<TGConnectingPoint num="6" id="1606" />
+<TGConnectingPoint num="7" id="1607" />
+<TGConnectingPoint num="8" id="1608" />
+<TGConnectingPoint num="9" id="1609" />
+<TGConnectingPoint num="10" id="1610" />
+<TGConnectingPoint num="11" id="1611" />
+<TGConnectingPoint num="12" id="1612" />
+<TGConnectingPoint num="13" id="1613" />
+<TGConnectingPoint num="14" id="1614" />
+<TGConnectingPoint num="15" id="1615" />
+<TGConnectingPoint num="16" id="1616" />
+<TGConnectingPoint num="17" id="1617" />
+<TGConnectingPoint num="18" id="1618" />
+<TGConnectingPoint num="19" id="1619" />
+<TGConnectingPoint num="20" id="1620" />
+<TGConnectingPoint num="21" id="1621" />
+<TGConnectingPoint num="22" id="1622" />
+<TGConnectingPoint num="23" id="1623" />
+<accessibility />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="216" >
-<father id="280" num="3" />
+<SUBCOMPONENT type="1402" id="1637" >
+<father id="1737" num="3" />
<cdparam x="716" y="441" />
<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
<infoparam name="TGComponent" value="<<AND>>" />
-<TGConnectingPoint num="0" id="204" />
-<TGConnectingPoint num="1" id="205" />
-<TGConnectingPoint num="2" id="206" />
-<TGConnectingPoint num="3" id="207" />
-<TGConnectingPoint num="4" id="208" />
-<TGConnectingPoint num="5" id="209" />
-<TGConnectingPoint num="6" id="210" />
-<TGConnectingPoint num="7" id="211" />
-<TGConnectingPoint num="8" id="212" />
-<TGConnectingPoint num="9" id="213" />
-<TGConnectingPoint num="10" id="214" />
-<TGConnectingPoint num="11" id="215" />
+<TGConnectingPoint num="0" id="1625" />
+<TGConnectingPoint num="1" id="1626" />
+<TGConnectingPoint num="2" id="1627" />
+<TGConnectingPoint num="3" id="1628" />
+<TGConnectingPoint num="4" id="1629" />
+<TGConnectingPoint num="5" id="1630" />
+<TGConnectingPoint num="6" id="1631" />
+<TGConnectingPoint num="7" id="1632" />
+<TGConnectingPoint num="8" id="1633" />
+<TGConnectingPoint num="9" id="1634" />
+<TGConnectingPoint num="10" id="1635" />
+<TGConnectingPoint num="11" id="1636" />
<extraparam>
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="229" >
-<father id="280" num="4" />
-<cdparam x="508" y="446" />
-<sizeparam width="156" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1662" >
+<father id="1737" num="4" />
+<cdparam x="635" y="344" />
+<sizeparam width="215" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="439" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Bypass_internal_firewall" />
-<TGConnectingPoint num="0" id="217" />
-<TGConnectingPoint num="1" id="218" />
-<TGConnectingPoint num="2" id="219" />
-<TGConnectingPoint num="3" id="220" />
-<TGConnectingPoint num="4" id="221" />
-<TGConnectingPoint num="5" id="222" />
-<TGConnectingPoint num="6" id="223" />
-<TGConnectingPoint num="7" id="224" />
-<TGConnectingPoint num="8" id="225" />
-<TGConnectingPoint num="9" id="226" />
-<TGConnectingPoint num="10" id="227" />
-<TGConnectingPoint num="11" id="228" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="380" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Listen_to_OpenDoor_messages" />
+<TGConnectingPoint num="0" id="1638" />
+<TGConnectingPoint num="1" id="1639" />
+<TGConnectingPoint num="2" id="1640" />
+<TGConnectingPoint num="3" id="1641" />
+<TGConnectingPoint num="4" id="1642" />
+<TGConnectingPoint num="5" id="1643" />
+<TGConnectingPoint num="6" id="1644" />
+<TGConnectingPoint num="7" id="1645" />
+<TGConnectingPoint num="8" id="1646" />
+<TGConnectingPoint num="9" id="1647" />
+<TGConnectingPoint num="10" id="1648" />
+<TGConnectingPoint num="11" id="1649" />
+<TGConnectingPoint num="12" id="1650" />
+<TGConnectingPoint num="13" id="1651" />
+<TGConnectingPoint num="14" id="1652" />
+<TGConnectingPoint num="15" id="1653" />
+<TGConnectingPoint num="16" id="1654" />
+<TGConnectingPoint num="17" id="1655" />
+<TGConnectingPoint num="18" id="1656" />
+<TGConnectingPoint num="19" id="1657" />
+<TGConnectingPoint num="20" id="1658" />
+<TGConnectingPoint num="21" id="1659" />
+<TGConnectingPoint num="22" id="1660" />
+<TGConnectingPoint num="23" id="1661" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="242" >
-<father id="280" num="5" />
-<cdparam x="716" y="522" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1687" >
+<father id="1737" num="5" />
+<cdparam x="501" y="292" />
+<sizeparam width="171" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
-<infoparam name="TGComponent" value="<<XOR>>" />
-<TGConnectingPoint num="0" id="230" />
-<TGConnectingPoint num="1" id="231" />
-<TGConnectingPoint num="2" id="232" />
-<TGConnectingPoint num="3" id="233" />
-<TGConnectingPoint num="4" id="234" />
-<TGConnectingPoint num="5" id="235" />
-<TGConnectingPoint num="6" id="236" />
-<TGConnectingPoint num="7" id="237" />
-<TGConnectingPoint num="8" id="238" />
-<TGConnectingPoint num="9" id="239" />
-<TGConnectingPoint num="10" id="240" />
-<TGConnectingPoint num="11" id="241" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="424" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Connect_to_System_Bus" />
+<TGConnectingPoint num="0" id="1663" />
+<TGConnectingPoint num="1" id="1664" />
+<TGConnectingPoint num="2" id="1665" />
+<TGConnectingPoint num="3" id="1666" />
+<TGConnectingPoint num="4" id="1667" />
+<TGConnectingPoint num="5" id="1668" />
+<TGConnectingPoint num="6" id="1669" />
+<TGConnectingPoint num="7" id="1670" />
+<TGConnectingPoint num="8" id="1671" />
+<TGConnectingPoint num="9" id="1672" />
+<TGConnectingPoint num="10" id="1673" />
+<TGConnectingPoint num="11" id="1674" />
+<TGConnectingPoint num="12" id="1675" />
+<TGConnectingPoint num="13" id="1676" />
+<TGConnectingPoint num="14" id="1677" />
+<TGConnectingPoint num="15" id="1678" />
+<TGConnectingPoint num="16" id="1679" />
+<TGConnectingPoint num="17" id="1680" />
+<TGConnectingPoint num="18" id="1681" />
+<TGConnectingPoint num="19" id="1682" />
+<TGConnectingPoint num="20" id="1683" />
+<TGConnectingPoint num="21" id="1684" />
+<TGConnectingPoint num="22" id="1685" />
+<TGConnectingPoint num="23" id="1686" />
<extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="255" >
-<father id="280" num="6" />
-<cdparam x="938" y="514" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1712" >
+<father id="1737" num="6" />
+<cdparam x="835" y="387" />
+<sizeparam width="251" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="495" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Plug_on_OBD" />
-<TGConnectingPoint num="0" id="243" />
-<TGConnectingPoint num="1" id="244" />
-<TGConnectingPoint num="2" id="245" />
-<TGConnectingPoint num="3" id="246" />
-<TGConnectingPoint num="4" id="247" />
-<TGConnectingPoint num="5" id="248" />
-<TGConnectingPoint num="6" id="249" />
-<TGConnectingPoint num="7" id="250" />
-<TGConnectingPoint num="8" id="251" />
-<TGConnectingPoint num="9" id="252" />
-<TGConnectingPoint num="10" id="253" />
-<TGConnectingPoint num="11" id="254" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="344" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Inject_or_Replay_OpenDoor_Message" />
+<TGConnectingPoint num="0" id="1688" />
+<TGConnectingPoint num="1" id="1689" />
+<TGConnectingPoint num="2" id="1690" />
+<TGConnectingPoint num="3" id="1691" />
+<TGConnectingPoint num="4" id="1692" />
+<TGConnectingPoint num="5" id="1693" />
+<TGConnectingPoint num="6" id="1694" />
+<TGConnectingPoint num="7" id="1695" />
+<TGConnectingPoint num="8" id="1696" />
+<TGConnectingPoint num="9" id="1697" />
+<TGConnectingPoint num="10" id="1698" />
+<TGConnectingPoint num="11" id="1699" />
+<TGConnectingPoint num="12" id="1700" />
+<TGConnectingPoint num="13" id="1701" />
+<TGConnectingPoint num="14" id="1702" />
+<TGConnectingPoint num="15" id="1703" />
+<TGConnectingPoint num="16" id="1704" />
+<TGConnectingPoint num="17" id="1705" />
+<TGConnectingPoint num="18" id="1706" />
+<TGConnectingPoint num="19" id="1707" />
+<TGConnectingPoint num="20" id="1708" />
+<TGConnectingPoint num="21" id="1709" />
+<TGConnectingPoint num="22" id="1710" />
+<TGConnectingPoint num="23" id="1711" />
<extraparam>
<info description="blah blah blah" root="false" />
</extraparam>
@@ -2991,49 +3099,50 @@
<Modeling type="TML Component Design" nameTab="KDP Perf Design_NoSec" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2400" minY="10" maxY="900" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="281" >
+<CONNECTOR type="126" id="1738" >
<cdparam x="833" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="806" y="144" id="296" />
-<P2 x="790" y="193" id="283" />
+<P1 x="806" y="144" id="1755" />
+<P2 x="790" y="193" id="1742" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="282" >
+<CONNECTOR type="126" id="1739" >
<cdparam x="767" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="720" y="144" id="298" />
-<P2 x="724" y="193" id="285" />
+<P1 x="720" y="144" id="1753" />
+<P2 x="724" y="193" id="1740" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="295" >
+<COMPONENT type="1202" id="1752" >
<cdparam x="704" y="206" />
<sizeparam width="106" height="94" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="LoadSink" />
-<TGConnectingPoint num="0" id="287" />
-<TGConnectingPoint num="1" id="288" />
-<TGConnectingPoint num="2" id="289" />
-<TGConnectingPoint num="3" id="290" />
-<TGConnectingPoint num="4" id="291" />
-<TGConnectingPoint num="5" id="292" />
-<TGConnectingPoint num="6" id="293" />
-<TGConnectingPoint num="7" id="294" />
+<TGConnectingPoint num="0" id="1744" />
+<TGConnectingPoint num="1" id="1745" />
+<TGConnectingPoint num="2" id="1746" />
+<TGConnectingPoint num="3" id="1747" />
+<TGConnectingPoint num="4" id="1748" />
+<TGConnectingPoint num="5" id="1749" />
+<TGConnectingPoint num="6" id="1750" />
+<TGConnectingPoint num="7" id="1751" />
<extraparam>
+<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="284" >
-<father id="295" num="0" />
-<cdparam x="777" y="193" />
+<SUBCOMPONENT type="1203" id="1741" >
+<father id="1752" num="0" />
+<cdparam x="711" y="193" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="283" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="1740" />
<extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -3041,16 +3150,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="286" >
-<father id="295" num="1" />
-<cdparam x="711" y="193" />
+<SUBCOMPONENT type="1203" id="1743" >
+<father id="1752" num="1" />
+<cdparam x="777" y="193" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="285" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="1742" />
<extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -3059,34 +3168,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="308" >
+<COMPONENT type="1202" id="1765" >
<cdparam x="696" y="41" />
<sizeparam width="137" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="LoadSource" />
-<TGConnectingPoint num="0" id="300" />
-<TGConnectingPoint num="1" id="301" />
-<TGConnectingPoint num="2" id="302" />
-<TGConnectingPoint num="3" id="303" />
-<TGConnectingPoint num="4" id="304" />
-<TGConnectingPoint num="5" id="305" />
-<TGConnectingPoint num="6" id="306" />
-<TGConnectingPoint num="7" id="307" />
-<extraparam>
+<TGConnectingPoint num="0" id="1757" />
+<TGConnectingPoint num="1" id="1758" />
+<TGConnectingPoint num="2" id="1759" />
+<TGConnectingPoint num="3" id="1760" />
+<TGConnectingPoint num="4" id="1761" />
+<TGConnectingPoint num="5" id="1762" />
+<TGConnectingPoint num="6" id="1763" />
+<TGConnectingPoint num="7" id="1764" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="evts" value="0" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="297" >
-<father id="308" num="0" />
-<cdparam x="793" y="118" />
+<SUBCOMPONENT type="1203" id="1754" >
+<father id="1765" num="0" />
+<cdparam x="707" y="118" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="296" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="1753" />
<extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -3094,16 +3204,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="299" >
-<father id="308" num="1" />
-<cdparam x="707" y="118" />
+<SUBCOMPONENT type="1203" id="1756" >
+<father id="1765" num="1" />
+<cdparam x="793" y="118" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="298" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="1755" />
<extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -3116,56 +3226,56 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="LoadSink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="310" >
+<COMPONENT type="1001" id="1767" >
<cdparam x="399" y="109" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="309" />
+<TGConnectingPoint num="0" id="1766" />
</COMPONENT>
-<COMPONENT type="1000" id="312" >
+<COMPONENT type="1000" id="1769" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="311" />
+<TGConnectingPoint num="0" id="1768" />
</COMPONENT>
-<CONNECTOR type="115" id="313" >
+<CONNECTOR type="115" id="1770" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to stop state" value="null" />
-<P1 x="407" y="70" id="311" />
-<P2 x="409" y="104" id="309" />
+<P1 x="407" y="70" id="1768" />
+<P2 x="409" y="104" id="1766" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="LoadSource" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="315" >
+<COMPONENT type="1000" id="1772" >
<cdparam x="585" y="128" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="314" />
+<TGConnectingPoint num="0" id="1771" />
</COMPONENT>
-<COMPONENT type="1026" id="319" >
+<COMPONENT type="1026" id="1776" >
<cdparam x="1006" y="302" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="delay" value="null" />
-<TGConnectingPoint num="0" id="317" />
-<TGConnectingPoint num="1" id="318" />
+<TGConnectingPoint num="0" id="1774" />
+<TGConnectingPoint num="1" id="1775" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="316" >
-<father id="319" num="0" />
+<SUBCOMPONENT type="-1" id="1773" >
+<father id="1776" num="0" />
<cdparam x="1021" y="322" />
<sizeparam width="34" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3176,35 +3286,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1012" id="327" >
+<COMPONENT type="1012" id="1784" >
<cdparam x="916" y="267" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="323" />
-<TGConnectingPoint num="1" id="324" />
-<TGConnectingPoint num="2" id="325" />
-<TGConnectingPoint num="3" id="326" />
+<TGConnectingPoint num="0" id="1780" />
+<TGConnectingPoint num="1" id="1781" />
+<TGConnectingPoint num="2" id="1782" />
+<TGConnectingPoint num="3" id="1783" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="320" >
-<father id="327" num="0" />
+<SUBCOMPONENT type="-1" id="1777" >
+<father id="1784" num="0" />
<cdparam x="870" y="278" />
<sizeparam width="32" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ 0% ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="321" >
-<father id="327" num="1" />
+<SUBCOMPONENT type="-1" id="1778" >
+<father id="1784" num="1" />
<cdparam x="951" y="277" />
<sizeparam width="40" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ 70% ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="322" >
-<father id="327" num="2" />
+<SUBCOMPONENT type="-1" id="1779" >
+<father id="1784" num="2" />
<cdparam x="936" y="312" />
<sizeparam width="40" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3212,288 +3322,328 @@
<infoparam name="guard 3" value="[ 30% ]" />
</SUBCOMPONENT>
-<COMPONENT type="301" id="336" >
+<COMPONENT type="301" id="1801" >
<cdparam x="208" y="126" />
<sizeparam width="354" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="accounts for traffic caused by ECUs not taken into account
" />
-<TGConnectingPoint num="0" id="328" />
-<TGConnectingPoint num="1" id="329" />
-<TGConnectingPoint num="2" id="330" />
-<TGConnectingPoint num="3" id="331" />
-<TGConnectingPoint num="4" id="332" />
-<TGConnectingPoint num="5" id="333" />
-<TGConnectingPoint num="6" id="334" />
-<TGConnectingPoint num="7" id="335" />
+<TGConnectingPoint num="0" id="1785" />
+<TGConnectingPoint num="1" id="1786" />
+<TGConnectingPoint num="2" id="1787" />
+<TGConnectingPoint num="3" id="1788" />
+<TGConnectingPoint num="4" id="1789" />
+<TGConnectingPoint num="5" id="1790" />
+<TGConnectingPoint num="6" id="1791" />
+<TGConnectingPoint num="7" id="1792" />
+<TGConnectingPoint num="8" id="1793" />
+<TGConnectingPoint num="9" id="1794" />
+<TGConnectingPoint num="10" id="1795" />
+<TGConnectingPoint num="11" id="1796" />
+<TGConnectingPoint num="12" id="1797" />
+<TGConnectingPoint num="13" id="1798" />
+<TGConnectingPoint num="14" id="1799" />
+<TGConnectingPoint num="15" id="1800" />
<extraparam>
<Line value="accounts for traffic caused by ECUs not taken into account" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1020" id="340" >
+<COMPONENT type="1020" id="1805" >
<cdparam x="689" y="211" />
<sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="337" />
-<TGConnectingPoint num="1" id="338" />
-<TGConnectingPoint num="2" id="339" />
+<TGConnectingPoint num="0" id="1802" />
+<TGConnectingPoint num="1" id="1803" />
+<TGConnectingPoint num="2" id="1804" />
</COMPONENT>
-<COMPONENT type="1001" id="342" >
+<COMPONENT type="1001" id="1807" >
<cdparam x="722" y="310" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="341" />
+<TGConnectingPoint num="0" id="1806" />
</COMPONENT>
-<COMPONENT type="1001" id="344" >
+<COMPONENT type="1001" id="1809" >
<cdparam x="586" y="220" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="343" />
+<TGConnectingPoint num="0" id="1808" />
</COMPONENT>
-<COMPONENT type="1014" id="348" >
+<COMPONENT type="1014" id="1813" >
<cdparam x="501" y="169" />
<sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for loop" value="for(evts=0;evts==0;evts=evts)" />
-<TGConnectingPoint num="0" id="345" />
-<TGConnectingPoint num="1" id="346" />
-<TGConnectingPoint num="2" id="347" />
+<TGConnectingPoint num="0" id="1810" />
+<TGConnectingPoint num="1" id="1811" />
+<TGConnectingPoint num="2" id="1812" />
<extraparam>
<Data init="evts=0" condition="evts==0" increment="evts=evts" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="350" >
+<COMPONENT type="1001" id="1815" >
<cdparam x="1001" y="364" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="349" />
+<TGConnectingPoint num="0" id="1814" />
</COMPONENT>
-<COMPONENT type="1001" id="352" >
+<COMPONENT type="1001" id="1817" >
<cdparam x="922" y="394" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="351" />
+<TGConnectingPoint num="0" id="1816" />
</COMPONENT>
-<COMPONENT type="1001" id="354" >
+<COMPONENT type="1001" id="1819" >
<cdparam x="835" y="357" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="353" />
+<TGConnectingPoint num="0" id="1818" />
</COMPONENT>
-<COMPONENT type="1006" id="357" >
+<COMPONENT type="1006" id="1822" >
<cdparam x="800" y="304" />
<sizeparam width="95" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="lowPrioLoad(1)" />
-<TGConnectingPoint num="0" id="355" />
-<TGConnectingPoint num="1" id="356" />
+<TGConnectingPoint num="0" id="1820" />
+<TGConnectingPoint num="1" id="1821" />
<extraparam>
-<Data channelName="lowPrioLoad" nbOfSamples="1" />
+<Data channelName="lowPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="366" >
+<COMPONENT type="301" id="1839" >
<cdparam x="1082" y="303" />
<sizeparam width="70" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="idle time
" />
-<TGConnectingPoint num="0" id="358" />
-<TGConnectingPoint num="1" id="359" />
-<TGConnectingPoint num="2" id="360" />
-<TGConnectingPoint num="3" id="361" />
-<TGConnectingPoint num="4" id="362" />
-<TGConnectingPoint num="5" id="363" />
-<TGConnectingPoint num="6" id="364" />
-<TGConnectingPoint num="7" id="365" />
+<TGConnectingPoint num="0" id="1823" />
+<TGConnectingPoint num="1" id="1824" />
+<TGConnectingPoint num="2" id="1825" />
+<TGConnectingPoint num="3" id="1826" />
+<TGConnectingPoint num="4" id="1827" />
+<TGConnectingPoint num="5" id="1828" />
+<TGConnectingPoint num="6" id="1829" />
+<TGConnectingPoint num="7" id="1830" />
+<TGConnectingPoint num="8" id="1831" />
+<TGConnectingPoint num="9" id="1832" />
+<TGConnectingPoint num="10" id="1833" />
+<TGConnectingPoint num="11" id="1834" />
+<TGConnectingPoint num="12" id="1835" />
+<TGConnectingPoint num="13" id="1836" />
+<TGConnectingPoint num="14" id="1837" />
+<TGConnectingPoint num="15" id="1838" />
<extraparam>
<Line value="idle time" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="375" >
+<COMPONENT type="301" id="1856" >
<cdparam x="526" y="287" />
<sizeparam width="179" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="check if processing finished
" />
-<TGConnectingPoint num="0" id="367" />
-<TGConnectingPoint num="1" id="368" />
-<TGConnectingPoint num="2" id="369" />
-<TGConnectingPoint num="3" id="370" />
-<TGConnectingPoint num="4" id="371" />
-<TGConnectingPoint num="5" id="372" />
-<TGConnectingPoint num="6" id="373" />
-<TGConnectingPoint num="7" id="374" />
+<TGConnectingPoint num="0" id="1840" />
+<TGConnectingPoint num="1" id="1841" />
+<TGConnectingPoint num="2" id="1842" />
+<TGConnectingPoint num="3" id="1843" />
+<TGConnectingPoint num="4" id="1844" />
+<TGConnectingPoint num="5" id="1845" />
+<TGConnectingPoint num="6" id="1846" />
+<TGConnectingPoint num="7" id="1847" />
+<TGConnectingPoint num="8" id="1848" />
+<TGConnectingPoint num="9" id="1849" />
+<TGConnectingPoint num="10" id="1850" />
+<TGConnectingPoint num="11" id="1851" />
+<TGConnectingPoint num="12" id="1852" />
+<TGConnectingPoint num="13" id="1853" />
+<TGConnectingPoint num="14" id="1854" />
+<TGConnectingPoint num="15" id="1855" />
<extraparam>
<Line value="check if processing finished" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="384" >
+<COMPONENT type="301" id="1873" >
<cdparam x="897" y="423" />
<sizeparam width="145" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="high priority Bus Load
" />
-<TGConnectingPoint num="0" id="376" />
-<TGConnectingPoint num="1" id="377" />
-<TGConnectingPoint num="2" id="378" />
-<TGConnectingPoint num="3" id="379" />
-<TGConnectingPoint num="4" id="380" />
-<TGConnectingPoint num="5" id="381" />
-<TGConnectingPoint num="6" id="382" />
-<TGConnectingPoint num="7" id="383" />
+<TGConnectingPoint num="0" id="1857" />
+<TGConnectingPoint num="1" id="1858" />
+<TGConnectingPoint num="2" id="1859" />
+<TGConnectingPoint num="3" id="1860" />
+<TGConnectingPoint num="4" id="1861" />
+<TGConnectingPoint num="5" id="1862" />
+<TGConnectingPoint num="6" id="1863" />
+<TGConnectingPoint num="7" id="1864" />
+<TGConnectingPoint num="8" id="1865" />
+<TGConnectingPoint num="9" id="1866" />
+<TGConnectingPoint num="10" id="1867" />
+<TGConnectingPoint num="11" id="1868" />
+<TGConnectingPoint num="12" id="1869" />
+<TGConnectingPoint num="13" id="1870" />
+<TGConnectingPoint num="14" id="1871" />
+<TGConnectingPoint num="15" id="1872" />
<extraparam>
<Line value="high priority Bus Load" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="393" >
+<COMPONENT type="301" id="1890" >
<cdparam x="732" y="390" />
<sizeparam width="145" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="high priority Bus Load
" />
-<TGConnectingPoint num="0" id="385" />
-<TGConnectingPoint num="1" id="386" />
-<TGConnectingPoint num="2" id="387" />
-<TGConnectingPoint num="3" id="388" />
-<TGConnectingPoint num="4" id="389" />
-<TGConnectingPoint num="5" id="390" />
-<TGConnectingPoint num="6" id="391" />
-<TGConnectingPoint num="7" id="392" />
+<TGConnectingPoint num="0" id="1874" />
+<TGConnectingPoint num="1" id="1875" />
+<TGConnectingPoint num="2" id="1876" />
+<TGConnectingPoint num="3" id="1877" />
+<TGConnectingPoint num="4" id="1878" />
+<TGConnectingPoint num="5" id="1879" />
+<TGConnectingPoint num="6" id="1880" />
+<TGConnectingPoint num="7" id="1881" />
+<TGConnectingPoint num="8" id="1882" />
+<TGConnectingPoint num="9" id="1883" />
+<TGConnectingPoint num="10" id="1884" />
+<TGConnectingPoint num="11" id="1885" />
+<TGConnectingPoint num="12" id="1886" />
+<TGConnectingPoint num="13" id="1887" />
+<TGConnectingPoint num="14" id="1888" />
+<TGConnectingPoint num="15" id="1889" />
<extraparam>
<Line value="high priority Bus Load" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="396" >
+<COMPONENT type="1006" id="1893" >
<cdparam x="882" y="344" />
<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="highPrioLoad(1)" />
-<TGConnectingPoint num="0" id="394" />
-<TGConnectingPoint num="1" id="395" />
+<TGConnectingPoint num="0" id="1891" />
+<TGConnectingPoint num="1" id="1892" />
<extraparam>
-<Data channelName="highPrioLoad" nbOfSamples="1" />
+<Data channelName="highPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="397" >
+<CONNECTOR type="115" id="1894" >
<cdparam x="735" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to stop state" value="null" />
-<P1 x="735" y="236" id="339" />
-<P2 x="732" y="305" id="341" />
+<P1 x="735" y="236" id="1804" />
+<P2 x="732" y="305" id="1806" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="398" >
+<CONNECTOR type="115" id="1895" >
<cdparam x="782" y="225" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to choice" value="null" />
-<P1 x="782" y="225" id="338" />
-<P2 x="931" y="257" id="323" />
+<P1 x="782" y="225" id="1803" />
+<P2 x="931" y="257" id="1780" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="399" >
+<CONNECTOR type="115" id="1896" >
<cdparam x="971" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to delay" value="null" />
-<P1 x="971" y="282" id="325" />
-<P2 x="1011" y="297" id="317" />
+<P1 x="971" y="282" id="1782" />
+<P2 x="1011" y="297" id="1774" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="400" >
+<CONNECTOR type="115" id="1897" >
<cdparam x="931" y="322" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to write channel" value="null" />
-<P1 x="931" y="322" id="326" />
-<P2 x="932" y="339" id="394" />
+<P1 x="931" y="322" id="1783" />
+<P2 x="932" y="339" id="1891" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="401" >
+<CONNECTOR type="115" id="1898" >
<cdparam x="891" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to write channel" value="null" />
-<P1 x="891" y="282" id="324" />
-<P2 x="847" y="299" id="355" />
+<P1 x="891" y="282" id="1781" />
+<P2 x="847" y="299" id="1820" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="402" >
+<CONNECTOR type="115" id="1899" >
<cdparam x="847" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="847" y="329" id="356" />
-<P2 x="845" y="352" id="353" />
+<P1 x="847" y="329" id="1821" />
+<P2 x="845" y="352" id="1818" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="403" >
+<CONNECTOR type="115" id="1900" >
<cdparam x="932" y="369" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="932" y="369" id="395" />
-<P2 x="932" y="389" id="351" />
+<P1 x="932" y="369" id="1892" />
+<P2 x="932" y="389" id="1816" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="404" >
+<CONNECTOR type="115" id="1901" >
<cdparam x="1011" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from delay to stop state" value="null" />
-<P1 x="1011" y="337" id="318" />
-<P2 x="1011" y="359" id="349" />
+<P1 x="1011" y="337" id="1775" />
+<P2 x="1011" y="359" id="1814" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="405" >
+<CONNECTOR type="115" id="1902" >
<cdparam x="598" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to stop state" value="null" />
-<P1 x="596" y="194" id="347" />
-<P2 x="596" y="215" id="343" />
+<P1 x="596" y="194" id="1812" />
+<P2 x="596" y="215" id="1808" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="406" >
+<CONNECTOR type="115" id="1903" >
<cdparam x="691" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to for loop" value="null" />
-<P1 x="691" y="183" id="346" />
-<P2 x="735" y="206" id="337" />
+<P1 x="691" y="183" id="1811" />
+<P2 x="735" y="206" id="1802" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="407" >
+<CONNECTOR type="115" id="1904" >
<cdparam x="586" y="155" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for loop" value="null" />
-<P1 x="592" y="148" id="314" />
-<P2 x="596" y="164" id="345" />
+<P1 x="592" y="148" id="1771" />
+<P2 x="596" y="164" id="1810" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -3506,210 +3656,212 @@
<Modeling type="TML Architecture" nameTab="Architecture_NoSec" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1400" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="441" >
+<COMPONENT type="1100" id="1938" >
<cdparam x="691" y="578" />
<sizeparam width="255" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="CPU_Sink" value="name" />
-<TGConnectingPoint num="0" id="417" />
-<TGConnectingPoint num="1" id="418" />
-<TGConnectingPoint num="2" id="419" />
-<TGConnectingPoint num="3" id="420" />
-<TGConnectingPoint num="4" id="421" />
-<TGConnectingPoint num="5" id="422" />
-<TGConnectingPoint num="6" id="423" />
-<TGConnectingPoint num="7" id="424" />
-<TGConnectingPoint num="8" id="425" />
-<TGConnectingPoint num="9" id="426" />
-<TGConnectingPoint num="10" id="427" />
-<TGConnectingPoint num="11" id="428" />
-<TGConnectingPoint num="12" id="429" />
-<TGConnectingPoint num="13" id="430" />
-<TGConnectingPoint num="14" id="431" />
-<TGConnectingPoint num="15" id="432" />
-<TGConnectingPoint num="16" id="433" />
-<TGConnectingPoint num="17" id="434" />
-<TGConnectingPoint num="18" id="435" />
-<TGConnectingPoint num="19" id="436" />
-<TGConnectingPoint num="20" id="437" />
-<TGConnectingPoint num="21" id="438" />
-<TGConnectingPoint num="22" id="439" />
-<TGConnectingPoint num="23" id="440" />
+<TGConnectingPoint num="0" id="1914" />
+<TGConnectingPoint num="1" id="1915" />
+<TGConnectingPoint num="2" id="1916" />
+<TGConnectingPoint num="3" id="1917" />
+<TGConnectingPoint num="4" id="1918" />
+<TGConnectingPoint num="5" id="1919" />
+<TGConnectingPoint num="6" id="1920" />
+<TGConnectingPoint num="7" id="1921" />
+<TGConnectingPoint num="8" id="1922" />
+<TGConnectingPoint num="9" id="1923" />
+<TGConnectingPoint num="10" id="1924" />
+<TGConnectingPoint num="11" id="1925" />
+<TGConnectingPoint num="12" id="1926" />
+<TGConnectingPoint num="13" id="1927" />
+<TGConnectingPoint num="14" id="1928" />
+<TGConnectingPoint num="15" id="1929" />
+<TGConnectingPoint num="16" id="1930" />
+<TGConnectingPoint num="17" id="1931" />
+<TGConnectingPoint num="18" id="1932" />
+<TGConnectingPoint num="19" id="1933" />
+<TGConnectingPoint num="20" id="1934" />
+<TGConnectingPoint num="21" id="1935" />
+<TGConnectingPoint num="22" id="1936" />
+<TGConnectingPoint num="23" id="1937" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU_Sink" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="416" >
-<father id="441" num="0" />
-<cdparam x="702" y="620" />
-<sizeparam width="229" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1913" >
+<father id="1938" num="0" />
+<cdparam x="701" y="620" />
+<sizeparam width="245" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="26" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="10" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KDP Perf Design_NoSec::LoadSink" />
-<TGConnectingPoint num="0" id="408" />
-<TGConnectingPoint num="1" id="409" />
-<TGConnectingPoint num="2" id="410" />
-<TGConnectingPoint num="3" id="411" />
-<TGConnectingPoint num="4" id="412" />
-<TGConnectingPoint num="5" id="413" />
-<TGConnectingPoint num="6" id="414" />
-<TGConnectingPoint num="7" id="415" />
+<TGConnectingPoint num="0" id="1905" />
+<TGConnectingPoint num="1" id="1906" />
+<TGConnectingPoint num="2" id="1907" />
+<TGConnectingPoint num="3" id="1908" />
+<TGConnectingPoint num="4" id="1909" />
+<TGConnectingPoint num="5" id="1910" />
+<TGConnectingPoint num="6" id="1911" />
+<TGConnectingPoint num="7" id="1912" />
<extraparam>
<info value="KDP Perf Design_NoSec::LoadSink" taskName="LoadSink" referenceTaskName="KDP Perf Design_NoSec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="475" >
+<COMPONENT type="1100" id="1972" >
<cdparam x="674" y="295" />
<sizeparam width="289" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="CPU_Source" value="name" />
-<TGConnectingPoint num="0" id="451" />
-<TGConnectingPoint num="1" id="452" />
-<TGConnectingPoint num="2" id="453" />
-<TGConnectingPoint num="3" id="454" />
-<TGConnectingPoint num="4" id="455" />
-<TGConnectingPoint num="5" id="456" />
-<TGConnectingPoint num="6" id="457" />
-<TGConnectingPoint num="7" id="458" />
-<TGConnectingPoint num="8" id="459" />
-<TGConnectingPoint num="9" id="460" />
-<TGConnectingPoint num="10" id="461" />
-<TGConnectingPoint num="11" id="462" />
-<TGConnectingPoint num="12" id="463" />
-<TGConnectingPoint num="13" id="464" />
-<TGConnectingPoint num="14" id="465" />
-<TGConnectingPoint num="15" id="466" />
-<TGConnectingPoint num="16" id="467" />
-<TGConnectingPoint num="17" id="468" />
-<TGConnectingPoint num="18" id="469" />
-<TGConnectingPoint num="19" id="470" />
-<TGConnectingPoint num="20" id="471" />
-<TGConnectingPoint num="21" id="472" />
-<TGConnectingPoint num="22" id="473" />
-<TGConnectingPoint num="23" id="474" />
+<TGConnectingPoint num="0" id="1948" />
+<TGConnectingPoint num="1" id="1949" />
+<TGConnectingPoint num="2" id="1950" />
+<TGConnectingPoint num="3" id="1951" />
+<TGConnectingPoint num="4" id="1952" />
+<TGConnectingPoint num="5" id="1953" />
+<TGConnectingPoint num="6" id="1954" />
+<TGConnectingPoint num="7" id="1955" />
+<TGConnectingPoint num="8" id="1956" />
+<TGConnectingPoint num="9" id="1957" />
+<TGConnectingPoint num="10" id="1958" />
+<TGConnectingPoint num="11" id="1959" />
+<TGConnectingPoint num="12" id="1960" />
+<TGConnectingPoint num="13" id="1961" />
+<TGConnectingPoint num="14" id="1962" />
+<TGConnectingPoint num="15" id="1963" />
+<TGConnectingPoint num="16" id="1964" />
+<TGConnectingPoint num="17" id="1965" />
+<TGConnectingPoint num="18" id="1966" />
+<TGConnectingPoint num="19" id="1967" />
+<TGConnectingPoint num="20" id="1968" />
+<TGConnectingPoint num="21" id="1969" />
+<TGConnectingPoint num="22" id="1970" />
+<TGConnectingPoint num="23" id="1971" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU_Source" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="450" >
-<father id="475" num="0" />
+<SUBCOMPONENT type="1101" id="1947" >
+<father id="1972" num="0" />
<cdparam x="692" y="340" />
-<sizeparam width="244" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="26" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KDP Perf Design_NoSec::LoadSource" />
-<TGConnectingPoint num="0" id="442" />
-<TGConnectingPoint num="1" id="443" />
-<TGConnectingPoint num="2" id="444" />
-<TGConnectingPoint num="3" id="445" />
-<TGConnectingPoint num="4" id="446" />
-<TGConnectingPoint num="5" id="447" />
-<TGConnectingPoint num="6" id="448" />
-<TGConnectingPoint num="7" id="449" />
+<TGConnectingPoint num="0" id="1939" />
+<TGConnectingPoint num="1" id="1940" />
+<TGConnectingPoint num="2" id="1941" />
+<TGConnectingPoint num="3" id="1942" />
+<TGConnectingPoint num="4" id="1943" />
+<TGConnectingPoint num="5" id="1944" />
+<TGConnectingPoint num="6" id="1945" />
+<TGConnectingPoint num="7" id="1946" />
<extraparam>
<info value="KDP Perf Design_NoSec::LoadSource" taskName="LoadSource" referenceTaskName="KDP Perf Design_NoSec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="518" >
+<COMPONENT type="1102" id="2015" >
<cdparam x="670" y="425" />
<sizeparam width="297" height="134" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="MainCAN" value="name" />
-<TGConnectingPoint num="0" id="494" />
-<TGConnectingPoint num="1" id="495" />
-<TGConnectingPoint num="2" id="496" />
-<TGConnectingPoint num="3" id="497" />
-<TGConnectingPoint num="4" id="498" />
-<TGConnectingPoint num="5" id="499" />
-<TGConnectingPoint num="6" id="500" />
-<TGConnectingPoint num="7" id="501" />
-<TGConnectingPoint num="8" id="502" />
-<TGConnectingPoint num="9" id="503" />
-<TGConnectingPoint num="10" id="504" />
-<TGConnectingPoint num="11" id="505" />
-<TGConnectingPoint num="12" id="506" />
-<TGConnectingPoint num="13" id="507" />
-<TGConnectingPoint num="14" id="508" />
-<TGConnectingPoint num="15" id="509" />
-<TGConnectingPoint num="16" id="510" />
-<TGConnectingPoint num="17" id="511" />
-<TGConnectingPoint num="18" id="512" />
-<TGConnectingPoint num="19" id="513" />
-<TGConnectingPoint num="20" id="514" />
-<TGConnectingPoint num="21" id="515" />
-<TGConnectingPoint num="22" id="516" />
-<TGConnectingPoint num="23" id="517" />
-<extraparam>
-<info stereotype="BUS-CAN" nodeName="MainCAN" />
-<attributes byteDataSize="1" arbitrationPolicy="2" sliceTime="10000" pipelineSize="1" clockRatio="3225" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1103" id="484" >
-<father id="518" num="0" />
-<cdparam x="706" y="508" />
-<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="50" minY="0" maxY="94" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
-<TGConnectingPoint num="2" id="478" />
-<TGConnectingPoint num="3" id="479" />
-<TGConnectingPoint num="4" id="480" />
-<TGConnectingPoint num="5" id="481" />
-<TGConnectingPoint num="6" id="482" />
-<TGConnectingPoint num="7" id="483" />
+<TGConnectingPoint num="0" id="1991" />
+<TGConnectingPoint num="1" id="1992" />
+<TGConnectingPoint num="2" id="1993" />
+<TGConnectingPoint num="3" id="1994" />
+<TGConnectingPoint num="4" id="1995" />
+<TGConnectingPoint num="5" id="1996" />
+<TGConnectingPoint num="6" id="1997" />
+<TGConnectingPoint num="7" id="1998" />
+<TGConnectingPoint num="8" id="1999" />
+<TGConnectingPoint num="9" id="2000" />
+<TGConnectingPoint num="10" id="2001" />
+<TGConnectingPoint num="11" id="2002" />
+<TGConnectingPoint num="12" id="2003" />
+<TGConnectingPoint num="13" id="2004" />
+<TGConnectingPoint num="14" id="2005" />
+<TGConnectingPoint num="15" id="2006" />
+<TGConnectingPoint num="16" id="2007" />
+<TGConnectingPoint num="17" id="2008" />
+<TGConnectingPoint num="18" id="2009" />
+<TGConnectingPoint num="19" id="2010" />
+<TGConnectingPoint num="20" id="2011" />
+<TGConnectingPoint num="21" id="2012" />
+<TGConnectingPoint num="22" id="2013" />
+<TGConnectingPoint num="23" id="2014" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="MainCAN" />
+<attributes byteDataSize="1" arbitrationPolicy="2" sliceTime="10000" pipelineSize="1" clockRatio="3225" privacy="0" referenceAttack="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="1981" >
+<father id="2015" num="0" />
+<cdparam x="697" y="462" />
+<sizeparam width="270" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="27" minY="0" maxY="94" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
+<TGConnectingPoint num="0" id="1973" />
+<TGConnectingPoint num="1" id="1974" />
+<TGConnectingPoint num="2" id="1975" />
+<TGConnectingPoint num="3" id="1976" />
+<TGConnectingPoint num="4" id="1977" />
+<TGConnectingPoint num="5" id="1978" />
+<TGConnectingPoint num="6" id="1979" />
+<TGConnectingPoint num="7" id="1980" />
<extraparam>
-<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
+<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="493" >
-<father id="518" num="1" />
-<cdparam x="702" y="462" />
-<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1103" id="1990" >
+<father id="2015" num="1" />
+<cdparam x="704" y="508" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="94" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
-<TGConnectingPoint num="0" id="485" />
-<TGConnectingPoint num="1" id="486" />
-<TGConnectingPoint num="2" id="487" />
-<TGConnectingPoint num="3" id="488" />
-<TGConnectingPoint num="4" id="489" />
-<TGConnectingPoint num="5" id="490" />
-<TGConnectingPoint num="6" id="491" />
-<TGConnectingPoint num="7" id="492" />
+<cdrectangleparam minX="0" maxX="34" minY="0" maxY="94" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
+<TGConnectingPoint num="0" id="1982" />
+<TGConnectingPoint num="1" id="1983" />
+<TGConnectingPoint num="2" id="1984" />
+<TGConnectingPoint num="3" id="1985" />
+<TGConnectingPoint num="4" id="1986" />
+<TGConnectingPoint num="5" id="1987" />
+<TGConnectingPoint num="6" id="1988" />
+<TGConnectingPoint num="7" id="1989" />
<extraparam>
-<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
+<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="519" >
+<CONNECTOR type="125" id="2016" >
<cdparam x="1166" y="557" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU_Sink to MainCAN" value="{info}" />
-<P1 x="818" y="578" id="418" />
-<P2 x="818" y="559" id="500" />
+<P1 x="818" y="578" id="1915" />
+<P2 x="818" y="559" id="1997" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="520" >
+<CONNECTOR type="125" id="2017" >
<cdparam x="545" y="515" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0 to MainCAN" value="{info}" />
-<P1 x="818" y="395" id="457" />
-<P2 x="818" y="425" id="495" />
+<P1 x="818" y="395" id="1954" />
+<P2 x="818" y="425" id="1992" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
@@ -3722,25 +3874,25 @@
<Modeling type="TML Component Design" nameTab="KDP Perf Design_Sec" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2400" minY="10" maxY="900" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="523" >
+<CONNECTOR type="126" id="2020" >
<cdparam x="678" y="51" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="678" y="51" id="600" />
-<P2 x="750" y="28" id="585" />
+<P1 x="678" y="51" id="2101" />
+<P2 x="750" y="28" id="2086" />
<Point x="725" y="15" />
<Point x="746" y="16" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="521" >
-<father id="523" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2018" >
+<father id="2020" num="0" />
<cdparam x="725" y="15" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="522" >
-<father id="523" num="1" />
+<SUBCOMPONENT type="-1" id="2019" >
+<father id="2020" num="1" />
<cdparam x="746" y="16" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3748,417 +3900,418 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="126" id="524" >
+<CONNECTOR type="126" id="2021" >
<cdparam x="833" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="806" y="144" id="589" />
-<P2 x="790" y="193" id="574" />
+<P1 x="806" y="144" id="2082" />
+<P2 x="790" y="193" id="2069" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="525" >
+<CONNECTOR type="126" id="2022" >
<cdparam x="767" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="720" y="144" id="587" />
-<P2 x="724" y="193" id="572" />
+<P1 x="720" y="144" id="2084" />
+<P2 x="724" y="193" id="2071" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="526" >
+<CONNECTOR type="126" id="2023" >
<cdparam x="1845" y="702" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1716" y="670" id="822" />
-<P2 x="1415" y="678" id="747" />
+<P1 x="1716" y="670" id="2325" />
+<P2 x="1415" y="678" id="2226" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="527" >
+<CONNECTOR type="126" id="2024" >
<cdparam x="1845" y="739" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1716" y="707" id="820" />
-<P2 x="1415" y="720" id="749" />
+<P1 x="1716" y="707" id="2327" />
+<P2 x="1415" y="720" id="2224" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="528" >
+<CONNECTOR type="126" id="2025" >
<cdparam x="1415" y="639" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1415" y="639" id="745" />
-<P2 x="1716" y="638" id="824" />
+<P1 x="1415" y="639" id="2228" />
+<P2 x="1716" y="638" id="2323" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="529" >
+<CONNECTOR type="126" id="2026" >
<cdparam x="1415" y="594" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1415" y="594" id="743" />
-<P2 x="1716" y="603" id="826" />
+<P1 x="1415" y="594" id="2230" />
+<P2 x="1716" y="603" id="2321" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="530" >
+<CONNECTOR type="126" id="2027" >
<cdparam x="678" y="707" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="678" y="707" id="654" />
-<P2 x="1112" y="699" id="741" />
+<P1 x="678" y="707" id="2137" />
+<P2 x="1112" y="699" id="2232" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="531" >
+<CONNECTOR type="126" id="2028" >
<cdparam x="678" y="671" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="678" y="671" id="652" />
-<P2 x="1112" y="663" id="739" />
+<P1 x="678" y="671" id="2139" />
+<P2 x="1112" y="663" id="2234" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="532" >
+<CONNECTOR type="126" id="2029" >
<cdparam x="1112" y="629" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1112" y="629" id="737" />
-<P2 x="678" y="624" id="650" />
+<P1 x="1112" y="629" id="2236" />
+<P2 x="678" y="624" id="2141" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="533" >
+<CONNECTOR type="126" id="2030" >
<cdparam x="1112" y="589" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1112" y="589" id="735" />
-<P2 x="678" y="583" id="648" />
+<P1 x="1112" y="589" id="2238" />
+<P2 x="678" y="583" id="2143" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="534" >
+<CONNECTOR type="126" id="2031" >
<cdparam x="425" y="111" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="425" y="111" id="691" />
-<P2 x="275" y="90" id="615" />
+<P1 x="425" y="111" id="2162" />
+<P2 x="275" y="90" id="2126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="535" >
+<CONNECTOR type="126" id="2032" >
<cdparam x="375" y="226" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="375" y="226" id="689" />
-<P2 x="275" y="231" id="621" />
+<P1 x="375" y="226" id="2164" />
+<P2 x="275" y="231" id="2120" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="536" >
+<CONNECTOR type="126" id="2033" >
<cdparam x="375" y="176" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="375" y="150" id="687" />
-<P2 x="275" y="139" id="617" />
+<P1 x="375" y="150" id="2166" />
+<P2 x="275" y="139" id="2124" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="537" >
+<CONNECTOR type="126" id="2034" >
<cdparam x="275" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="275" y="185" id="619" />
-<P2 x="375" y="187" id="685" />
+<P1 x="275" y="185" id="2122" />
+<P2 x="375" y="187" id="2168" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="538" >
+<CONNECTOR type="126" id="2035" >
<cdparam x="275" y="271" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="275" y="273" id="623" />
-<P2 x="375" y="267" id="683" />
+<P1 x="275" y="273" id="2118" />
+<P2 x="375" y="267" id="2170" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="539" >
+<CONNECTOR type="126" id="2036" >
<cdparam x="375" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="375" y="343" id="681" />
-<P2 x="275" y="358" id="627" />
+<P1 x="375" y="343" id="2172" />
+<P2 x="275" y="358" id="2114" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="540" >
+<CONNECTOR type="126" id="2037" >
<cdparam x="375" y="334" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="375" y="305" id="679" />
-<P2 x="275" y="319" id="625" />
+<P1 x="375" y="305" id="2174" />
+<P2 x="275" y="319" id="2116" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="541" >
+<CONNECTOR type="126" id="2038" >
<cdparam x="375" y="335" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="375" y="375" id="677" />
-<P2 x="275" y="393" id="629" />
+<P1 x="375" y="375" id="2176" />
+<P2 x="275" y="393" id="2112" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="542" >
+<CONNECTOR type="126" id="2039" >
<cdparam x="565" y="202" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="588" y="111" id="675" />
-<P2 x="586" y="91" id="604" />
+<P1 x="588" y="111" id="2178" />
+<P2 x="586" y="91" id="2097" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="543" >
+<CONNECTOR type="126" id="2040" >
<cdparam x="449" y="151" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="495" y="91" id="602" />
-<P2 x="498" y="111" id="673" />
+<P1 x="495" y="91" id="2099" />
+<P2 x="498" y="111" id="2180" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="544" >
+<CONNECTOR type="126" id="2041" >
<cdparam x="620" y="437" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="620" y="515" id="646" />
-<P2 x="620" y="410" id="671" />
+<P1 x="620" y="515" id="2145" />
+<P2 x="620" y="410" id="2182" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="545" >
+<CONNECTOR type="126" id="2042" >
<cdparam x="558" y="437" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="557" y="515" id="644" />
-<P2 x="557" y="410" id="669" />
+<P1 x="557" y="515" id="2147" />
+<P2 x="557" y="410" id="2184" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="546" >
+<CONNECTOR type="126" id="2043" >
<cdparam x="495" y="381" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="494" y="410" id="667" />
-<P2 x="494" y="515" id="642" />
+<P1 x="494" y="410" id="2186" />
+<P2 x="494" y="515" id="2149" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="547" >
+<CONNECTOR type="126" id="2044" >
<cdparam x="438" y="381" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="437" y="410" id="665" />
-<P2 x="437" y="515" id="640" />
+<P1 x="437" y="410" id="2188" />
+<P2 x="437" y="515" id="2151" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="548" >
+<CONNECTOR type="126" id="2045" >
<cdparam x="1170" y="160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1162" y="114" id="762" />
-<P2 x="1021" y="103" id="702" />
+<P1 x="1162" y="114" id="2277" />
+<P2 x="1021" y="103" id="2213" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="549" >
+<CONNECTOR type="126" id="2046" >
<cdparam x="1120" y="275" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1112" y="229" id="764" />
-<P2 x="1021" y="244" id="712" />
+<P1 x="1112" y="229" id="2275" />
+<P2 x="1021" y="244" id="2203" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="550" >
+<CONNECTOR type="126" id="2047" >
<cdparam x="1120" y="225" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1112" y="153" id="766" />
-<P2 x="1021" y="152" id="716" />
+<P1 x="1112" y="153" id="2273" />
+<P2 x="1021" y="152" id="2199" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="551" >
+<CONNECTOR type="126" id="2048" >
<cdparam x="1020" y="232" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1021" y="198" id="714" />
-<P2 x="1112" y="190" id="768" />
+<P1 x="1021" y="198" id="2201" />
+<P2 x="1112" y="190" id="2271" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="552" >
+<CONNECTOR type="126" id="2049" >
<cdparam x="1020" y="320" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1021" y="286" id="710" />
-<P2 x="1112" y="270" id="770" />
+<P1 x="1021" y="286" id="2205" />
+<P2 x="1112" y="270" id="2269" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="553" >
+<CONNECTOR type="126" id="2050" >
<cdparam x="1120" y="386" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1112" y="346" id="772" />
-<P2 x="1021" y="371" id="706" />
+<P1 x="1112" y="346" id="2267" />
+<P2 x="1021" y="371" id="2209" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="554" >
+<CONNECTOR type="126" id="2051" >
<cdparam x="1120" y="383" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1112" y="308" id="774" />
-<P2 x="1021" y="332" id="708" />
+<P1 x="1112" y="308" id="2265" />
+<P2 x="1021" y="332" id="2207" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="555" >
+<CONNECTOR type="126" id="2052" >
<cdparam x="1120" y="384" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1112" y="378" id="776" />
-<P2 x="1021" y="406" id="704" />
+<P1 x="1112" y="378" id="2263" />
+<P2 x="1021" y="406" id="2211" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="556" >
+<CONNECTOR type="126" id="2053" >
<cdparam x="1365" y="486" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1357" y="515" id="729" />
-<P2 x="1357" y="413" id="778" />
+<P1 x="1357" y="515" id="2244" />
+<P2 x="1357" y="413" id="2261" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="557" >
+<CONNECTOR type="126" id="2054" >
<cdparam x="1303" y="486" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1294" y="515" id="731" />
-<P2 x="1294" y="413" id="780" />
+<P1 x="1294" y="515" id="2242" />
+<P2 x="1294" y="413" id="2259" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="558" >
+<CONNECTOR type="126" id="2055" >
<cdparam x="1240" y="430" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1231" y="413" id="782" />
-<P2 x="1231" y="515" id="733" />
+<P1 x="1231" y="413" id="2257" />
+<P2 x="1231" y="515" id="2240" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="559" >
+<CONNECTOR type="126" id="2056" >
<cdparam x="1183" y="430" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1174" y="413" id="760" />
-<P2 x="1174" y="515" id="727" />
+<P1 x="1174" y="413" id="2279" />
+<P2 x="1174" y="515" id="2246" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="560" >
+<CONNECTOR type="126" id="2057" >
<cdparam x="1766" y="176" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1766" y="176" id="845" />
-<P2 x="1616" y="153" id="793" />
+<P1 x="1766" y="176" id="2360" />
+<P2 x="1616" y="153" id="2304" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="561" >
+<CONNECTOR type="126" id="2058" >
<cdparam x="1716" y="291" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1716" y="291" id="847" />
-<P2 x="1616" y="294" id="803" />
+<P1 x="1716" y="291" id="2358" />
+<P2 x="1616" y="294" id="2294" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="562" >
+<CONNECTOR type="126" id="2059" >
<cdparam x="1716" y="241" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1716" y="215" id="849" />
-<P2 x="1616" y="202" id="807" />
+<P1 x="1716" y="215" id="2356" />
+<P2 x="1616" y="202" id="2290" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="563" >
+<CONNECTOR type="126" id="2060" >
<cdparam x="1616" y="248" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1616" y="248" id="805" />
-<P2 x="1716" y="252" id="851" />
+<P1 x="1616" y="248" id="2292" />
+<P2 x="1716" y="252" id="2354" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="564" >
+<CONNECTOR type="126" id="2061" >
<cdparam x="1616" y="336" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1616" y="336" id="801" />
-<P2 x="1716" y="332" id="853" />
+<P1 x="1616" y="336" id="2296" />
+<P2 x="1716" y="332" id="2352" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="565" >
+<CONNECTOR type="126" id="2062" >
<cdparam x="1716" y="402" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1716" y="408" id="855" />
-<P2 x="1616" y="421" id="797" />
+<P1 x="1716" y="408" id="2350" />
+<P2 x="1616" y="421" id="2300" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="566" >
+<CONNECTOR type="126" id="2063" >
<cdparam x="1716" y="399" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1716" y="370" id="857" />
-<P2 x="1616" y="382" id="799" />
+<P1 x="1716" y="370" id="2348" />
+<P2 x="1616" y="382" id="2298" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="567" >
+<CONNECTOR type="126" id="2064" >
<cdparam x="1716" y="400" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1716" y="440" id="859" />
-<P2 x="1616" y="456" id="795" />
+<P1 x="1716" y="440" id="2346" />
+<P2 x="1616" y="456" id="2302" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="568" >
+<CONNECTOR type="126" id="2065" >
<cdparam x="1961" y="502" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1961" y="543" id="828" />
-<P2 x="1961" y="475" id="861" />
+<P1 x="1961" y="543" id="2319" />
+<P2 x="1961" y="475" id="2344" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="569" >
+<CONNECTOR type="126" id="2066" >
<cdparam x="1899" y="502" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1898" y="543" id="830" />
-<P2 x="1898" y="475" id="863" />
+<P1 x="1898" y="543" id="2317" />
+<P2 x="1898" y="475" id="2342" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="570" >
+<CONNECTOR type="126" id="2067" >
<cdparam x="1836" y="446" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1835" y="475" id="865" />
-<P2 x="1835" y="543" id="832" />
+<P1 x="1835" y="475" id="2340" />
+<P2 x="1835" y="543" id="2315" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="571" >
+<CONNECTOR type="126" id="2068" >
<cdparam x="1779" y="446" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1 x="1778" y="475" id="843" />
-<P2 x="1778" y="543" id="818" />
+<P1 x="1778" y="475" id="2362" />
+<P2 x="1778" y="543" id="2329" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="584" >
+<COMPONENT type="1202" id="2081" >
<cdparam x="704" y="206" />
<sizeparam width="106" height="94" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="LoadSink" />
-<TGConnectingPoint num="0" id="576" />
-<TGConnectingPoint num="1" id="577" />
-<TGConnectingPoint num="2" id="578" />
-<TGConnectingPoint num="3" id="579" />
-<TGConnectingPoint num="4" id="580" />
-<TGConnectingPoint num="5" id="581" />
-<TGConnectingPoint num="6" id="582" />
-<TGConnectingPoint num="7" id="583" />
+<TGConnectingPoint num="0" id="2073" />
+<TGConnectingPoint num="1" id="2074" />
+<TGConnectingPoint num="2" id="2075" />
+<TGConnectingPoint num="3" id="2076" />
+<TGConnectingPoint num="4" id="2077" />
+<TGConnectingPoint num="5" id="2078" />
+<TGConnectingPoint num="6" id="2079" />
+<TGConnectingPoint num="7" id="2080" />
<extraparam>
+<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="573" >
-<father id="584" num="0" />
-<cdparam x="711" y="193" />
+<SUBCOMPONENT type="1203" id="2070" >
+<father id="2081" num="0" />
+<cdparam x="777" y="193" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="572" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="2069" />
<extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4166,16 +4319,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="575" >
-<father id="584" num="1" />
-<cdparam x="777" y="193" />
+<SUBCOMPONENT type="1203" id="2072" >
+<father id="2081" num="1" />
+<cdparam x="711" y="193" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="574" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="2071" />
<extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4184,34 +4337,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="599" >
+<COMPONENT type="1202" id="2096" >
<cdparam x="696" y="41" />
<sizeparam width="137" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="LoadSource" />
-<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="0" id="2088" />
+<TGConnectingPoint num="1" id="2089" />
+<TGConnectingPoint num="2" id="2090" />
+<TGConnectingPoint num="3" id="2091" />
+<TGConnectingPoint num="4" id="2092" />
+<TGConnectingPoint num="5" id="2093" />
+<TGConnectingPoint num="6" id="2094" />
+<TGConnectingPoint num="7" id="2095" />
<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="evts" value="0" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="586" >
-<father id="599" num="0" />
-<cdparam x="737" y="28" />
+<SUBCOMPONENT type="1203" id="2083" >
+<father id="2096" num="0" />
+<cdparam x="793" y="118" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Event endProcessing" />
-<TGConnectingPoint num="0" id="585" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="2082" />
<extraparam>
-<Prop commName="endProcessing" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4219,16 +4373,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="588" >
-<father id="599" num="1" />
+<SUBCOMPONENT type="1203" id="2085" >
+<father id="2096" num="1" />
<cdparam x="707" y="118" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="587" />
+<TGConnectingPoint num="0" id="2084" />
<extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4236,16 +4390,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="590" >
-<father id="599" num="2" />
-<cdparam x="793" y="118" />
+<SUBCOMPONENT type="1203" id="2087" >
+<father id="2096" num="2" />
+<cdparam x="737" y="28" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="589" />
+<infoparam name="Primitive port" value="Event endProcessing" />
+<TGConnectingPoint num="0" id="2086" />
<extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="endProcessing" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4254,33 +4408,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="614" >
+<COMPONENT type="1202" id="2111" >
<cdparam x="381" y="19" />
<sizeparam width="284" height="59" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="App_ECU1" />
-<TGConnectingPoint num="0" id="606" />
-<TGConnectingPoint num="1" id="607" />
-<TGConnectingPoint num="2" id="608" />
-<TGConnectingPoint num="3" id="609" />
-<TGConnectingPoint num="4" id="610" />
-<TGConnectingPoint num="5" id="611" />
-<TGConnectingPoint num="6" id="612" />
-<TGConnectingPoint num="7" id="613" />
+<TGConnectingPoint num="0" id="2103" />
+<TGConnectingPoint num="1" id="2104" />
+<TGConnectingPoint num="2" id="2105" />
+<TGConnectingPoint num="3" id="2106" />
+<TGConnectingPoint num="4" id="2107" />
+<TGConnectingPoint num="5" id="2108" />
+<TGConnectingPoint num="6" id="2109" />
+<TGConnectingPoint num="7" id="2110" />
<extraparam>
+<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="601" >
-<father id="614" num="0" />
-<cdparam x="652" y="38" />
+<SUBCOMPONENT type="1203" id="2098" >
+<father id="2111" num="0" />
+<cdparam x="573" y="65" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
-<infoparam name="Primitive port" value="Event endProcessing" />
-<TGConnectingPoint num="0" id="600" />
+<infoparam name="Primitive port" value="Event done" />
+<TGConnectingPoint num="0" id="2097" />
<extraparam>
-<Prop commName="endProcessing" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="done" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4288,16 +4443,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="603" >
-<father id="614" num="1" />
+<SUBCOMPONENT type="1203" id="2100" >
+<father id="2111" num="1" />
<cdparam x="482" y="65" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
<infoparam name="Primitive port" value="Event distributeKey" />
-<TGConnectingPoint num="0" id="602" />
+<TGConnectingPoint num="0" id="2099" />
<extraparam>
-<Prop commName="distributeKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="distributeKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4305,16 +4460,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="605" >
-<father id="614" num="2" />
-<cdparam x="573" y="65" />
+<SUBCOMPONENT type="1203" id="2102" >
+<father id="2111" num="2" />
+<cdparam x="652" y="38" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
-<infoparam name="Primitive port" value="Event done" />
-<TGConnectingPoint num="0" id="604" />
+<infoparam name="Primitive port" value="Event endProcessing" />
+<TGConnectingPoint num="0" id="2101" />
<extraparam>
-<Prop commName="done" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="endProcessing" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4323,34 +4478,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="639" >
+<COMPONENT type="1202" id="2136" >
<cdparam x="144" y="28" />
<sizeparam width="118" height="398" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="HSM_ECU1" />
-<TGConnectingPoint num="0" id="631" />
-<TGConnectingPoint num="1" id="632" />
-<TGConnectingPoint num="2" id="633" />
-<TGConnectingPoint num="3" id="634" />
-<TGConnectingPoint num="4" id="635" />
-<TGConnectingPoint num="5" id="636" />
-<TGConnectingPoint num="6" id="637" />
-<TGConnectingPoint num="7" id="638" />
-<extraparam>
+<TGConnectingPoint num="0" id="2128" />
+<TGConnectingPoint num="1" id="2129" />
+<TGConnectingPoint num="2" id="2130" />
+<TGConnectingPoint num="3" id="2131" />
+<TGConnectingPoint num="4" id="2132" />
+<TGConnectingPoint num="5" id="2133" />
+<TGConnectingPoint num="6" id="2134" />
+<TGConnectingPoint num="7" id="2135" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="616" >
-<father id="639" num="0" />
-<cdparam x="249" y="77" />
+<SUBCOMPONENT type="1203" id="2113" >
+<father id="2136" num="0" />
+<cdparam x="249" y="380" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event putMsgECU1" />
-<TGConnectingPoint num="0" id="615" />
+<infoparam name="Primitive port" value="Event generateKeyECU1" />
+<TGConnectingPoint num="0" id="2112" />
<extraparam>
-<Prop commName="putMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKeyECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4358,16 +4514,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="618" >
-<father id="639" num="1" />
-<cdparam x="249" y="126" />
+<SUBCOMPONENT type="1203" id="2115" >
+<father id="2136" num="1" />
+<cdparam x="249" y="345" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event getMsgECU1" />
-<TGConnectingPoint num="0" id="617" />
+<infoparam name="Primitive port" value="Event macECU1" />
+<TGConnectingPoint num="0" id="2114" />
<extraparam>
-<Prop commName="getMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="macECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4375,33 +4531,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="620" >
-<father id="639" num="2" />
-<cdparam x="249" y="172" />
+<SUBCOMPONENT type="1203" id="2117" >
+<father id="2136" num="2" />
+<cdparam x="249" y="306" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event doneHSMECU1" />
-<TGConnectingPoint num="0" id="619" />
+<infoparam name="Primitive port" value="Event encryptECU1" />
+<TGConnectingPoint num="0" id="2116" />
<extraparam>
-<Prop commName="doneHSMECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="622" >
-<father id="639" num="3" />
-<cdparam x="249" y="218" />
+<SUBCOMPONENT type="1203" id="2119" >
+<father id="2136" num="3" />
+<cdparam x="249" y="260" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Channel inHSMECU1" />
-<TGConnectingPoint num="0" id="621" />
+<infoparam name="Primitive port" value="Channel outHSMECU1" />
+<TGConnectingPoint num="0" id="2118" />
<extraparam>
-<Prop commName="inHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="outHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4409,16 +4565,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="624" >
-<father id="639" num="4" />
-<cdparam x="249" y="260" />
+<SUBCOMPONENT type="1203" id="2121" >
+<father id="2136" num="4" />
+<cdparam x="249" y="218" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Channel outHSMECU1" />
-<TGConnectingPoint num="0" id="623" />
+<infoparam name="Primitive port" value="Channel inHSMECU1" />
+<TGConnectingPoint num="0" id="2120" />
<extraparam>
-<Prop commName="outHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="inHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4426,33 +4582,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="626" >
-<father id="639" num="5" />
-<cdparam x="249" y="306" />
+<SUBCOMPONENT type="1203" id="2123" >
+<father id="2136" num="5" />
+<cdparam x="249" y="172" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event encryptECU1" />
-<TGConnectingPoint num="0" id="625" />
+<infoparam name="Primitive port" value="Event doneHSMECU1" />
+<TGConnectingPoint num="0" id="2122" />
<extraparam>
-<Prop commName="encryptECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="628" >
-<father id="639" num="6" />
-<cdparam x="249" y="345" />
+<SUBCOMPONENT type="1203" id="2125" >
+<father id="2136" num="6" />
+<cdparam x="249" y="126" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event macECU1" />
-<TGConnectingPoint num="0" id="627" />
+<infoparam name="Primitive port" value="Event getMsgECU1" />
+<TGConnectingPoint num="0" id="2124" />
<extraparam>
-<Prop commName="macECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4460,16 +4616,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="630" >
-<father id="639" num="7" />
-<cdparam x="249" y="380" />
+<SUBCOMPONENT type="1203" id="2127" >
+<father id="2136" num="7" />
+<cdparam x="249" y="77" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event generateKeyECU1" />
-<TGConnectingPoint num="0" id="629" />
+<infoparam name="Primitive port" value="Event putMsgECU1" />
+<TGConnectingPoint num="0" id="2126" />
<extraparam>
-<Prop commName="generateKeyECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4478,68 +4634,69 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="664" >
+<COMPONENT type="1202" id="2161" >
<cdparam x="388" y="528" />
<sizeparam width="277" height="200" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="CTP_ECU1" />
-<TGConnectingPoint num="0" id="656" />
-<TGConnectingPoint num="1" id="657" />
-<TGConnectingPoint num="2" id="658" />
-<TGConnectingPoint num="3" id="659" />
-<TGConnectingPoint num="4" id="660" />
-<TGConnectingPoint num="5" id="661" />
-<TGConnectingPoint num="6" id="662" />
-<TGConnectingPoint num="7" id="663" />
-<extraparam>
+<TGConnectingPoint num="0" id="2153" />
+<TGConnectingPoint num="1" id="2154" />
+<TGConnectingPoint num="2" id="2155" />
+<TGConnectingPoint num="3" id="2156" />
+<TGConnectingPoint num="4" id="2157" />
+<TGConnectingPoint num="5" id="2158" />
+<TGConnectingPoint num="6" id="2159" />
+<TGConnectingPoint num="7" id="2160" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="641" >
-<father id="664" num="0" />
-<cdparam x="424" y="515" />
+<SUBCOMPONENT type="1203" id="2138" >
+<father id="2161" num="0" />
+<cdparam x="652" y="694" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event sendEvtECU1" />
-<TGConnectingPoint num="0" id="640" />
+<infoparam name="Primitive port" value="Channel dataFromECU1" />
+<TGConnectingPoint num="0" id="2137" />
<extraparam>
-<Prop commName="sendEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="dataFromECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="643" >
-<father id="664" num="1" />
-<cdparam x="481" y="515" />
+<SUBCOMPONENT type="1203" id="2140" >
+<father id="2161" num="1" />
+<cdparam x="652" y="658" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel sendDataECU1" />
-<TGConnectingPoint num="0" id="642" />
+<infoparam name="Primitive port" value="Event evtFromECU1" />
+<TGConnectingPoint num="0" id="2139" />
<extraparam>
-<Prop commName="sendDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="645" >
-<father id="664" num="2" />
-<cdparam x="544" y="515" />
+<SUBCOMPONENT type="1203" id="2142" >
+<father id="2161" num="2" />
+<cdparam x="652" y="611" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel recvDataECU1" />
-<TGConnectingPoint num="0" id="644" />
+<infoparam name="Primitive port" value="Channel dataToECU1" />
+<TGConnectingPoint num="0" id="2141" />
<extraparam>
-<Prop commName="recvDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataToECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4547,16 +4704,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="647" >
-<father id="664" num="3" />
-<cdparam x="607" y="515" />
+<SUBCOMPONENT type="1203" id="2144" >
+<father id="2161" num="3" />
+<cdparam x="652" y="570" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event recvEvtECU1" />
-<TGConnectingPoint num="0" id="646" />
+<infoparam name="Primitive port" value="Event evtToECU1" />
+<TGConnectingPoint num="0" id="2143" />
<extraparam>
-<Prop commName="recvEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtToECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4564,16 +4721,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="649" >
-<father id="664" num="4" />
-<cdparam x="652" y="570" />
+<SUBCOMPONENT type="1203" id="2146" >
+<father id="2161" num="4" />
+<cdparam x="607" y="515" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtToECU1" />
-<TGConnectingPoint num="0" id="648" />
+<infoparam name="Primitive port" value="Event recvEvtECU1" />
+<TGConnectingPoint num="0" id="2145" />
<extraparam>
-<Prop commName="evtToECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4581,16 +4738,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="651" >
-<father id="664" num="5" />
-<cdparam x="652" y="611" />
+<SUBCOMPONENT type="1203" id="2148" >
+<father id="2161" num="5" />
+<cdparam x="544" y="515" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataToECU1" />
-<TGConnectingPoint num="0" id="650" />
+<infoparam name="Primitive port" value="Channel recvDataECU1" />
+<TGConnectingPoint num="0" id="2147" />
<extraparam>
-<Prop commName="dataToECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4598,34 +4755,34 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="653" >
-<father id="664" num="6" />
-<cdparam x="652" y="658" />
+<SUBCOMPONENT type="1203" id="2150" >
+<father id="2161" num="6" />
+<cdparam x="481" y="515" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtFromECU1" />
-<TGConnectingPoint num="0" id="652" />
+<infoparam name="Primitive port" value="Channel sendDataECU1" />
+<TGConnectingPoint num="0" id="2149" />
<extraparam>
-<Prop commName="evtFromECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="655" >
-<father id="664" num="7" />
-<cdparam x="652" y="694" />
+<SUBCOMPONENT type="1203" id="2152" >
+<father id="2161" num="7" />
+<cdparam x="424" y="515" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataFromECU1" />
-<TGConnectingPoint num="0" id="654" />
+<infoparam name="Primitive port" value="Event sendEvtECU1" />
+<TGConnectingPoint num="0" id="2151" />
<extraparam>
-<Prop commName="dataFromECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4633,35 +4790,36 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="701" >
+<COMPONENT type="1202" id="2198" >
<cdparam x="388" y="124" />
<sizeparam width="276" height="273" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="DistributionManager_ECU1" />
-<TGConnectingPoint num="0" id="693" />
-<TGConnectingPoint num="1" id="694" />
-<TGConnectingPoint num="2" id="695" />
-<TGConnectingPoint num="3" id="696" />
-<TGConnectingPoint num="4" id="697" />
-<TGConnectingPoint num="5" id="698" />
-<TGConnectingPoint num="6" id="699" />
-<TGConnectingPoint num="7" id="700" />
+<TGConnectingPoint num="0" id="2190" />
+<TGConnectingPoint num="1" id="2191" />
+<TGConnectingPoint num="2" id="2192" />
+<TGConnectingPoint num="3" id="2193" />
+<TGConnectingPoint num="4" id="2194" />
+<TGConnectingPoint num="5" id="2195" />
+<TGConnectingPoint num="6" id="2196" />
+<TGConnectingPoint num="7" id="2197" />
<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
<Attribute access="2" id="i" value="0" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="666" >
-<father id="701" num="0" />
-<cdparam x="424" y="384" />
+<SUBCOMPONENT type="1203" id="2163" >
+<father id="2198" num="0" />
+<cdparam x="412" y="111" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvtECU1" />
-<TGConnectingPoint num="0" id="665" />
+<infoparam name="Primitive port" value="Event putMsgECU1" />
+<TGConnectingPoint num="0" id="2162" />
<extraparam>
-<Prop commName="sendEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4669,16 +4827,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="668" >
-<father id="701" num="1" />
-<cdparam x="481" y="384" />
+<SUBCOMPONENT type="1203" id="2165" >
+<father id="2198" num="1" />
+<cdparam x="375" y="213" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendDataECU1" />
-<TGConnectingPoint num="0" id="667" />
+<infoparam name="Primitive port" value="Channel inHSMECU1" />
+<TGConnectingPoint num="0" id="2164" />
<extraparam>
-<Prop commName="sendDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="inHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4686,50 +4844,50 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="670" >
-<father id="701" num="2" />
-<cdparam x="544" y="384" />
+<SUBCOMPONENT type="1203" id="2167" >
+<father id="2198" num="2" />
+<cdparam x="375" y="137" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvDataECU1" />
-<TGConnectingPoint num="0" id="669" />
+<infoparam name="Primitive port" value="Event getMsgECU1" />
+<TGConnectingPoint num="0" id="2166" />
<extraparam>
-<Prop commName="recvDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="getMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="672" >
-<father id="701" num="3" />
-<cdparam x="607" y="384" />
+<SUBCOMPONENT type="1203" id="2169" >
+<father id="2198" num="3" />
+<cdparam x="375" y="174" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvtECU1" />
-<TGConnectingPoint num="0" id="671" />
+<infoparam name="Primitive port" value="Event doneHSMECU1" />
+<TGConnectingPoint num="0" id="2168" />
<extraparam>
-<Prop commName="recvEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="674" >
-<father id="701" num="4" />
-<cdparam x="485" y="111" />
+<SUBCOMPONENT type="1203" id="2171" >
+<father id="2198" num="4" />
+<cdparam x="375" y="254" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event distributeKey" />
-<TGConnectingPoint num="0" id="673" />
+<infoparam name="Primitive port" value="Channel outHSMECU1" />
+<TGConnectingPoint num="0" id="2170" />
<extraparam>
-<Prop commName="distributeKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="outHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4737,33 +4895,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="676" >
-<father id="701" num="5" />
-<cdparam x="575" y="111" />
+<SUBCOMPONENT type="1203" id="2173" >
+<father id="2198" num="5" />
+<cdparam x="375" y="330" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event done" />
-<TGConnectingPoint num="0" id="675" />
+<infoparam name="Primitive port" value="Event macECU1" />
+<TGConnectingPoint num="0" id="2172" />
<extraparam>
-<Prop commName="done" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="macECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="678" >
-<father id="701" num="6" />
-<cdparam x="375" y="362" />
+<SUBCOMPONENT type="1203" id="2175" >
+<father id="2198" num="6" />
+<cdparam x="375" y="292" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKeyECU1" />
-<TGConnectingPoint num="0" id="677" />
+<infoparam name="Primitive port" value="Event encryptECU1" />
+<TGConnectingPoint num="0" id="2174" />
<extraparam>
-<Prop commName="generateKeyECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="encryptECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4771,16 +4929,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="680" >
-<father id="701" num="7" />
-<cdparam x="375" y="292" />
+<SUBCOMPONENT type="1203" id="2177" >
+<father id="2198" num="7" />
+<cdparam x="375" y="362" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encryptECU1" />
-<TGConnectingPoint num="0" id="679" />
+<infoparam name="Primitive port" value="Event generateKeyECU1" />
+<TGConnectingPoint num="0" id="2176" />
<extraparam>
-<Prop commName="encryptECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKeyECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4788,33 +4946,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="682" >
-<father id="701" num="8" />
-<cdparam x="375" y="330" />
+<SUBCOMPONENT type="1203" id="2179" >
+<father id="2198" num="8" />
+<cdparam x="575" y="111" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event macECU1" />
-<TGConnectingPoint num="0" id="681" />
+<infoparam name="Primitive port" value="Event done" />
+<TGConnectingPoint num="0" id="2178" />
<extraparam>
-<Prop commName="macECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="done" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="684" >
-<father id="701" num="9" />
-<cdparam x="375" y="254" />
+<SUBCOMPONENT type="1203" id="2181" >
+<father id="2198" num="9" />
+<cdparam x="485" y="111" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSMECU1" />
-<TGConnectingPoint num="0" id="683" />
+<infoparam name="Primitive port" value="Event distributeKey" />
+<TGConnectingPoint num="0" id="2180" />
<extraparam>
-<Prop commName="outHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="distributeKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4822,50 +4980,50 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="686" >
-<father id="701" num="10" />
-<cdparam x="375" y="174" />
+<SUBCOMPONENT type="1203" id="2183" >
+<father id="2198" num="10" />
+<cdparam x="607" y="384" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSMECU1" />
-<TGConnectingPoint num="0" id="685" />
+<infoparam name="Primitive port" value="Event recvEvtECU1" />
+<TGConnectingPoint num="0" id="2182" />
<extraparam>
-<Prop commName="doneHSMECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="688" >
-<father id="701" num="11" />
-<cdparam x="375" y="137" />
+<SUBCOMPONENT type="1203" id="2185" >
+<father id="2198" num="11" />
+<cdparam x="544" y="384" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsgECU1" />
-<TGConnectingPoint num="0" id="687" />
+<infoparam name="Primitive port" value="Channel recvDataECU1" />
+<TGConnectingPoint num="0" id="2184" />
<extraparam>
-<Prop commName="getMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="recvDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="690" >
-<father id="701" num="12" />
-<cdparam x="375" y="213" />
+<SUBCOMPONENT type="1203" id="2187" >
+<father id="2198" num="12" />
+<cdparam x="481" y="384" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSMECU1" />
-<TGConnectingPoint num="0" id="689" />
+<infoparam name="Primitive port" value="Channel sendDataECU1" />
+<TGConnectingPoint num="0" id="2186" />
<extraparam>
-<Prop commName="inHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="sendDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4873,16 +5031,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="692" >
-<father id="701" num="13" />
-<cdparam x="412" y="111" />
+<SUBCOMPONENT type="1203" id="2189" >
+<father id="2198" num="13" />
+<cdparam x="424" y="384" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsgECU1" />
-<TGConnectingPoint num="0" id="691" />
+<infoparam name="Primitive port" value="Event sendEvtECU1" />
+<TGConnectingPoint num="0" id="2188" />
<extraparam>
-<Prop commName="putMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="sendEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4891,34 +5049,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="726" >
+<COMPONENT type="1202" id="2223" >
<cdparam x="852" y="41" />
<sizeparam width="156" height="400" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="HSM_KM" />
-<TGConnectingPoint num="0" id="718" />
-<TGConnectingPoint num="1" id="719" />
-<TGConnectingPoint num="2" id="720" />
-<TGConnectingPoint num="3" id="721" />
-<TGConnectingPoint num="4" id="722" />
-<TGConnectingPoint num="5" id="723" />
-<TGConnectingPoint num="6" id="724" />
-<TGConnectingPoint num="7" id="725" />
+<TGConnectingPoint num="0" id="2215" />
+<TGConnectingPoint num="1" id="2216" />
+<TGConnectingPoint num="2" id="2217" />
+<TGConnectingPoint num="3" id="2218" />
+<TGConnectingPoint num="4" id="2219" />
+<TGConnectingPoint num="5" id="2220" />
+<TGConnectingPoint num="6" id="2221" />
+<TGConnectingPoint num="7" id="2222" />
<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="703" >
-<father id="726" num="0" />
-<cdparam x="995" y="90" />
+<SUBCOMPONENT type="1203" id="2200" >
+<father id="2223" num="0" />
+<cdparam x="995" y="139" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event putMsg" />
-<TGConnectingPoint num="0" id="702" />
+<infoparam name="Primitive port" value="Event getMsg" />
+<TGConnectingPoint num="0" id="2199" />
<extraparam>
-<Prop commName="putMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -4926,118 +5085,118 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="705" >
-<father id="726" num="1" />
-<cdparam x="995" y="393" />
+<SUBCOMPONENT type="1203" id="2202" >
+<father id="2223" num="1" />
+<cdparam x="995" y="185" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event generateKey" />
-<TGConnectingPoint num="0" id="704" />
+<infoparam name="Primitive port" value="Event doneHSM" />
+<TGConnectingPoint num="0" id="2201" />
<extraparam>
-<Prop commName="generateKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSM" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="707" >
-<father id="726" num="2" />
-<cdparam x="995" y="358" />
+<SUBCOMPONENT type="1203" id="2204" >
+<father id="2223" num="2" />
+<cdparam x="995" y="231" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event mac" />
-<TGConnectingPoint num="0" id="706" />
+<infoparam name="Primitive port" value="Channel inHSM" />
+<TGConnectingPoint num="0" id="2203" />
<extraparam>
-<Prop commName="mac" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="709" >
-<father id="726" num="3" />
-<cdparam x="995" y="319" />
+<SUBCOMPONENT type="1203" id="2206" >
+<father id="2223" num="3" />
+<cdparam x="995" y="273" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event encrypt" />
-<TGConnectingPoint num="0" id="708" />
+<infoparam name="Primitive port" value="Channel outHSM" />
+<TGConnectingPoint num="0" id="2205" />
<extraparam>
-<Prop commName="encrypt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="711" >
-<father id="726" num="4" />
-<cdparam x="995" y="273" />
+<SUBCOMPONENT type="1203" id="2208" >
+<father id="2223" num="4" />
+<cdparam x="995" y="319" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel outHSM" />
-<TGConnectingPoint num="0" id="710" />
+<infoparam name="Primitive port" value="Event encrypt" />
+<TGConnectingPoint num="0" id="2207" />
<extraparam>
-<Prop commName="outHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encrypt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="713" >
-<father id="726" num="5" />
-<cdparam x="995" y="231" />
+<SUBCOMPONENT type="1203" id="2210" >
+<father id="2223" num="5" />
+<cdparam x="995" y="358" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel inHSM" />
-<TGConnectingPoint num="0" id="712" />
+<infoparam name="Primitive port" value="Event mac" />
+<TGConnectingPoint num="0" id="2209" />
<extraparam>
-<Prop commName="inHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="mac" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="715" >
-<father id="726" num="6" />
-<cdparam x="995" y="185" />
+<SUBCOMPONENT type="1203" id="2212" >
+<father id="2223" num="6" />
+<cdparam x="995" y="393" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event doneHSM" />
-<TGConnectingPoint num="0" id="714" />
+<infoparam name="Primitive port" value="Event generateKey" />
+<TGConnectingPoint num="0" id="2211" />
<extraparam>
-<Prop commName="doneHSM" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="generateKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="717" >
-<father id="726" num="7" />
-<cdparam x="995" y="139" />
+<SUBCOMPONENT type="1203" id="2214" >
+<father id="2223" num="7" />
+<cdparam x="995" y="90" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event getMsg" />
-<TGConnectingPoint num="0" id="716" />
+<infoparam name="Primitive port" value="Event putMsg" />
+<TGConnectingPoint num="0" id="2213" />
<extraparam>
-<Prop commName="getMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5046,86 +5205,70 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="759" >
+<COMPONENT type="1202" id="2256" >
<cdparam x="1125" y="528" />
<sizeparam width="277" height="214" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="CTP_KM" />
-<TGConnectingPoint num="0" id="751" />
-<TGConnectingPoint num="1" id="752" />
-<TGConnectingPoint num="2" id="753" />
-<TGConnectingPoint num="3" id="754" />
-<TGConnectingPoint num="4" id="755" />
-<TGConnectingPoint num="5" id="756" />
-<TGConnectingPoint num="6" id="757" />
-<TGConnectingPoint num="7" id="758" />
-<extraparam>
+<TGConnectingPoint num="0" id="2248" />
+<TGConnectingPoint num="1" id="2249" />
+<TGConnectingPoint num="2" id="2250" />
+<TGConnectingPoint num="3" id="2251" />
+<TGConnectingPoint num="4" id="2252" />
+<TGConnectingPoint num="5" id="2253" />
+<TGConnectingPoint num="6" id="2254" />
+<TGConnectingPoint num="7" id="2255" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
<Attribute access="2" id="destination" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="728" >
-<father id="759" num="0" />
-<cdparam x="1161" y="515" />
+<SUBCOMPONENT type="1203" id="2225" >
+<father id="2256" num="0" />
+<cdparam x="1389" y="707" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event sendEvt" />
-<TGConnectingPoint num="0" id="727" />
+<infoparam name="Primitive port" value="Channel dataFromECUN" />
+<TGConnectingPoint num="0" id="2224" />
<extraparam>
-<Prop commName="sendEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
-<Type type="1" typeOther="" />
+<Prop commName="dataFromECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="730" >
-<father id="759" num="1" />
-<cdparam x="1344" y="515" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event recvEvt" />
-<TGConnectingPoint num="0" id="729" />
-<extraparam>
-<Prop commName="recvEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="732" >
-<father id="759" num="2" />
-<cdparam x="1281" y="515" />
+<SUBCOMPONENT type="1203" id="2227" >
+<father id="2256" num="1" />
+<cdparam x="1389" y="665" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel recvData" />
-<TGConnectingPoint num="0" id="731" />
+<infoparam name="Primitive port" value="Event evtFromECUN" />
+<TGConnectingPoint num="0" id="2226" />
<extraparam>
-<Prop commName="recvData" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="734" >
-<father id="759" num="3" />
-<cdparam x="1218" y="515" />
+<SUBCOMPONENT type="1203" id="2229" >
+<father id="2256" num="2" />
+<cdparam x="1389" y="626" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel sendData" />
-<TGConnectingPoint num="0" id="733" />
+<infoparam name="Primitive port" value="Channel dataToECUN" />
+<TGConnectingPoint num="0" id="2228" />
<extraparam>
-<Prop commName="sendData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataToECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5133,16 +5276,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="736" >
-<father id="759" num="4" />
-<cdparam x="1112" y="576" />
+<SUBCOMPONENT type="1203" id="2231" >
+<father id="2256" num="3" />
+<cdparam x="1389" y="581" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtToECU1" />
-<TGConnectingPoint num="0" id="735" />
+<infoparam name="Primitive port" value="Event evtToECUN" />
+<TGConnectingPoint num="0" id="2230" />
<extraparam>
-<Prop commName="evtToECU1" commType="1" origin="true" finite="true" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtToECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5150,16 +5293,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="738" >
-<father id="759" num="5" />
-<cdparam x="1112" y="616" />
+<SUBCOMPONENT type="1203" id="2233" >
+<father id="2256" num="4" />
+<cdparam x="1112" y="686" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataToECU1" />
-<TGConnectingPoint num="0" id="737" />
+<infoparam name="Primitive port" value="Channel dataFromECU1" />
+<TGConnectingPoint num="0" id="2232" />
<extraparam>
-<Prop commName="dataToECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataFromECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5167,16 +5310,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="740" >
-<father id="759" num="6" />
+<SUBCOMPONENT type="1203" id="2235" >
+<father id="2256" num="5" />
<cdparam x="1112" y="650" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
<infoparam name="Primitive port" value="Event evtFromECU1" />
-<TGConnectingPoint num="0" id="739" />
+<TGConnectingPoint num="0" id="2234" />
<extraparam>
-<Prop commName="evtFromECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtFromECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5184,16 +5327,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="742" >
-<father id="759" num="7" />
-<cdparam x="1112" y="686" />
+<SUBCOMPONENT type="1203" id="2237" >
+<father id="2256" num="6" />
+<cdparam x="1112" y="616" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataFromECU1" />
-<TGConnectingPoint num="0" id="741" />
+<infoparam name="Primitive port" value="Channel dataToECU1" />
+<TGConnectingPoint num="0" id="2236" />
<extraparam>
-<Prop commName="dataFromECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataToECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5201,16 +5344,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="744" >
-<father id="759" num="8" />
-<cdparam x="1389" y="581" />
+<SUBCOMPONENT type="1203" id="2239" >
+<father id="2256" num="7" />
+<cdparam x="1112" y="576" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtToECUN" />
-<TGConnectingPoint num="0" id="743" />
+<infoparam name="Primitive port" value="Event evtToECU1" />
+<TGConnectingPoint num="0" id="2238" />
<extraparam>
-<Prop commName="evtToECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtToECU1" commType="1" origin="true" finite="true" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5218,16 +5361,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="746" >
-<father id="759" num="9" />
-<cdparam x="1389" y="626" />
+<SUBCOMPONENT type="1203" id="2241" >
+<father id="2256" num="8" />
+<cdparam x="1218" y="515" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataToECUN" />
-<TGConnectingPoint num="0" id="745" />
+<infoparam name="Primitive port" value="Channel sendData" />
+<TGConnectingPoint num="0" id="2240" />
<extraparam>
-<Prop commName="dataToECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="sendData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5235,16 +5378,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="748" >
-<father id="759" num="10" />
-<cdparam x="1389" y="665" />
+<SUBCOMPONENT type="1203" id="2243" >
+<father id="2256" num="9" />
+<cdparam x="1281" y="515" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtFromECUN" />
-<TGConnectingPoint num="0" id="747" />
+<infoparam name="Primitive port" value="Channel recvData" />
+<TGConnectingPoint num="0" id="2242" />
<extraparam>
-<Prop commName="evtFromECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvData" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5252,104 +5395,122 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="750" >
-<father id="759" num="11" />
-<cdparam x="1389" y="707" />
+<SUBCOMPONENT type="1203" id="2245" >
+<father id="2256" num="10" />
+<cdparam x="1344" y="515" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataFromECUN" />
-<TGConnectingPoint num="0" id="749" />
+<infoparam name="Primitive port" value="Event recvEvt" />
+<TGConnectingPoint num="0" id="2244" />
<extraparam>
-<Prop commName="dataFromECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="2247" >
+<father id="2256" num="11" />
+<cdparam x="1161" y="515" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
+<infoparam name="Primitive port" value="Event sendEvt" />
+<TGConnectingPoint num="0" id="2246" />
+<extraparam>
+<Prop commName="sendEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="792" >
+<COMPONENT type="1202" id="2289" >
<cdparam x="1125" y="127" />
<sizeparam width="276" height="273" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="KM" />
-<TGConnectingPoint num="0" id="784" />
-<TGConnectingPoint num="1" id="785" />
-<TGConnectingPoint num="2" id="786" />
-<TGConnectingPoint num="3" id="787" />
-<TGConnectingPoint num="4" id="788" />
-<TGConnectingPoint num="5" id="789" />
-<TGConnectingPoint num="6" id="790" />
-<TGConnectingPoint num="7" id="791" />
-<extraparam>
+<TGConnectingPoint num="0" id="2281" />
+<TGConnectingPoint num="1" id="2282" />
+<TGConnectingPoint num="2" id="2283" />
+<TGConnectingPoint num="3" id="2284" />
+<TGConnectingPoint num="4" id="2285" />
+<TGConnectingPoint num="5" id="2286" />
+<TGConnectingPoint num="6" id="2287" />
+<TGConnectingPoint num="7" id="2288" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
<Attribute access="2" id="i" value="0" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="761" >
-<father id="792" num="0" />
-<cdparam x="1161" y="387" />
+<SUBCOMPONENT type="1203" id="2258" >
+<father id="2289" num="0" />
+<cdparam x="1218" y="387" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvt" />
-<TGConnectingPoint num="0" id="760" />
+<infoparam name="Primitive port" value="Channel sendData" />
+<TGConnectingPoint num="0" id="2257" />
<extraparam>
-<Prop commName="sendEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendData" commType="0" origin="true" finite="false" blocking="true" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="763" >
-<father id="792" num="1" />
-<cdparam x="1149" y="114" />
+<SUBCOMPONENT type="1203" id="2260" >
+<father id="2289" num="1" />
+<cdparam x="1281" y="387" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsg" />
-<TGConnectingPoint num="0" id="762" />
+<infoparam name="Primitive port" value="Channel recvData" />
+<TGConnectingPoint num="0" id="2259" />
<extraparam>
-<Prop commName="putMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="recvData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="765" >
-<father id="792" num="2" />
-<cdparam x="1112" y="216" />
+<SUBCOMPONENT type="1203" id="2262" >
+<father id="2289" num="2" />
+<cdparam x="1344" y="387" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSM" />
-<TGConnectingPoint num="0" id="764" />
+<infoparam name="Primitive port" value="Event recvEvt" />
+<TGConnectingPoint num="0" id="2261" />
<extraparam>
-<Prop commName="inHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="767" >
-<father id="792" num="3" />
-<cdparam x="1112" y="140" />
+<SUBCOMPONENT type="1203" id="2264" >
+<father id="2289" num="3" />
+<cdparam x="1112" y="365" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsg" />
-<TGConnectingPoint num="0" id="766" />
+<infoparam name="Primitive port" value="Event generateKey" />
+<TGConnectingPoint num="0" id="2263" />
<extraparam>
-<Prop commName="getMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5357,84 +5518,84 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="769" >
-<father id="792" num="4" />
-<cdparam x="1112" y="177" />
+<SUBCOMPONENT type="1203" id="2266" >
+<father id="2289" num="4" />
+<cdparam x="1112" y="295" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSM" />
-<TGConnectingPoint num="0" id="768" />
+<infoparam name="Primitive port" value="Event encrypt" />
+<TGConnectingPoint num="0" id="2265" />
<extraparam>
-<Prop commName="doneHSM" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encrypt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="771" >
-<father id="792" num="5" />
-<cdparam x="1112" y="257" />
+<SUBCOMPONENT type="1203" id="2268" >
+<father id="2289" num="5" />
+<cdparam x="1112" y="333" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSM" />
-<TGConnectingPoint num="0" id="770" />
+<infoparam name="Primitive port" value="Event mac" />
+<TGConnectingPoint num="0" id="2267" />
<extraparam>
-<Prop commName="outHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="mac" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="773" >
-<father id="792" num="6" />
-<cdparam x="1112" y="333" />
+<SUBCOMPONENT type="1203" id="2270" >
+<father id="2289" num="6" />
+<cdparam x="1112" y="257" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event mac" />
-<TGConnectingPoint num="0" id="772" />
+<infoparam name="Primitive port" value="Channel outHSM" />
+<TGConnectingPoint num="0" id="2269" />
<extraparam>
-<Prop commName="mac" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="775" >
-<father id="792" num="7" />
-<cdparam x="1112" y="295" />
+<SUBCOMPONENT type="1203" id="2272" >
+<father id="2289" num="7" />
+<cdparam x="1112" y="177" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encrypt" />
-<TGConnectingPoint num="0" id="774" />
+<infoparam name="Primitive port" value="Event doneHSM" />
+<TGConnectingPoint num="0" id="2271" />
<extraparam>
-<Prop commName="encrypt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSM" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="777" >
-<father id="792" num="8" />
-<cdparam x="1112" y="365" />
+<SUBCOMPONENT type="1203" id="2274" >
+<father id="2289" num="8" />
+<cdparam x="1112" y="140" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKey" />
-<TGConnectingPoint num="0" id="776" />
+<infoparam name="Primitive port" value="Event getMsg" />
+<TGConnectingPoint num="0" id="2273" />
<extraparam>
-<Prop commName="generateKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5442,86 +5603,87 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="779" >
-<father id="792" num="9" />
-<cdparam x="1344" y="387" />
+<SUBCOMPONENT type="1203" id="2276" >
+<father id="2289" num="9" />
+<cdparam x="1112" y="216" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvt" />
-<TGConnectingPoint num="0" id="778" />
+<infoparam name="Primitive port" value="Channel inHSM" />
+<TGConnectingPoint num="0" id="2275" />
<extraparam>
-<Prop commName="recvEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="781" >
-<father id="792" num="10" />
-<cdparam x="1281" y="387" />
+<SUBCOMPONENT type="1203" id="2278" >
+<father id="2289" num="10" />
+<cdparam x="1149" y="114" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvData" />
-<TGConnectingPoint num="0" id="780" />
+<infoparam name="Primitive port" value="Event putMsg" />
+<TGConnectingPoint num="0" id="2277" />
<extraparam>
-<Prop commName="recvData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="putMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="783" >
-<father id="792" num="11" />
-<cdparam x="1218" y="387" />
+<SUBCOMPONENT type="1203" id="2280" >
+<father id="2289" num="11" />
+<cdparam x="1161" y="387" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendData" />
-<TGConnectingPoint num="0" id="782" />
+<infoparam name="Primitive port" value="Event sendEvt" />
+<TGConnectingPoint num="0" id="2279" />
<extraparam>
-<Prop commName="sendData" commType="0" origin="true" finite="false" blocking="true" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="817" >
+<COMPONENT type="1202" id="2314" >
<cdparam x="1447" y="91" />
<sizeparam width="156" height="400" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="HSM_ECUN" />
-<TGConnectingPoint num="0" id="809" />
-<TGConnectingPoint num="1" id="810" />
-<TGConnectingPoint num="2" id="811" />
-<TGConnectingPoint num="3" id="812" />
-<TGConnectingPoint num="4" id="813" />
-<TGConnectingPoint num="5" id="814" />
-<TGConnectingPoint num="6" id="815" />
-<TGConnectingPoint num="7" id="816" />
-<extraparam>
+<TGConnectingPoint num="0" id="2306" />
+<TGConnectingPoint num="1" id="2307" />
+<TGConnectingPoint num="2" id="2308" />
+<TGConnectingPoint num="3" id="2309" />
+<TGConnectingPoint num="4" id="2310" />
+<TGConnectingPoint num="5" id="2311" />
+<TGConnectingPoint num="6" id="2312" />
+<TGConnectingPoint num="7" id="2313" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="794" >
-<father id="817" num="0" />
-<cdparam x="1590" y="140" />
+<SUBCOMPONENT type="1203" id="2291" >
+<father id="2314" num="0" />
+<cdparam x="1590" y="189" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="793" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="2290" />
<extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5529,118 +5691,118 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="796" >
-<father id="817" num="1" />
-<cdparam x="1590" y="443" />
+<SUBCOMPONENT type="1203" id="2293" >
+<father id="2314" num="1" />
+<cdparam x="1590" y="235" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="795" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="2292" />
<extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="798" >
-<father id="817" num="2" />
-<cdparam x="1590" y="408" />
+<SUBCOMPONENT type="1203" id="2295" >
+<father id="2314" num="2" />
+<cdparam x="1590" y="281" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="797" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="2294" />
<extraparam>
-<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="800" >
-<father id="817" num="3" />
-<cdparam x="1590" y="369" />
+<SUBCOMPONENT type="1203" id="2297" >
+<father id="2314" num="3" />
+<cdparam x="1590" y="323" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="799" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="2296" />
<extraparam>
-<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="802" >
-<father id="817" num="4" />
-<cdparam x="1590" y="323" />
+<SUBCOMPONENT type="1203" id="2299" >
+<father id="2314" num="4" />
+<cdparam x="1590" y="369" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="801" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="2298" />
<extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="804" >
-<father id="817" num="5" />
-<cdparam x="1590" y="281" />
+<SUBCOMPONENT type="1203" id="2301" >
+<father id="2314" num="5" />
+<cdparam x="1590" y="408" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="803" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="2300" />
<extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="806" >
-<father id="817" num="6" />
-<cdparam x="1590" y="235" />
+<SUBCOMPONENT type="1203" id="2303" >
+<father id="2314" num="6" />
+<cdparam x="1590" y="443" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="805" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="2302" />
<extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="808" >
-<father id="817" num="7" />
-<cdparam x="1590" y="189" />
+<SUBCOMPONENT type="1203" id="2305" >
+<father id="2314" num="7" />
+<cdparam x="1590" y="140" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="807" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="2304" />
<extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5649,51 +5811,52 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="842" >
+<COMPONENT type="1202" id="2339" >
<cdparam x="1729" y="556" />
<sizeparam width="277" height="200" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="CTP_ECUN" />
-<TGConnectingPoint num="0" id="834" />
-<TGConnectingPoint num="1" id="835" />
-<TGConnectingPoint num="2" id="836" />
-<TGConnectingPoint num="3" id="837" />
-<TGConnectingPoint num="4" id="838" />
-<TGConnectingPoint num="5" id="839" />
-<TGConnectingPoint num="6" id="840" />
-<TGConnectingPoint num="7" id="841" />
-<extraparam>
+<TGConnectingPoint num="0" id="2331" />
+<TGConnectingPoint num="1" id="2332" />
+<TGConnectingPoint num="2" id="2333" />
+<TGConnectingPoint num="3" id="2334" />
+<TGConnectingPoint num="4" id="2335" />
+<TGConnectingPoint num="5" id="2336" />
+<TGConnectingPoint num="6" id="2337" />
+<TGConnectingPoint num="7" id="2338" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="819" >
-<father id="842" num="0" />
-<cdparam x="1765" y="543" />
+<SUBCOMPONENT type="1203" id="2316" >
+<father id="2339" num="0" />
+<cdparam x="1822" y="543" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="818" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="2315" />
<extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="821" >
-<father id="842" num="1" />
-<cdparam x="1716" y="694" />
+<SUBCOMPONENT type="1203" id="2318" >
+<father id="2339" num="1" />
+<cdparam x="1885" y="543" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataFromECUN" />
-<TGConnectingPoint num="0" id="820" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="2317" />
<extraparam>
-<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5701,16 +5864,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="823" >
-<father id="842" num="2" />
-<cdparam x="1716" y="657" />
+<SUBCOMPONENT type="1203" id="2320" >
+<father id="2339" num="2" />
+<cdparam x="1948" y="543" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtFromECUN" />
-<TGConnectingPoint num="0" id="822" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="2319" />
<extraparam>
-<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5718,50 +5881,50 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="825" >
-<father id="842" num="3" />
-<cdparam x="1716" y="625" />
+<SUBCOMPONENT type="1203" id="2322" >
+<father id="2339" num="3" />
+<cdparam x="1716" y="590" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataToECUN" />
-<TGConnectingPoint num="0" id="824" />
+<infoparam name="Primitive port" value="Event evtToECUN" />
+<TGConnectingPoint num="0" id="2321" />
<extraparam>
-<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="827" >
-<father id="842" num="4" />
-<cdparam x="1716" y="590" />
+<SUBCOMPONENT type="1203" id="2324" >
+<father id="2339" num="4" />
+<cdparam x="1716" y="625" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtToECUN" />
-<TGConnectingPoint num="0" id="826" />
+<infoparam name="Primitive port" value="Channel dataToECUN" />
+<TGConnectingPoint num="0" id="2323" />
<extraparam>
-<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="829" >
-<father id="842" num="5" />
-<cdparam x="1948" y="543" />
+<SUBCOMPONENT type="1203" id="2326" >
+<father id="2339" num="5" />
+<cdparam x="1716" y="657" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="828" />
+<infoparam name="Primitive port" value="Event evtFromECUN" />
+<TGConnectingPoint num="0" id="2325" />
<extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5769,16 +5932,16 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="831" >
-<father id="842" num="6" />
-<cdparam x="1885" y="543" />
+<SUBCOMPONENT type="1203" id="2328" >
+<father id="2339" num="6" />
+<cdparam x="1716" y="694" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="830" />
+<infoparam name="Primitive port" value="Channel dataFromECUN" />
+<TGConnectingPoint num="0" id="2327" />
<extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5786,17 +5949,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="833" >
-<father id="842" num="7" />
-<cdparam x="1822" y="543" />
+<SUBCOMPONENT type="1203" id="2330" >
+<father id="2339" num="7" />
+<cdparam x="1765" y="543" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="832" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="2329" />
<extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5804,86 +5967,87 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="875" >
+<COMPONENT type="1202" id="2372" >
<cdparam x="1729" y="189" />
<sizeparam width="276" height="273" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
<infoparam name="Primitive component" value="KeyManager_ECUN" />
-<TGConnectingPoint num="0" id="867" />
-<TGConnectingPoint num="1" id="868" />
-<TGConnectingPoint num="2" id="869" />
-<TGConnectingPoint num="3" id="870" />
-<TGConnectingPoint num="4" id="871" />
-<TGConnectingPoint num="5" id="872" />
-<TGConnectingPoint num="6" id="873" />
-<TGConnectingPoint num="7" id="874" />
-<extraparam>
+<TGConnectingPoint num="0" id="2364" />
+<TGConnectingPoint num="1" id="2365" />
+<TGConnectingPoint num="2" id="2366" />
+<TGConnectingPoint num="3" id="2367" />
+<TGConnectingPoint num="4" id="2368" />
+<TGConnectingPoint num="5" id="2369" />
+<TGConnectingPoint num="6" id="2370" />
+<TGConnectingPoint num="7" id="2371" />
+<extraparam>
+<Data isAttacker="No" />
<Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
<Attribute access="2" id="i" value="0" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="844" >
-<father id="875" num="0" />
-<cdparam x="1765" y="449" />
+<SUBCOMPONENT type="1203" id="2341" >
+<father id="2372" num="0" />
+<cdparam x="1822" y="449" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="843" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="2340" />
<extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="846" >
-<father id="875" num="1" />
-<cdparam x="1753" y="176" />
+<SUBCOMPONENT type="1203" id="2343" >
+<father id="2372" num="1" />
+<cdparam x="1885" y="449" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="845" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="2342" />
<extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="848" >
-<father id="875" num="2" />
-<cdparam x="1716" y="278" />
+<SUBCOMPONENT type="1203" id="2345" >
+<father id="2372" num="2" />
+<cdparam x="1948" y="449" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="847" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="2344" />
<extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="850" >
-<father id="875" num="3" />
-<cdparam x="1716" y="202" />
+<SUBCOMPONENT type="1203" id="2347" >
+<father id="2372" num="3" />
+<cdparam x="1716" y="427" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="849" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="2346" />
<extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5891,84 +6055,84 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="852" >
-<father id="875" num="4" />
-<cdparam x="1716" y="239" />
+<SUBCOMPONENT type="1203" id="2349" >
+<father id="2372" num="4" />
+<cdparam x="1716" y="357" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="851" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="2348" />
<extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="854" >
-<father id="875" num="5" />
-<cdparam x="1716" y="319" />
+<SUBCOMPONENT type="1203" id="2351" >
+<father id="2372" num="5" />
+<cdparam x="1716" y="395" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="853" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="2350" />
<extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="856" >
-<father id="875" num="6" />
-<cdparam x="1716" y="395" />
+<SUBCOMPONENT type="1203" id="2353" >
+<father id="2372" num="6" />
+<cdparam x="1716" y="319" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="855" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="2352" />
<extraparam>
-<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="858" >
-<father id="875" num="7" />
-<cdparam x="1716" y="357" />
+<SUBCOMPONENT type="1203" id="2355" >
+<father id="2372" num="7" />
+<cdparam x="1716" y="239" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="857" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="2354" />
<extraparam>
-<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="860" >
-<father id="875" num="8" />
-<cdparam x="1716" y="427" />
+<SUBCOMPONENT type="1203" id="2357" >
+<father id="2372" num="8" />
+<cdparam x="1716" y="202" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="859" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="2356" />
<extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -5976,51 +6140,51 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="862" >
-<father id="875" num="9" />
-<cdparam x="1948" y="449" />
+<SUBCOMPONENT type="1203" id="2359" >
+<father id="2372" num="9" />
+<cdparam x="1716" y="278" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="861" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="2358" />
<extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="864" >
-<father id="875" num="10" />
-<cdparam x="1885" y="449" />
+<SUBCOMPONENT type="1203" id="2361" >
+<father id="2372" num="10" />
+<cdparam x="1753" y="176" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="863" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="2360" />
<extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="866" >
-<father id="875" num="11" />
-<cdparam x="1822" y="449" />
+<SUBCOMPONENT type="1203" id="2363" >
+<father id="2372" num="11" />
+<cdparam x="1765" y="449" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="865" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="2362" />
<extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -6032,56 +6196,56 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="LoadSink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="877" >
+<COMPONENT type="1001" id="2374" >
<cdparam x="399" y="109" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="876" />
+<TGConnectingPoint num="0" id="2373" />
</COMPONENT>
-<COMPONENT type="1000" id="879" >
+<COMPONENT type="1000" id="2376" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="0" id="2375" />
</COMPONENT>
-<CONNECTOR type="115" id="880" >
+<CONNECTOR type="115" id="2377" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to stop state" value="null" />
-<P1 x="407" y="70" id="878" />
-<P2 x="409" y="104" id="876" />
+<P1 x="407" y="70" id="2375" />
+<P2 x="409" y="104" id="2373" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="LoadSource" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="882" >
+<COMPONENT type="1000" id="2379" >
<cdparam x="585" y="128" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="881" />
+<TGConnectingPoint num="0" id="2378" />
</COMPONENT>
-<COMPONENT type="1026" id="886" >
+<COMPONENT type="1026" id="2383" >
<cdparam x="1006" y="302" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="delay" value="null" />
-<TGConnectingPoint num="0" id="884" />
-<TGConnectingPoint num="1" id="885" />
+<TGConnectingPoint num="0" id="2381" />
+<TGConnectingPoint num="1" id="2382" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="883" >
-<father id="886" num="0" />
+<SUBCOMPONENT type="-1" id="2380" >
+<father id="2383" num="0" />
<cdparam x="1021" y="322" />
<sizeparam width="32" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6092,35 +6256,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1012" id="894" >
+<COMPONENT type="1012" id="2391" >
<cdparam x="916" y="267" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="890" />
-<TGConnectingPoint num="1" id="891" />
-<TGConnectingPoint num="2" id="892" />
-<TGConnectingPoint num="3" id="893" />
+<TGConnectingPoint num="0" id="2387" />
+<TGConnectingPoint num="1" id="2388" />
+<TGConnectingPoint num="2" id="2389" />
+<TGConnectingPoint num="3" id="2390" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="887" >
-<father id="894" num="0" />
+<SUBCOMPONENT type="-1" id="2384" >
+<father id="2391" num="0" />
<cdparam x="870" y="278" />
<sizeparam width="30" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ 0% ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="888" >
-<father id="894" num="1" />
+<SUBCOMPONENT type="-1" id="2385" >
+<father id="2391" num="1" />
<cdparam x="951" y="277" />
<sizeparam width="37" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ 70% ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="889" >
-<father id="894" num="2" />
+<SUBCOMPONENT type="-1" id="2386" >
+<father id="2391" num="2" />
<cdparam x="936" y="312" />
<sizeparam width="37" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6128,504 +6292,544 @@
<infoparam name="guard 3" value="[ 30% ]" />
</SUBCOMPONENT>
-<COMPONENT type="301" id="903" >
+<COMPONENT type="301" id="2408" >
<cdparam x="208" y="126" />
<sizeparam width="336" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="accounts for traffic caused by ECUs not taken into account
" />
-<TGConnectingPoint num="0" id="895" />
-<TGConnectingPoint num="1" id="896" />
-<TGConnectingPoint num="2" id="897" />
-<TGConnectingPoint num="3" id="898" />
-<TGConnectingPoint num="4" id="899" />
-<TGConnectingPoint num="5" id="900" />
-<TGConnectingPoint num="6" id="901" />
-<TGConnectingPoint num="7" id="902" />
+<TGConnectingPoint num="0" id="2392" />
+<TGConnectingPoint num="1" id="2393" />
+<TGConnectingPoint num="2" id="2394" />
+<TGConnectingPoint num="3" id="2395" />
+<TGConnectingPoint num="4" id="2396" />
+<TGConnectingPoint num="5" id="2397" />
+<TGConnectingPoint num="6" id="2398" />
+<TGConnectingPoint num="7" id="2399" />
+<TGConnectingPoint num="8" id="2400" />
+<TGConnectingPoint num="9" id="2401" />
+<TGConnectingPoint num="10" id="2402" />
+<TGConnectingPoint num="11" id="2403" />
+<TGConnectingPoint num="12" id="2404" />
+<TGConnectingPoint num="13" id="2405" />
+<TGConnectingPoint num="14" id="2406" />
+<TGConnectingPoint num="15" id="2407" />
<extraparam>
<Line value="accounts for traffic caused by ECUs not taken into account" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1020" id="907" >
+<COMPONENT type="1020" id="2412" >
<cdparam x="691" y="211" />
<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="904" />
-<TGConnectingPoint num="1" id="905" />
-<TGConnectingPoint num="2" id="906" />
+<TGConnectingPoint num="0" id="2409" />
+<TGConnectingPoint num="1" id="2410" />
+<TGConnectingPoint num="2" id="2411" />
</COMPONENT>
-<COMPONENT type="1001" id="909" >
+<COMPONENT type="1001" id="2414" >
<cdparam x="722" y="310" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="908" />
+<TGConnectingPoint num="0" id="2413" />
</COMPONENT>
-<COMPONENT type="1017" id="912" >
+<COMPONENT type="1017" id="2417" >
<cdparam x="661" y="257" />
<sizeparam width="143" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="notified event" value="evts=?endProcessing()" />
-<TGConnectingPoint num="0" id="910" />
-<TGConnectingPoint num="1" id="911" />
+<TGConnectingPoint num="0" id="2415" />
+<TGConnectingPoint num="1" id="2416" />
<extraparam>
<Data eventName="endProcessing" variable="evts" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="914" >
+<COMPONENT type="1001" id="2419" >
<cdparam x="586" y="220" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="913" />
+<TGConnectingPoint num="0" id="2418" />
</COMPONENT>
-<COMPONENT type="1014" id="918" >
+<COMPONENT type="1014" id="2423" >
<cdparam x="512" y="169" />
<sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for loop" value="for(evts=0;evts==0;evts=evts)" />
-<TGConnectingPoint num="0" id="915" />
-<TGConnectingPoint num="1" id="916" />
-<TGConnectingPoint num="2" id="917" />
+<TGConnectingPoint num="0" id="2420" />
+<TGConnectingPoint num="1" id="2421" />
+<TGConnectingPoint num="2" id="2422" />
<extraparam>
<Data init="evts=0" condition="evts==0" increment="evts=evts" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="920" >
+<COMPONENT type="1001" id="2425" >
<cdparam x="1001" y="364" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="919" />
+<TGConnectingPoint num="0" id="2424" />
</COMPONENT>
-<COMPONENT type="1001" id="922" >
+<COMPONENT type="1001" id="2427" >
<cdparam x="922" y="394" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="921" />
+<TGConnectingPoint num="0" id="2426" />
</COMPONENT>
-<COMPONENT type="1001" id="924" >
+<COMPONENT type="1001" id="2429" >
<cdparam x="835" y="357" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="923" />
+<TGConnectingPoint num="0" id="2428" />
</COMPONENT>
-<COMPONENT type="1006" id="927" >
+<COMPONENT type="1006" id="2432" >
<cdparam x="800" y="304" />
<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="lowPrioLoad(1)" />
-<TGConnectingPoint num="0" id="925" />
-<TGConnectingPoint num="1" id="926" />
+<TGConnectingPoint num="0" id="2430" />
+<TGConnectingPoint num="1" id="2431" />
<extraparam>
-<Data channelName="lowPrioLoad" nbOfSamples="1" />
+<Data channelName="lowPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="936" >
+<COMPONENT type="301" id="2449" >
<cdparam x="1082" y="303" />
<sizeparam width="67" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="idle time
" />
-<TGConnectingPoint num="0" id="928" />
-<TGConnectingPoint num="1" id="929" />
-<TGConnectingPoint num="2" id="930" />
-<TGConnectingPoint num="3" id="931" />
-<TGConnectingPoint num="4" id="932" />
-<TGConnectingPoint num="5" id="933" />
-<TGConnectingPoint num="6" id="934" />
-<TGConnectingPoint num="7" id="935" />
+<TGConnectingPoint num="0" id="2433" />
+<TGConnectingPoint num="1" id="2434" />
+<TGConnectingPoint num="2" id="2435" />
+<TGConnectingPoint num="3" id="2436" />
+<TGConnectingPoint num="4" id="2437" />
+<TGConnectingPoint num="5" id="2438" />
+<TGConnectingPoint num="6" id="2439" />
+<TGConnectingPoint num="7" id="2440" />
+<TGConnectingPoint num="8" id="2441" />
+<TGConnectingPoint num="9" id="2442" />
+<TGConnectingPoint num="10" id="2443" />
+<TGConnectingPoint num="11" id="2444" />
+<TGConnectingPoint num="12" id="2445" />
+<TGConnectingPoint num="13" id="2446" />
+<TGConnectingPoint num="14" id="2447" />
+<TGConnectingPoint num="15" id="2448" />
<extraparam>
<Line value="idle time" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="945" >
+<COMPONENT type="301" id="2466" >
<cdparam x="526" y="287" />
<sizeparam width="173" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="check if processing finished
" />
-<TGConnectingPoint num="0" id="937" />
-<TGConnectingPoint num="1" id="938" />
-<TGConnectingPoint num="2" id="939" />
-<TGConnectingPoint num="3" id="940" />
-<TGConnectingPoint num="4" id="941" />
-<TGConnectingPoint num="5" id="942" />
-<TGConnectingPoint num="6" id="943" />
-<TGConnectingPoint num="7" id="944" />
+<TGConnectingPoint num="0" id="2450" />
+<TGConnectingPoint num="1" id="2451" />
+<TGConnectingPoint num="2" id="2452" />
+<TGConnectingPoint num="3" id="2453" />
+<TGConnectingPoint num="4" id="2454" />
+<TGConnectingPoint num="5" id="2455" />
+<TGConnectingPoint num="6" id="2456" />
+<TGConnectingPoint num="7" id="2457" />
+<TGConnectingPoint num="8" id="2458" />
+<TGConnectingPoint num="9" id="2459" />
+<TGConnectingPoint num="10" id="2460" />
+<TGConnectingPoint num="11" id="2461" />
+<TGConnectingPoint num="12" id="2462" />
+<TGConnectingPoint num="13" id="2463" />
+<TGConnectingPoint num="14" id="2464" />
+<TGConnectingPoint num="15" id="2465" />
<extraparam>
<Line value="check if processing finished" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="954" >
+<COMPONENT type="301" id="2483" >
<cdparam x="897" y="423" />
<sizeparam width="139" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="high priority Bus Load
" />
-<TGConnectingPoint num="0" id="946" />
-<TGConnectingPoint num="1" id="947" />
-<TGConnectingPoint num="2" id="948" />
-<TGConnectingPoint num="3" id="949" />
-<TGConnectingPoint num="4" id="950" />
-<TGConnectingPoint num="5" id="951" />
-<TGConnectingPoint num="6" id="952" />
-<TGConnectingPoint num="7" id="953" />
+<TGConnectingPoint num="0" id="2467" />
+<TGConnectingPoint num="1" id="2468" />
+<TGConnectingPoint num="2" id="2469" />
+<TGConnectingPoint num="3" id="2470" />
+<TGConnectingPoint num="4" id="2471" />
+<TGConnectingPoint num="5" id="2472" />
+<TGConnectingPoint num="6" id="2473" />
+<TGConnectingPoint num="7" id="2474" />
+<TGConnectingPoint num="8" id="2475" />
+<TGConnectingPoint num="9" id="2476" />
+<TGConnectingPoint num="10" id="2477" />
+<TGConnectingPoint num="11" id="2478" />
+<TGConnectingPoint num="12" id="2479" />
+<TGConnectingPoint num="13" id="2480" />
+<TGConnectingPoint num="14" id="2481" />
+<TGConnectingPoint num="15" id="2482" />
<extraparam>
<Line value="high priority Bus Load" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="963" >
+<COMPONENT type="301" id="2500" >
<cdparam x="732" y="390" />
<sizeparam width="139" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="high priority Bus Load
" />
-<TGConnectingPoint num="0" id="955" />
-<TGConnectingPoint num="1" id="956" />
-<TGConnectingPoint num="2" id="957" />
-<TGConnectingPoint num="3" id="958" />
-<TGConnectingPoint num="4" id="959" />
-<TGConnectingPoint num="5" id="960" />
-<TGConnectingPoint num="6" id="961" />
-<TGConnectingPoint num="7" id="962" />
+<TGConnectingPoint num="0" id="2484" />
+<TGConnectingPoint num="1" id="2485" />
+<TGConnectingPoint num="2" id="2486" />
+<TGConnectingPoint num="3" id="2487" />
+<TGConnectingPoint num="4" id="2488" />
+<TGConnectingPoint num="5" id="2489" />
+<TGConnectingPoint num="6" id="2490" />
+<TGConnectingPoint num="7" id="2491" />
+<TGConnectingPoint num="8" id="2492" />
+<TGConnectingPoint num="9" id="2493" />
+<TGConnectingPoint num="10" id="2494" />
+<TGConnectingPoint num="11" id="2495" />
+<TGConnectingPoint num="12" id="2496" />
+<TGConnectingPoint num="13" id="2497" />
+<TGConnectingPoint num="14" id="2498" />
+<TGConnectingPoint num="15" id="2499" />
<extraparam>
<Line value="high priority Bus Load" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="966" >
+<COMPONENT type="1006" id="2503" >
<cdparam x="883" y="344" />
<sizeparam width="99" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="highPrioLoad(1)" />
-<TGConnectingPoint num="0" id="964" />
-<TGConnectingPoint num="1" id="965" />
+<TGConnectingPoint num="0" id="2501" />
+<TGConnectingPoint num="1" id="2502" />
<extraparam>
-<Data channelName="highPrioLoad" nbOfSamples="1" />
+<Data channelName="highPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="967" >
+<CONNECTOR type="115" id="2504" >
<cdparam x="732" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from notified event to stop state" value="null" />
-<P1 x="732" y="282" id="911" />
-<P2 x="732" y="305" id="908" />
+<P1 x="732" y="282" id="2416" />
+<P2 x="732" y="305" id="2413" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="968" >
+<CONNECTOR type="115" id="2505" >
<cdparam x="735" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to notified event" value="null" />
-<P1 x="735" y="236" id="906" />
-<P2 x="732" y="252" id="910" />
+<P1 x="735" y="236" id="2411" />
+<P2 x="732" y="252" id="2415" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="969" >
+<CONNECTOR type="115" id="2506" >
<cdparam x="782" y="225" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to choice" value="null" />
-<P1 x="780" y="225" id="905" />
-<P2 x="931" y="257" id="890" />
+<P1 x="780" y="225" id="2410" />
+<P2 x="931" y="257" id="2387" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="970" >
+<CONNECTOR type="115" id="2507" >
<cdparam x="971" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to delay" value="null" />
-<P1 x="971" y="282" id="892" />
-<P2 x="1011" y="297" id="884" />
+<P1 x="971" y="282" id="2389" />
+<P2 x="1011" y="297" id="2381" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="971" >
+<CONNECTOR type="115" id="2508" >
<cdparam x="931" y="322" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to write channel" value="null" />
-<P1 x="931" y="322" id="893" />
-<P2 x="932" y="339" id="964" />
+<P1 x="931" y="322" id="2390" />
+<P2 x="932" y="339" id="2501" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="972" >
+<CONNECTOR type="115" id="2509" >
<cdparam x="891" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to write channel" value="null" />
-<P1 x="891" y="282" id="891" />
-<P2 x="847" y="299" id="925" />
+<P1 x="891" y="282" id="2388" />
+<P2 x="847" y="299" id="2430" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="973" >
+<CONNECTOR type="115" id="2510" >
<cdparam x="847" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="847" y="329" id="926" />
-<P2 x="845" y="352" id="923" />
+<P1 x="847" y="329" id="2431" />
+<P2 x="845" y="352" id="2428" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="974" >
+<CONNECTOR type="115" id="2511" >
<cdparam x="932" y="369" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="932" y="369" id="965" />
-<P2 x="932" y="389" id="921" />
+<P1 x="932" y="369" id="2502" />
+<P2 x="932" y="389" id="2426" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="975" >
+<CONNECTOR type="115" id="2512" >
<cdparam x="1011" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from delay to stop state" value="null" />
-<P1 x="1011" y="337" id="885" />
-<P2 x="1011" y="359" id="919" />
+<P1 x="1011" y="337" id="2382" />
+<P2 x="1011" y="359" id="2424" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="976" >
+<CONNECTOR type="115" id="2513" >
<cdparam x="598" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to stop state" value="null" />
-<P1 x="596" y="194" id="917" />
-<P2 x="596" y="215" id="913" />
+<P1 x="596" y="194" id="2422" />
+<P2 x="596" y="215" id="2418" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="977" >
+<CONNECTOR type="115" id="2514" >
<cdparam x="691" y="183" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to for loop" value="null" />
-<P1 x="680" y="183" id="916" />
-<P2 x="735" y="206" id="904" />
+<P1 x="680" y="183" id="2421" />
+<P2 x="735" y="206" id="2409" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="978" >
+<CONNECTOR type="115" id="2515" >
<cdparam x="586" y="155" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for loop" value="null" />
-<P1 x="592" y="148" id="881" />
-<P2 x="596" y="164" id="915" />
+<P1 x="592" y="148" id="2378" />
+<P2 x="596" y="164" id="2420" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="App_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="980" >
+<COMPONENT type="1000" id="2517" >
<cdparam x="258" y="60" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="979" />
+<TGConnectingPoint num="0" id="2516" />
</COMPONENT>
-<COMPONENT type="1001" id="982" >
+<COMPONENT type="1001" id="2519" >
<cdparam x="297" y="327" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="981" />
+<TGConnectingPoint num="0" id="2518" />
</COMPONENT>
-<COMPONENT type="1010" id="985" >
+<COMPONENT type="1010" id="2522" >
<cdparam x="252" y="186" />
<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="done() " />
-<TGConnectingPoint num="0" id="983" />
-<TGConnectingPoint num="1" id="984" />
+<TGConnectingPoint num="0" id="2520" />
+<TGConnectingPoint num="1" id="2521" />
<extraparam>
<Data eventName="done" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="988" >
+<COMPONENT type="1008" id="2525" >
<cdparam x="227" y="146" />
<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="distributeKey()" />
-<TGConnectingPoint num="0" id="986" />
-<TGConnectingPoint num="1" id="987" />
+<TGConnectingPoint num="0" id="2523" />
+<TGConnectingPoint num="1" id="2524" />
<extraparam>
<Data eventName="distributeKey" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="991" >
+<COMPONENT type="1008" id="2528" >
<cdparam x="244" y="280" />
<sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="endProcessing()" />
-<TGConnectingPoint num="0" id="989" />
-<TGConnectingPoint num="1" id="990" />
+<TGConnectingPoint num="0" id="2526" />
+<TGConnectingPoint num="1" id="2527" />
<extraparam>
<Data eventName="endProcessing" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="992" >
+<CONNECTOR type="115" id="2529" >
<cdparam x="283" y="262" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="295" y="305" id="990" />
-<P2 x="307" y="322" id="981" />
+<P1 x="295" y="305" id="2527" />
+<P2 x="307" y="322" id="2518" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="993" >
+<CONNECTOR type="115" id="2530" >
<cdparam x="271" y="171" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="271" y="171" id="987" />
-<P2 x="276" y="181" id="983" />
+<P1 x="271" y="171" id="2524" />
+<P2 x="276" y="181" id="2520" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="994" >
+<CONNECTOR type="115" id="2531" >
<cdparam x="276" y="211" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to stop state" value="null" />
-<P1 x="276" y="211" id="984" />
-<P2 x="295" y="275" id="989" />
+<P1 x="276" y="211" id="2521" />
+<P2 x="295" y="275" id="2526" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="995" >
+<CONNECTOR type="115" id="2532" >
<cdparam x="464" y="109" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to delay" value="null" />
-<P1 x="265" y="80" id="979" />
-<P2 x="271" y="141" id="986" />
+<P1 x="265" y="80" id="2516" />
+<P2 x="271" y="141" id="2523" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="HSM_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="997" >
+<COMPONENT type="1001" id="2534" >
<cdparam x="70" y="410" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="996" />
+<TGConnectingPoint num="0" id="2533" />
</COMPONENT>
-<COMPONENT type="1009" id="1000" >
+<COMPONENT type="1009" id="2537" >
<cdparam x="5" y="362" />
<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="inHSMECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="998" />
-<TGConnectingPoint num="1" id="999" />
+<TGConnectingPoint num="0" id="2535" />
+<TGConnectingPoint num="1" id="2536" />
<extraparam>
-<Data channelName="inHSMECU1" nbOfSamples="sizeOfMsg" />
+<Data channelName="inHSMECU1" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1003" >
+<COMPONENT type="1010" id="2540" >
<cdparam x="4" y="315" />
<sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="putMsgECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1001" />
-<TGConnectingPoint num="1" id="1002" />
+<TGConnectingPoint num="0" id="2538" />
+<TGConnectingPoint num="1" id="2539" />
<extraparam>
<Data eventName="putMsgECU1" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1005" >
+<COMPONENT type="1001" id="2542" >
<cdparam x="213" y="425" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1004" />
+<TGConnectingPoint num="0" id="2541" />
</COMPONENT>
-<COMPONENT type="1001" id="1007" >
+<COMPONENT type="1001" id="2544" >
<cdparam x="353" y="423" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1006" />
+<TGConnectingPoint num="0" id="2543" />
</COMPONENT>
-<COMPONENT type="1001" id="1009" >
+<COMPONENT type="1001" id="2546" >
<cdparam x="495" y="424" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1008" />
+<TGConnectingPoint num="0" id="2545" />
</COMPONENT>
-<COMPONENT type="1001" id="1011" >
+<COMPONENT type="1001" id="2548" >
<cdparam x="681" y="430" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1010" />
+<TGConnectingPoint num="0" id="2547" />
</COMPONENT>
-<COMPONENT type="1006" id="1014" >
+<COMPONENT type="1006" id="2551" >
<cdparam x="615" y="379" />
<sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="outHSMECU1(sizeOfMsg)" />
-<TGConnectingPoint num="0" id="1012" />
-<TGConnectingPoint num="1" id="1013" />
+<TGConnectingPoint num="0" id="2549" />
+<TGConnectingPoint num="1" id="2550" />
<extraparam>
-<Data channelName="outHSMECU1" nbOfSamples="sizeOfMsg" />
+<Data channelName="outHSMECU1" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1013" id="1018" >
+<COMPONENT type="1013" id="2555" >
<cdparam x="499" y="372" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1016" />
-<TGConnectingPoint num="1" id="1017" />
+<TGConnectingPoint num="0" id="2553" />
+<TGConnectingPoint num="1" id="2554" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1015" >
-<father id="1018" num="0" />
+<SUBCOMPONENT type="-1" id="2552" >
+<father id="2555" num="0" />
<cdparam x="514" y="392" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6633,17 +6837,17 @@
<infoparam name="value of the delay" value="sizeOfMsg*60" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="1022" >
+<COMPONENT type="1013" id="2559" >
<cdparam x="219" y="364" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1020" />
-<TGConnectingPoint num="1" id="1021" />
+<TGConnectingPoint num="0" id="2557" />
+<TGConnectingPoint num="1" id="2558" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1019" >
-<father id="1022" num="0" />
+<SUBCOMPONENT type="-1" id="2556" >
+<father id="2559" num="0" />
<cdparam x="234" y="384" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6651,17 +6855,17 @@
<infoparam name="value of the delay" value="15*sizeOfMsg" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="1026" >
+<COMPONENT type="1013" id="2563" >
<cdparam x="357" y="368" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1024" />
-<TGConnectingPoint num="1" id="1025" />
+<TGConnectingPoint num="0" id="2561" />
+<TGConnectingPoint num="1" id="2562" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1023" >
-<father id="1026" num="0" />
+<SUBCOMPONENT type="-1" id="2560" >
+<father id="2563" num="0" />
<cdparam x="372" y="388" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6669,43 +6873,43 @@
<infoparam name="value of the delay" value="15*sizeOfMsg" />
</SUBCOMPONENT>
-<COMPONENT type="1001" id="1028" >
+<COMPONENT type="1001" id="2565" >
<cdparam x="600" y="243" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1027" />
+<TGConnectingPoint num="0" id="2564" />
</COMPONENT>
-<COMPONENT type="1008" id="1031" >
+<COMPONENT type="1008" id="2568" >
<cdparam x="557" y="196" />
<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="doneHSMECU1()" />
-<TGConnectingPoint num="0" id="1029" />
-<TGConnectingPoint num="1" id="1030" />
+<TGConnectingPoint num="0" id="2566" />
+<TGConnectingPoint num="1" id="2567" />
<extraparam>
<Data eventName="doneHSMECU1" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1016" id="1039" >
+<COMPONENT type="1016" id="2576" >
<cdparam x="466" y="152" />
<sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="sequence" value="null" />
-<TGConnectingPoint num="0" id="1033" />
-<TGConnectingPoint num="1" id="1034" />
-<TGConnectingPoint num="2" id="1035" />
-<TGConnectingPoint num="3" id="1036" />
-<TGConnectingPoint num="4" id="1037" />
-<TGConnectingPoint num="5" id="1038" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1032" >
-<father id="1039" num="0" />
+<TGConnectingPoint num="0" id="2570" />
+<TGConnectingPoint num="1" id="2571" />
+<TGConnectingPoint num="2" id="2572" />
+<TGConnectingPoint num="3" id="2573" />
+<TGConnectingPoint num="4" id="2574" />
+<TGConnectingPoint num="5" id="2575" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="2569" >
+<father id="2576" num="0" />
<cdparam x="620" y="159" />
<sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6713,141 +6917,141 @@
<infoparam name="Sequence" value=">>" />
</SUBCOMPONENT>
-<COMPONENT type="1010" id="1042" >
+<COMPONENT type="1010" id="2579" >
<cdparam x="615" y="327" />
<sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="getMsgECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1040" />
-<TGConnectingPoint num="1" id="1041" />
+<TGConnectingPoint num="0" id="2577" />
+<TGConnectingPoint num="1" id="2578" />
<extraparam>
<Data eventName="getMsgECU1" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1045" >
+<COMPONENT type="1010" id="2582" >
<cdparam x="414" y="320" />
<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="generateKeyECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1043" />
-<TGConnectingPoint num="1" id="1044" />
+<TGConnectingPoint num="0" id="2580" />
+<TGConnectingPoint num="1" id="2581" />
<extraparam>
<Data eventName="generateKeyECU1" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1048" >
+<COMPONENT type="1010" id="2585" >
<cdparam x="294" y="312" />
<sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="macECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1046" />
-<TGConnectingPoint num="1" id="1047" />
+<TGConnectingPoint num="0" id="2583" />
+<TGConnectingPoint num="1" id="2584" />
<extraparam>
<Data eventName="macECU1" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1051" >
+<COMPONENT type="1010" id="2588" >
<cdparam x="149" y="312" />
<sizeparam width="150" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="encryptECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1049" />
-<TGConnectingPoint num="1" id="1050" />
+<TGConnectingPoint num="0" id="2586" />
+<TGConnectingPoint num="1" id="2587" />
<extraparam>
<Data eventName="encryptECU1" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1018" id="1062" >
+<COMPONENT type="1018" id="2599" >
<cdparam x="383" y="209" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1052" />
-<TGConnectingPoint num="1" id="1053" />
-<TGConnectingPoint num="2" id="1054" />
-<TGConnectingPoint num="3" id="1055" />
-<TGConnectingPoint num="4" id="1056" />
-<TGConnectingPoint num="5" id="1057" />
-<TGConnectingPoint num="6" id="1058" />
-<TGConnectingPoint num="7" id="1059" />
-<TGConnectingPoint num="8" id="1060" />
-<TGConnectingPoint num="9" id="1061" />
-</COMPONENT>
-
-<COMPONENT type="1030" id="1065" >
+<TGConnectingPoint num="0" id="2589" />
+<TGConnectingPoint num="1" id="2590" />
+<TGConnectingPoint num="2" id="2591" />
+<TGConnectingPoint num="3" id="2592" />
+<TGConnectingPoint num="4" id="2593" />
+<TGConnectingPoint num="5" id="2594" />
+<TGConnectingPoint num="6" id="2595" />
+<TGConnectingPoint num="7" id="2596" />
+<TGConnectingPoint num="8" id="2597" />
+<TGConnectingPoint num="9" id="2598" />
+</COMPONENT>
+
+<COMPONENT type="1030" id="2602" >
<cdparam x="209" y="89" />
<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1063" />
-<TGConnectingPoint num="1" id="1064" />
+<TGConnectingPoint num="0" id="2600" />
+<TGConnectingPoint num="1" id="2601" />
</COMPONENT>
-<COMPONENT type="1000" id="1067" >
+<COMPONENT type="1000" id="2604" >
<cdparam x="242" y="40" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1066" />
+<TGConnectingPoint num="0" id="2603" />
</COMPONENT>
-<CONNECTOR type="115" id="1068" >
+<CONNECTOR type="115" id="2605" >
<cdparam x="358" y="224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="358" y="224" id="1056" />
-<P2 x="79" y="310" id="1001" />
+<P1 x="358" y="224" id="2593" />
+<P2 x="79" y="310" id="2538" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1069" >
+<CONNECTOR type="115" id="2606" >
<cdparam x="534" y="157" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from sequence to select" value="null" />
-<P1 x="515" y="157" id="1035" />
-<P2 x="398" y="199" id="1052" />
+<P1 x="515" y="157" id="2572" />
+<P2 x="398" y="199" id="2589" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1070" >
+<CONNECTOR type="115" id="2607" >
<cdparam x="585" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="438" y="224" id="1057" />
-<P2 x="690" y="322" id="1040" />
+<P1 x="438" y="224" id="2594" />
+<P2 x="690" y="322" id="2577" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1071" >
+<CONNECTOR type="115" id="2608" >
<cdparam x="245" y="91" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for ever loop" value="null" />
-<P1 x="249" y="60" id="1066" />
-<P2 x="249" y="84" id="1063" />
+<P1 x="249" y="60" id="2603" />
+<P2 x="249" y="84" id="2600" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1073" >
+<CONNECTOR type="115" id="2610" >
<cdparam x="423" y="160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for ever loop to select" value="null" />
-<P1 x="290" y="103" id="1064" />
-<P2 x="541" y="152" id="1033" />
+<P1 x="290" y="103" id="2601" />
+<P2 x="541" y="152" id="2570" />
<Point x="476" y="121" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1072" >
-<father id="1073" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2609" >
+<father id="2610" num="0" />
<cdparam x="476" y="121" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6855,646 +7059,654 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1074" >
+<CONNECTOR type="115" id="2611" >
<cdparam x="505" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="358" y="224" id="1053" />
-<P2 x="224" y="307" id="1049" />
+<P1 x="358" y="224" id="2590" />
+<P2 x="224" y="307" id="2586" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1075" >
+<CONNECTOR type="115" id="2612" >
<cdparam x="448" y="278" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="398" y="264" id="1055" />
-<P2 x="361" y="307" id="1046" />
+<P1 x="398" y="264" id="2592" />
+<P2 x="361" y="307" id="2583" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1076" >
+<CONNECTOR type="115" id="2613" >
<cdparam x="585" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="438" y="224" id="1054" />
-<P2 x="504" y="315" id="1043" />
+<P1 x="438" y="224" id="2591" />
+<P2 x="504" y="315" id="2580" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1077" >
+<CONNECTOR type="115" id="2614" >
<cdparam x="778" y="153" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from sequence to send event" value="null" />
-<P1 x="590" y="157" id="1038" />
-<P2 x="609" y="191" id="1029" />
+<P1 x="590" y="157" id="2575" />
+<P2 x="609" y="191" id="2566" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1078" >
+<CONNECTOR type="115" id="2615" >
<cdparam x="609" y="221" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="609" y="221" id="1030" />
-<P2 x="610" y="238" id="1027" />
+<P1 x="609" y="221" id="2567" />
+<P2 x="610" y="238" id="2564" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1079" >
+<CONNECTOR type="115" id="2616" >
<cdparam x="361" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="361" y="337" id="1047" />
-<P2 x="362" y="363" id="1024" />
+<P1 x="361" y="337" id="2584" />
+<P2 x="362" y="363" id="2561" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1080" >
+<CONNECTOR type="115" id="2617" >
<cdparam x="224" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="224" y="337" id="1050" />
-<P2 x="224" y="359" id="1020" />
+<P1 x="224" y="337" id="2587" />
+<P2 x="224" y="359" id="2557" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1081" >
+<CONNECTOR type="115" id="2618" >
<cdparam x="504" y="345" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="504" y="345" id="1044" />
-<P2 x="504" y="367" id="1016" />
+<P1 x="504" y="345" id="2581" />
+<P2 x="504" y="367" id="2553" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1082" >
+<CONNECTOR type="115" id="2619" >
<cdparam x="690" y="352" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to write channel" value="null" />
-<P1 x="690" y="352" id="1041" />
-<P2 x="690" y="374" id="1012" />
+<P1 x="690" y="352" id="2578" />
+<P2 x="690" y="374" id="2549" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1083" >
+<CONNECTOR type="115" id="2620" >
<cdparam x="690" y="404" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="690" y="404" id="1013" />
-<P2 x="691" y="425" id="1010" />
+<P1 x="690" y="404" id="2550" />
+<P2 x="691" y="425" id="2547" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1084" >
+<CONNECTOR type="115" id="2621" >
<cdparam x="504" y="407" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="504" y="407" id="1017" />
-<P2 x="505" y="419" id="1008" />
+<P1 x="504" y="407" id="2554" />
+<P2 x="505" y="419" id="2545" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1085" >
+<CONNECTOR type="115" id="2622" >
<cdparam x="362" y="403" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="362" y="403" id="1025" />
-<P2 x="363" y="418" id="1006" />
+<P1 x="362" y="403" id="2562" />
+<P2 x="363" y="418" id="2543" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1086" >
+<CONNECTOR type="115" id="2623" >
<cdparam x="224" y="399" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="224" y="399" id="1021" />
-<P2 x="223" y="420" id="1004" />
+<P1 x="224" y="399" id="2558" />
+<P2 x="223" y="420" id="2541" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1087" >
+<CONNECTOR type="115" id="2624" >
<cdparam x="79" y="340" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="79" y="340" id="1002" />
-<P2 x="78" y="357" id="998" />
+<P1 x="79" y="340" id="2539" />
+<P2 x="78" y="357" id="2535" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1088" >
+<CONNECTOR type="115" id="2625" >
<cdparam x="78" y="387" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to stop state" value="null" />
-<P1 x="78" y="387" id="999" />
-<P2 x="80" y="405" id="996" />
+<P1 x="78" y="387" id="2536" />
+<P2 x="80" y="405" id="2533" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="CTP_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1090" >
+<COMPONENT type="1001" id="2627" >
<cdparam x="531" y="500" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1089" />
+<TGConnectingPoint num="0" id="2626" />
</COMPONENT>
-<COMPONENT type="1006" id="1093" >
+<COMPONENT type="1006" id="2630" >
<cdparam x="455" y="451" />
<sizeparam width="175" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="recvDataECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1091" />
-<TGConnectingPoint num="1" id="1092" />
+<TGConnectingPoint num="0" id="2628" />
+<TGConnectingPoint num="1" id="2629" />
<extraparam>
-<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1096" >
+<COMPONENT type="1008" id="2633" >
<cdparam x="468" y="396" />
<sizeparam width="165" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="recvEvtECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1094" />
-<TGConnectingPoint num="1" id="1095" />
+<TGConnectingPoint num="0" id="2631" />
+<TGConnectingPoint num="1" id="2632" />
<extraparam>
<Data eventName="recvEvtECU1" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1099" >
+<COMPONENT type="1011" id="2636" >
<cdparam x="440" y="351" />
<sizeparam width="211" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="action state" value="nbOfSamples = (nbOfSamples * 7)/8" />
-<TGConnectingPoint num="0" id="1097" />
-<TGConnectingPoint num="1" id="1098" />
+<TGConnectingPoint num="0" id="2634" />
+<TGConnectingPoint num="1" id="2635" />
</COMPONENT>
-<COMPONENT type="1009" id="1102" >
+<COMPONENT type="1009" id="2639" >
<cdparam x="462" y="283" />
<sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="dataToECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1100" />
-<TGConnectingPoint num="1" id="1101" />
+<TGConnectingPoint num="0" id="2637" />
+<TGConnectingPoint num="1" id="2638" />
<extraparam>
-<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1105" >
+<COMPONENT type="1010" id="2642" >
<cdparam x="466" y="230" />
<sizeparam width="159" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="evtToECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1103" />
-<TGConnectingPoint num="1" id="1104" />
+<TGConnectingPoint num="0" id="2640" />
+<TGConnectingPoint num="1" id="2641" />
<extraparam>
<Data eventName="evtToECU1" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1107" >
+<COMPONENT type="1001" id="2644" >
<cdparam x="262" y="493" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1106" />
+<TGConnectingPoint num="0" id="2643" />
</COMPONENT>
-<COMPONENT type="1006" id="1110" >
+<COMPONENT type="1006" id="2647" >
<cdparam x="182" y="451" />
<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="dataFromECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1108" />
-<TGConnectingPoint num="1" id="1109" />
+<TGConnectingPoint num="0" id="2645" />
+<TGConnectingPoint num="1" id="2646" />
<extraparam>
-<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1113" >
+<COMPONENT type="1008" id="2650" >
<cdparam x="187" y="400" />
<sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="evtFromECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1111" />
-<TGConnectingPoint num="1" id="1112" />
+<TGConnectingPoint num="0" id="2648" />
+<TGConnectingPoint num="1" id="2649" />
<extraparam>
<Data eventName="evtFromECU1" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1116" >
+<COMPONENT type="1011" id="2653" >
<cdparam x="164" y="353" />
<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
-<TGConnectingPoint num="0" id="1114" />
-<TGConnectingPoint num="1" id="1115" />
+<TGConnectingPoint num="0" id="2651" />
+<TGConnectingPoint num="1" id="2652" />
</COMPONENT>
-<COMPONENT type="1009" id="1119" >
+<COMPONENT type="1009" id="2656" >
<cdparam x="178" y="284" />
<sizeparam width="184" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="sendDataECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1117" />
-<TGConnectingPoint num="1" id="1118" />
+<TGConnectingPoint num="0" id="2654" />
+<TGConnectingPoint num="1" id="2655" />
<extraparam>
-<Data channelName="sendDataECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="sendDataECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1122" >
+<COMPONENT type="1010" id="2659" >
<cdparam x="182" y="230" />
<sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="sendEvtECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1120" />
-<TGConnectingPoint num="1" id="1121" />
+<TGConnectingPoint num="0" id="2657" />
+<TGConnectingPoint num="1" id="2658" />
<extraparam>
<Data eventName="sendEvtECU1" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1030" id="1125" >
+<COMPONENT type="1030" id="2662" >
<cdparam x="247" y="96" />
<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1123" />
-<TGConnectingPoint num="1" id="1124" />
+<TGConnectingPoint num="0" id="2660" />
+<TGConnectingPoint num="1" id="2661" />
</COMPONENT>
-<COMPONENT type="1018" id="1136" >
+<COMPONENT type="1018" id="2673" >
<cdparam x="409" y="173" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1126" />
-<TGConnectingPoint num="1" id="1127" />
-<TGConnectingPoint num="2" id="1128" />
-<TGConnectingPoint num="3" id="1129" />
-<TGConnectingPoint num="4" id="1130" />
-<TGConnectingPoint num="5" id="1131" />
-<TGConnectingPoint num="6" id="1132" />
-<TGConnectingPoint num="7" id="1133" />
-<TGConnectingPoint num="8" id="1134" />
-<TGConnectingPoint num="9" id="1135" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1138" >
+<TGConnectingPoint num="0" id="2663" />
+<TGConnectingPoint num="1" id="2664" />
+<TGConnectingPoint num="2" id="2665" />
+<TGConnectingPoint num="3" id="2666" />
+<TGConnectingPoint num="4" id="2667" />
+<TGConnectingPoint num="5" id="2668" />
+<TGConnectingPoint num="6" id="2669" />
+<TGConnectingPoint num="7" id="2670" />
+<TGConnectingPoint num="8" id="2671" />
+<TGConnectingPoint num="9" id="2672" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="2675" >
<cdparam x="270" y="41" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1137" />
+<TGConnectingPoint num="0" id="2674" />
</COMPONENT>
-<CONNECTOR type="115" id="1139" >
+<CONNECTOR type="115" id="2676" >
<cdparam x="272" y="378" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="272" y="378" id="1115" />
-<P2 x="272" y="395" id="1111" />
+<P1 x="272" y="378" id="2652" />
+<P2 x="272" y="395" id="2648" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1140" >
+<CONNECTOR type="115" id="2677" >
<cdparam x="328" y="110" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for ever loop to select" value="null" />
-<P1 x="328" y="110" id="1124" />
-<P2 x="424" y="163" id="1126" />
+<P1 x="328" y="110" id="2661" />
+<P2 x="424" y="163" id="2663" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1141" >
+<CONNECTOR type="115" id="2678" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to stop state" value="null" />
-<P1 x="277" y="61" id="1137" />
-<P2 x="287" y="91" id="1123" />
+<P1 x="277" y="61" id="2674" />
+<P2 x="287" y="91" id="2660" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1142" >
+<CONNECTOR type="115" id="2679" >
<cdparam x="384" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="384" y="188" id="1127" />
-<P2 x="269" y="225" id="1120" />
+<P1 x="384" y="188" id="2664" />
+<P2 x="269" y="225" id="2657" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1143" >
+<CONNECTOR type="115" id="2680" >
<cdparam x="269" y="255" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="269" y="255" id="1121" />
-<P2 x="270" y="279" id="1117" />
+<P1 x="269" y="255" id="2658" />
+<P2 x="270" y="279" id="2654" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1144" >
+<CONNECTOR type="115" id="2681" >
<cdparam x="270" y="309" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to action state" value="null" />
-<P1 x="270" y="309" id="1118" />
-<P2 x="272" y="348" id="1114" />
+<P1 x="270" y="309" id="2655" />
+<P2 x="272" y="348" id="2651" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1145" >
+<CONNECTOR type="115" id="2682" >
<cdparam x="272" y="425" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="272" y="425" id="1112" />
-<P2 x="272" y="446" id="1108" />
+<P1 x="272" y="425" id="2649" />
+<P2 x="272" y="446" id="2645" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1146" >
+<CONNECTOR type="115" id="2683" >
<cdparam x="272" y="476" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="272" y="476" id="1109" />
-<P2 x="272" y="488" id="1106" />
+<P1 x="272" y="476" id="2646" />
+<P2 x="272" y="488" id="2643" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1147" >
+<CONNECTOR type="115" id="2684" >
<cdparam x="464" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="464" y="188" id="1128" />
-<P2 x="545" y="225" id="1103" />
+<P1 x="464" y="188" id="2665" />
+<P2 x="545" y="225" id="2640" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1148" >
+<CONNECTOR type="115" id="2685" >
<cdparam x="545" y="255" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="545" y="255" id="1104" />
-<P2 x="546" y="278" id="1100" />
+<P1 x="545" y="255" id="2641" />
+<P2 x="546" y="278" id="2637" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1149" >
+<CONNECTOR type="115" id="2686" >
<cdparam x="546" y="308" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to action state" value="null" />
-<P1 x="546" y="308" id="1101" />
-<P2 x="545" y="346" id="1097" />
+<P1 x="546" y="308" id="2638" />
+<P2 x="545" y="346" id="2634" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1150" >
+<CONNECTOR type="115" id="2687" >
<cdparam x="545" y="376" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="545" y="376" id="1098" />
-<P2 x="550" y="391" id="1094" />
+<P1 x="545" y="376" id="2635" />
+<P2 x="550" y="391" id="2631" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1151" >
+<CONNECTOR type="115" id="2688" >
<cdparam x="550" y="421" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="550" y="421" id="1095" />
-<P2 x="542" y="446" id="1091" />
+<P1 x="550" y="421" id="2632" />
+<P2 x="542" y="446" id="2628" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1152" >
+<CONNECTOR type="115" id="2689" >
<cdparam x="542" y="476" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="542" y="476" id="1092" />
-<P2 x="541" y="495" id="1089" />
+<P1 x="542" y="476" id="2629" />
+<P2 x="541" y="495" id="2626" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="DistributionManager_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="1155" >
+<COMPONENT type="1010" id="2692" >
<cdparam x="219" y="504" />
<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1153" />
-<TGConnectingPoint num="1" id="1154" />
+<TGConnectingPoint num="0" id="2690" />
+<TGConnectingPoint num="1" id="2691" />
<extraparam>
<Data eventName="doneHSMECU1" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1164" >
+<COMPONENT type="301" id="2709" >
<cdparam x="609" y="75" />
<sizeparam width="127" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="Sending msg to KM
" />
-<TGConnectingPoint num="0" id="1156" />
-<TGConnectingPoint num="1" id="1157" />
-<TGConnectingPoint num="2" id="1158" />
-<TGConnectingPoint num="3" id="1159" />
-<TGConnectingPoint num="4" id="1160" />
-<TGConnectingPoint num="5" id="1161" />
-<TGConnectingPoint num="6" id="1162" />
-<TGConnectingPoint num="7" id="1163" />
+<TGConnectingPoint num="0" id="2693" />
+<TGConnectingPoint num="1" id="2694" />
+<TGConnectingPoint num="2" id="2695" />
+<TGConnectingPoint num="3" id="2696" />
+<TGConnectingPoint num="4" id="2697" />
+<TGConnectingPoint num="5" id="2698" />
+<TGConnectingPoint num="6" id="2699" />
+<TGConnectingPoint num="7" id="2700" />
+<TGConnectingPoint num="8" id="2701" />
+<TGConnectingPoint num="9" id="2702" />
+<TGConnectingPoint num="10" id="2703" />
+<TGConnectingPoint num="11" id="2704" />
+<TGConnectingPoint num="12" id="2705" />
+<TGConnectingPoint num="13" id="2706" />
+<TGConnectingPoint num="14" id="2707" />
+<TGConnectingPoint num="15" id="2708" />
<extraparam>
<Line value="Sending msg to KM" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1167" >
+<COMPONENT type="1010" id="2712" >
<cdparam x="215" y="371" />
<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1165" />
-<TGConnectingPoint num="1" id="1166" />
+<TGConnectingPoint num="0" id="2710" />
+<TGConnectingPoint num="1" id="2711" />
<extraparam>
<Data eventName="doneHSMECU1" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1170" >
+<COMPONENT type="1010" id="2715" >
<cdparam x="214" y="285" />
<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1168" />
-<TGConnectingPoint num="1" id="1169" />
+<TGConnectingPoint num="0" id="2713" />
+<TGConnectingPoint num="1" id="2714" />
<extraparam>
<Data eventName="doneHSMECU1" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1173" >
+<COMPONENT type="1010" id="2718" >
<cdparam x="209" y="191" />
<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1171" />
-<TGConnectingPoint num="1" id="1172" />
+<TGConnectingPoint num="0" id="2716" />
+<TGConnectingPoint num="1" id="2717" />
<extraparam>
<Data eventName="doneHSMECU1" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1176" >
+<COMPONENT type="1008" id="2721" >
<cdparam x="218" y="420" />
<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="getMsgECU1(59)" />
-<TGConnectingPoint num="0" id="1174" />
-<TGConnectingPoint num="1" id="1175" />
+<TGConnectingPoint num="0" id="2719" />
+<TGConnectingPoint num="1" id="2720" />
<extraparam>
<Data eventName="getMsgECU1" nbOfParams="5" />
<Param index="0" value="59" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="1179" >
+<COMPONENT type="1009" id="2724" >
<cdparam x="218" y="468" />
<sizeparam width="111" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="outHSMECU1(59) " />
-<TGConnectingPoint num="0" id="1177" />
-<TGConnectingPoint num="1" id="1178" />
+<TGConnectingPoint num="0" id="2722" />
+<TGConnectingPoint num="1" id="2723" />
<extraparam>
-<Data channelName="outHSMECU1" nbOfSamples="59" />
+<Data channelName="outHSMECU1" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1182" >
+<COMPONENT type="1008" id="2727" >
<cdparam x="224" y="336" />
<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="macECU1(43)" />
-<TGConnectingPoint num="0" id="1180" />
-<TGConnectingPoint num="1" id="1181" />
+<TGConnectingPoint num="0" id="2725" />
+<TGConnectingPoint num="1" id="2726" />
<extraparam>
<Data eventName="macECU1" nbOfParams="5" />
<Param index="0" value="43" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1185" >
+<COMPONENT type="1008" id="2730" >
<cdparam x="211" y="238" />
<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="encryptECU1(43)" />
-<TGConnectingPoint num="0" id="1183" />
-<TGConnectingPoint num="1" id="1184" />
+<TGConnectingPoint num="0" id="2728" />
+<TGConnectingPoint num="1" id="2729" />
<extraparam>
<Data eventName="encryptECU1" nbOfParams="5" />
<Param index="0" value="43" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1188" >
+<COMPONENT type="1008" id="2733" >
<cdparam x="196" y="151" />
<sizeparam width="134" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="generateKeyECU1(32)" />
-<TGConnectingPoint num="0" id="1186" />
-<TGConnectingPoint num="1" id="1187" />
+<TGConnectingPoint num="0" id="2731" />
+<TGConnectingPoint num="1" id="2732" />
<extraparam>
<Data eventName="generateKeyECU1" nbOfParams="5" />
<Param index="0" value="32" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1191" >
+<COMPONENT type="1008" id="2736" >
<cdparam x="661" y="366" />
<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="done()" />
-<TGConnectingPoint num="0" id="1189" />
-<TGConnectingPoint num="1" id="1190" />
+<TGConnectingPoint num="0" id="2734" />
+<TGConnectingPoint num="1" id="2735" />
<extraparam>
<Data eventName="done" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1194" >
+<COMPONENT type="1010" id="2739" >
<cdparam x="213" y="100" />
<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="distributeKey() " />
-<TGConnectingPoint num="0" id="1192" />
-<TGConnectingPoint num="1" id="1193" />
+<TGConnectingPoint num="0" id="2737" />
+<TGConnectingPoint num="1" id="2738" />
<extraparam>
<Data eventName="distributeKey" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1196" >
+<COMPONENT type="1001" id="2741" >
<cdparam x="673" y="421" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1195" />
+<TGConnectingPoint num="0" id="2740" />
</COMPONENT>
-<COMPONENT type="1009" id="1199" >
+<COMPONENT type="1009" id="2744" >
<cdparam x="594" y="319" />
<sizeparam width="178" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="recvDataECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1197" />
-<TGConnectingPoint num="1" id="1198" />
+<TGConnectingPoint num="0" id="2742" />
+<TGConnectingPoint num="1" id="2743" />
<extraparam>
-<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1202" >
+<COMPONENT type="1010" id="2747" >
<cdparam x="598" y="261" />
<sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="recvEvtECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1200" />
-<TGConnectingPoint num="1" id="1201" />
+<TGConnectingPoint num="0" id="2745" />
+<TGConnectingPoint num="1" id="2746" />
<extraparam>
<Data eventName="recvEvtECU1" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1205" >
+<COMPONENT type="1006" id="2750" >
<cdparam x="624" y="213" />
<sizeparam width="119" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="sendDataECU1(59)" />
-<TGConnectingPoint num="0" id="1203" />
-<TGConnectingPoint num="1" id="1204" />
+<TGConnectingPoint num="0" id="2748" />
+<TGConnectingPoint num="1" id="2749" />
<extraparam>
-<Data channelName="sendDataECU1" nbOfSamples="59" />
+<Data channelName="sendDataECU1" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1214" >
+<COMPONENT type="301" id="2767" >
<cdparam x="14" y="216" />
<sizeparam width="187" height="68" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -7503,14 +7715,22 @@
86 bits of structure + key (256)
+ MAC (16 bytes)
" />
-<TGConnectingPoint num="0" id="1206" />
-<TGConnectingPoint num="1" id="1207" />
-<TGConnectingPoint num="2" id="1208" />
-<TGConnectingPoint num="3" id="1209" />
-<TGConnectingPoint num="4" id="1210" />
-<TGConnectingPoint num="5" id="1211" />
-<TGConnectingPoint num="6" id="1212" />
-<TGConnectingPoint num="7" id="1213" />
+<TGConnectingPoint num="0" id="2751" />
+<TGConnectingPoint num="1" id="2752" />
+<TGConnectingPoint num="2" id="2753" />
+<TGConnectingPoint num="3" id="2754" />
+<TGConnectingPoint num="4" id="2755" />
+<TGConnectingPoint num="5" id="2756" />
+<TGConnectingPoint num="6" id="2757" />
+<TGConnectingPoint num="7" id="2758" />
+<TGConnectingPoint num="8" id="2759" />
+<TGConnectingPoint num="9" id="2760" />
+<TGConnectingPoint num="10" id="2761" />
+<TGConnectingPoint num="11" id="2762" />
+<TGConnectingPoint num="12" id="2763" />
+<TGConnectingPoint num="13" id="2764" />
+<TGConnectingPoint num="14" id="2765" />
+<TGConnectingPoint num="15" id="2766" />
<extraparam>
<Line value="59 bytes" />
<Line value="86 bits of structure + key (256) " />
@@ -7518,103 +7738,103 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1217" >
+<COMPONENT type="1008" id="2770" >
<cdparam x="634" y="162" />
<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="sendEvtECU1(59)" />
-<TGConnectingPoint num="0" id="1215" />
-<TGConnectingPoint num="1" id="1216" />
+<TGConnectingPoint num="0" id="2768" />
+<TGConnectingPoint num="1" id="2769" />
<extraparam>
<Data eventName="sendEvtECU1" nbOfParams="5" />
<Param index="0" value="59" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1219" >
+<COMPONENT type="1000" id="2772" >
<cdparam x="252" y="37" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1218" />
+<TGConnectingPoint num="0" id="2771" />
</COMPONENT>
-<CONNECTOR type="115" id="1220" >
+<CONNECTOR type="115" id="2773" >
<cdparam x="273" y="493" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to wait event" value="null" />
-<P1 x="273" y="493" id="1178" />
-<P2 x="273" y="499" id="1153" />
+<P1 x="273" y="493" id="2723" />
+<P2 x="273" y="499" id="2690" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1221" >
+<CONNECTOR type="115" id="2774" >
<cdparam x="269" y="396" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="269" y="396" id="1166" />
-<P2 x="270" y="415" id="1174" />
+<P1 x="269" y="396" id="2711" />
+<P2 x="270" y="415" id="2719" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1222" >
+<CONNECTOR type="115" id="2775" >
<cdparam x="263" y="216" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="263" y="216" id="1172" />
-<P2 x="263" y="233" id="1183" />
+<P1 x="263" y="216" id="2717" />
+<P2 x="263" y="233" id="2728" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1223" >
+<CONNECTOR type="115" id="2776" >
<cdparam x="259" y="125" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="259" y="125" id="1193" />
-<P2 x="263" y="146" id="1186" />
+<P1 x="259" y="125" id="2738" />
+<P2 x="263" y="146" id="2731" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1224" >
+<CONNECTOR type="115" id="2777" >
<cdparam x="688" y="187" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="688" y="187" id="1216" />
-<P2 x="683" y="208" id="1203" />
+<P1 x="688" y="187" id="2769" />
+<P2 x="683" y="208" id="2748" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1225" >
+<CONNECTOR type="115" id="2778" >
<cdparam x="281" y="472" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to read channel" value="null" />
-<P1 x="270" y="445" id="1175" />
-<P2 x="273" y="463" id="1177" />
+<P1 x="270" y="445" id="2720" />
+<P2 x="273" y="463" id="2722" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1226" >
+<CONNECTOR type="115" id="2779" >
<cdparam x="694" y="343" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="683" y="344" id="1198" />
-<P2 x="684" y="361" id="1189" />
+<P1 x="683" y="344" id="2743" />
+<P2 x="684" y="361" id="2734" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1227" >
+<CONNECTOR type="115" id="2780" >
<cdparam x="682" y="286" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="682" y="286" id="1201" />
-<P2 x="683" y="314" id="1197" />
+<P1 x="682" y="286" id="2746" />
+<P2 x="683" y="314" id="2742" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1229" >
+<CONNECTOR type="115" id="2782" >
<cdparam x="684" y="391" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="684" y="391" id="1190" />
-<P2 x="683" y="416" id="1195" />
+<P1 x="684" y="391" id="2735" />
+<P2 x="683" y="416" id="2740" />
<Point x="683" y="407" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1228" >
-<father id="1229" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2781" >
+<father id="2782" num="0" />
<cdparam x="683" y="407" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -7622,67 +7842,67 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1230" >
+<CONNECTOR type="115" id="2783" >
<cdparam x="259" y="57" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to send event" value="null" />
-<P1 x="259" y="57" id="1218" />
-<P2 x="259" y="95" id="1192" />
+<P1 x="259" y="57" id="2771" />
+<P2 x="259" y="95" id="2737" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1231" >
+<CONNECTOR type="115" id="2784" >
<cdparam x="687" y="103" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to wait event" value="null" />
-<P1 x="683" y="238" id="1204" />
-<P2 x="682" y="256" id="1200" />
+<P1 x="683" y="238" id="2749" />
+<P2 x="682" y="256" id="2745" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1232" >
+<CONNECTOR type="115" id="2785" >
<cdparam x="264" y="200" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to send event" value="null" />
-<P1 x="263" y="176" id="1187" />
-<P2 x="263" y="186" id="1171" />
+<P1 x="263" y="176" id="2732" />
+<P2 x="263" y="186" id="2716" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1237" >
+<CONNECTOR type="115" id="2790" >
<cdparam x="301" y="381" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to write channel" value="null" />
-<P1 x="273" y="529" id="1154" />
-<P2 x="688" y="157" id="1215" />
+<P1 x="273" y="529" id="2691" />
+<P2 x="688" y="157" id="2768" />
<Point x="273" y="534" />
<Point x="480" y="534" />
<Point x="480" y="137" />
<Point x="688" y="137" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1233" >
-<father id="1237" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2786" >
+<father id="2790" num="0" />
<cdparam x="273" y="534" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1234" >
-<father id="1237" num="1" />
+<SUBCOMPONENT type="-1" id="2787" >
+<father id="2790" num="1" />
<cdparam x="480" y="534" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1235" >
-<father id="1237" num="2" />
+<SUBCOMPONENT type="-1" id="2788" >
+<father id="2790" num="2" />
<cdparam x="480" y="137" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1236" >
-<father id="1237" num="3" />
+<SUBCOMPONENT type="-1" id="2789" >
+<father id="2790" num="3" />
<cdparam x="688" y="137" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -7690,130 +7910,130 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1238" >
+<CONNECTOR type="115" id="2791" >
<cdparam x="263" y="263" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="263" y="263" id="1184" />
-<P2 x="268" y="280" id="1168" />
+<P1 x="263" y="263" id="2729" />
+<P2 x="268" y="280" id="2713" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1239" >
+<CONNECTOR type="115" id="2792" >
<cdparam x="268" y="310" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="268" y="310" id="1169" />
-<P2 x="268" y="331" id="1180" />
+<P1 x="268" y="310" id="2714" />
+<P2 x="268" y="331" id="2725" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1240" >
+<CONNECTOR type="115" id="2793" >
<cdparam x="268" y="361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="268" y="361" id="1181" />
-<P2 x="269" y="366" id="1165" />
+<P1 x="268" y="361" id="2726" />
+<P2 x="269" y="366" id="2710" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="HSM_KM" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1242" >
+<COMPONENT type="1001" id="2795" >
<cdparam x="70" y="410" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1241" />
+<TGConnectingPoint num="0" id="2794" />
</COMPONENT>
-<COMPONENT type="1009" id="1245" >
+<COMPONENT type="1009" id="2798" >
<cdparam x="21" y="362" />
<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="inHSM(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1243" />
-<TGConnectingPoint num="1" id="1244" />
+<TGConnectingPoint num="0" id="2796" />
+<TGConnectingPoint num="1" id="2797" />
<extraparam>
-<Data channelName="inHSM" nbOfSamples="sizeOfMsg" />
+<Data channelName="inHSM" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1248" >
+<COMPONENT type="1010" id="2801" >
<cdparam x="20" y="315" />
<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="putMsg(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1246" />
-<TGConnectingPoint num="1" id="1247" />
+<TGConnectingPoint num="0" id="2799" />
+<TGConnectingPoint num="1" id="2800" />
<extraparam>
<Data eventName="putMsg" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1250" >
+<COMPONENT type="1001" id="2803" >
<cdparam x="213" y="425" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1249" />
+<TGConnectingPoint num="0" id="2802" />
</COMPONENT>
-<COMPONENT type="1001" id="1252" >
+<COMPONENT type="1001" id="2805" >
<cdparam x="353" y="423" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1251" />
+<TGConnectingPoint num="0" id="2804" />
</COMPONENT>
-<COMPONENT type="1001" id="1254" >
+<COMPONENT type="1001" id="2807" >
<cdparam x="495" y="424" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1253" />
+<TGConnectingPoint num="0" id="2806" />
</COMPONENT>
-<COMPONENT type="1001" id="1256" >
+<COMPONENT type="1001" id="2809" >
<cdparam x="681" y="430" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1255" />
+<TGConnectingPoint num="0" id="2808" />
</COMPONENT>
-<COMPONENT type="1006" id="1259" >
+<COMPONENT type="1006" id="2812" >
<cdparam x="631" y="379" />
<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="outHSM(sizeOfMsg)" />
-<TGConnectingPoint num="0" id="1257" />
-<TGConnectingPoint num="1" id="1258" />
+<TGConnectingPoint num="0" id="2810" />
+<TGConnectingPoint num="1" id="2811" />
<extraparam>
-<Data channelName="outHSM" nbOfSamples="sizeOfMsg" />
+<Data channelName="outHSM" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1013" id="1263" >
+<COMPONENT type="1013" id="2816" >
<cdparam x="499" y="372" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1261" />
-<TGConnectingPoint num="1" id="1262" />
+<TGConnectingPoint num="0" id="2814" />
+<TGConnectingPoint num="1" id="2815" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1260" >
-<father id="1263" num="0" />
+<SUBCOMPONENT type="-1" id="2813" >
+<father id="2816" num="0" />
<cdparam x="514" y="392" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -7821,17 +8041,17 @@
<infoparam name="value of the delay" value="sizeOfMsg*60" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="1267" >
+<COMPONENT type="1013" id="2820" >
<cdparam x="219" y="364" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1265" />
-<TGConnectingPoint num="1" id="1266" />
+<TGConnectingPoint num="0" id="2818" />
+<TGConnectingPoint num="1" id="2819" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1264" >
-<father id="1267" num="0" />
+<SUBCOMPONENT type="-1" id="2817" >
+<father id="2820" num="0" />
<cdparam x="234" y="384" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -7839,17 +8059,17 @@
<infoparam name="value of the delay" value="15*sizeOfMsg" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="1271" >
+<COMPONENT type="1013" id="2824" >
<cdparam x="357" y="368" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1269" />
-<TGConnectingPoint num="1" id="1270" />
+<TGConnectingPoint num="0" id="2822" />
+<TGConnectingPoint num="1" id="2823" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1268" >
-<father id="1271" num="0" />
+<SUBCOMPONENT type="-1" id="2821" >
+<father id="2824" num="0" />
<cdparam x="372" y="388" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -7857,43 +8077,43 @@
<infoparam name="value of the delay" value="15*sizeOfMsg" />
</SUBCOMPONENT>
-<COMPONENT type="1001" id="1273" >
+<COMPONENT type="1001" id="2826" >
<cdparam x="600" y="243" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1272" />
+<TGConnectingPoint num="0" id="2825" />
</COMPONENT>
-<COMPONENT type="1008" id="1276" >
+<COMPONENT type="1008" id="2829" >
<cdparam x="573" y="196" />
<sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="doneHSM()" />
-<TGConnectingPoint num="0" id="1274" />
-<TGConnectingPoint num="1" id="1275" />
+<TGConnectingPoint num="0" id="2827" />
+<TGConnectingPoint num="1" id="2828" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1016" id="1284" >
+<COMPONENT type="1016" id="2837" >
<cdparam x="466" y="152" />
<sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="sequence" value="null" />
-<TGConnectingPoint num="0" id="1278" />
-<TGConnectingPoint num="1" id="1279" />
-<TGConnectingPoint num="2" id="1280" />
-<TGConnectingPoint num="3" id="1281" />
-<TGConnectingPoint num="4" id="1282" />
-<TGConnectingPoint num="5" id="1283" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1277" >
-<father id="1284" num="0" />
+<TGConnectingPoint num="0" id="2831" />
+<TGConnectingPoint num="1" id="2832" />
+<TGConnectingPoint num="2" id="2833" />
+<TGConnectingPoint num="3" id="2834" />
+<TGConnectingPoint num="4" id="2835" />
+<TGConnectingPoint num="5" id="2836" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="2830" >
+<father id="2837" num="0" />
<cdparam x="620" y="159" />
<sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -7901,141 +8121,141 @@
<infoparam name="Sequence" value=">>" />
</SUBCOMPONENT>
-<COMPONENT type="1010" id="1287" >
+<COMPONENT type="1010" id="2840" >
<cdparam x="631" y="327" />
<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="getMsg(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1285" />
-<TGConnectingPoint num="1" id="1286" />
+<TGConnectingPoint num="0" id="2838" />
+<TGConnectingPoint num="1" id="2839" />
<extraparam>
<Data eventName="getMsg" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1290" >
+<COMPONENT type="1010" id="2843" >
<cdparam x="431" y="320" />
<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="generateKey(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1288" />
-<TGConnectingPoint num="1" id="1289" />
+<TGConnectingPoint num="0" id="2841" />
+<TGConnectingPoint num="1" id="2842" />
<extraparam>
<Data eventName="generateKey" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1293" >
+<COMPONENT type="1010" id="2846" >
<cdparam x="310" y="312" />
<sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="mac(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1291" />
-<TGConnectingPoint num="1" id="1292" />
+<TGConnectingPoint num="0" id="2844" />
+<TGConnectingPoint num="1" id="2845" />
<extraparam>
<Data eventName="mac" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1296" >
+<COMPONENT type="1010" id="2849" >
<cdparam x="166" y="312" />
<sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="encrypt(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1294" />
-<TGConnectingPoint num="1" id="1295" />
+<TGConnectingPoint num="0" id="2847" />
+<TGConnectingPoint num="1" id="2848" />
<extraparam>
<Data eventName="encrypt" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1018" id="1307" >
+<COMPONENT type="1018" id="2860" >
<cdparam x="383" y="209" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1297" />
-<TGConnectingPoint num="1" id="1298" />
-<TGConnectingPoint num="2" id="1299" />
-<TGConnectingPoint num="3" id="1300" />
-<TGConnectingPoint num="4" id="1301" />
-<TGConnectingPoint num="5" id="1302" />
-<TGConnectingPoint num="6" id="1303" />
-<TGConnectingPoint num="7" id="1304" />
-<TGConnectingPoint num="8" id="1305" />
-<TGConnectingPoint num="9" id="1306" />
-</COMPONENT>
-
-<COMPONENT type="1030" id="1310" >
+<TGConnectingPoint num="0" id="2850" />
+<TGConnectingPoint num="1" id="2851" />
+<TGConnectingPoint num="2" id="2852" />
+<TGConnectingPoint num="3" id="2853" />
+<TGConnectingPoint num="4" id="2854" />
+<TGConnectingPoint num="5" id="2855" />
+<TGConnectingPoint num="6" id="2856" />
+<TGConnectingPoint num="7" id="2857" />
+<TGConnectingPoint num="8" id="2858" />
+<TGConnectingPoint num="9" id="2859" />
+</COMPONENT>
+
+<COMPONENT type="1030" id="2863" >
<cdparam x="209" y="89" />
<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1308" />
-<TGConnectingPoint num="1" id="1309" />
+<TGConnectingPoint num="0" id="2861" />
+<TGConnectingPoint num="1" id="2862" />
</COMPONENT>
-<COMPONENT type="1000" id="1312" >
+<COMPONENT type="1000" id="2865" >
<cdparam x="242" y="40" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1311" />
+<TGConnectingPoint num="0" id="2864" />
</COMPONENT>
-<CONNECTOR type="115" id="1313" >
+<CONNECTOR type="115" id="2866" >
<cdparam x="358" y="224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="358" y="224" id="1301" />
-<P2 x="79" y="310" id="1246" />
+<P1 x="358" y="224" id="2854" />
+<P2 x="79" y="310" id="2799" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1314" >
+<CONNECTOR type="115" id="2867" >
<cdparam x="534" y="157" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from sequence to select" value="null" />
-<P1 x="515" y="157" id="1280" />
-<P2 x="398" y="199" id="1297" />
+<P1 x="515" y="157" id="2833" />
+<P2 x="398" y="199" id="2850" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1315" >
+<CONNECTOR type="115" id="2868" >
<cdparam x="585" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="438" y="224" id="1302" />
-<P2 x="690" y="322" id="1285" />
+<P1 x="438" y="224" id="2855" />
+<P2 x="690" y="322" id="2838" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1316" >
+<CONNECTOR type="115" id="2869" >
<cdparam x="245" y="91" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for ever loop" value="null" />
-<P1 x="249" y="60" id="1311" />
-<P2 x="249" y="84" id="1308" />
+<P1 x="249" y="60" id="2864" />
+<P2 x="249" y="84" id="2861" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1318" >
+<CONNECTOR type="115" id="2871" >
<cdparam x="423" y="160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for ever loop to select" value="null" />
-<P1 x="290" y="103" id="1309" />
-<P2 x="541" y="152" id="1278" />
+<P1 x="290" y="103" id="2862" />
+<P2 x="541" y="152" id="2831" />
<Point x="476" y="121" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1317" >
-<father id="1318" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2870" >
+<father id="2871" num="0" />
<cdparam x="476" y="121" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -8043,286 +8263,286 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1319" >
+<CONNECTOR type="115" id="2872" >
<cdparam x="505" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="358" y="224" id="1298" />
-<P2 x="224" y="307" id="1294" />
+<P1 x="358" y="224" id="2851" />
+<P2 x="224" y="307" id="2847" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1320" >
+<CONNECTOR type="115" id="2873" >
<cdparam x="448" y="278" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="398" y="264" id="1300" />
-<P2 x="361" y="307" id="1291" />
+<P1 x="398" y="264" id="2853" />
+<P2 x="361" y="307" id="2844" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1321" >
+<CONNECTOR type="115" id="2874" >
<cdparam x="585" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="438" y="224" id="1299" />
-<P2 x="504" y="315" id="1288" />
+<P1 x="438" y="224" id="2852" />
+<P2 x="504" y="315" id="2841" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1322" >
+<CONNECTOR type="115" id="2875" >
<cdparam x="778" y="153" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from sequence to send event" value="null" />
-<P1 x="590" y="157" id="1283" />
-<P2 x="609" y="191" id="1274" />
+<P1 x="590" y="157" id="2836" />
+<P2 x="609" y="191" id="2827" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1323" >
+<CONNECTOR type="115" id="2876" >
<cdparam x="609" y="221" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="609" y="221" id="1275" />
-<P2 x="610" y="238" id="1272" />
+<P1 x="609" y="221" id="2828" />
+<P2 x="610" y="238" id="2825" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1324" >
+<CONNECTOR type="115" id="2877" >
<cdparam x="361" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="361" y="337" id="1292" />
-<P2 x="362" y="363" id="1269" />
+<P1 x="361" y="337" id="2845" />
+<P2 x="362" y="363" id="2822" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1325" >
+<CONNECTOR type="115" id="2878" >
<cdparam x="224" y="337" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="224" y="337" id="1295" />
-<P2 x="224" y="359" id="1265" />
+<P1 x="224" y="337" id="2848" />
+<P2 x="224" y="359" id="2818" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1326" >
+<CONNECTOR type="115" id="2879" >
<cdparam x="504" y="345" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="504" y="345" id="1289" />
-<P2 x="504" y="367" id="1261" />
+<P1 x="504" y="345" id="2842" />
+<P2 x="504" y="367" id="2814" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1327" >
+<CONNECTOR type="115" id="2880" >
<cdparam x="690" y="352" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to write channel" value="null" />
-<P1 x="690" y="352" id="1286" />
-<P2 x="690" y="374" id="1257" />
+<P1 x="690" y="352" id="2839" />
+<P2 x="690" y="374" id="2810" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1328" >
+<CONNECTOR type="115" id="2881" >
<cdparam x="690" y="404" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="690" y="404" id="1258" />
-<P2 x="691" y="425" id="1255" />
+<P1 x="690" y="404" id="2811" />
+<P2 x="691" y="425" id="2808" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1329" >
+<CONNECTOR type="115" id="2882" >
<cdparam x="504" y="407" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="504" y="407" id="1262" />
-<P2 x="505" y="419" id="1253" />
+<P1 x="504" y="407" id="2815" />
+<P2 x="505" y="419" id="2806" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1330" >
+<CONNECTOR type="115" id="2883" >
<cdparam x="362" y="403" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="362" y="403" id="1270" />
-<P2 x="363" y="418" id="1251" />
+<P1 x="362" y="403" id="2823" />
+<P2 x="363" y="418" id="2804" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1331" >
+<CONNECTOR type="115" id="2884" >
<cdparam x="224" y="399" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="224" y="399" id="1266" />
-<P2 x="223" y="420" id="1249" />
+<P1 x="224" y="399" id="2819" />
+<P2 x="223" y="420" id="2802" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1332" >
+<CONNECTOR type="115" id="2885" >
<cdparam x="79" y="340" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="79" y="340" id="1247" />
-<P2 x="78" y="357" id="1243" />
+<P1 x="79" y="340" id="2800" />
+<P2 x="78" y="357" id="2796" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1333" >
+<CONNECTOR type="115" id="2886" >
<cdparam x="78" y="387" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to stop state" value="null" />
-<P1 x="78" y="387" id="1244" />
-<P2 x="80" y="405" id="1241" />
+<P1 x="78" y="387" id="2797" />
+<P2 x="80" y="405" id="2794" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="CTP_KM" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1335" >
+<COMPONENT type="1001" id="2888" >
<cdparam x="593" y="586" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1334" />
+<TGConnectingPoint num="0" id="2887" />
</COMPONENT>
-<COMPONENT type="1006" id="1338" >
-<cdparam x="535" y="516" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2891" >
+<cdparam x="527" y="516" />
+<sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="recvData(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1336" />
-<TGConnectingPoint num="1" id="1337" />
+<TGConnectingPoint num="0" id="2889" />
+<TGConnectingPoint num="1" id="2890" />
<extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1341" >
-<cdparam x="543" y="460" />
-<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2894" >
+<cdparam x="536" y="460" />
+<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="recvEvt(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1339" />
-<TGConnectingPoint num="1" id="1340" />
+<TGConnectingPoint num="0" id="2892" />
+<TGConnectingPoint num="1" id="2893" />
<extraparam>
<Data eventName="recvEvt" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="1344" >
-<cdparam x="514" y="342" />
-<sizeparam width="183" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="2897" >
+<cdparam x="506" y="342" />
+<sizeparam width="199" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="dataFromECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1342" />
-<TGConnectingPoint num="1" id="1343" />
+<TGConnectingPoint num="0" id="2895" />
+<TGConnectingPoint num="1" id="2896" />
<extraparam>
-<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1347" >
-<cdparam x="518" y="292" />
-<sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="2900" >
+<cdparam x="511" y="292" />
+<sizeparam width="189" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="evtFromECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1345" />
-<TGConnectingPoint num="1" id="1346" />
+<TGConnectingPoint num="0" id="2898" />
+<TGConnectingPoint num="1" id="2899" />
<extraparam>
<Data eventName="evtFromECU1" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1350" >
-<cdparam x="36" y="573" />
-<sizeparam width="165" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2903" >
+<cdparam x="29" y="573" />
+<sizeparam width="179" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="dataToECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1348" />
-<TGConnectingPoint num="1" id="1349" />
+<TGConnectingPoint num="0" id="2901" />
+<TGConnectingPoint num="1" id="2902" />
<extraparam>
-<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1353" >
-<cdparam x="45" y="527" />
-<sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2906" >
+<cdparam x="39" y="527" />
+<sizeparam width="169" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="evtToECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1351" />
-<TGConnectingPoint num="1" id="1352" />
+<TGConnectingPoint num="0" id="2904" />
+<TGConnectingPoint num="1" id="2905" />
<extraparam>
<Data eventName="evtToECU1" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="1361" >
+<COMPONENT type="1012" id="2914" >
<cdparam x="214" y="445" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1357" />
-<TGConnectingPoint num="1" id="1358" />
-<TGConnectingPoint num="2" id="1359" />
-<TGConnectingPoint num="3" id="1360" />
+<TGConnectingPoint num="0" id="2910" />
+<TGConnectingPoint num="1" id="2911" />
+<TGConnectingPoint num="2" id="2912" />
+<TGConnectingPoint num="3" id="2913" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1354" >
-<father id="1361" num="0" />
+<SUBCOMPONENT type="-1" id="2907" >
+<father id="2914" num="0" />
<cdparam x="139" y="456" />
-<sizeparam width="94" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="117" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[destination == 1]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1355" >
-<father id="1361" num="1" />
+<SUBCOMPONENT type="-1" id="2908" >
+<father id="2914" num="1" />
<cdparam x="249" y="455" />
-<sizeparam width="97" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="121" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[destination == 2 ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1356" >
-<father id="1361" num="2" />
+<SUBCOMPONENT type="-1" id="2909" >
+<father id="2914" num="2" />
<cdparam x="234" y="490" />
-<sizeparam width="9" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1001" id="1363" >
+<COMPONENT type="1001" id="2916" >
<cdparam x="110" y="637" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1362" />
+<TGConnectingPoint num="0" id="2915" />
</COMPONENT>
-<COMPONENT type="1009" id="1366" >
-<cdparam x="148" y="322" />
-<sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="2919" >
+<cdparam x="140" y="322" />
+<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="sendData(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1364" />
-<TGConnectingPoint num="1" id="1365" />
+<TGConnectingPoint num="0" id="2917" />
+<TGConnectingPoint num="1" id="2918" />
<extraparam>
-<Data channelName="sendData" nbOfSamples="nbOfSamples" />
+<Data channelName="sendData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1369" >
-<cdparam x="120" y="275" />
-<sizeparam width="208" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="2922" >
+<cdparam x="107" y="275" />
+<sizeparam width="235" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="sendEvt(nbOfSamples, destination) " />
-<TGConnectingPoint num="0" id="1367" />
-<TGConnectingPoint num="1" id="1368" />
+<TGConnectingPoint num="0" id="2920" />
+<TGConnectingPoint num="1" id="2921" />
<extraparam>
<Data eventName="sendEvt" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
@@ -8330,697 +8550,705 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1030" id="1372" >
-<cdparam x="361" y="106" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1030" id="2925" >
+<cdparam x="355" y="106" />
+<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1370" />
-<TGConnectingPoint num="1" id="1371" />
+<TGConnectingPoint num="0" id="2923" />
+<TGConnectingPoint num="1" id="2924" />
</COMPONENT>
-<COMPONENT type="1018" id="1383" >
+<COMPONENT type="1018" id="2936" >
<cdparam x="591" y="195" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1373" />
-<TGConnectingPoint num="1" id="1374" />
-<TGConnectingPoint num="2" id="1375" />
-<TGConnectingPoint num="3" id="1376" />
-<TGConnectingPoint num="4" id="1377" />
-<TGConnectingPoint num="5" id="1378" />
-<TGConnectingPoint num="6" id="1379" />
-<TGConnectingPoint num="7" id="1380" />
-<TGConnectingPoint num="8" id="1381" />
-<TGConnectingPoint num="9" id="1382" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1385" >
+<TGConnectingPoint num="0" id="2926" />
+<TGConnectingPoint num="1" id="2927" />
+<TGConnectingPoint num="2" id="2928" />
+<TGConnectingPoint num="3" id="2929" />
+<TGConnectingPoint num="4" id="2930" />
+<TGConnectingPoint num="5" id="2931" />
+<TGConnectingPoint num="6" id="2932" />
+<TGConnectingPoint num="7" id="2933" />
+<TGConnectingPoint num="8" id="2934" />
+<TGConnectingPoint num="9" id="2935" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="2938" >
<cdparam x="384" y="51" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1384" />
+<TGConnectingPoint num="0" id="2937" />
</COMPONENT>
-<COMPONENT type="1006" id="1388" >
-<cdparam x="239" y="573" />
-<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2941" >
+<cdparam x="232" y="573" />
+<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="dataToECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1386" />
-<TGConnectingPoint num="1" id="1387" />
+<TGConnectingPoint num="0" id="2939" />
+<TGConnectingPoint num="1" id="2940" />
<extraparam>
-<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1391" >
-<cdparam x="240" y="527" />
-<sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2944" >
+<cdparam x="234" y="527" />
+<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="evtToECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1389" />
-<TGConnectingPoint num="1" id="1390" />
+<TGConnectingPoint num="0" id="2942" />
+<TGConnectingPoint num="1" id="2943" />
<extraparam>
<Data eventName="evtToECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1393" >
+<COMPONENT type="1001" id="2946" >
<cdparam x="313" y="634" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1392" />
+<TGConnectingPoint num="0" id="2945" />
</COMPONENT>
-<COMPONENT type="1011" id="1396" >
-<cdparam x="500" y="403" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="2949" >
+<cdparam x="486" y="403" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="action state" value="nbOfSamples = (nbOfSamples * 8) / 9" />
-<TGConnectingPoint num="0" id="1394" />
-<TGConnectingPoint num="1" id="1395" />
+<TGConnectingPoint num="0" id="2947" />
+<TGConnectingPoint num="1" id="2948" />
</COMPONENT>
-<COMPONENT type="1011" id="1399" >
-<cdparam x="117" y="370" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="2952" >
+<cdparam x="103" y="370" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
-<TGConnectingPoint num="0" id="1397" />
-<TGConnectingPoint num="1" id="1398" />
+<TGConnectingPoint num="0" id="2950" />
+<TGConnectingPoint num="1" id="2951" />
</COMPONENT>
-<COMPONENT type="1001" id="1401" >
+<COMPONENT type="1001" id="2954" >
<cdparam x="921" y="595" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1400" />
+<TGConnectingPoint num="0" id="2953" />
</COMPONENT>
-<COMPONENT type="1006" id="1404" >
-<cdparam x="863" y="525" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2957" >
+<cdparam x="855" y="525" />
+<sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="recvData(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1402" />
-<TGConnectingPoint num="1" id="1403" />
+<TGConnectingPoint num="0" id="2955" />
+<TGConnectingPoint num="1" id="2956" />
<extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1407" >
-<cdparam x="871" y="469" />
-<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2960" >
+<cdparam x="864" y="469" />
+<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="recvEvt(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1405" />
-<TGConnectingPoint num="1" id="1406" />
+<TGConnectingPoint num="0" id="2958" />
+<TGConnectingPoint num="1" id="2959" />
<extraparam>
<Data eventName="recvEvt" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="1410" >
-<cdparam x="841" y="351" />
-<sizeparam width="185" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="2963" >
+<cdparam x="833" y="351" />
+<sizeparam width="200" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="dataFromECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1408" />
-<TGConnectingPoint num="1" id="1409" />
+<TGConnectingPoint num="0" id="2961" />
+<TGConnectingPoint num="1" id="2962" />
<extraparam>
-<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1413" >
-<cdparam x="845" y="301" />
-<sizeparam width="176" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="2966" >
+<cdparam x="838" y="301" />
+<sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="evtFromECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1411" />
-<TGConnectingPoint num="1" id="1412" />
+<TGConnectingPoint num="0" id="2964" />
+<TGConnectingPoint num="1" id="2965" />
<extraparam>
<Data eventName="evtFromECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1416" >
-<cdparam x="828" y="412" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="2969" >
+<cdparam x="814" y="412" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="action state" value="nbOfSamples = (nbOfSamples * 8) / 9" />
-<TGConnectingPoint num="0" id="1414" />
-<TGConnectingPoint num="1" id="1415" />
+<TGConnectingPoint num="0" id="2967" />
+<TGConnectingPoint num="1" id="2968" />
</COMPONENT>
-<CONNECTOR type="115" id="1417" >
+<CONNECTOR type="115" id="2970" >
<cdparam x="646" y="210" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="646" y="210" id="1375" />
-<P2 x="933" y="296" id="1411" />
+<P1 x="646" y="210" id="2928" />
+<P2 x="933" y="296" id="2964" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1418" >
+<CONNECTOR type="115" id="2971" >
<cdparam x="605" y="367" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to action state" value="null" />
-<P1 x="605" y="367" id="1343" />
-<P2 x="608" y="398" id="1394" />
+<P1 x="605" y="367" id="2896" />
+<P2 x="608" y="398" id="2947" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1419" >
+<CONNECTOR type="115" id="2972" >
<cdparam x="269" y="460" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to send event" value="null" />
-<P1 x="269" y="460" id="1359" />
-<P2 x="319" y="522" id="1389" />
+<P1 x="269" y="460" id="2912" />
+<P2 x="319" y="522" id="2942" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1420" >
+<CONNECTOR type="115" id="2973" >
<cdparam x="328" y="110" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for ever loop to select" value="null" />
-<P1 x="442" y="120" id="1371" />
-<P2 x="606" y="185" id="1373" />
+<P1 x="447" y="120" id="2924" />
+<P2 x="606" y="185" id="2926" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1421" >
+<CONNECTOR type="115" id="2974" >
<cdparam x="521" y="80" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to stop state" value="null" />
-<P1 x="391" y="71" id="1384" />
-<P2 x="401" y="101" id="1370" />
+<P1 x="391" y="71" id="2937" />
+<P2 x="401" y="101" id="2923" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1422" >
+<CONNECTOR type="115" id="2975" >
<cdparam x="384" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="566" y="210" id="1374" />
-<P2 x="224" y="270" id="1367" />
+<P1 x="566" y="210" id="2927" />
+<P2 x="224" y="270" id="2920" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1423" >
+<CONNECTOR type="115" id="2976" >
<cdparam x="224" y="300" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="224" y="300" id="1368" />
-<P2 x="223" y="317" id="1364" />
+<P1 x="224" y="300" id="2921" />
+<P2 x="223" y="317" id="2917" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1424" >
+<CONNECTOR type="115" id="2977" >
<cdparam x="223" y="347" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to action state" value="null" />
-<P1 x="223" y="347" id="1365" />
-<P2 x="225" y="365" id="1397" />
+<P1 x="223" y="347" id="2918" />
+<P2 x="225" y="365" id="2950" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1425" >
+<CONNECTOR type="115" id="2978" >
<cdparam x="225" y="395" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to stop state" value="null" />
-<P1 x="225" y="395" id="1398" />
-<P2 x="229" y="435" id="1357" />
+<P1 x="225" y="395" id="2951" />
+<P2 x="229" y="435" id="2910" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1426" >
+<CONNECTOR type="115" id="2979" >
<cdparam x="189" y="460" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from choice to send event" value="null" />
-<P1 x="189" y="460" id="1358" />
-<P2 x="123" y="522" id="1351" />
+<P1 x="189" y="460" id="2911" />
+<P2 x="123" y="522" id="2904" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1427" >
+<CONNECTOR type="115" id="2980" >
<cdparam x="123" y="552" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="123" y="552" id="1352" />
-<P2 x="118" y="568" id="1348" />
+<P1 x="123" y="552" id="2905" />
+<P2 x="118" y="568" id="2901" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1428" >
+<CONNECTOR type="115" id="2981" >
<cdparam x="118" y="598" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="118" y="598" id="1349" />
-<P2 x="120" y="632" id="1362" />
+<P1 x="118" y="598" id="2902" />
+<P2 x="120" y="632" id="2915" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1429" >
+<CONNECTOR type="115" id="2982" >
<cdparam x="319" y="552" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="319" y="552" id="1390" />
-<P2 x="322" y="568" id="1386" />
+<P1 x="319" y="552" id="2943" />
+<P2 x="322" y="568" id="2939" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1430" >
+<CONNECTOR type="115" id="2983" >
<cdparam x="314" y="598" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="322" y="598" id="1387" />
-<P2 x="323" y="629" id="1392" />
+<P1 x="322" y="598" id="2940" />
+<P2 x="323" y="629" id="2945" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1431" >
+<CONNECTOR type="115" id="2984" >
<cdparam x="560" y="239" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="606" y="250" id="1376" />
-<P2 x="605" y="287" id="1345" />
+<P1 x="606" y="250" id="2929" />
+<P2 x="605" y="287" id="2898" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1432" >
+<CONNECTOR type="115" id="2985" >
<cdparam x="605" y="317" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="605" y="317" id="1346" />
-<P2 x="605" y="337" id="1342" />
+<P1 x="605" y="317" id="2899" />
+<P2 x="605" y="337" id="2895" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1433" >
+<CONNECTOR type="115" id="2986" >
<cdparam x="608" y="428" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="608" y="428" id="1395" />
-<P2 x="609" y="455" id="1339" />
+<P1 x="608" y="428" id="2948" />
+<P2 x="609" y="455" id="2892" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1434" >
+<CONNECTOR type="115" id="2987" >
<cdparam x="609" y="485" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="609" y="485" id="1340" />
-<P2 x="606" y="511" id="1336" />
+<P1 x="609" y="485" id="2893" />
+<P2 x="606" y="511" id="2889" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1435" >
+<CONNECTOR type="115" id="2988" >
<cdparam x="606" y="541" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="606" y="541" id="1337" />
-<P2 x="603" y="581" id="1334" />
+<P1 x="606" y="541" id="2890" />
+<P2 x="603" y="581" id="2887" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1436" >
+<CONNECTOR type="115" id="2989" >
<cdparam x="933" y="376" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to action state" value="null" />
-<P1 x="933" y="376" id="1409" />
-<P2 x="936" y="407" id="1414" />
+<P1 x="933" y="376" id="2962" />
+<P2 x="936" y="407" id="2967" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1437" >
+<CONNECTOR type="115" id="2990" >
<cdparam x="933" y="326" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="933" y="326" id="1412" />
-<P2 x="933" y="346" id="1408" />
+<P1 x="933" y="326" id="2965" />
+<P2 x="933" y="346" id="2961" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1438" >
+<CONNECTOR type="115" id="2991" >
<cdparam x="936" y="437" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="936" y="437" id="1415" />
-<P2 x="937" y="464" id="1405" />
+<P1 x="936" y="437" id="2968" />
+<P2 x="937" y="464" id="2958" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1439" >
+<CONNECTOR type="115" id="2992" >
<cdparam x="937" y="494" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="937" y="494" id="1406" />
-<P2 x="934" y="520" id="1402" />
+<P1 x="937" y="494" id="2959" />
+<P2 x="934" y="520" id="2955" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1440" >
+<CONNECTOR type="115" id="2993" >
<cdparam x="934" y="550" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="934" y="550" id="1403" />
-<P2 x="931" y="590" id="1400" />
+<P1 x="934" y="550" id="2956" />
+<P2 x="931" y="590" id="2953" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1009" id="1443" >
+<COMPONENT type="1009" id="2996" >
<cdparam x="120" y="184" />
<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="recvData(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1441" />
-<TGConnectingPoint num="1" id="1442" />
+<TGConnectingPoint num="0" id="2994" />
+<TGConnectingPoint num="1" id="2995" />
<extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1446" >
+<COMPONENT type="1010" id="2999" >
<cdparam x="120" y="120" />
<sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="recvEvt(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1444" />
-<TGConnectingPoint num="1" id="1445" />
+<TGConnectingPoint num="0" id="2997" />
+<TGConnectingPoint num="1" id="2998" />
<extraparam>
<Data eventName="recvEvt" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1449" >
+<COMPONENT type="1010" id="3002" >
<cdparam x="515" y="536" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1447" />
-<TGConnectingPoint num="1" id="1448" />
+<TGConnectingPoint num="0" id="3000" />
+<TGConnectingPoint num="1" id="3001" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="301" id="1458" >
+<COMPONENT type="301" id="3019" >
<cdparam x="609" y="75" />
<sizeparam width="127" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="Sending msg to KM
" />
-<TGConnectingPoint num="0" id="1450" />
-<TGConnectingPoint num="1" id="1451" />
-<TGConnectingPoint num="2" id="1452" />
-<TGConnectingPoint num="3" id="1453" />
-<TGConnectingPoint num="4" id="1454" />
-<TGConnectingPoint num="5" id="1455" />
-<TGConnectingPoint num="6" id="1456" />
-<TGConnectingPoint num="7" id="1457" />
+<TGConnectingPoint num="0" id="3003" />
+<TGConnectingPoint num="1" id="3004" />
+<TGConnectingPoint num="2" id="3005" />
+<TGConnectingPoint num="3" id="3006" />
+<TGConnectingPoint num="4" id="3007" />
+<TGConnectingPoint num="5" id="3008" />
+<TGConnectingPoint num="6" id="3009" />
+<TGConnectingPoint num="7" id="3010" />
+<TGConnectingPoint num="8" id="3011" />
+<TGConnectingPoint num="9" id="3012" />
+<TGConnectingPoint num="10" id="3013" />
+<TGConnectingPoint num="11" id="3014" />
+<TGConnectingPoint num="12" id="3015" />
+<TGConnectingPoint num="13" id="3016" />
+<TGConnectingPoint num="14" id="3017" />
+<TGConnectingPoint num="15" id="3018" />
<extraparam>
<Line value="Sending msg to KM" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1461" >
+<COMPONENT type="1010" id="3022" >
<cdparam x="511" y="403" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1459" />
-<TGConnectingPoint num="1" id="1460" />
+<TGConnectingPoint num="0" id="3020" />
+<TGConnectingPoint num="1" id="3021" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1464" >
+<COMPONENT type="1010" id="3025" >
<cdparam x="510" y="317" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1462" />
-<TGConnectingPoint num="1" id="1463" />
+<TGConnectingPoint num="0" id="3023" />
+<TGConnectingPoint num="1" id="3024" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1467" >
+<COMPONENT type="1008" id="3028" >
<cdparam x="513" y="452" />
<sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="getMsg(59)" />
-<TGConnectingPoint num="0" id="1465" />
-<TGConnectingPoint num="1" id="1466" />
+<TGConnectingPoint num="0" id="3026" />
+<TGConnectingPoint num="1" id="3027" />
<extraparam>
<Data eventName="getMsg" nbOfParams="5" />
<Param index="0" value="59" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="1470" >
+<COMPONENT type="1009" id="3031" >
<cdparam x="513" y="500" />
<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="outHSM(59) " />
-<TGConnectingPoint num="0" id="1468" />
-<TGConnectingPoint num="1" id="1469" />
+<TGConnectingPoint num="0" id="3029" />
+<TGConnectingPoint num="1" id="3030" />
<extraparam>
-<Data channelName="outHSM" nbOfSamples="59" />
+<Data channelName="outHSM" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1473" >
+<COMPONENT type="1008" id="3034" >
<cdparam x="519" y="368" />
<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="mac(43)" />
-<TGConnectingPoint num="0" id="1471" />
-<TGConnectingPoint num="1" id="1472" />
+<TGConnectingPoint num="0" id="3032" />
+<TGConnectingPoint num="1" id="3033" />
<extraparam>
<Data eventName="mac" nbOfParams="5" />
<Param index="0" value="43" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1476" >
+<COMPONENT type="1008" id="3037" >
<cdparam x="510" y="269" />
<sizeparam width="71" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="encrypt(43)" />
-<TGConnectingPoint num="0" id="1474" />
-<TGConnectingPoint num="1" id="1475" />
+<TGConnectingPoint num="0" id="3035" />
+<TGConnectingPoint num="1" id="3036" />
<extraparam>
<Data eventName="encrypt" nbOfParams="5" />
<Param index="0" value="43" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1478" >
+<COMPONENT type="1001" id="3039" >
<cdparam x="870" y="811" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1477" />
+<TGConnectingPoint num="0" id="3038" />
</COMPONENT>
-<COMPONENT type="1009" id="1481" >
+<COMPONENT type="1009" id="3042" >
<cdparam x="723" y="347" />
<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="recvData(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1479" />
-<TGConnectingPoint num="1" id="1480" />
+<TGConnectingPoint num="0" id="3040" />
+<TGConnectingPoint num="1" id="3041" />
<extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1484" >
+<COMPONENT type="1010" id="3045" >
<cdparam x="727" y="289" />
<sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="recvEvt(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1482" />
-<TGConnectingPoint num="1" id="1483" />
+<TGConnectingPoint num="0" id="3043" />
+<TGConnectingPoint num="1" id="3044" />
<extraparam>
<Data eventName="recvEvt" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1486" >
+<COMPONENT type="1000" id="3047" >
<cdparam x="180" y="44" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1485" />
+<TGConnectingPoint num="0" id="3046" />
</COMPONENT>
-<COMPONENT type="1010" id="1489" >
+<COMPONENT type="1010" id="3050" >
<cdparam x="177" y="413" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1487" />
-<TGConnectingPoint num="1" id="1488" />
+<TGConnectingPoint num="0" id="3048" />
+<TGConnectingPoint num="1" id="3049" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1492" >
+<COMPONENT type="1008" id="3053" >
<cdparam x="144" y="360" />
<sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="encrypt(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1490" />
-<TGConnectingPoint num="1" id="1491" />
+<TGConnectingPoint num="0" id="3051" />
+<TGConnectingPoint num="1" id="3052" />
<extraparam>
<Data eventName="encrypt" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1495" >
+<COMPONENT type="1008" id="3056" >
<cdparam x="737" y="410" />
<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="mac(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1493" />
-<TGConnectingPoint num="1" id="1494" />
+<TGConnectingPoint num="0" id="3054" />
+<TGConnectingPoint num="1" id="3055" />
<extraparam>
<Data eventName="mac" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1498" >
+<COMPONENT type="1008" id="3059" >
<cdparam x="146" y="250" />
<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="mac(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1496" />
-<TGConnectingPoint num="1" id="1497" />
+<TGConnectingPoint num="0" id="3057" />
+<TGConnectingPoint num="1" id="3058" />
<extraparam>
<Data eventName="mac" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1501" >
+<COMPONENT type="1010" id="3062" >
<cdparam x="760" y="472" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1499" />
-<TGConnectingPoint num="1" id="1500" />
+<TGConnectingPoint num="0" id="3060" />
+<TGConnectingPoint num="1" id="3061" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1504" >
+<COMPONENT type="1010" id="3065" >
<cdparam x="170" y="307" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1502" />
-<TGConnectingPoint num="1" id="1503" />
+<TGConnectingPoint num="0" id="3063" />
+<TGConnectingPoint num="1" id="3064" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1507" >
+<COMPONENT type="1010" id="3068" >
<cdparam x="765" y="571" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1505" />
-<TGConnectingPoint num="1" id="1506" />
+<TGConnectingPoint num="0" id="3066" />
+<TGConnectingPoint num="1" id="3067" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1510" >
+<COMPONENT type="1008" id="3071" >
<cdparam x="766" y="518" />
<sizeparam width="64" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="encrypt(1)" />
-<TGConnectingPoint num="0" id="1508" />
-<TGConnectingPoint num="1" id="1509" />
+<TGConnectingPoint num="0" id="3069" />
+<TGConnectingPoint num="1" id="3070" />
<extraparam>
<Data eventName="encrypt" nbOfParams="5" />
<Param index="0" value="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1513" >
+<COMPONENT type="1010" id="3074" >
<cdparam x="807" y="663" />
<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1511" />
-<TGConnectingPoint num="1" id="1512" />
+<TGConnectingPoint num="0" id="3072" />
+<TGConnectingPoint num="1" id="3073" />
<extraparam>
<Data eventName="doneHSM" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1516" >
+<COMPONENT type="1008" id="3077" >
<cdparam x="798" y="616" />
<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="mac(1)" />
-<TGConnectingPoint num="0" id="1514" />
-<TGConnectingPoint num="1" id="1515" />
+<TGConnectingPoint num="0" id="3075" />
+<TGConnectingPoint num="1" id="3076" />
<extraparam>
<Data eventName="mac" nbOfParams="5" />
<Param index="0" value="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1519" >
+<COMPONENT type="1008" id="3080" >
<cdparam x="843" y="730" />
<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="sendEvt(1, 1)" />
-<TGConnectingPoint num="0" id="1517" />
-<TGConnectingPoint num="1" id="1518" />
+<TGConnectingPoint num="0" id="3078" />
+<TGConnectingPoint num="1" id="3079" />
<extraparam>
<Data eventName="sendEvt" nbOfParams="5" />
<Param index="0" value="1" />
@@ -9028,14 +9256,14 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1522" >
+<COMPONENT type="1008" id="3083" >
<cdparam x="756" y="190" />
<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="sendEvt(59, 2)" />
-<TGConnectingPoint num="0" id="1520" />
-<TGConnectingPoint num="1" id="1521" />
+<TGConnectingPoint num="0" id="3081" />
+<TGConnectingPoint num="1" id="3082" />
<extraparam>
<Data eventName="sendEvt" nbOfParams="5" />
<Param index="0" value="59" />
@@ -9043,117 +9271,117 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1525" >
+<COMPONENT type="1006" id="3086" >
<cdparam x="856" y="771" />
<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="sendData(1)" />
-<TGConnectingPoint num="0" id="1523" />
-<TGConnectingPoint num="1" id="1524" />
+<TGConnectingPoint num="0" id="3084" />
+<TGConnectingPoint num="1" id="3085" />
<extraparam>
-<Data channelName="sendData" nbOfSamples="1" />
+<Data channelName="sendData" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1528" >
+<COMPONENT type="1006" id="3089" >
<cdparam x="752" y="241" />
<sizeparam width="86" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="sendData(59)" />
-<TGConnectingPoint num="0" id="1526" />
-<TGConnectingPoint num="1" id="1527" />
+<TGConnectingPoint num="0" id="3087" />
+<TGConnectingPoint num="1" id="3088" />
<extraparam>
-<Data channelName="sendData" nbOfSamples="59" />
+<Data channelName="sendData" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="1529" >
+<CONNECTOR type="115" id="3090" >
<cdparam x="895" y="796" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="895" y="796" id="1524" />
-<P2 x="880" y="806" id="1477" />
+<P1 x="895" y="796" id="3085" />
+<P2 x="880" y="806" id="3038" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1530" >
+<CONNECTOR type="115" id="3091" >
<cdparam x="884" y="755" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="884" y="755" id="1518" />
-<P2 x="895" y="766" id="1523" />
+<P1 x="884" y="755" id="3079" />
+<P2 x="895" y="766" id="3084" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1531" >
+<CONNECTOR type="115" id="3092" >
<cdparam x="844" y="688" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="844" y="688" id="1512" />
-<P2 x="884" y="725" id="1517" />
+<P1 x="844" y="688" id="3073" />
+<P2 x="884" y="725" id="3078" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1532" >
+<CONNECTOR type="115" id="3093" >
<cdparam x="802" y="596" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="802" y="596" id="1506" />
-<P2 x="822" y="611" id="1514" />
+<P1 x="802" y="596" id="3067" />
+<P2 x="822" y="611" id="3075" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1533" >
+<CONNECTOR type="115" id="3094" >
<cdparam x="797" y="497" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="797" y="497" id="1500" />
-<P2 x="798" y="513" id="1508" />
+<P1 x="797" y="497" id="3061" />
+<P2 x="798" y="513" id="3069" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1534" >
+<CONNECTOR type="115" id="3095" >
<cdparam x="796" y="435" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="796" y="435" id="1494" />
-<P2 x="797" y="467" id="1499" />
+<P1 x="796" y="435" id="3055" />
+<P2 x="797" y="467" id="3060" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1539" >
+<CONNECTOR type="115" id="3100" >
<cdparam x="214" y="438" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="214" y="438" id="1488" />
-<P2 x="545" y="264" id="1474" />
+<P1 x="214" y="438" id="3049" />
+<P2 x="545" y="264" id="3035" />
<Point x="221" y="473" />
<Point x="345" y="482" />
<Point x="419" y="212" />
<Point x="538" y="199" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1535" >
-<father id="1539" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3096" >
+<father id="3100" num="0" />
<cdparam x="221" y="473" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1536" >
-<father id="1539" num="1" />
+<SUBCOMPONENT type="-1" id="3097" >
+<father id="3100" num="1" />
<cdparam x="345" y="482" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1537" >
-<father id="1539" num="2" />
+<SUBCOMPONENT type="-1" id="3098" >
+<father id="3100" num="2" />
<cdparam x="419" y="212" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1538" >
-<father id="1539" num="3" />
+<SUBCOMPONENT type="-1" id="3099" >
+<father id="3100" num="3" />
<cdparam x="538" y="199" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9161,107 +9389,107 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1540" >
+<CONNECTOR type="115" id="3101" >
<cdparam x="795" y="372" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to stop state" value="null" />
-<P1 x="795" y="372" id="1480" />
-<P2 x="796" y="405" id="1493" />
+<P1 x="795" y="372" id="3041" />
+<P2 x="796" y="405" id="3054" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1541" >
+<CONNECTOR type="115" id="3102" >
<cdparam x="259" y="57" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to send event" value="null" />
-<P1 x="187" y="64" id="1485" />
-<P2 x="187" y="115" id="1444" />
+<P1 x="187" y="64" id="3046" />
+<P2 x="187" y="115" id="2997" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1542" >
+<CONNECTOR type="115" id="3103" >
<cdparam x="552" y="525" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to wait event" value="null" />
-<P1 x="552" y="525" id="1469" />
-<P2 x="552" y="531" id="1447" />
+<P1 x="552" y="525" id="3030" />
+<P2 x="552" y="531" id="3000" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1543" >
+<CONNECTOR type="115" id="3104" >
<cdparam x="548" y="428" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="548" y="428" id="1460" />
-<P2 x="549" y="447" id="1465" />
+<P1 x="548" y="428" id="3021" />
+<P2 x="549" y="447" id="3026" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1544" >
+<CONNECTOR type="115" id="3105" >
<cdparam x="800" y="215" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="800" y="215" id="1521" />
-<P2 x="795" y="236" id="1526" />
+<P1 x="800" y="215" id="3082" />
+<P2 x="795" y="236" id="3087" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1545" >
+<CONNECTOR type="115" id="3106" >
<cdparam x="560" y="504" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to read channel" value="null" />
-<P1 x="549" y="477" id="1466" />
-<P2 x="552" y="495" id="1468" />
+<P1 x="549" y="477" id="3027" />
+<P2 x="552" y="495" id="3029" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1546" >
+<CONNECTOR type="115" id="3107" >
<cdparam x="794" y="314" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="794" y="314" id="1483" />
-<P2 x="795" y="342" id="1479" />
+<P1 x="794" y="314" id="3044" />
+<P2 x="795" y="342" id="3040" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1547" >
+<CONNECTOR type="115" id="3108" >
<cdparam x="799" y="131" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to wait event" value="null" />
-<P1 x="795" y="266" id="1527" />
-<P2 x="794" y="284" id="1482" />
+<P1 x="795" y="266" id="3088" />
+<P2 x="794" y="284" id="3043" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1552" >
+<CONNECTOR type="115" id="3113" >
<cdparam x="552" y="391" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to write channel" value="null" />
-<P1 x="552" y="561" id="1448" />
-<P2 x="800" y="185" id="1520" />
+<P1 x="552" y="561" id="3001" />
+<P2 x="800" y="185" id="3081" />
<Point x="651" y="574" />
<Point x="670" y="544" />
<Point x="670" y="147" />
<Point x="756" y="147" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1548" >
-<father id="1552" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3109" >
+<father id="3113" num="0" />
<cdparam x="651" y="574" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1549" >
-<father id="1552" num="1" />
+<SUBCOMPONENT type="-1" id="3110" >
+<father id="3113" num="1" />
<cdparam x="670" y="544" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1550" >
-<father id="1552" num="2" />
+<SUBCOMPONENT type="-1" id="3111" >
+<father id="3113" num="2" />
<cdparam x="670" y="147" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1551" >
-<father id="1552" num="3" />
+<SUBCOMPONENT type="-1" id="3112" >
+<father id="3113" num="3" />
<cdparam x="756" y="147" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9269,186 +9497,186 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1553" >
+<CONNECTOR type="115" id="3114" >
<cdparam x="542" y="295" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="545" y="294" id="1475" />
-<P2 x="547" y="312" id="1462" />
+<P1 x="545" y="294" id="3036" />
+<P2 x="547" y="312" id="3023" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1554" >
+<CONNECTOR type="115" id="3115" >
<cdparam x="547" y="342" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="547" y="342" id="1463" />
-<P2 x="547" y="363" id="1471" />
+<P1 x="547" y="342" id="3024" />
+<P2 x="547" y="363" id="3032" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1555" >
+<CONNECTOR type="115" id="3116" >
<cdparam x="547" y="393" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="547" y="393" id="1472" />
-<P2 x="548" y="398" id="1459" />
+<P1 x="547" y="393" id="3033" />
+<P2 x="548" y="398" id="3020" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1556" >
+<CONNECTOR type="115" id="3117" >
<cdparam x="745" y="370" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="207" y="332" id="1503" />
-<P2 x="210" y="355" id="1490" />
+<P1 x="207" y="332" id="3064" />
+<P2 x="210" y="355" id="3051" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1557" >
+<CONNECTOR type="115" id="3118" >
<cdparam x="1170" y="317" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="192" y="209" id="1442" />
-<P2 x="205" y="245" id="1496" />
+<P1 x="192" y="209" id="2995" />
+<P2 x="205" y="245" id="3057" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1558" >
+<CONNECTOR type="115" id="3119" >
<cdparam x="739" y="237" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="210" y="385" id="1491" />
-<P2 x="214" y="408" id="1487" />
+<P1 x="210" y="385" id="3052" />
+<P2 x="214" y="408" id="3048" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1559" >
+<CONNECTOR type="115" id="3120" >
<cdparam x="728" y="316" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="205" y="275" id="1497" />
-<P2 x="207" y="302" id="1502" />
+<P1 x="205" y="275" id="3058" />
+<P2 x="207" y="302" id="3063" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1560" >
+<CONNECTOR type="115" id="3121" >
<cdparam x="205" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="187" y="145" id="1445" />
-<P2 x="192" y="179" id="1441" />
+<P1 x="187" y="145" id="2998" />
+<P2 x="192" y="179" id="2994" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1561" >
+<CONNECTOR type="115" id="3122" >
<cdparam x="1327" y="395" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="798" y="543" id="1509" />
-<P2 x="802" y="566" id="1505" />
+<P1 x="798" y="543" id="3070" />
+<P2 x="802" y="566" id="3066" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1562" >
+<CONNECTOR type="115" id="3123" >
<cdparam x="861" y="650" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="822" y="641" id="1515" />
-<P2 x="844" y="658" id="1511" />
+<P1 x="822" y="641" id="3076" />
+<P2 x="844" y="658" id="3072" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="HSM_ECUN" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1564" >
+<COMPONENT type="1001" id="3125" >
<cdparam x="70" y="410" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1563" />
+<TGConnectingPoint num="0" id="3124" />
</COMPONENT>
-<COMPONENT type="1009" id="1567" >
+<COMPONENT type="1009" id="3128" >
<cdparam x="4" y="362" />
<sizeparam width="149" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="inHSMECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1565" />
-<TGConnectingPoint num="1" id="1566" />
+<TGConnectingPoint num="0" id="3126" />
+<TGConnectingPoint num="1" id="3127" />
<extraparam>
-<Data channelName="inHSMECUN" nbOfSamples="sizeOfMsg" />
+<Data channelName="inHSMECUN" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1570" >
+<COMPONENT type="1010" id="3131" >
<cdparam x="3" y="315" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="putMsgECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1568" />
-<TGConnectingPoint num="1" id="1569" />
+<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="1" id="3130" />
<extraparam>
<Data eventName="putMsgECUN" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1572" >
+<COMPONENT type="1001" id="3133" >
<cdparam x="232" y="435" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1571" />
+<TGConnectingPoint num="0" id="3132" />
</COMPONENT>
-<COMPONENT type="1001" id="1574" >
+<COMPONENT type="1001" id="3135" >
<cdparam x="415" y="483" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1573" />
+<TGConnectingPoint num="0" id="3134" />
</COMPONENT>
-<COMPONENT type="1001" id="1576" >
+<COMPONENT type="1001" id="3137" >
<cdparam x="551" y="435" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1575" />
+<TGConnectingPoint num="0" id="3136" />
</COMPONENT>
-<COMPONENT type="1001" id="1578" >
+<COMPONENT type="1001" id="3139" >
<cdparam x="796" y="443" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1577" />
+<TGConnectingPoint num="0" id="3138" />
</COMPONENT>
-<COMPONENT type="1006" id="1581" >
+<COMPONENT type="1006" id="3142" >
<cdparam x="729" y="392" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="outHSMECUN(sizeOfMsg)" />
-<TGConnectingPoint num="0" id="1579" />
-<TGConnectingPoint num="1" id="1580" />
+<TGConnectingPoint num="0" id="3140" />
+<TGConnectingPoint num="1" id="3141" />
<extraparam>
-<Data channelName="outHSMECUN" nbOfSamples="sizeOfMsg" />
+<Data channelName="outHSMECUN" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1013" id="1585" >
+<COMPONENT type="1013" id="3146" >
<cdparam x="555" y="383" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1583" />
-<TGConnectingPoint num="1" id="1584" />
+<TGConnectingPoint num="0" id="3144" />
+<TGConnectingPoint num="1" id="3145" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1582" >
-<father id="1585" num="0" />
+<SUBCOMPONENT type="-1" id="3143" >
+<father id="3146" num="0" />
<cdparam x="570" y="403" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9456,17 +9684,17 @@
<infoparam name="value of the delay" value="sizeOfMsg*60" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="1589" >
+<COMPONENT type="1013" id="3150" >
<cdparam x="238" y="374" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1587" />
-<TGConnectingPoint num="1" id="1588" />
+<TGConnectingPoint num="0" id="3148" />
+<TGConnectingPoint num="1" id="3149" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1586" >
-<father id="1589" num="0" />
+<SUBCOMPONENT type="-1" id="3147" >
+<father id="3150" num="0" />
<cdparam x="253" y="394" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9474,17 +9702,17 @@
<infoparam name="value of the delay" value="15*sizeOfMsg" />
</SUBCOMPONENT>
-<COMPONENT type="1013" id="1593" >
+<COMPONENT type="1013" id="3154" >
<cdparam x="430" y="435" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1591" />
-<TGConnectingPoint num="1" id="1592" />
+<TGConnectingPoint num="0" id="3152" />
+<TGConnectingPoint num="1" id="3153" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="1590" >
-<father id="1593" num="0" />
+<SUBCOMPONENT type="-1" id="3151" >
+<father id="3154" num="0" />
<cdparam x="445" y="455" />
<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9492,43 +9720,43 @@
<infoparam name="value of the delay" value="15*sizeOfMsg" />
</SUBCOMPONENT>
-<COMPONENT type="1001" id="1595" >
+<COMPONENT type="1001" id="3156" >
<cdparam x="600" y="243" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1594" />
+<TGConnectingPoint num="0" id="3155" />
</COMPONENT>
-<COMPONENT type="1008" id="1598" >
+<COMPONENT type="1008" id="3159" >
<cdparam x="556" y="196" />
<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="doneHSMECUN()" />
-<TGConnectingPoint num="0" id="1596" />
-<TGConnectingPoint num="1" id="1597" />
+<TGConnectingPoint num="0" id="3157" />
+<TGConnectingPoint num="1" id="3158" />
<extraparam>
<Data eventName="doneHSMECUN" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1016" id="1606" >
+<COMPONENT type="1016" id="3167" >
<cdparam x="466" y="152" />
<sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="sequence" value="null" />
-<TGConnectingPoint num="0" id="1600" />
-<TGConnectingPoint num="1" id="1601" />
-<TGConnectingPoint num="2" id="1602" />
-<TGConnectingPoint num="3" id="1603" />
-<TGConnectingPoint num="4" id="1604" />
-<TGConnectingPoint num="5" id="1605" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1599" >
-<father id="1606" num="0" />
+<TGConnectingPoint num="0" id="3161" />
+<TGConnectingPoint num="1" id="3162" />
+<TGConnectingPoint num="2" id="3163" />
+<TGConnectingPoint num="3" id="3164" />
+<TGConnectingPoint num="4" id="3165" />
+<TGConnectingPoint num="5" id="3166" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="3160" >
+<father id="3167" num="0" />
<cdparam x="620" y="159" />
<sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9536,141 +9764,141 @@
<infoparam name="Sequence" value=">>" />
</SUBCOMPONENT>
-<COMPONENT type="1010" id="1609" >
+<COMPONENT type="1010" id="3170" >
<cdparam x="729" y="340" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="getMsgECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1607" />
-<TGConnectingPoint num="1" id="1608" />
+<TGConnectingPoint num="0" id="3168" />
+<TGConnectingPoint num="1" id="3169" />
<extraparam>
<Data eventName="getMsgECUN" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1612" >
+<COMPONENT type="1010" id="3173" >
<cdparam x="469" y="331" />
<sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="generateKeyECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1610" />
-<TGConnectingPoint num="1" id="1611" />
+<TGConnectingPoint num="0" id="3171" />
+<TGConnectingPoint num="1" id="3172" />
<extraparam>
<Data eventName="generateKeyECUN" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1615" >
+<COMPONENT type="1010" id="3176" >
<cdparam x="355" y="372" />
<sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="macECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1613" />
-<TGConnectingPoint num="1" id="1614" />
+<TGConnectingPoint num="0" id="3174" />
+<TGConnectingPoint num="1" id="3175" />
<extraparam>
<Data eventName="macECUN" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1618" >
+<COMPONENT type="1010" id="3179" >
<cdparam x="167" y="322" />
<sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="encryptECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1616" />
-<TGConnectingPoint num="1" id="1617" />
+<TGConnectingPoint num="0" id="3177" />
+<TGConnectingPoint num="1" id="3178" />
<extraparam>
<Data eventName="encryptECUN" nbOfParams="5" />
<Param index="0" value="sizeOfMsg" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1018" id="1629" >
+<COMPONENT type="1018" id="3190" >
<cdparam x="383" y="209" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1619" />
-<TGConnectingPoint num="1" id="1620" />
-<TGConnectingPoint num="2" id="1621" />
-<TGConnectingPoint num="3" id="1622" />
-<TGConnectingPoint num="4" id="1623" />
-<TGConnectingPoint num="5" id="1624" />
-<TGConnectingPoint num="6" id="1625" />
-<TGConnectingPoint num="7" id="1626" />
-<TGConnectingPoint num="8" id="1627" />
-<TGConnectingPoint num="9" id="1628" />
-</COMPONENT>
-
-<COMPONENT type="1030" id="1632" >
+<TGConnectingPoint num="0" id="3180" />
+<TGConnectingPoint num="1" id="3181" />
+<TGConnectingPoint num="2" id="3182" />
+<TGConnectingPoint num="3" id="3183" />
+<TGConnectingPoint num="4" id="3184" />
+<TGConnectingPoint num="5" id="3185" />
+<TGConnectingPoint num="6" id="3186" />
+<TGConnectingPoint num="7" id="3187" />
+<TGConnectingPoint num="8" id="3188" />
+<TGConnectingPoint num="9" id="3189" />
+</COMPONENT>
+
+<COMPONENT type="1030" id="3193" >
<cdparam x="209" y="89" />
<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1630" />
-<TGConnectingPoint num="1" id="1631" />
+<TGConnectingPoint num="0" id="3191" />
+<TGConnectingPoint num="1" id="3192" />
</COMPONENT>
-<COMPONENT type="1000" id="1634" >
+<COMPONENT type="1000" id="3195" >
<cdparam x="242" y="40" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1633" />
+<TGConnectingPoint num="0" id="3194" />
</COMPONENT>
-<CONNECTOR type="115" id="1635" >
+<CONNECTOR type="115" id="3196" >
<cdparam x="358" y="224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="358" y="224" id="1623" />
-<P2 x="79" y="310" id="1568" />
+<P1 x="358" y="224" id="3184" />
+<P2 x="79" y="310" id="3129" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1636" >
+<CONNECTOR type="115" id="3197" >
<cdparam x="534" y="157" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from sequence to select" value="null" />
-<P1 x="515" y="157" id="1602" />
-<P2 x="398" y="199" id="1619" />
+<P1 x="515" y="157" id="3163" />
+<P2 x="398" y="199" id="3180" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1637" >
+<CONNECTOR type="115" id="3198" >
<cdparam x="585" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="438" y="224" id="1624" />
-<P2 x="805" y="335" id="1607" />
+<P1 x="438" y="224" id="3185" />
+<P2 x="805" y="335" id="3168" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1638" >
+<CONNECTOR type="115" id="3199" >
<cdparam x="245" y="91" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to for ever loop" value="null" />
-<P1 x="249" y="60" id="1633" />
-<P2 x="249" y="84" id="1630" />
+<P1 x="249" y="60" id="3194" />
+<P2 x="249" y="84" id="3191" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1640" >
+<CONNECTOR type="115" id="3201" >
<cdparam x="423" y="160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for ever loop to select" value="null" />
-<P1 x="290" y="103" id="1631" />
-<P2 x="541" y="152" id="1600" />
+<P1 x="290" y="103" id="3192" />
+<P2 x="541" y="152" id="3161" />
<Point x="476" y="121" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1639" >
-<father id="1640" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3200" >
+<father id="3201" num="0" />
<cdparam x="476" y="121" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -9678,645 +9906,653 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="1641" >
+<CONNECTOR type="115" id="3202" >
<cdparam x="505" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="358" y="224" id="1620" />
-<P2 x="243" y="317" id="1616" />
+<P1 x="358" y="224" id="3181" />
+<P2 x="243" y="317" id="3177" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1642" >
+<CONNECTOR type="115" id="3203" >
<cdparam x="448" y="278" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="398" y="264" id="1622" />
-<P2 x="423" y="367" id="1613" />
+<P1 x="398" y="264" id="3183" />
+<P2 x="423" y="367" id="3174" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1643" >
+<CONNECTOR type="115" id="3204" >
<cdparam x="585" y="218" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="438" y="224" id="1621" />
-<P2 x="560" y="326" id="1610" />
+<P1 x="438" y="224" id="3182" />
+<P2 x="560" y="326" id="3171" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1644" >
+<CONNECTOR type="115" id="3205" >
<cdparam x="778" y="153" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from sequence to send event" value="null" />
-<P1 x="590" y="157" id="1605" />
-<P2 x="609" y="191" id="1596" />
+<P1 x="590" y="157" id="3166" />
+<P2 x="609" y="191" id="3157" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1645" >
+<CONNECTOR type="115" id="3206" >
<cdparam x="609" y="221" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to stop state" value="null" />
-<P1 x="609" y="221" id="1597" />
-<P2 x="610" y="238" id="1594" />
+<P1 x="609" y="221" id="3158" />
+<P2 x="610" y="238" id="3155" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1646" >
+<CONNECTOR type="115" id="3207" >
<cdparam x="434" y="404" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="423" y="397" id="1614" />
-<P2 x="435" y="430" id="1591" />
+<P1 x="423" y="397" id="3175" />
+<P2 x="435" y="430" id="3152" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1647" >
+<CONNECTOR type="115" id="3208" >
<cdparam x="243" y="347" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="243" y="347" id="1617" />
-<P2 x="243" y="369" id="1587" />
+<P1 x="243" y="347" id="3178" />
+<P2 x="243" y="369" id="3148" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1648" >
+<CONNECTOR type="115" id="3209" >
<cdparam x="560" y="356" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to execI" value="null" />
-<P1 x="560" y="356" id="1611" />
-<P2 x="560" y="378" id="1583" />
+<P1 x="560" y="356" id="3172" />
+<P2 x="560" y="378" id="3144" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1649" >
+<CONNECTOR type="115" id="3210" >
<cdparam x="805" y="365" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to write channel" value="null" />
-<P1 x="805" y="365" id="1608" />
-<P2 x="805" y="387" id="1579" />
+<P1 x="805" y="365" id="3169" />
+<P2 x="805" y="387" id="3140" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1650" >
+<CONNECTOR type="115" id="3211" >
<cdparam x="805" y="417" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="805" y="417" id="1580" />
-<P2 x="806" y="438" id="1577" />
+<P1 x="805" y="417" id="3141" />
+<P2 x="806" y="438" id="3138" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1651" >
+<CONNECTOR type="115" id="3212" >
<cdparam x="560" y="418" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="560" y="418" id="1584" />
-<P2 x="561" y="430" id="1575" />
+<P1 x="560" y="418" id="3145" />
+<P2 x="561" y="430" id="3136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1652" >
+<CONNECTOR type="115" id="3213" >
<cdparam x="435" y="470" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="435" y="470" id="1592" />
-<P2 x="425" y="478" id="1573" />
+<P1 x="435" y="470" id="3153" />
+<P2 x="425" y="478" id="3134" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1653" >
+<CONNECTOR type="115" id="3214" >
<cdparam x="243" y="409" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from execI to stop state" value="null" />
-<P1 x="243" y="409" id="1588" />
-<P2 x="242" y="430" id="1571" />
+<P1 x="243" y="409" id="3149" />
+<P2 x="242" y="430" id="3132" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1654" >
+<CONNECTOR type="115" id="3215" >
<cdparam x="79" y="340" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="79" y="340" id="1569" />
-<P2 x="78" y="357" id="1565" />
+<P1 x="79" y="340" id="3130" />
+<P2 x="78" y="357" id="3126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1655" >
+<CONNECTOR type="115" id="3216" >
<cdparam x="78" y="387" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to stop state" value="null" />
-<P1 x="78" y="387" id="1566" />
-<P2 x="80" y="405" id="1563" />
+<P1 x="78" y="387" id="3127" />
+<P2 x="80" y="405" id="3124" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="CTP_ECUN" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1657" >
+<COMPONENT type="1001" id="3218" >
<cdparam x="531" y="500" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1656" />
+<TGConnectingPoint num="0" id="3217" />
</COMPONENT>
-<COMPONENT type="1006" id="1660" >
-<cdparam x="454" y="451" />
-<sizeparam width="177" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="3221" >
+<cdparam x="446" y="451" />
+<sizeparam width="192" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="recvDataECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1658" />
-<TGConnectingPoint num="1" id="1659" />
+<TGConnectingPoint num="0" id="3219" />
+<TGConnectingPoint num="1" id="3220" />
<extraparam>
-<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1663" >
-<cdparam x="467" y="396" />
-<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="3224" >
+<cdparam x="460" y="396" />
+<sizeparam width="181" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="recvEvtECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1661" />
-<TGConnectingPoint num="1" id="1662" />
+<TGConnectingPoint num="0" id="3222" />
+<TGConnectingPoint num="1" id="3223" />
<extraparam>
<Data eventName="recvEvtECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1666" >
-<cdparam x="440" y="351" />
-<sizeparam width="211" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="3227" >
+<cdparam x="427" y="351" />
+<sizeparam width="236" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="action state" value="nbOfSamples = (nbOfSamples * 8)/9" />
-<TGConnectingPoint num="0" id="1664" />
-<TGConnectingPoint num="1" id="1665" />
+<TGConnectingPoint num="0" id="3225" />
+<TGConnectingPoint num="1" id="3226" />
</COMPONENT>
-<COMPONENT type="1009" id="1669" >
-<cdparam x="461" y="283" />
-<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="3230" >
+<cdparam x="454" y="283" />
+<sizeparam width="184" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="dataToECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1667" />
-<TGConnectingPoint num="1" id="1668" />
+<TGConnectingPoint num="0" id="3228" />
+<TGConnectingPoint num="1" id="3229" />
<extraparam>
-<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1672" >
-<cdparam x="465" y="230" />
-<sizeparam width="161" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="3233" >
+<cdparam x="458" y="230" />
+<sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="evtToECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1670" />
-<TGConnectingPoint num="1" id="1671" />
+<TGConnectingPoint num="0" id="3231" />
+<TGConnectingPoint num="1" id="3232" />
<extraparam>
<Data eventName="evtToECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1674" >
+<COMPONENT type="1001" id="3235" >
<cdparam x="262" y="493" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1673" />
+<TGConnectingPoint num="0" id="3234" />
</COMPONENT>
-<COMPONENT type="1006" id="1677" >
-<cdparam x="181" y="451" />
-<sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="3238" >
+<cdparam x="174" y="451" />
+<sizeparam width="196" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="dataFromECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1675" />
-<TGConnectingPoint num="1" id="1676" />
+<TGConnectingPoint num="0" id="3236" />
+<TGConnectingPoint num="1" id="3237" />
<extraparam>
-<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1680" >
-<cdparam x="186" y="400" />
-<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="3241" >
+<cdparam x="179" y="400" />
+<sizeparam width="186" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="evtFromECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1678" />
-<TGConnectingPoint num="1" id="1679" />
+<TGConnectingPoint num="0" id="3239" />
+<TGConnectingPoint num="1" id="3240" />
<extraparam>
<Data eventName="evtFromECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1011" id="1683" >
-<cdparam x="164" y="353" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="3244" >
+<cdparam x="150" y="353" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
-<TGConnectingPoint num="0" id="1681" />
-<TGConnectingPoint num="1" id="1682" />
+<TGConnectingPoint num="0" id="3242" />
+<TGConnectingPoint num="1" id="3243" />
</COMPONENT>
-<COMPONENT type="1009" id="1686" >
-<cdparam x="177" y="284" />
-<sizeparam width="186" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="3247" >
+<cdparam x="170" y="284" />
+<sizeparam width="201" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="sendDataECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1684" />
-<TGConnectingPoint num="1" id="1685" />
+<TGConnectingPoint num="0" id="3245" />
+<TGConnectingPoint num="1" id="3246" />
<extraparam>
-<Data channelName="sendDataECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="sendDataECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1689" >
-<cdparam x="181" y="230" />
-<sizeparam width="176" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="3250" >
+<cdparam x="174" y="230" />
+<sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="sendEvtECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1687" />
-<TGConnectingPoint num="1" id="1688" />
+<TGConnectingPoint num="0" id="3248" />
+<TGConnectingPoint num="1" id="3249" />
<extraparam>
<Data eventName="sendEvtECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1030" id="1692" >
-<cdparam x="247" y="96" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1030" id="3253" >
+<cdparam x="241" y="96" />
+<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1690" />
-<TGConnectingPoint num="1" id="1691" />
+<TGConnectingPoint num="0" id="3251" />
+<TGConnectingPoint num="1" id="3252" />
</COMPONENT>
-<COMPONENT type="1018" id="1703" >
+<COMPONENT type="1018" id="3264" >
<cdparam x="409" y="173" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1693" />
-<TGConnectingPoint num="1" id="1694" />
-<TGConnectingPoint num="2" id="1695" />
-<TGConnectingPoint num="3" id="1696" />
-<TGConnectingPoint num="4" id="1697" />
-<TGConnectingPoint num="5" id="1698" />
-<TGConnectingPoint num="6" id="1699" />
-<TGConnectingPoint num="7" id="1700" />
-<TGConnectingPoint num="8" id="1701" />
-<TGConnectingPoint num="9" id="1702" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1705" >
+<TGConnectingPoint num="0" id="3254" />
+<TGConnectingPoint num="1" id="3255" />
+<TGConnectingPoint num="2" id="3256" />
+<TGConnectingPoint num="3" id="3257" />
+<TGConnectingPoint num="4" id="3258" />
+<TGConnectingPoint num="5" id="3259" />
+<TGConnectingPoint num="6" id="3260" />
+<TGConnectingPoint num="7" id="3261" />
+<TGConnectingPoint num="8" id="3262" />
+<TGConnectingPoint num="9" id="3263" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="3266" >
<cdparam x="270" y="41" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1704" />
+<TGConnectingPoint num="0" id="3265" />
</COMPONENT>
-<CONNECTOR type="115" id="1706" >
+<CONNECTOR type="115" id="3267" >
<cdparam x="272" y="378" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="272" y="378" id="1682" />
-<P2 x="272" y="395" id="1678" />
+<P1 x="272" y="378" id="3243" />
+<P2 x="272" y="395" id="3239" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1707" >
+<CONNECTOR type="115" id="3268" >
<cdparam x="328" y="110" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for ever loop to select" value="null" />
-<P1 x="328" y="110" id="1691" />
-<P2 x="424" y="163" id="1693" />
+<P1 x="333" y="110" id="3252" />
+<P2 x="424" y="163" id="3254" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1708" >
+<CONNECTOR type="115" id="3269" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to stop state" value="null" />
-<P1 x="277" y="61" id="1704" />
-<P2 x="287" y="91" id="1690" />
+<P1 x="277" y="61" id="3265" />
+<P2 x="287" y="91" id="3251" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1709" >
+<CONNECTOR type="115" id="3270" >
<cdparam x="384" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="384" y="188" id="1694" />
-<P2 x="269" y="225" id="1687" />
+<P1 x="384" y="188" id="3255" />
+<P2 x="269" y="225" id="3248" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1710" >
+<CONNECTOR type="115" id="3271" >
<cdparam x="269" y="255" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="269" y="255" id="1688" />
-<P2 x="270" y="279" id="1684" />
+<P1 x="269" y="255" id="3249" />
+<P2 x="270" y="279" id="3245" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1711" >
+<CONNECTOR type="115" id="3272" >
<cdparam x="270" y="309" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to action state" value="null" />
-<P1 x="270" y="309" id="1685" />
-<P2 x="272" y="348" id="1681" />
+<P1 x="270" y="309" id="3246" />
+<P2 x="272" y="348" id="3242" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1712" >
+<CONNECTOR type="115" id="3273" >
<cdparam x="272" y="425" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="272" y="425" id="1679" />
-<P2 x="272" y="446" id="1675" />
+<P1 x="272" y="425" id="3240" />
+<P2 x="272" y="446" id="3236" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1713" >
+<CONNECTOR type="115" id="3274" >
<cdparam x="272" y="476" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="272" y="476" id="1676" />
-<P2 x="272" y="488" id="1673" />
+<P1 x="272" y="476" id="3237" />
+<P2 x="272" y="488" id="3234" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1714" >
+<CONNECTOR type="115" id="3275" >
<cdparam x="464" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from select to wait event" value="null" />
-<P1 x="464" y="188" id="1695" />
-<P2 x="545" y="225" id="1670" />
+<P1 x="464" y="188" id="3256" />
+<P2 x="545" y="225" id="3231" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1715" >
+<CONNECTOR type="115" id="3276" >
<cdparam x="545" y="255" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="545" y="255" id="1671" />
-<P2 x="546" y="278" id="1667" />
+<P1 x="545" y="255" id="3232" />
+<P2 x="546" y="278" id="3228" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1716" >
+<CONNECTOR type="115" id="3277" >
<cdparam x="546" y="308" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to action state" value="null" />
-<P1 x="546" y="308" id="1668" />
-<P2 x="545" y="346" id="1664" />
+<P1 x="546" y="308" id="3229" />
+<P2 x="545" y="346" id="3225" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1717" >
+<CONNECTOR type="115" id="3278" >
<cdparam x="545" y="376" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from action state to send event" value="null" />
-<P1 x="545" y="376" id="1665" />
-<P2 x="550" y="391" id="1661" />
+<P1 x="545" y="376" id="3226" />
+<P2 x="550" y="391" id="3222" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1718" >
+<CONNECTOR type="115" id="3279" >
<cdparam x="550" y="421" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="550" y="421" id="1662" />
-<P2 x="542" y="446" id="1658" />
+<P1 x="550" y="421" id="3223" />
+<P2 x="542" y="446" id="3219" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1719" >
+<CONNECTOR type="115" id="3280" >
<cdparam x="542" y="476" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="542" y="476" id="1659" />
-<P2 x="541" y="495" id="1656" />
+<P1 x="542" y="476" id="3220" />
+<P2 x="541" y="495" id="3217" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="KeyManager_ECUN" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1721" >
+<COMPONENT type="1001" id="3282" >
<cdparam x="301" y="676" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1720" />
+<TGConnectingPoint num="0" id="3281" />
</COMPONENT>
-<COMPONENT type="301" id="1730" >
+<COMPONENT type="301" id="3299" >
<cdparam x="116" y="561" />
<sizeparam width="127" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="Sending msg to KM
" />
-<TGConnectingPoint num="0" id="1722" />
-<TGConnectingPoint num="1" id="1723" />
-<TGConnectingPoint num="2" id="1724" />
-<TGConnectingPoint num="3" id="1725" />
-<TGConnectingPoint num="4" id="1726" />
-<TGConnectingPoint num="5" id="1727" />
-<TGConnectingPoint num="6" id="1728" />
-<TGConnectingPoint num="7" id="1729" />
+<TGConnectingPoint num="0" id="3283" />
+<TGConnectingPoint num="1" id="3284" />
+<TGConnectingPoint num="2" id="3285" />
+<TGConnectingPoint num="3" id="3286" />
+<TGConnectingPoint num="4" id="3287" />
+<TGConnectingPoint num="5" id="3288" />
+<TGConnectingPoint num="6" id="3289" />
+<TGConnectingPoint num="7" id="3290" />
+<TGConnectingPoint num="8" id="3291" />
+<TGConnectingPoint num="9" id="3292" />
+<TGConnectingPoint num="10" id="3293" />
+<TGConnectingPoint num="11" id="3294" />
+<TGConnectingPoint num="12" id="3295" />
+<TGConnectingPoint num="13" id="3296" />
+<TGConnectingPoint num="14" id="3297" />
+<TGConnectingPoint num="15" id="3298" />
<extraparam>
<Line value="Sending msg to KM" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1733" >
+<COMPONENT type="1010" id="3302" >
<cdparam x="252" y="381" />
<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSMECUN() " />
-<TGConnectingPoint num="0" id="1731" />
-<TGConnectingPoint num="1" id="1732" />
+<TGConnectingPoint num="0" id="3300" />
+<TGConnectingPoint num="1" id="3301" />
<extraparam>
<Data eventName="doneHSMECUN" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1736" >
+<COMPONENT type="1010" id="3305" >
<cdparam x="262" y="502" />
<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="doneHSMECUN() " />
-<TGConnectingPoint num="0" id="1734" />
-<TGConnectingPoint num="1" id="1735" />
+<TGConnectingPoint num="0" id="3303" />
+<TGConnectingPoint num="1" id="3304" />
<extraparam>
<Data eventName="doneHSMECUN" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1739" >
+<COMPONENT type="1008" id="3308" >
<cdparam x="234" y="338" />
<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="macECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1737" />
-<TGConnectingPoint num="1" id="1738" />
+<TGConnectingPoint num="0" id="3306" />
+<TGConnectingPoint num="1" id="3307" />
<extraparam>
<Data eventName="macECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1742" >
+<COMPONENT type="1008" id="3311" >
<cdparam x="222" y="444" />
<sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="encryptECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1740" />
-<TGConnectingPoint num="1" id="1741" />
+<TGConnectingPoint num="0" id="3309" />
+<TGConnectingPoint num="1" id="3310" />
<extraparam>
<Data eventName="encryptECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="1745" >
+<COMPONENT type="1009" id="3314" >
<cdparam x="224" y="267" />
<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="read channel" value="recvDataECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1743" />
-<TGConnectingPoint num="1" id="1744" />
+<TGConnectingPoint num="0" id="3312" />
+<TGConnectingPoint num="1" id="3313" />
<extraparam>
-<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="1748" >
+<COMPONENT type="1010" id="3317" >
<cdparam x="216" y="189" />
<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="wait event" value="recvEvtECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1746" />
-<TGConnectingPoint num="1" id="1747" />
+<TGConnectingPoint num="0" id="3315" />
+<TGConnectingPoint num="1" id="3316" />
<extraparam>
<Data eventName="recvEvtECUN" nbOfParams="5" />
<Param index="0" value="nbOfSamples" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="1751" >
+<COMPONENT type="1006" id="3320" >
<cdparam x="257" y="627" />
<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="write channel" value="sendDataECUN(1)" />
-<TGConnectingPoint num="0" id="1749" />
-<TGConnectingPoint num="1" id="1750" />
+<TGConnectingPoint num="0" id="3318" />
+<TGConnectingPoint num="1" id="3319" />
<extraparam>
-<Data channelName="sendDataECUN" nbOfSamples="1" />
+<Data channelName="sendDataECUN" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="1754" >
+<COMPONENT type="1008" id="3323" >
<cdparam x="260" y="564" />
<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="send event" value="sendEvtECUN(1)" />
-<TGConnectingPoint num="0" id="1752" />
-<TGConnectingPoint num="1" id="1753" />
+<TGConnectingPoint num="0" id="3321" />
+<TGConnectingPoint num="1" id="3322" />
<extraparam>
<Data eventName="sendEvtECUN" nbOfParams="5" />
<Param index="0" value="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1756" >
+<COMPONENT type="1000" id="3325" >
<cdparam x="264" y="77" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1755" />
+<TGConnectingPoint num="0" id="3324" />
</COMPONENT>
-<CONNECTOR type="115" id="1757" >
+<CONNECTOR type="115" id="3326" >
<cdparam x="317" y="527" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="317" y="527" id="1735" />
-<P2 x="312" y="559" id="1752" />
+<P1 x="317" y="527" id="3304" />
+<P2 x="312" y="559" id="3321" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1758" >
+<CONNECTOR type="115" id="3327" >
<cdparam x="548" y="442" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to send event" value="null" />
-<P1 x="307" y="406" id="1732" />
-<P2 x="306" y="439" id="1740" />
+<P1 x="307" y="406" id="3301" />
+<P2 x="306" y="439" id="3309" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1759" >
+<CONNECTOR type="115" id="3328" >
<cdparam x="967" y="233" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to write channel" value="null" />
-<P1 x="312" y="589" id="1753" />
-<P2 x="314" y="622" id="1749" />
+<P1 x="312" y="589" id="3322" />
+<P2 x="314" y="622" id="3318" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1760" >
+<CONNECTOR type="115" id="3329" >
<cdparam x="973" y="389" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from read channel to send event" value="null" />
-<P1 x="314" y="292" id="1744" />
-<P2 x="310" y="333" id="1737" />
+<P1 x="314" y="292" id="3313" />
+<P2 x="310" y="333" id="3306" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1761" >
+<CONNECTOR type="115" id="3330" >
<cdparam x="961" y="332" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from wait event to read channel" value="null" />
-<P1 x="301" y="214" id="1747" />
-<P2 x="314" y="262" id="1743" />
+<P1 x="301" y="214" id="3316" />
+<P2 x="314" y="262" id="3312" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1762" >
+<CONNECTOR type="115" id="3331" >
<cdparam x="966" y="149" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to wait event" value="null" />
-<P1 x="271" y="97" id="1755" />
-<P2 x="301" y="184" id="1746" />
+<P1 x="271" y="97" id="3324" />
+<P2 x="301" y="184" id="3315" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1763" >
+<CONNECTOR type="115" id="3332" >
<cdparam x="542" y="309" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="306" y="469" id="1741" />
-<P2 x="317" y="497" id="1734" />
+<P1 x="306" y="469" id="3310" />
+<P2 x="317" y="497" id="3303" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1764" >
+<CONNECTOR type="115" id="3333" >
<cdparam x="531" y="388" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from send event to wait event" value="null" />
-<P1 x="310" y="363" id="1738" />
-<P2 x="307" y="376" id="1731" />
+<P1 x="310" y="363" id="3307" />
+<P2 x="307" y="376" id="3300" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="1765" >
+<CONNECTOR type="115" id="3334" >
<cdparam x="314" y="652" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from write channel to stop state" value="null" />
-<P1 x="314" y="652" id="1750" />
-<P2 x="311" y="671" id="1720" />
+<P1 x="314" y="652" id="3319" />
+<P2 x="311" y="671" id="3281" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -10329,955 +10565,958 @@
<Modeling type="TML Architecture" nameTab="Architecture_Sec" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="1799" >
+<COMPONENT type="1100" id="3368" >
<cdparam x="586" y="553" />
<sizeparam width="228" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="CPU_Sink" value="name" />
-<TGConnectingPoint num="0" id="1775" />
-<TGConnectingPoint num="1" id="1776" />
-<TGConnectingPoint num="2" id="1777" />
-<TGConnectingPoint num="3" id="1778" />
-<TGConnectingPoint num="4" id="1779" />
-<TGConnectingPoint num="5" id="1780" />
-<TGConnectingPoint num="6" id="1781" />
-<TGConnectingPoint num="7" id="1782" />
-<TGConnectingPoint num="8" id="1783" />
-<TGConnectingPoint num="9" id="1784" />
-<TGConnectingPoint num="10" id="1785" />
-<TGConnectingPoint num="11" id="1786" />
-<TGConnectingPoint num="12" id="1787" />
-<TGConnectingPoint num="13" id="1788" />
-<TGConnectingPoint num="14" id="1789" />
-<TGConnectingPoint num="15" id="1790" />
-<TGConnectingPoint num="16" id="1791" />
-<TGConnectingPoint num="17" id="1792" />
-<TGConnectingPoint num="18" id="1793" />
-<TGConnectingPoint num="19" id="1794" />
-<TGConnectingPoint num="20" id="1795" />
-<TGConnectingPoint num="21" id="1796" />
-<TGConnectingPoint num="22" id="1797" />
-<TGConnectingPoint num="23" id="1798" />
+<TGConnectingPoint num="0" id="3344" />
+<TGConnectingPoint num="1" id="3345" />
+<TGConnectingPoint num="2" id="3346" />
+<TGConnectingPoint num="3" id="3347" />
+<TGConnectingPoint num="4" id="3348" />
+<TGConnectingPoint num="5" id="3349" />
+<TGConnectingPoint num="6" id="3350" />
+<TGConnectingPoint num="7" id="3351" />
+<TGConnectingPoint num="8" id="3352" />
+<TGConnectingPoint num="9" id="3353" />
+<TGConnectingPoint num="10" id="3354" />
+<TGConnectingPoint num="11" id="3355" />
+<TGConnectingPoint num="12" id="3356" />
+<TGConnectingPoint num="13" id="3357" />
+<TGConnectingPoint num="14" id="3358" />
+<TGConnectingPoint num="15" id="3359" />
+<TGConnectingPoint num="16" id="3360" />
+<TGConnectingPoint num="17" id="3361" />
+<TGConnectingPoint num="18" id="3362" />
+<TGConnectingPoint num="19" id="3363" />
+<TGConnectingPoint num="20" id="3364" />
+<TGConnectingPoint num="21" id="3365" />
+<TGConnectingPoint num="22" id="3366" />
+<TGConnectingPoint num="23" id="3367" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU_Sink" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1774" >
-<father id="1799" num="0" />
-<cdparam x="594" y="600" />
-<sizeparam width="213" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3343" >
+<father id="3368" num="0" />
+<cdparam x="586" y="600" />
+<sizeparam width="228" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="15" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="0" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KDP Perf Design_Sec::LoadSink" />
-<TGConnectingPoint num="0" id="1766" />
-<TGConnectingPoint num="1" id="1767" />
-<TGConnectingPoint num="2" id="1768" />
-<TGConnectingPoint num="3" id="1769" />
-<TGConnectingPoint num="4" id="1770" />
-<TGConnectingPoint num="5" id="1771" />
-<TGConnectingPoint num="6" id="1772" />
-<TGConnectingPoint num="7" id="1773" />
+<TGConnectingPoint num="0" id="3335" />
+<TGConnectingPoint num="1" id="3336" />
+<TGConnectingPoint num="2" id="3337" />
+<TGConnectingPoint num="3" id="3338" />
+<TGConnectingPoint num="4" id="3339" />
+<TGConnectingPoint num="5" id="3340" />
+<TGConnectingPoint num="6" id="3341" />
+<TGConnectingPoint num="7" id="3342" />
<extraparam>
<info value="KDP Perf Design_Sec::LoadSink" taskName="LoadSink" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1833" >
+<COMPONENT type="1100" id="3402" >
<cdparam x="701" y="293" />
<sizeparam width="234" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="CPU_Source" value="name" />
-<TGConnectingPoint num="0" id="1809" />
-<TGConnectingPoint num="1" id="1810" />
-<TGConnectingPoint num="2" id="1811" />
-<TGConnectingPoint num="3" id="1812" />
-<TGConnectingPoint num="4" id="1813" />
-<TGConnectingPoint num="5" id="1814" />
-<TGConnectingPoint num="6" id="1815" />
-<TGConnectingPoint num="7" id="1816" />
-<TGConnectingPoint num="8" id="1817" />
-<TGConnectingPoint num="9" id="1818" />
-<TGConnectingPoint num="10" id="1819" />
-<TGConnectingPoint num="11" id="1820" />
-<TGConnectingPoint num="12" id="1821" />
-<TGConnectingPoint num="13" id="1822" />
-<TGConnectingPoint num="14" id="1823" />
-<TGConnectingPoint num="15" id="1824" />
-<TGConnectingPoint num="16" id="1825" />
-<TGConnectingPoint num="17" id="1826" />
-<TGConnectingPoint num="18" id="1827" />
-<TGConnectingPoint num="19" id="1828" />
-<TGConnectingPoint num="20" id="1829" />
-<TGConnectingPoint num="21" id="1830" />
-<TGConnectingPoint num="22" id="1831" />
-<TGConnectingPoint num="23" id="1832" />
+<TGConnectingPoint num="0" id="3378" />
+<TGConnectingPoint num="1" id="3379" />
+<TGConnectingPoint num="2" id="3380" />
+<TGConnectingPoint num="3" id="3381" />
+<TGConnectingPoint num="4" id="3382" />
+<TGConnectingPoint num="5" id="3383" />
+<TGConnectingPoint num="6" id="3384" />
+<TGConnectingPoint num="7" id="3385" />
+<TGConnectingPoint num="8" id="3386" />
+<TGConnectingPoint num="9" id="3387" />
+<TGConnectingPoint num="10" id="3388" />
+<TGConnectingPoint num="11" id="3389" />
+<TGConnectingPoint num="12" id="3390" />
+<TGConnectingPoint num="13" id="3391" />
+<TGConnectingPoint num="14" id="3392" />
+<TGConnectingPoint num="15" id="3393" />
+<TGConnectingPoint num="16" id="3394" />
+<TGConnectingPoint num="17" id="3395" />
+<TGConnectingPoint num="18" id="3396" />
+<TGConnectingPoint num="19" id="3397" />
+<TGConnectingPoint num="20" id="3398" />
+<TGConnectingPoint num="21" id="3399" />
+<TGConnectingPoint num="22" id="3400" />
+<TGConnectingPoint num="23" id="3401" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU_Source" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1808" >
-<father id="1833" num="0" />
-<cdparam x="704" y="343" />
-<sizeparam width="228" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3377" >
+<father id="3402" num="0" />
+<cdparam x="689" y="343" />
+<sizeparam width="246" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="6" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="-12" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KDP Perf Design_Sec::LoadSource" />
-<TGConnectingPoint num="0" id="1800" />
-<TGConnectingPoint num="1" id="1801" />
-<TGConnectingPoint num="2" id="1802" />
-<TGConnectingPoint num="3" id="1803" />
-<TGConnectingPoint num="4" id="1804" />
-<TGConnectingPoint num="5" id="1805" />
-<TGConnectingPoint num="6" id="1806" />
-<TGConnectingPoint num="7" id="1807" />
+<TGConnectingPoint num="0" id="3369" />
+<TGConnectingPoint num="1" id="3370" />
+<TGConnectingPoint num="2" id="3371" />
+<TGConnectingPoint num="3" id="3372" />
+<TGConnectingPoint num="4" id="3373" />
+<TGConnectingPoint num="5" id="3374" />
+<TGConnectingPoint num="6" id="3375" />
+<TGConnectingPoint num="7" id="3376" />
<extraparam>
<info value="KDP Perf Design_Sec::LoadSource" taskName="LoadSource" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="1876" >
+<COMPONENT type="1102" id="3445" >
<cdparam x="582" y="410" />
<sizeparam width="473" height="123" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="MainCAN" value="name" />
-<TGConnectingPoint num="0" id="1852" />
-<TGConnectingPoint num="1" id="1853" />
-<TGConnectingPoint num="2" id="1854" />
-<TGConnectingPoint num="3" id="1855" />
-<TGConnectingPoint num="4" id="1856" />
-<TGConnectingPoint num="5" id="1857" />
-<TGConnectingPoint num="6" id="1858" />
-<TGConnectingPoint num="7" id="1859" />
-<TGConnectingPoint num="8" id="1860" />
-<TGConnectingPoint num="9" id="1861" />
-<TGConnectingPoint num="10" id="1862" />
-<TGConnectingPoint num="11" id="1863" />
-<TGConnectingPoint num="12" id="1864" />
-<TGConnectingPoint num="13" id="1865" />
-<TGConnectingPoint num="14" id="1866" />
-<TGConnectingPoint num="15" id="1867" />
-<TGConnectingPoint num="16" id="1868" />
-<TGConnectingPoint num="17" id="1869" />
-<TGConnectingPoint num="18" id="1870" />
-<TGConnectingPoint num="19" id="1871" />
-<TGConnectingPoint num="20" id="1872" />
-<TGConnectingPoint num="21" id="1873" />
-<TGConnectingPoint num="22" id="1874" />
-<TGConnectingPoint num="23" id="1875" />
-<extraparam>
-<info stereotype="BUS-CAN" nodeName="MainCAN" />
-<attributes byteDataSize="1" arbitrationPolicy="2" sliceTime="10000" pipelineSize="1" clockRatio="3225" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1103" id="1842" >
-<father id="1876" num="0" />
-<cdparam x="593" y="443" />
-<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="3421" />
+<TGConnectingPoint num="1" id="3422" />
+<TGConnectingPoint num="2" id="3423" />
+<TGConnectingPoint num="3" id="3424" />
+<TGConnectingPoint num="4" id="3425" />
+<TGConnectingPoint num="5" id="3426" />
+<TGConnectingPoint num="6" id="3427" />
+<TGConnectingPoint num="7" id="3428" />
+<TGConnectingPoint num="8" id="3429" />
+<TGConnectingPoint num="9" id="3430" />
+<TGConnectingPoint num="10" id="3431" />
+<TGConnectingPoint num="11" id="3432" />
+<TGConnectingPoint num="12" id="3433" />
+<TGConnectingPoint num="13" id="3434" />
+<TGConnectingPoint num="14" id="3435" />
+<TGConnectingPoint num="15" id="3436" />
+<TGConnectingPoint num="16" id="3437" />
+<TGConnectingPoint num="17" id="3438" />
+<TGConnectingPoint num="18" id="3439" />
+<TGConnectingPoint num="19" id="3440" />
+<TGConnectingPoint num="20" id="3441" />
+<TGConnectingPoint num="21" id="3442" />
+<TGConnectingPoint num="22" id="3443" />
+<TGConnectingPoint num="23" id="3444" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="MainCAN" />
+<attributes byteDataSize="1" arbitrationPolicy="2" sliceTime="10000" pipelineSize="1" clockRatio="3225" privacy="0" referenceAttack="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="3411" >
+<father id="3445" num="0" />
+<cdparam x="787" y="487" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="221" minY="0" maxY="83" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
-<TGConnectingPoint num="0" id="1834" />
-<TGConnectingPoint num="1" id="1835" />
-<TGConnectingPoint num="2" id="1836" />
-<TGConnectingPoint num="3" id="1837" />
-<TGConnectingPoint num="4" id="1838" />
-<TGConnectingPoint num="5" id="1839" />
-<TGConnectingPoint num="6" id="1840" />
-<TGConnectingPoint num="7" id="1841" />
+<cdrectangleparam minX="0" maxX="210" minY="0" maxY="83" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
+<TGConnectingPoint num="0" id="3403" />
+<TGConnectingPoint num="1" id="3404" />
+<TGConnectingPoint num="2" id="3405" />
+<TGConnectingPoint num="3" id="3406" />
+<TGConnectingPoint num="4" id="3407" />
+<TGConnectingPoint num="5" id="3408" />
+<TGConnectingPoint num="6" id="3409" />
+<TGConnectingPoint num="7" id="3410" />
<extraparam>
-<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
+<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="1851" >
-<father id="1876" num="1" />
-<cdparam x="787" y="487" />
-<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1103" id="3420" >
+<father id="3445" num="1" />
+<cdparam x="593" y="443" />
+<sizeparam width="270" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="226" minY="0" maxY="83" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
-<TGConnectingPoint num="0" id="1843" />
-<TGConnectingPoint num="1" id="1844" />
-<TGConnectingPoint num="2" id="1845" />
-<TGConnectingPoint num="3" id="1846" />
-<TGConnectingPoint num="4" id="1847" />
-<TGConnectingPoint num="5" id="1848" />
-<TGConnectingPoint num="6" id="1849" />
-<TGConnectingPoint num="7" id="1850" />
+<cdrectangleparam minX="0" maxX="203" minY="0" maxY="83" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
+<TGConnectingPoint num="0" id="3412" />
+<TGConnectingPoint num="1" id="3413" />
+<TGConnectingPoint num="2" id="3414" />
+<TGConnectingPoint num="3" id="3415" />
+<TGConnectingPoint num="4" id="3416" />
+<TGConnectingPoint num="5" id="3417" />
+<TGConnectingPoint num="6" id="3418" />
+<TGConnectingPoint num="7" id="3419" />
<extraparam>
-<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
+<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1106" id="1901" >
+<COMPONENT type="1106" id="3470" >
<cdparam x="464" y="326" />
<sizeparam width="163" height="59" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="BridgeECU1" value="name" />
-<TGConnectingPoint num="0" id="1877" />
-<TGConnectingPoint num="1" id="1878" />
-<TGConnectingPoint num="2" id="1879" />
-<TGConnectingPoint num="3" id="1880" />
-<TGConnectingPoint num="4" id="1881" />
-<TGConnectingPoint num="5" id="1882" />
-<TGConnectingPoint num="6" id="1883" />
-<TGConnectingPoint num="7" id="1884" />
-<TGConnectingPoint num="8" id="1885" />
-<TGConnectingPoint num="9" id="1886" />
-<TGConnectingPoint num="10" id="1887" />
-<TGConnectingPoint num="11" id="1888" />
-<TGConnectingPoint num="12" id="1889" />
-<TGConnectingPoint num="13" id="1890" />
-<TGConnectingPoint num="14" id="1891" />
-<TGConnectingPoint num="15" id="1892" />
-<TGConnectingPoint num="16" id="1893" />
-<TGConnectingPoint num="17" id="1894" />
-<TGConnectingPoint num="18" id="1895" />
-<TGConnectingPoint num="19" id="1896" />
-<TGConnectingPoint num="20" id="1897" />
-<TGConnectingPoint num="21" id="1898" />
-<TGConnectingPoint num="22" id="1899" />
-<TGConnectingPoint num="23" id="1900" />
+<TGConnectingPoint num="0" id="3446" />
+<TGConnectingPoint num="1" id="3447" />
+<TGConnectingPoint num="2" id="3448" />
+<TGConnectingPoint num="3" id="3449" />
+<TGConnectingPoint num="4" id="3450" />
+<TGConnectingPoint num="5" id="3451" />
+<TGConnectingPoint num="6" id="3452" />
+<TGConnectingPoint num="7" id="3453" />
+<TGConnectingPoint num="8" id="3454" />
+<TGConnectingPoint num="9" id="3455" />
+<TGConnectingPoint num="10" id="3456" />
+<TGConnectingPoint num="11" id="3457" />
+<TGConnectingPoint num="12" id="3458" />
+<TGConnectingPoint num="13" id="3459" />
+<TGConnectingPoint num="14" id="3460" />
+<TGConnectingPoint num="15" id="3461" />
+<TGConnectingPoint num="16" id="3462" />
+<TGConnectingPoint num="17" id="3463" />
+<TGConnectingPoint num="18" id="3464" />
+<TGConnectingPoint num="19" id="3465" />
+<TGConnectingPoint num="20" id="3466" />
+<TGConnectingPoint num="21" id="3467" />
+<TGConnectingPoint num="22" id="3468" />
+<TGConnectingPoint num="23" id="3469" />
<extraparam>
<info stereotype="BRIDGE" nodeName="BridgeECU1" />
<attributes bufferByteDataSize="4" clockRatio="2" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="1926" >
+<COMPONENT type="1105" id="3495" >
<cdparam x="985" y="270" />
<sizeparam width="165" height="80" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="MemoryECU1" value="name" />
-<TGConnectingPoint num="0" id="1902" />
-<TGConnectingPoint num="1" id="1903" />
-<TGConnectingPoint num="2" id="1904" />
-<TGConnectingPoint num="3" id="1905" />
-<TGConnectingPoint num="4" id="1906" />
-<TGConnectingPoint num="5" id="1907" />
-<TGConnectingPoint num="6" id="1908" />
-<TGConnectingPoint num="7" id="1909" />
-<TGConnectingPoint num="8" id="1910" />
-<TGConnectingPoint num="9" id="1911" />
-<TGConnectingPoint num="10" id="1912" />
-<TGConnectingPoint num="11" id="1913" />
-<TGConnectingPoint num="12" id="1914" />
-<TGConnectingPoint num="13" id="1915" />
-<TGConnectingPoint num="14" id="1916" />
-<TGConnectingPoint num="15" id="1917" />
-<TGConnectingPoint num="16" id="1918" />
-<TGConnectingPoint num="17" id="1919" />
-<TGConnectingPoint num="18" id="1920" />
-<TGConnectingPoint num="19" id="1921" />
-<TGConnectingPoint num="20" id="1922" />
-<TGConnectingPoint num="21" id="1923" />
-<TGConnectingPoint num="22" id="1924" />
-<TGConnectingPoint num="23" id="1925" />
+<TGConnectingPoint num="0" id="3471" />
+<TGConnectingPoint num="1" id="3472" />
+<TGConnectingPoint num="2" id="3473" />
+<TGConnectingPoint num="3" id="3474" />
+<TGConnectingPoint num="4" id="3475" />
+<TGConnectingPoint num="5" id="3476" />
+<TGConnectingPoint num="6" id="3477" />
+<TGConnectingPoint num="7" id="3478" />
+<TGConnectingPoint num="8" id="3479" />
+<TGConnectingPoint num="9" id="3480" />
+<TGConnectingPoint num="10" id="3481" />
+<TGConnectingPoint num="11" id="3482" />
+<TGConnectingPoint num="12" id="3483" />
+<TGConnectingPoint num="13" id="3484" />
+<TGConnectingPoint num="14" id="3485" />
+<TGConnectingPoint num="15" id="3486" />
+<TGConnectingPoint num="16" id="3487" />
+<TGConnectingPoint num="17" id="3488" />
+<TGConnectingPoint num="18" id="3489" />
+<TGConnectingPoint num="19" id="3490" />
+<TGConnectingPoint num="20" id="3491" />
+<TGConnectingPoint num="21" id="3492" />
+<TGConnectingPoint num="22" id="3493" />
+<TGConnectingPoint num="23" id="3494" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemoryECU1" />
-<attributes byteDataSize="4" clockRatio="2" bufferType="0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="2" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1951" >
+<COMPONENT type="1102" id="3520" >
<cdparam x="448" y="206" />
<sizeparam width="224" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="InternalBusECU1" value="name" />
-<TGConnectingPoint num="0" id="1927" />
-<TGConnectingPoint num="1" id="1928" />
-<TGConnectingPoint num="2" id="1929" />
-<TGConnectingPoint num="3" id="1930" />
-<TGConnectingPoint num="4" id="1931" />
-<TGConnectingPoint num="5" id="1932" />
-<TGConnectingPoint num="6" id="1933" />
-<TGConnectingPoint num="7" id="1934" />
-<TGConnectingPoint num="8" id="1935" />
-<TGConnectingPoint num="9" id="1936" />
-<TGConnectingPoint num="10" id="1937" />
-<TGConnectingPoint num="11" id="1938" />
-<TGConnectingPoint num="12" id="1939" />
-<TGConnectingPoint num="13" id="1940" />
-<TGConnectingPoint num="14" id="1941" />
-<TGConnectingPoint num="15" id="1942" />
-<TGConnectingPoint num="16" id="1943" />
-<TGConnectingPoint num="17" id="1944" />
-<TGConnectingPoint num="18" id="1945" />
-<TGConnectingPoint num="19" id="1946" />
-<TGConnectingPoint num="20" id="1947" />
-<TGConnectingPoint num="21" id="1948" />
-<TGConnectingPoint num="22" id="1949" />
-<TGConnectingPoint num="23" id="1950" />
+<TGConnectingPoint num="0" id="3496" />
+<TGConnectingPoint num="1" id="3497" />
+<TGConnectingPoint num="2" id="3498" />
+<TGConnectingPoint num="3" id="3499" />
+<TGConnectingPoint num="4" id="3500" />
+<TGConnectingPoint num="5" id="3501" />
+<TGConnectingPoint num="6" id="3502" />
+<TGConnectingPoint num="7" id="3503" />
+<TGConnectingPoint num="8" id="3504" />
+<TGConnectingPoint num="9" id="3505" />
+<TGConnectingPoint num="10" id="3506" />
+<TGConnectingPoint num="11" id="3507" />
+<TGConnectingPoint num="12" id="3508" />
+<TGConnectingPoint num="13" id="3509" />
+<TGConnectingPoint num="14" id="3510" />
+<TGConnectingPoint num="15" id="3511" />
+<TGConnectingPoint num="16" id="3512" />
+<TGConnectingPoint num="17" id="3513" />
+<TGConnectingPoint num="18" id="3514" />
+<TGConnectingPoint num="19" id="3515" />
+<TGConnectingPoint num="20" id="3516" />
+<TGConnectingPoint num="21" id="3517" />
+<TGConnectingPoint num="22" id="3518" />
+<TGConnectingPoint num="23" id="3519" />
<extraparam>
<info stereotype="BUS-RR" nodeName="InternalBusECU1" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="2" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="2" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="2003" >
+<COMPONENT type="1100" id="3572" >
<cdparam x="757" y="74" />
<sizeparam width="335" height="173" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="CPU_ECU1" value="name" />
-<TGConnectingPoint num="0" id="1979" />
-<TGConnectingPoint num="1" id="1980" />
-<TGConnectingPoint num="2" id="1981" />
-<TGConnectingPoint num="3" id="1982" />
-<TGConnectingPoint num="4" id="1983" />
-<TGConnectingPoint num="5" id="1984" />
-<TGConnectingPoint num="6" id="1985" />
-<TGConnectingPoint num="7" id="1986" />
-<TGConnectingPoint num="8" id="1987" />
-<TGConnectingPoint num="9" id="1988" />
-<TGConnectingPoint num="10" id="1989" />
-<TGConnectingPoint num="11" id="1990" />
-<TGConnectingPoint num="12" id="1991" />
-<TGConnectingPoint num="13" id="1992" />
-<TGConnectingPoint num="14" id="1993" />
-<TGConnectingPoint num="15" id="1994" />
-<TGConnectingPoint num="16" id="1995" />
-<TGConnectingPoint num="17" id="1996" />
-<TGConnectingPoint num="18" id="1997" />
-<TGConnectingPoint num="19" id="1998" />
-<TGConnectingPoint num="20" id="1999" />
-<TGConnectingPoint num="21" id="2000" />
-<TGConnectingPoint num="22" id="2001" />
-<TGConnectingPoint num="23" id="2002" />
+<TGConnectingPoint num="0" id="3548" />
+<TGConnectingPoint num="1" id="3549" />
+<TGConnectingPoint num="2" id="3550" />
+<TGConnectingPoint num="3" id="3551" />
+<TGConnectingPoint num="4" id="3552" />
+<TGConnectingPoint num="5" id="3553" />
+<TGConnectingPoint num="6" id="3554" />
+<TGConnectingPoint num="7" id="3555" />
+<TGConnectingPoint num="8" id="3556" />
+<TGConnectingPoint num="9" id="3557" />
+<TGConnectingPoint num="10" id="3558" />
+<TGConnectingPoint num="11" id="3559" />
+<TGConnectingPoint num="12" id="3560" />
+<TGConnectingPoint num="13" id="3561" />
+<TGConnectingPoint num="14" id="3562" />
+<TGConnectingPoint num="15" id="3563" />
+<TGConnectingPoint num="16" id="3564" />
+<TGConnectingPoint num="17" id="3565" />
+<TGConnectingPoint num="18" id="3566" />
+<TGConnectingPoint num="19" id="3567" />
+<TGConnectingPoint num="20" id="3568" />
+<TGConnectingPoint num="21" id="3569" />
+<TGConnectingPoint num="22" id="3570" />
+<TGConnectingPoint num="23" id="3571" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU_ECU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1960" >
-<father id="2003" num="0" />
-<cdparam x="766" y="157" />
-<sizeparam width="315" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3529" >
+<father id="3572" num="0" />
+<cdparam x="807" y="111" />
+<sizeparam width="235" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="133" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::DistributionManager_ECU1" />
-<TGConnectingPoint num="0" id="1952" />
-<TGConnectingPoint num="1" id="1953" />
-<TGConnectingPoint num="2" id="1954" />
-<TGConnectingPoint num="3" id="1955" />
-<TGConnectingPoint num="4" id="1956" />
-<TGConnectingPoint num="5" id="1957" />
-<TGConnectingPoint num="6" id="1958" />
-<TGConnectingPoint num="7" id="1959" />
+<cdrectangleparam minX="0" maxX="100" minY="0" maxY="133" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::App_ECU1" />
+<TGConnectingPoint num="0" id="3521" />
+<TGConnectingPoint num="1" id="3522" />
+<TGConnectingPoint num="2" id="3523" />
+<TGConnectingPoint num="3" id="3524" />
+<TGConnectingPoint num="4" id="3525" />
+<TGConnectingPoint num="5" id="3526" />
+<TGConnectingPoint num="6" id="3527" />
+<TGConnectingPoint num="7" id="3528" />
<extraparam>
-<info value="KDP Perf Design_Sec::DistributionManager_ECU1" taskName="DistributionManager_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::App_ECU1" taskName="App_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1969" >
-<father id="2003" num="1" />
+<SUBCOMPONENT type="1101" id="3538" >
+<father id="3572" num="1" />
<cdparam x="806" y="202" />
-<sizeparam width="222" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="234" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="113" minY="0" maxY="133" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="133" />
<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECU1" />
-<TGConnectingPoint num="0" id="1961" />
-<TGConnectingPoint num="1" id="1962" />
-<TGConnectingPoint num="2" id="1963" />
-<TGConnectingPoint num="3" id="1964" />
-<TGConnectingPoint num="4" id="1965" />
-<TGConnectingPoint num="5" id="1966" />
-<TGConnectingPoint num="6" id="1967" />
-<TGConnectingPoint num="7" id="1968" />
+<TGConnectingPoint num="0" id="3530" />
+<TGConnectingPoint num="1" id="3531" />
+<TGConnectingPoint num="2" id="3532" />
+<TGConnectingPoint num="3" id="3533" />
+<TGConnectingPoint num="4" id="3534" />
+<TGConnectingPoint num="5" id="3535" />
+<TGConnectingPoint num="6" id="3536" />
+<TGConnectingPoint num="7" id="3537" />
<extraparam>
<info value="KDP Perf Design_Sec::CTP_ECU1" taskName="CTP_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1978" >
-<father id="2003" num="2" />
-<cdparam x="807" y="111" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3547" >
+<father id="3572" num="2" />
+<cdparam x="754" y="157" />
+<sizeparam width="338" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="112" minY="0" maxY="133" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::App_ECU1" />
-<TGConnectingPoint num="0" id="1970" />
-<TGConnectingPoint num="1" id="1971" />
-<TGConnectingPoint num="2" id="1972" />
-<TGConnectingPoint num="3" id="1973" />
-<TGConnectingPoint num="4" id="1974" />
-<TGConnectingPoint num="5" id="1975" />
-<TGConnectingPoint num="6" id="1976" />
-<TGConnectingPoint num="7" id="1977" />
+<cdrectangleparam minX="0" maxX="-3" minY="0" maxY="133" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::DistributionManager_ECU1" />
+<TGConnectingPoint num="0" id="3539" />
+<TGConnectingPoint num="1" id="3540" />
+<TGConnectingPoint num="2" id="3541" />
+<TGConnectingPoint num="3" id="3542" />
+<TGConnectingPoint num="4" id="3543" />
+<TGConnectingPoint num="5" id="3544" />
+<TGConnectingPoint num="6" id="3545" />
+<TGConnectingPoint num="7" id="3546" />
<extraparam>
-<info value="KDP Perf Design_Sec::App_ECU1" taskName="App_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::DistributionManager_ECU1" taskName="DistributionManager_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="2037" >
+<COMPONENT type="1100" id="3606" >
<cdparam x="440" y="82" />
<sizeparam width="240" height="105" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="HSM_ECU1" value="name" />
-<TGConnectingPoint num="0" id="2013" />
-<TGConnectingPoint num="1" id="2014" />
-<TGConnectingPoint num="2" id="2015" />
-<TGConnectingPoint num="3" id="2016" />
-<TGConnectingPoint num="4" id="2017" />
-<TGConnectingPoint num="5" id="2018" />
-<TGConnectingPoint num="6" id="2019" />
-<TGConnectingPoint num="7" id="2020" />
-<TGConnectingPoint num="8" id="2021" />
-<TGConnectingPoint num="9" id="2022" />
-<TGConnectingPoint num="10" id="2023" />
-<TGConnectingPoint num="11" id="2024" />
-<TGConnectingPoint num="12" id="2025" />
-<TGConnectingPoint num="13" id="2026" />
-<TGConnectingPoint num="14" id="2027" />
-<TGConnectingPoint num="15" id="2028" />
-<TGConnectingPoint num="16" id="2029" />
-<TGConnectingPoint num="17" id="2030" />
-<TGConnectingPoint num="18" id="2031" />
-<TGConnectingPoint num="19" id="2032" />
-<TGConnectingPoint num="20" id="2033" />
-<TGConnectingPoint num="21" id="2034" />
-<TGConnectingPoint num="22" id="2035" />
-<TGConnectingPoint num="23" id="2036" />
+<TGConnectingPoint num="0" id="3582" />
+<TGConnectingPoint num="1" id="3583" />
+<TGConnectingPoint num="2" id="3584" />
+<TGConnectingPoint num="3" id="3585" />
+<TGConnectingPoint num="4" id="3586" />
+<TGConnectingPoint num="5" id="3587" />
+<TGConnectingPoint num="6" id="3588" />
+<TGConnectingPoint num="7" id="3589" />
+<TGConnectingPoint num="8" id="3590" />
+<TGConnectingPoint num="9" id="3591" />
+<TGConnectingPoint num="10" id="3592" />
+<TGConnectingPoint num="11" id="3593" />
+<TGConnectingPoint num="12" id="3594" />
+<TGConnectingPoint num="13" id="3595" />
+<TGConnectingPoint num="14" id="3596" />
+<TGConnectingPoint num="15" id="3597" />
+<TGConnectingPoint num="16" id="3598" />
+<TGConnectingPoint num="17" id="3599" />
+<TGConnectingPoint num="18" id="3600" />
+<TGConnectingPoint num="19" id="3601" />
+<TGConnectingPoint num="20" id="3602" />
+<TGConnectingPoint num="21" id="3603" />
+<TGConnectingPoint num="22" id="3604" />
+<TGConnectingPoint num="23" id="3605" />
<extraparam>
<info stereotype="CPURRPB" nodeName="HSM_ECU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="2012" >
-<father id="2037" num="0" />
-<cdparam x="449" y="130" />
-<sizeparam width="224" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3581" >
+<father id="3606" num="0" />
+<cdparam x="442" y="130" />
+<sizeparam width="238" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="65" />
+<cdrectangleparam minX="0" maxX="2" minY="0" maxY="65" />
<infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_ECU1" />
-<TGConnectingPoint num="0" id="2004" />
-<TGConnectingPoint num="1" id="2005" />
-<TGConnectingPoint num="2" id="2006" />
-<TGConnectingPoint num="3" id="2007" />
-<TGConnectingPoint num="4" id="2008" />
-<TGConnectingPoint num="5" id="2009" />
-<TGConnectingPoint num="6" id="2010" />
-<TGConnectingPoint num="7" id="2011" />
+<TGConnectingPoint num="0" id="3573" />
+<TGConnectingPoint num="1" id="3574" />
+<TGConnectingPoint num="2" id="3575" />
+<TGConnectingPoint num="3" id="3576" />
+<TGConnectingPoint num="4" id="3577" />
+<TGConnectingPoint num="5" id="3578" />
+<TGConnectingPoint num="6" id="3579" />
+<TGConnectingPoint num="7" id="3580" />
<extraparam>
<info value="KDP Perf Design_Sec::HSM_ECU1" taskName="HSM_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1106" id="2062" >
+<COMPONENT type="1106" id="3631" >
<cdparam x="446" y="726" />
<sizeparam width="129" height="59" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="BridgeKM" value="name" />
-<TGConnectingPoint num="0" id="2038" />
-<TGConnectingPoint num="1" id="2039" />
-<TGConnectingPoint num="2" id="2040" />
-<TGConnectingPoint num="3" id="2041" />
-<TGConnectingPoint num="4" id="2042" />
-<TGConnectingPoint num="5" id="2043" />
-<TGConnectingPoint num="6" id="2044" />
-<TGConnectingPoint num="7" id="2045" />
-<TGConnectingPoint num="8" id="2046" />
-<TGConnectingPoint num="9" id="2047" />
-<TGConnectingPoint num="10" id="2048" />
-<TGConnectingPoint num="11" id="2049" />
-<TGConnectingPoint num="12" id="2050" />
-<TGConnectingPoint num="13" id="2051" />
-<TGConnectingPoint num="14" id="2052" />
-<TGConnectingPoint num="15" id="2053" />
-<TGConnectingPoint num="16" id="2054" />
-<TGConnectingPoint num="17" id="2055" />
-<TGConnectingPoint num="18" id="2056" />
-<TGConnectingPoint num="19" id="2057" />
-<TGConnectingPoint num="20" id="2058" />
-<TGConnectingPoint num="21" id="2059" />
-<TGConnectingPoint num="22" id="2060" />
-<TGConnectingPoint num="23" id="2061" />
+<TGConnectingPoint num="0" id="3607" />
+<TGConnectingPoint num="1" id="3608" />
+<TGConnectingPoint num="2" id="3609" />
+<TGConnectingPoint num="3" id="3610" />
+<TGConnectingPoint num="4" id="3611" />
+<TGConnectingPoint num="5" id="3612" />
+<TGConnectingPoint num="6" id="3613" />
+<TGConnectingPoint num="7" id="3614" />
+<TGConnectingPoint num="8" id="3615" />
+<TGConnectingPoint num="9" id="3616" />
+<TGConnectingPoint num="10" id="3617" />
+<TGConnectingPoint num="11" id="3618" />
+<TGConnectingPoint num="12" id="3619" />
+<TGConnectingPoint num="13" id="3620" />
+<TGConnectingPoint num="14" id="3621" />
+<TGConnectingPoint num="15" id="3622" />
+<TGConnectingPoint num="16" id="3623" />
+<TGConnectingPoint num="17" id="3624" />
+<TGConnectingPoint num="18" id="3625" />
+<TGConnectingPoint num="19" id="3626" />
+<TGConnectingPoint num="20" id="3627" />
+<TGConnectingPoint num="21" id="3628" />
+<TGConnectingPoint num="22" id="3629" />
+<TGConnectingPoint num="23" id="3630" />
<extraparam>
<info stereotype="BRIDGE" nodeName="BridgeKM" />
<attributes bufferByteDataSize="4" clockRatio="2" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="2087" >
+<COMPONENT type="1105" id="3656" >
<cdparam x="443" y="825" />
<sizeparam width="165" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="MemoryKM" value="name" />
-<TGConnectingPoint num="0" id="2063" />
-<TGConnectingPoint num="1" id="2064" />
-<TGConnectingPoint num="2" id="2065" />
-<TGConnectingPoint num="3" id="2066" />
-<TGConnectingPoint num="4" id="2067" />
-<TGConnectingPoint num="5" id="2068" />
-<TGConnectingPoint num="6" id="2069" />
-<TGConnectingPoint num="7" id="2070" />
-<TGConnectingPoint num="8" id="2071" />
-<TGConnectingPoint num="9" id="2072" />
-<TGConnectingPoint num="10" id="2073" />
-<TGConnectingPoint num="11" id="2074" />
-<TGConnectingPoint num="12" id="2075" />
-<TGConnectingPoint num="13" id="2076" />
-<TGConnectingPoint num="14" id="2077" />
-<TGConnectingPoint num="15" id="2078" />
-<TGConnectingPoint num="16" id="2079" />
-<TGConnectingPoint num="17" id="2080" />
-<TGConnectingPoint num="18" id="2081" />
-<TGConnectingPoint num="19" id="2082" />
-<TGConnectingPoint num="20" id="2083" />
-<TGConnectingPoint num="21" id="2084" />
-<TGConnectingPoint num="22" id="2085" />
-<TGConnectingPoint num="23" id="2086" />
+<TGConnectingPoint num="0" id="3632" />
+<TGConnectingPoint num="1" id="3633" />
+<TGConnectingPoint num="2" id="3634" />
+<TGConnectingPoint num="3" id="3635" />
+<TGConnectingPoint num="4" id="3636" />
+<TGConnectingPoint num="5" id="3637" />
+<TGConnectingPoint num="6" id="3638" />
+<TGConnectingPoint num="7" id="3639" />
+<TGConnectingPoint num="8" id="3640" />
+<TGConnectingPoint num="9" id="3641" />
+<TGConnectingPoint num="10" id="3642" />
+<TGConnectingPoint num="11" id="3643" />
+<TGConnectingPoint num="12" id="3644" />
+<TGConnectingPoint num="13" id="3645" />
+<TGConnectingPoint num="14" id="3646" />
+<TGConnectingPoint num="15" id="3647" />
+<TGConnectingPoint num="16" id="3648" />
+<TGConnectingPoint num="17" id="3649" />
+<TGConnectingPoint num="18" id="3650" />
+<TGConnectingPoint num="19" id="3651" />
+<TGConnectingPoint num="20" id="3652" />
+<TGConnectingPoint num="21" id="3653" />
+<TGConnectingPoint num="22" id="3654" />
+<TGConnectingPoint num="23" id="3655" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemoryKM" />
-<attributes byteDataSize="4" clockRatio="2" bufferType="0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="2" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="2112" >
+<COMPONENT type="1102" id="3681" >
<cdparam x="648" y="817" />
<sizeparam width="176" height="67" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="InternalBusKM" value="name" />
-<TGConnectingPoint num="0" id="2088" />
-<TGConnectingPoint num="1" id="2089" />
-<TGConnectingPoint num="2" id="2090" />
-<TGConnectingPoint num="3" id="2091" />
-<TGConnectingPoint num="4" id="2092" />
-<TGConnectingPoint num="5" id="2093" />
-<TGConnectingPoint num="6" id="2094" />
-<TGConnectingPoint num="7" id="2095" />
-<TGConnectingPoint num="8" id="2096" />
-<TGConnectingPoint num="9" id="2097" />
-<TGConnectingPoint num="10" id="2098" />
-<TGConnectingPoint num="11" id="2099" />
-<TGConnectingPoint num="12" id="2100" />
-<TGConnectingPoint num="13" id="2101" />
-<TGConnectingPoint num="14" id="2102" />
-<TGConnectingPoint num="15" id="2103" />
-<TGConnectingPoint num="16" id="2104" />
-<TGConnectingPoint num="17" id="2105" />
-<TGConnectingPoint num="18" id="2106" />
-<TGConnectingPoint num="19" id="2107" />
-<TGConnectingPoint num="20" id="2108" />
-<TGConnectingPoint num="21" id="2109" />
-<TGConnectingPoint num="22" id="2110" />
-<TGConnectingPoint num="23" id="2111" />
+<TGConnectingPoint num="0" id="3657" />
+<TGConnectingPoint num="1" id="3658" />
+<TGConnectingPoint num="2" id="3659" />
+<TGConnectingPoint num="3" id="3660" />
+<TGConnectingPoint num="4" id="3661" />
+<TGConnectingPoint num="5" id="3662" />
+<TGConnectingPoint num="6" id="3663" />
+<TGConnectingPoint num="7" id="3664" />
+<TGConnectingPoint num="8" id="3665" />
+<TGConnectingPoint num="9" id="3666" />
+<TGConnectingPoint num="10" id="3667" />
+<TGConnectingPoint num="11" id="3668" />
+<TGConnectingPoint num="12" id="3669" />
+<TGConnectingPoint num="13" id="3670" />
+<TGConnectingPoint num="14" id="3671" />
+<TGConnectingPoint num="15" id="3672" />
+<TGConnectingPoint num="16" id="3673" />
+<TGConnectingPoint num="17" id="3674" />
+<TGConnectingPoint num="18" id="3675" />
+<TGConnectingPoint num="19" id="3676" />
+<TGConnectingPoint num="20" id="3677" />
+<TGConnectingPoint num="21" id="3678" />
+<TGConnectingPoint num="22" id="3679" />
+<TGConnectingPoint num="23" id="3680" />
<extraparam>
<info stereotype="BUS-RR" nodeName="InternalBusKM" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="2" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="2" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="2155" >
+<COMPONENT type="1100" id="3724" >
<cdparam x="510" y="905" />
<sizeparam width="243" height="147" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="CPU_KM" value="name" />
-<TGConnectingPoint num="0" id="2131" />
-<TGConnectingPoint num="1" id="2132" />
-<TGConnectingPoint num="2" id="2133" />
-<TGConnectingPoint num="3" id="2134" />
-<TGConnectingPoint num="4" id="2135" />
-<TGConnectingPoint num="5" id="2136" />
-<TGConnectingPoint num="6" id="2137" />
-<TGConnectingPoint num="7" id="2138" />
-<TGConnectingPoint num="8" id="2139" />
-<TGConnectingPoint num="9" id="2140" />
-<TGConnectingPoint num="10" id="2141" />
-<TGConnectingPoint num="11" id="2142" />
-<TGConnectingPoint num="12" id="2143" />
-<TGConnectingPoint num="13" id="2144" />
-<TGConnectingPoint num="14" id="2145" />
-<TGConnectingPoint num="15" id="2146" />
-<TGConnectingPoint num="16" id="2147" />
-<TGConnectingPoint num="17" id="2148" />
-<TGConnectingPoint num="18" id="2149" />
-<TGConnectingPoint num="19" id="2150" />
-<TGConnectingPoint num="20" id="2151" />
-<TGConnectingPoint num="21" id="2152" />
-<TGConnectingPoint num="22" id="2153" />
-<TGConnectingPoint num="23" id="2154" />
+<TGConnectingPoint num="0" id="3700" />
+<TGConnectingPoint num="1" id="3701" />
+<TGConnectingPoint num="2" id="3702" />
+<TGConnectingPoint num="3" id="3703" />
+<TGConnectingPoint num="4" id="3704" />
+<TGConnectingPoint num="5" id="3705" />
+<TGConnectingPoint num="6" id="3706" />
+<TGConnectingPoint num="7" id="3707" />
+<TGConnectingPoint num="8" id="3708" />
+<TGConnectingPoint num="9" id="3709" />
+<TGConnectingPoint num="10" id="3710" />
+<TGConnectingPoint num="11" id="3711" />
+<TGConnectingPoint num="12" id="3712" />
+<TGConnectingPoint num="13" id="3713" />
+<TGConnectingPoint num="14" id="3714" />
+<TGConnectingPoint num="15" id="3715" />
+<TGConnectingPoint num="16" id="3716" />
+<TGConnectingPoint num="17" id="3717" />
+<TGConnectingPoint num="18" id="3718" />
+<TGConnectingPoint num="19" id="3719" />
+<TGConnectingPoint num="20" id="3720" />
+<TGConnectingPoint num="21" id="3721" />
+<TGConnectingPoint num="22" id="3722" />
+<TGConnectingPoint num="23" id="3723" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU_KM" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="2121" >
-<father id="2155" num="0" />
-<cdparam x="527" y="945" />
-<sizeparam width="180" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3690" >
+<father id="3724" num="0" />
+<cdparam x="522" y="992" />
+<sizeparam width="218" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="63" minY="0" maxY="107" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::KM" />
-<TGConnectingPoint num="0" id="2113" />
-<TGConnectingPoint num="1" id="2114" />
-<TGConnectingPoint num="2" id="2115" />
-<TGConnectingPoint num="3" id="2116" />
-<TGConnectingPoint num="4" id="2117" />
-<TGConnectingPoint num="5" id="2118" />
-<TGConnectingPoint num="6" id="2119" />
-<TGConnectingPoint num="7" id="2120" />
+<cdrectangleparam minX="0" maxX="25" minY="0" maxY="107" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_KM" />
+<TGConnectingPoint num="0" id="3682" />
+<TGConnectingPoint num="1" id="3683" />
+<TGConnectingPoint num="2" id="3684" />
+<TGConnectingPoint num="3" id="3685" />
+<TGConnectingPoint num="4" id="3686" />
+<TGConnectingPoint num="5" id="3687" />
+<TGConnectingPoint num="6" id="3688" />
+<TGConnectingPoint num="7" id="3689" />
<extraparam>
-<info value="KDP Perf Design_Sec::KM" taskName="KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::CTP_KM" taskName="CTP_KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="2130" >
-<father id="2155" num="1" />
-<cdparam x="522" y="992" />
-<sizeparam width="209" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3699" >
+<father id="3724" num="1" />
+<cdparam x="527" y="945" />
+<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="34" minY="0" maxY="107" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_KM" />
-<TGConnectingPoint num="0" id="2122" />
-<TGConnectingPoint num="1" id="2123" />
-<TGConnectingPoint num="2" id="2124" />
-<TGConnectingPoint num="3" id="2125" />
-<TGConnectingPoint num="4" id="2126" />
-<TGConnectingPoint num="5" id="2127" />
-<TGConnectingPoint num="6" id="2128" />
-<TGConnectingPoint num="7" id="2129" />
+<cdrectangleparam minX="0" maxX="54" minY="0" maxY="107" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::KM" />
+<TGConnectingPoint num="0" id="3691" />
+<TGConnectingPoint num="1" id="3692" />
+<TGConnectingPoint num="2" id="3693" />
+<TGConnectingPoint num="3" id="3694" />
+<TGConnectingPoint num="4" id="3695" />
+<TGConnectingPoint num="5" id="3696" />
+<TGConnectingPoint num="6" id="3697" />
+<TGConnectingPoint num="7" id="3698" />
<extraparam>
-<info value="KDP Perf Design_Sec::CTP_KM" taskName="CTP_KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::KM" taskName="KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="2189" >
+<COMPONENT type="1100" id="3758" >
<cdparam x="632" y="690" />
<sizeparam width="229" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="HSM_KM" value="name" />
-<TGConnectingPoint num="0" id="2165" />
-<TGConnectingPoint num="1" id="2166" />
-<TGConnectingPoint num="2" id="2167" />
-<TGConnectingPoint num="3" id="2168" />
-<TGConnectingPoint num="4" id="2169" />
-<TGConnectingPoint num="5" id="2170" />
-<TGConnectingPoint num="6" id="2171" />
-<TGConnectingPoint num="7" id="2172" />
-<TGConnectingPoint num="8" id="2173" />
-<TGConnectingPoint num="9" id="2174" />
-<TGConnectingPoint num="10" id="2175" />
-<TGConnectingPoint num="11" id="2176" />
-<TGConnectingPoint num="12" id="2177" />
-<TGConnectingPoint num="13" id="2178" />
-<TGConnectingPoint num="14" id="2179" />
-<TGConnectingPoint num="15" id="2180" />
-<TGConnectingPoint num="16" id="2181" />
-<TGConnectingPoint num="17" id="2182" />
-<TGConnectingPoint num="18" id="2183" />
-<TGConnectingPoint num="19" id="2184" />
-<TGConnectingPoint num="20" id="2185" />
-<TGConnectingPoint num="21" id="2186" />
-<TGConnectingPoint num="22" id="2187" />
-<TGConnectingPoint num="23" id="2188" />
+<TGConnectingPoint num="0" id="3734" />
+<TGConnectingPoint num="1" id="3735" />
+<TGConnectingPoint num="2" id="3736" />
+<TGConnectingPoint num="3" id="3737" />
+<TGConnectingPoint num="4" id="3738" />
+<TGConnectingPoint num="5" id="3739" />
+<TGConnectingPoint num="6" id="3740" />
+<TGConnectingPoint num="7" id="3741" />
+<TGConnectingPoint num="8" id="3742" />
+<TGConnectingPoint num="9" id="3743" />
+<TGConnectingPoint num="10" id="3744" />
+<TGConnectingPoint num="11" id="3745" />
+<TGConnectingPoint num="12" id="3746" />
+<TGConnectingPoint num="13" id="3747" />
+<TGConnectingPoint num="14" id="3748" />
+<TGConnectingPoint num="15" id="3749" />
+<TGConnectingPoint num="16" id="3750" />
+<TGConnectingPoint num="17" id="3751" />
+<TGConnectingPoint num="18" id="3752" />
+<TGConnectingPoint num="19" id="3753" />
+<TGConnectingPoint num="20" id="3754" />
+<TGConnectingPoint num="21" id="3755" />
+<TGConnectingPoint num="22" id="3756" />
+<TGConnectingPoint num="23" id="3757" />
<extraparam>
<info stereotype="CPURRPB" nodeName="HSM_KM" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="2164" >
-<father id="2189" num="0" />
-<cdparam x="642" y="733" />
-<sizeparam width="211" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3733" >
+<father id="3758" num="0" />
+<cdparam x="639" y="733" />
+<sizeparam width="222" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="18" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="7" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_KM" />
-<TGConnectingPoint num="0" id="2156" />
-<TGConnectingPoint num="1" id="2157" />
-<TGConnectingPoint num="2" id="2158" />
-<TGConnectingPoint num="3" id="2159" />
-<TGConnectingPoint num="4" id="2160" />
-<TGConnectingPoint num="5" id="2161" />
-<TGConnectingPoint num="6" id="2162" />
-<TGConnectingPoint num="7" id="2163" />
+<TGConnectingPoint num="0" id="3725" />
+<TGConnectingPoint num="1" id="3726" />
+<TGConnectingPoint num="2" id="3727" />
+<TGConnectingPoint num="3" id="3728" />
+<TGConnectingPoint num="4" id="3729" />
+<TGConnectingPoint num="5" id="3730" />
+<TGConnectingPoint num="6" id="3731" />
+<TGConnectingPoint num="7" id="3732" />
<extraparam>
<info value="KDP Perf Design_Sec::HSM_KM" taskName="HSM_KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1106" id="2214" >
+<COMPONENT type="1106" id="3783" >
<cdparam x="1046" y="617" />
<sizeparam width="163" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="BridgeECUN" value="name" />
-<TGConnectingPoint num="0" id="2190" />
-<TGConnectingPoint num="1" id="2191" />
-<TGConnectingPoint num="2" id="2192" />
-<TGConnectingPoint num="3" id="2193" />
-<TGConnectingPoint num="4" id="2194" />
-<TGConnectingPoint num="5" id="2195" />
-<TGConnectingPoint num="6" id="2196" />
-<TGConnectingPoint num="7" id="2197" />
-<TGConnectingPoint num="8" id="2198" />
-<TGConnectingPoint num="9" id="2199" />
-<TGConnectingPoint num="10" id="2200" />
-<TGConnectingPoint num="11" id="2201" />
-<TGConnectingPoint num="12" id="2202" />
-<TGConnectingPoint num="13" id="2203" />
-<TGConnectingPoint num="14" id="2204" />
-<TGConnectingPoint num="15" id="2205" />
-<TGConnectingPoint num="16" id="2206" />
-<TGConnectingPoint num="17" id="2207" />
-<TGConnectingPoint num="18" id="2208" />
-<TGConnectingPoint num="19" id="2209" />
-<TGConnectingPoint num="20" id="2210" />
-<TGConnectingPoint num="21" id="2211" />
-<TGConnectingPoint num="22" id="2212" />
-<TGConnectingPoint num="23" id="2213" />
+<TGConnectingPoint num="0" id="3759" />
+<TGConnectingPoint num="1" id="3760" />
+<TGConnectingPoint num="2" id="3761" />
+<TGConnectingPoint num="3" id="3762" />
+<TGConnectingPoint num="4" id="3763" />
+<TGConnectingPoint num="5" id="3764" />
+<TGConnectingPoint num="6" id="3765" />
+<TGConnectingPoint num="7" id="3766" />
+<TGConnectingPoint num="8" id="3767" />
+<TGConnectingPoint num="9" id="3768" />
+<TGConnectingPoint num="10" id="3769" />
+<TGConnectingPoint num="11" id="3770" />
+<TGConnectingPoint num="12" id="3771" />
+<TGConnectingPoint num="13" id="3772" />
+<TGConnectingPoint num="14" id="3773" />
+<TGConnectingPoint num="15" id="3774" />
+<TGConnectingPoint num="16" id="3775" />
+<TGConnectingPoint num="17" id="3776" />
+<TGConnectingPoint num="18" id="3777" />
+<TGConnectingPoint num="19" id="3778" />
+<TGConnectingPoint num="20" id="3779" />
+<TGConnectingPoint num="21" id="3780" />
+<TGConnectingPoint num="22" id="3781" />
+<TGConnectingPoint num="23" id="3782" />
<extraparam>
<info stereotype="BRIDGE" nodeName="BridgeECUN" />
<attributes bufferByteDataSize="4" clockRatio="2" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="2239" >
+<COMPONENT type="1105" id="3808" >
<cdparam x="874" y="615" />
<sizeparam width="152" height="53" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="MemoryECUN" value="name" />
-<TGConnectingPoint num="0" id="2215" />
-<TGConnectingPoint num="1" id="2216" />
-<TGConnectingPoint num="2" id="2217" />
-<TGConnectingPoint num="3" id="2218" />
-<TGConnectingPoint num="4" id="2219" />
-<TGConnectingPoint num="5" id="2220" />
-<TGConnectingPoint num="6" id="2221" />
-<TGConnectingPoint num="7" id="2222" />
-<TGConnectingPoint num="8" id="2223" />
-<TGConnectingPoint num="9" id="2224" />
-<TGConnectingPoint num="10" id="2225" />
-<TGConnectingPoint num="11" id="2226" />
-<TGConnectingPoint num="12" id="2227" />
-<TGConnectingPoint num="13" id="2228" />
-<TGConnectingPoint num="14" id="2229" />
-<TGConnectingPoint num="15" id="2230" />
-<TGConnectingPoint num="16" id="2231" />
-<TGConnectingPoint num="17" id="2232" />
-<TGConnectingPoint num="18" id="2233" />
-<TGConnectingPoint num="19" id="2234" />
-<TGConnectingPoint num="20" id="2235" />
-<TGConnectingPoint num="21" id="2236" />
-<TGConnectingPoint num="22" id="2237" />
-<TGConnectingPoint num="23" id="2238" />
+<TGConnectingPoint num="0" id="3784" />
+<TGConnectingPoint num="1" id="3785" />
+<TGConnectingPoint num="2" id="3786" />
+<TGConnectingPoint num="3" id="3787" />
+<TGConnectingPoint num="4" id="3788" />
+<TGConnectingPoint num="5" id="3789" />
+<TGConnectingPoint num="6" id="3790" />
+<TGConnectingPoint num="7" id="3791" />
+<TGConnectingPoint num="8" id="3792" />
+<TGConnectingPoint num="9" id="3793" />
+<TGConnectingPoint num="10" id="3794" />
+<TGConnectingPoint num="11" id="3795" />
+<TGConnectingPoint num="12" id="3796" />
+<TGConnectingPoint num="13" id="3797" />
+<TGConnectingPoint num="14" id="3798" />
+<TGConnectingPoint num="15" id="3799" />
+<TGConnectingPoint num="16" id="3800" />
+<TGConnectingPoint num="17" id="3801" />
+<TGConnectingPoint num="18" id="3802" />
+<TGConnectingPoint num="19" id="3803" />
+<TGConnectingPoint num="20" id="3804" />
+<TGConnectingPoint num="21" id="3805" />
+<TGConnectingPoint num="22" id="3806" />
+<TGConnectingPoint num="23" id="3807" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemoryECUN" />
-<attributes byteDataSize="4" clockRatio="2" bufferType="0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="2" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="2264" >
+<COMPONENT type="1102" id="3833" >
<cdparam x="1036" y="678" />
<sizeparam width="173" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="InternalBusECUN" value="name" />
-<TGConnectingPoint num="0" id="2240" />
-<TGConnectingPoint num="1" id="2241" />
-<TGConnectingPoint num="2" id="2242" />
-<TGConnectingPoint num="3" id="2243" />
-<TGConnectingPoint num="4" id="2244" />
-<TGConnectingPoint num="5" id="2245" />
-<TGConnectingPoint num="6" id="2246" />
-<TGConnectingPoint num="7" id="2247" />
-<TGConnectingPoint num="8" id="2248" />
-<TGConnectingPoint num="9" id="2249" />
-<TGConnectingPoint num="10" id="2250" />
-<TGConnectingPoint num="11" id="2251" />
-<TGConnectingPoint num="12" id="2252" />
-<TGConnectingPoint num="13" id="2253" />
-<TGConnectingPoint num="14" id="2254" />
-<TGConnectingPoint num="15" id="2255" />
-<TGConnectingPoint num="16" id="2256" />
-<TGConnectingPoint num="17" id="2257" />
-<TGConnectingPoint num="18" id="2258" />
-<TGConnectingPoint num="19" id="2259" />
-<TGConnectingPoint num="20" id="2260" />
-<TGConnectingPoint num="21" id="2261" />
-<TGConnectingPoint num="22" id="2262" />
-<TGConnectingPoint num="23" id="2263" />
+<TGConnectingPoint num="0" id="3809" />
+<TGConnectingPoint num="1" id="3810" />
+<TGConnectingPoint num="2" id="3811" />
+<TGConnectingPoint num="3" id="3812" />
+<TGConnectingPoint num="4" id="3813" />
+<TGConnectingPoint num="5" id="3814" />
+<TGConnectingPoint num="6" id="3815" />
+<TGConnectingPoint num="7" id="3816" />
+<TGConnectingPoint num="8" id="3817" />
+<TGConnectingPoint num="9" id="3818" />
+<TGConnectingPoint num="10" id="3819" />
+<TGConnectingPoint num="11" id="3820" />
+<TGConnectingPoint num="12" id="3821" />
+<TGConnectingPoint num="13" id="3822" />
+<TGConnectingPoint num="14" id="3823" />
+<TGConnectingPoint num="15" id="3824" />
+<TGConnectingPoint num="16" id="3825" />
+<TGConnectingPoint num="17" id="3826" />
+<TGConnectingPoint num="18" id="3827" />
+<TGConnectingPoint num="19" id="3828" />
+<TGConnectingPoint num="20" id="3829" />
+<TGConnectingPoint num="21" id="3830" />
+<TGConnectingPoint num="22" id="3831" />
+<TGConnectingPoint num="23" id="3832" />
<extraparam>
<info stereotype="BUS-RR" nodeName="InternalBusECUN" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="2" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="2" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="2307" >
+<COMPONENT type="1100" id="3876" >
<cdparam x="907" y="892" />
<sizeparam width="283" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="CPU_ECUN" value="name" />
-<TGConnectingPoint num="0" id="2283" />
-<TGConnectingPoint num="1" id="2284" />
-<TGConnectingPoint num="2" id="2285" />
-<TGConnectingPoint num="3" id="2286" />
-<TGConnectingPoint num="4" id="2287" />
-<TGConnectingPoint num="5" id="2288" />
-<TGConnectingPoint num="6" id="2289" />
-<TGConnectingPoint num="7" id="2290" />
-<TGConnectingPoint num="8" id="2291" />
-<TGConnectingPoint num="9" id="2292" />
-<TGConnectingPoint num="10" id="2293" />
-<TGConnectingPoint num="11" id="2294" />
-<TGConnectingPoint num="12" id="2295" />
-<TGConnectingPoint num="13" id="2296" />
-<TGConnectingPoint num="14" id="2297" />
-<TGConnectingPoint num="15" id="2298" />
-<TGConnectingPoint num="16" id="2299" />
-<TGConnectingPoint num="17" id="2300" />
-<TGConnectingPoint num="18" id="2301" />
-<TGConnectingPoint num="19" id="2302" />
-<TGConnectingPoint num="20" id="2303" />
-<TGConnectingPoint num="21" id="2304" />
-<TGConnectingPoint num="22" id="2305" />
-<TGConnectingPoint num="23" id="2306" />
+<TGConnectingPoint num="0" id="3852" />
+<TGConnectingPoint num="1" id="3853" />
+<TGConnectingPoint num="2" id="3854" />
+<TGConnectingPoint num="3" id="3855" />
+<TGConnectingPoint num="4" id="3856" />
+<TGConnectingPoint num="5" id="3857" />
+<TGConnectingPoint num="6" id="3858" />
+<TGConnectingPoint num="7" id="3859" />
+<TGConnectingPoint num="8" id="3860" />
+<TGConnectingPoint num="9" id="3861" />
+<TGConnectingPoint num="10" id="3862" />
+<TGConnectingPoint num="11" id="3863" />
+<TGConnectingPoint num="12" id="3864" />
+<TGConnectingPoint num="13" id="3865" />
+<TGConnectingPoint num="14" id="3866" />
+<TGConnectingPoint num="15" id="3867" />
+<TGConnectingPoint num="16" id="3868" />
+<TGConnectingPoint num="17" id="3869" />
+<TGConnectingPoint num="18" id="3870" />
+<TGConnectingPoint num="19" id="3871" />
+<TGConnectingPoint num="20" id="3872" />
+<TGConnectingPoint num="21" id="3873" />
+<TGConnectingPoint num="22" id="3874" />
+<TGConnectingPoint num="23" id="3875" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU_ECUN" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="2273" >
-<father id="2307" num="0" />
-<cdparam x="934" y="973" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3842" >
+<father id="3876" num="0" />
+<cdparam x="902" y="930" />
+<sizeparam width="288" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="60" minY="0" maxY="86" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECUN" />
-<TGConnectingPoint num="0" id="2265" />
-<TGConnectingPoint num="1" id="2266" />
-<TGConnectingPoint num="2" id="2267" />
-<TGConnectingPoint num="3" id="2268" />
-<TGConnectingPoint num="4" id="2269" />
-<TGConnectingPoint num="5" id="2270" />
-<TGConnectingPoint num="6" id="2271" />
-<TGConnectingPoint num="7" id="2272" />
+<cdrectangleparam minX="0" maxX="-5" minY="0" maxY="86" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::KeyManager_ECUN" />
+<TGConnectingPoint num="0" id="3834" />
+<TGConnectingPoint num="1" id="3835" />
+<TGConnectingPoint num="2" id="3836" />
+<TGConnectingPoint num="3" id="3837" />
+<TGConnectingPoint num="4" id="3838" />
+<TGConnectingPoint num="5" id="3839" />
+<TGConnectingPoint num="6" id="3840" />
+<TGConnectingPoint num="7" id="3841" />
<extraparam>
-<info value="KDP Perf Design_Sec::CTP_ECUN" taskName="CTP_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::KeyManager_ECUN" taskName="KeyManager_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="2282" >
-<father id="2307" num="1" />
-<cdparam x="913" y="930" />
-<sizeparam width="271" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3851" >
+<father id="3876" num="1" />
+<cdparam x="934" y="973" />
+<sizeparam width="235" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="12" minY="0" maxY="86" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::KeyManager_ECUN" />
-<TGConnectingPoint num="0" id="2274" />
-<TGConnectingPoint num="1" id="2275" />
-<TGConnectingPoint num="2" id="2276" />
-<TGConnectingPoint num="3" id="2277" />
-<TGConnectingPoint num="4" id="2278" />
-<TGConnectingPoint num="5" id="2279" />
-<TGConnectingPoint num="6" id="2280" />
-<TGConnectingPoint num="7" id="2281" />
+<cdrectangleparam minX="0" maxX="48" minY="0" maxY="86" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECUN" />
+<TGConnectingPoint num="0" id="3843" />
+<TGConnectingPoint num="1" id="3844" />
+<TGConnectingPoint num="2" id="3845" />
+<TGConnectingPoint num="3" id="3846" />
+<TGConnectingPoint num="4" id="3847" />
+<TGConnectingPoint num="5" id="3848" />
+<TGConnectingPoint num="6" id="3849" />
+<TGConnectingPoint num="7" id="3850" />
<extraparam>
-<info value="KDP Perf Design_Sec::KeyManager_ECUN" taskName="KeyManager_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::CTP_ECUN" taskName="CTP_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="2341" >
+<COMPONENT type="1100" id="3910" >
<cdparam x="895" y="769" />
<sizeparam width="234" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
<infoparam name="HSM_ECUN" value="name" />
-<TGConnectingPoint num="0" id="2317" />
-<TGConnectingPoint num="1" id="2318" />
-<TGConnectingPoint num="2" id="2319" />
-<TGConnectingPoint num="3" id="2320" />
-<TGConnectingPoint num="4" id="2321" />
-<TGConnectingPoint num="5" id="2322" />
-<TGConnectingPoint num="6" id="2323" />
-<TGConnectingPoint num="7" id="2324" />
-<TGConnectingPoint num="8" id="2325" />
-<TGConnectingPoint num="9" id="2326" />
-<TGConnectingPoint num="10" id="2327" />
-<TGConnectingPoint num="11" id="2328" />
-<TGConnectingPoint num="12" id="2329" />
-<TGConnectingPoint num="13" id="2330" />
-<TGConnectingPoint num="14" id="2331" />
-<TGConnectingPoint num="15" id="2332" />
-<TGConnectingPoint num="16" id="2333" />
-<TGConnectingPoint num="17" id="2334" />
-<TGConnectingPoint num="18" id="2335" />
-<TGConnectingPoint num="19" id="2336" />
-<TGConnectingPoint num="20" id="2337" />
-<TGConnectingPoint num="21" id="2338" />
-<TGConnectingPoint num="22" id="2339" />
-<TGConnectingPoint num="23" id="2340" />
+<TGConnectingPoint num="0" id="3886" />
+<TGConnectingPoint num="1" id="3887" />
+<TGConnectingPoint num="2" id="3888" />
+<TGConnectingPoint num="3" id="3889" />
+<TGConnectingPoint num="4" id="3890" />
+<TGConnectingPoint num="5" id="3891" />
+<TGConnectingPoint num="6" id="3892" />
+<TGConnectingPoint num="7" id="3893" />
+<TGConnectingPoint num="8" id="3894" />
+<TGConnectingPoint num="9" id="3895" />
+<TGConnectingPoint num="10" id="3896" />
+<TGConnectingPoint num="11" id="3897" />
+<TGConnectingPoint num="12" id="3898" />
+<TGConnectingPoint num="13" id="3899" />
+<TGConnectingPoint num="14" id="3900" />
+<TGConnectingPoint num="15" id="3901" />
+<TGConnectingPoint num="16" id="3902" />
+<TGConnectingPoint num="17" id="3903" />
+<TGConnectingPoint num="18" id="3904" />
+<TGConnectingPoint num="19" id="3905" />
+<TGConnectingPoint num="20" id="3906" />
+<TGConnectingPoint num="21" id="3907" />
+<TGConnectingPoint num="22" id="3908" />
+<TGConnectingPoint num="23" id="3909" />
<extraparam>
<info stereotype="CPURRPB" nodeName="HSM_ECUN" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="2316" >
-<father id="2341" num="0" />
-<cdparam x="900" y="817" />
-<sizeparam width="225" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3885" >
+<father id="3910" num="0" />
+<cdparam x="890" y="817" />
+<sizeparam width="239" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="9" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="-5" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_ECUN" />
-<TGConnectingPoint num="0" id="2308" />
-<TGConnectingPoint num="1" id="2309" />
-<TGConnectingPoint num="2" id="2310" />
-<TGConnectingPoint num="3" id="2311" />
-<TGConnectingPoint num="4" id="2312" />
-<TGConnectingPoint num="5" id="2313" />
-<TGConnectingPoint num="6" id="2314" />
-<TGConnectingPoint num="7" id="2315" />
+<TGConnectingPoint num="0" id="3877" />
+<TGConnectingPoint num="1" id="3878" />
+<TGConnectingPoint num="2" id="3879" />
+<TGConnectingPoint num="3" id="3880" />
+<TGConnectingPoint num="4" id="3881" />
+<TGConnectingPoint num="5" id="3882" />
+<TGConnectingPoint num="6" id="3883" />
+<TGConnectingPoint num="7" id="3884" />
<extraparam>
<info value="KDP Perf Design_Sec::HSM_ECUN" taskName="HSM_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="2342" >
+<CONNECTOR type="125" id="3911" >
<cdparam x="1166" y="557" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU_Sink to MainCAN" value="{info}" />
-<P1 x="700" y="553" id="1776" />
-<P2 x="700" y="533" id="1866" />
+<P1 x="700" y="553" id="3345" />
+<P2 x="700" y="533" id="3435" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2343" >
+<CONNECTOR type="125" id="3912" >
<cdparam x="545" y="515" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0 to MainCAN" value="{info}" />
-<P1 x="818" y="393" id="1815" />
-<P2 x="818" y="410" id="1853" />
+<P1 x="818" y="393" id="3384" />
+<P2 x="818" y="410" id="3422" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2345" >
+<CONNECTOR type="125" id="3914" >
<cdparam x="1269" y="398" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from BridgeECUN to MainCAN" value="{info}" />
-<P1 x="1127" y="617" id="2191" />
-<P2 x="1055" y="533" id="1859" />
+<P1 x="1127" y="617" id="3760" />
+<P2 x="1055" y="533" id="3428" />
<Point x="1127" y="533" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2344" >
-<father id="2345" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3913" >
+<father id="3914" num="0" />
<cdparam x="1127" y="533" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11285,19 +11524,20 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="125" id="2347" >
+<CONNECTOR type="125" id="3916" >
<cdparam x="462" y="724" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Bridge0 to MainCAN" value="{info}" />
-<P1 x="542" y="726" id="2047" />
-<P2 x="582" y="533" id="1857" />
+<P1 x="542" y="726" id="3616" />
+<P2 x="582" y="533" id="3426" />
<Point x="542" y="533" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2346" >
-<father id="2347" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3915" >
+<father id="3916" num="0" />
<cdparam x="542" y="533" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11305,41 +11545,44 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="125" id="2348" >
+<CONNECTOR type="125" id="3917" >
<cdparam x="545" y="429" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Bridge0 to MainCAN" value="{info}" />
-<P1 x="545" y="385" id="1883" />
-<P2 x="582" y="410" id="1852" />
+<P1 x="545" y="385" id="3452" />
+<P2 x="582" y="410" id="3421" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2349" >
+<CONNECTOR type="125" id="3918" >
<cdparam x="641" y="319" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Bridge0 to Bus0" value="{info}" />
-<P1 x="504" y="326" id="1885" />
-<P2 x="504" y="256" id="1941" />
+<P1 x="504" y="326" id="3454" />
+<P2 x="504" y="256" id="3510" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2351" >
+<CONNECTOR type="125" id="3920" >
<cdparam x="599" y="312" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="985" y="270" id="1902" />
-<P2 x="672" y="256" id="1934" />
+<P1 x="985" y="270" id="3471" />
+<P2 x="672" y="256" id="3503" />
<Point x="672" y="270" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2350" >
-<father id="2351" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3919" >
+<father id="3920" num="0" />
<cdparam x="672" y="270" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11347,107 +11590,116 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="125" id="2352" >
+<CONNECTOR type="125" id="3921" >
<cdparam x="791" y="235" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0_ECU1 to Bus0" value="{info}" />
-<P1 x="757" y="203" id="1991" />
-<P2 x="672" y="231" id="1931" />
+<P1 x="757" y="203" id="3560" />
+<P2 x="672" y="231" id="3500" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2353" >
+<CONNECTOR type="125" id="3922" >
<cdparam x="591" y="197" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from HSM_ECU1 to Bus0" value="{info}" />
-<P1 x="560" y="187" id="2019" />
-<P2 x="560" y="206" id="1928" />
+<P1 x="560" y="187" id="3588" />
+<P2 x="560" y="206" id="3497" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2354" >
+<CONNECTOR type="125" id="3923" >
<cdparam x="1004" y="1041" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Bridge0 to Bus0" value="{info}" />
-<P1 x="478" y="726" id="2046" />
-<P2 x="648" y="817" id="2088" />
+<P1 x="478" y="726" id="3615" />
+<P2 x="648" y="817" id="3657" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2355" >
+<CONNECTOR type="125" id="3924" >
<cdparam x="800" y="997" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="608" y="850" id="2067" />
-<P2 x="648" y="850" id="2091" />
+<P1 x="608" y="850" id="3636" />
+<P2 x="648" y="850" id="3660" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2356" >
+<CONNECTOR type="125" id="3925" >
<cdparam x="992" y="920" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0_ECU1 to Bus0" value="{info}" />
-<P1 x="692" y="905" id="2140" />
-<P2 x="692" y="884" id="2102" />
+<P1 x="692" y="905" id="3709" />
+<P2 x="692" y="884" id="3671" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2357" >
+<CONNECTOR type="125" id="3926" >
<cdparam x="792" y="882" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from HSM_ECU1 to Bus0" value="{info}" />
-<P1 x="746" y="790" id="2171" />
-<P2 x="692" y="817" id="2096" />
+<P1 x="746" y="790" id="3740" />
+<P2 x="692" y="817" id="3665" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2358" >
+<CONNECTOR type="125" id="3927" >
<cdparam x="1657" y="831" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Bridge0 to Bus0" value="{info}" />
-<P1 x="1127" y="667" id="2196" />
-<P2 x="1122" y="678" id="2241" />
+<P1 x="1127" y="667" id="3765" />
+<P2 x="1122" y="678" id="3810" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2359" >
+<CONNECTOR type="125" id="3928" >
<cdparam x="1453" y="787" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="950" y="615" id="2216" />
-<P2 x="1036" y="678" id="2240" />
+<P1 x="950" y="615" id="3785" />
+<P2 x="1036" y="678" id="3809" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="2361" >
+<CONNECTOR type="125" id="3930" >
<cdparam x="1645" y="710" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0_ECU1 to Bus0" value="{info}" />
-<P1 x="1119" y="892" id="2292" />
-<P2 x="1165" y="728" id="2255" />
+<P1 x="1119" y="892" id="3861" />
+<P2 x="1165" y="728" id="3824" />
<Point x="1165" y="865" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2360" >
-<father id="2361" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3929" >
+<father id="3930" num="0" />
<cdparam x="1165" y="865" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -11455,15 +11707,16 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="125" id="2362" >
+<CONNECTOR type="125" id="3931" >
<cdparam x="1445" y="672" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from HSM_ECU1 to Bus0" value="{info}" />
-<P1 x="1012" y="769" id="2318" />
-<P2 x="1079" y="728" id="2254" />
+<P1 x="1012" y="769" id="3887" />
+<P2 x="1079" y="728" id="3823" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
+<spy value="false" />
</extraparam>
</CONNECTOR>
diff --git a/modeling/monoprocessor.xml b/modeling/monoprocessor.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47361466534e6031df4ea0b2ec9bf84a3e3ac13a
--- /dev/null
+++ b/modeling/monoprocessor.xml
@@ -0,0 +1,742 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<TURTLEGMODELING version="1.0beta">
+
+<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+<COMPONENT type="5000" id="25" >
+<cdparam x="117" y="236" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="Block0" />
+<TGConnectingPoint num="0" id="1" />
+<TGConnectingPoint num="1" id="2" />
+<TGConnectingPoint num="2" id="3" />
+<TGConnectingPoint num="3" id="4" />
+<TGConnectingPoint num="4" id="5" />
+<TGConnectingPoint num="5" id="6" />
+<TGConnectingPoint num="6" id="7" />
+<TGConnectingPoint num="7" id="8" />
+<TGConnectingPoint num="8" id="9" />
+<TGConnectingPoint num="9" id="10" />
+<TGConnectingPoint num="10" id="11" />
+<TGConnectingPoint num="11" id="12" />
+<TGConnectingPoint num="12" id="13" />
+<TGConnectingPoint num="13" id="14" />
+<TGConnectingPoint num="14" id="15" />
+<TGConnectingPoint num="15" id="16" />
+<TGConnectingPoint num="16" id="17" />
+<TGConnectingPoint num="17" id="18" />
+<TGConnectingPoint num="18" id="19" />
+<TGConnectingPoint num="19" id="20" />
+<TGConnectingPoint num="20" id="21" />
+<TGConnectingPoint num="21" id="22" />
+<TGConnectingPoint num="22" id="23" />
+<TGConnectingPoint num="23" id="24" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+</extraparam>
+</COMPONENT>
+
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Block0" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="32" >
+<cdparam x="460" y="115" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="31" />
+<P1 x="460" y="115" id="48" />
+<P2 x="456" y="164" id="40" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="30" >
+<father id="32" num="0" />
+<cdparam x="458" y="139" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="26" />
+<TGConnectingPoint num="1" id="27" />
+<TGConnectingPoint num="2" id="28" />
+<TGConnectingPoint num="3" id="29" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="39" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="38" />
+<P1 x="407" y="70" id="83" />
+<P2 x="410" y="71" id="62" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="37" >
+<father id="39" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="33" />
+<TGConnectingPoint num="1" id="34" />
+<TGConnectingPoint num="2" id="35" />
+<TGConnectingPoint num="3" id="36" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5101" id="41" >
+<cdparam x="446" y="169" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="40" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="82" >
+<cdparam x="410" y="65" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="42" />
+<TGConnectingPoint num="1" id="43" />
+<TGConnectingPoint num="2" id="44" />
+<TGConnectingPoint num="3" id="45" />
+<TGConnectingPoint num="4" id="46" />
+<TGConnectingPoint num="5" id="47" />
+<TGConnectingPoint num="6" id="48" />
+<TGConnectingPoint num="7" id="49" />
+<TGConnectingPoint num="8" id="50" />
+<TGConnectingPoint num="9" id="51" />
+<TGConnectingPoint num="10" id="52" />
+<TGConnectingPoint num="11" id="53" />
+<TGConnectingPoint num="12" id="54" />
+<TGConnectingPoint num="13" id="55" />
+<TGConnectingPoint num="14" id="56" />
+<TGConnectingPoint num="15" id="57" />
+<TGConnectingPoint num="16" id="58" />
+<TGConnectingPoint num="17" id="59" />
+<TGConnectingPoint num="18" id="60" />
+<TGConnectingPoint num="19" id="61" />
+<TGConnectingPoint num="20" id="62" />
+<TGConnectingPoint num="21" id="63" />
+<TGConnectingPoint num="22" id="64" />
+<TGConnectingPoint num="23" id="65" />
+<TGConnectingPoint num="24" id="66" />
+<TGConnectingPoint num="25" id="67" />
+<TGConnectingPoint num="26" id="68" />
+<TGConnectingPoint num="27" id="69" />
+<TGConnectingPoint num="28" id="70" />
+<TGConnectingPoint num="29" id="71" />
+<TGConnectingPoint num="30" id="72" />
+<TGConnectingPoint num="31" id="73" />
+<TGConnectingPoint num="32" id="74" />
+<TGConnectingPoint num="33" id="75" />
+<TGConnectingPoint num="34" id="76" />
+<TGConnectingPoint num="35" id="77" />
+<TGConnectingPoint num="36" id="78" />
+<TGConnectingPoint num="37" id="79" />
+<TGConnectingPoint num="38" id="80" />
+<TGConnectingPoint num="39" id="81" />
+<extraparam>
+<entryCode value="printf("Hello World! \n");" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="84" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="83" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="ADD" nameTab="Avatar Deployment" >
+<ADDDiagramPanel name="Deployment Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
+<COMPONENT type="5365" id="109" >
+<cdparam x="1177" y="513" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="cluster1" value="cluster1" />
+<TGConnectingPoint num="0" id="85" />
+<TGConnectingPoint num="1" id="86" />
+<TGConnectingPoint num="2" id="87" />
+<TGConnectingPoint num="3" id="88" />
+<TGConnectingPoint num="4" id="89" />
+<TGConnectingPoint num="5" id="90" />
+<TGConnectingPoint num="6" id="91" />
+<TGConnectingPoint num="7" id="92" />
+<TGConnectingPoint num="8" id="93" />
+<TGConnectingPoint num="9" id="94" />
+<TGConnectingPoint num="10" id="95" />
+<TGConnectingPoint num="11" id="96" />
+<TGConnectingPoint num="12" id="97" />
+<TGConnectingPoint num="13" id="98" />
+<TGConnectingPoint num="14" id="99" />
+<TGConnectingPoint num="15" id="100" />
+<TGConnectingPoint num="16" id="101" />
+<TGConnectingPoint num="17" id="102" />
+<TGConnectingPoint num="18" id="103" />
+<TGConnectingPoint num="19" id="104" />
+<TGConnectingPoint num="20" id="105" />
+<TGConnectingPoint num="21" id="106" />
+<TGConnectingPoint num="22" id="107" />
+<TGConnectingPoint num="23" id="108" />
+<extraparam>
+<info stereotype="SystemC-AMS Cluster" nodeName="cluster1" />
+<attributes index="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5365" id="134" >
+<cdparam x="995" y="128" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="cluster" value="cluster" />
+<TGConnectingPoint num="0" id="110" />
+<TGConnectingPoint num="1" id="111" />
+<TGConnectingPoint num="2" id="112" />
+<TGConnectingPoint num="3" id="113" />
+<TGConnectingPoint num="4" id="114" />
+<TGConnectingPoint num="5" id="115" />
+<TGConnectingPoint num="6" id="116" />
+<TGConnectingPoint num="7" id="117" />
+<TGConnectingPoint num="8" id="118" />
+<TGConnectingPoint num="9" id="119" />
+<TGConnectingPoint num="10" id="120" />
+<TGConnectingPoint num="11" id="121" />
+<TGConnectingPoint num="12" id="122" />
+<TGConnectingPoint num="13" id="123" />
+<TGConnectingPoint num="14" id="124" />
+<TGConnectingPoint num="15" id="125" />
+<TGConnectingPoint num="16" id="126" />
+<TGConnectingPoint num="17" id="127" />
+<TGConnectingPoint num="18" id="128" />
+<TGConnectingPoint num="19" id="129" />
+<TGConnectingPoint num="20" id="130" />
+<TGConnectingPoint num="21" id="131" />
+<TGConnectingPoint num="22" id="132" />
+<TGConnectingPoint num="23" id="133" />
+<extraparam>
+<info stereotype="SystemC-AMS Cluster" nodeName="cluster" />
+<attributes index="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5363" id="159" >
+<cdparam x="523" y="309" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Bus0" value="name" />
+<TGConnectingPoint num="0" id="135" />
+<TGConnectingPoint num="1" id="136" />
+<TGConnectingPoint num="2" id="137" />
+<TGConnectingPoint num="3" id="138" />
+<TGConnectingPoint num="4" id="139" />
+<TGConnectingPoint num="5" id="140" />
+<TGConnectingPoint num="6" id="141" />
+<TGConnectingPoint num="7" id="142" />
+<TGConnectingPoint num="8" id="143" />
+<TGConnectingPoint num="9" id="144" />
+<TGConnectingPoint num="10" id="145" />
+<TGConnectingPoint num="11" id="146" />
+<TGConnectingPoint num="12" id="147" />
+<TGConnectingPoint num="13" id="148" />
+<TGConnectingPoint num="14" id="149" />
+<TGConnectingPoint num="15" id="150" />
+<TGConnectingPoint num="16" id="151" />
+<TGConnectingPoint num="17" id="152" />
+<TGConnectingPoint num="18" id="153" />
+<TGConnectingPoint num="19" id="154" />
+<TGConnectingPoint num="20" id="155" />
+<TGConnectingPoint num="21" id="156" />
+<TGConnectingPoint num="22" id="157" />
+<TGConnectingPoint num="23" id="158" />
+<extraparam>
+<info stereotype="VGSB" nodeName="Bus0" />
+<attributes index="0" nbOfAttachedInitiators="0" nbOfAttachedTargets="0" minLatency="10" fifoDepth="10" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5355" id="184" >
+<cdparam x="218" y="386" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Memory0" value="name" />
+<TGConnectingPoint num="0" id="160" />
+<TGConnectingPoint num="1" id="161" />
+<TGConnectingPoint num="2" id="162" />
+<TGConnectingPoint num="3" id="163" />
+<TGConnectingPoint num="4" id="164" />
+<TGConnectingPoint num="5" id="165" />
+<TGConnectingPoint num="6" id="166" />
+<TGConnectingPoint num="7" id="167" />
+<TGConnectingPoint num="8" id="168" />
+<TGConnectingPoint num="9" id="169" />
+<TGConnectingPoint num="10" id="170" />
+<TGConnectingPoint num="11" id="171" />
+<TGConnectingPoint num="12" id="172" />
+<TGConnectingPoint num="13" id="173" />
+<TGConnectingPoint num="14" id="174" />
+<TGConnectingPoint num="15" id="175" />
+<TGConnectingPoint num="16" id="176" />
+<TGConnectingPoint num="17" id="177" />
+<TGConnectingPoint num="18" id="178" />
+<TGConnectingPoint num="19" id="179" />
+<TGConnectingPoint num="20" id="180" />
+<TGConnectingPoint num="21" id="181" />
+<TGConnectingPoint num="22" id="182" />
+<TGConnectingPoint num="23" id="183" />
+<extraparam>
+<info stereotype="RAM" nodeName="Memory0" />
+<attributes byteDataSize="1048576" index="0" processCode="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5354" id="209" >
+<cdparam x="639" y="474" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="TTY0" value="name" />
+<TGConnectingPoint num="0" id="185" />
+<TGConnectingPoint num="1" id="186" />
+<TGConnectingPoint num="2" id="187" />
+<TGConnectingPoint num="3" id="188" />
+<TGConnectingPoint num="4" id="189" />
+<TGConnectingPoint num="5" id="190" />
+<TGConnectingPoint num="6" id="191" />
+<TGConnectingPoint num="7" id="192" />
+<TGConnectingPoint num="8" id="193" />
+<TGConnectingPoint num="9" id="194" />
+<TGConnectingPoint num="10" id="195" />
+<TGConnectingPoint num="11" id="196" />
+<TGConnectingPoint num="12" id="197" />
+<TGConnectingPoint num="13" id="198" />
+<TGConnectingPoint num="14" id="199" />
+<TGConnectingPoint num="15" id="200" />
+<TGConnectingPoint num="16" id="201" />
+<TGConnectingPoint num="17" id="202" />
+<TGConnectingPoint num="18" id="203" />
+<TGConnectingPoint num="19" id="204" />
+<TGConnectingPoint num="20" id="205" />
+<TGConnectingPoint num="21" id="206" />
+<TGConnectingPoint num="22" id="207" />
+<TGConnectingPoint num="23" id="208" />
+<extraparam>
+<info stereotype="TTY" nodeName="TTY0" />
+<attributes index="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5351" id="243" >
+<cdparam x="113" y="44" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="CPU0" value="name" />
+<TGConnectingPoint num="0" id="219" />
+<TGConnectingPoint num="1" id="220" />
+<TGConnectingPoint num="2" id="221" />
+<TGConnectingPoint num="3" id="222" />
+<TGConnectingPoint num="4" id="223" />
+<TGConnectingPoint num="5" id="224" />
+<TGConnectingPoint num="6" id="225" />
+<TGConnectingPoint num="7" id="226" />
+<TGConnectingPoint num="8" id="227" />
+<TGConnectingPoint num="9" id="228" />
+<TGConnectingPoint num="10" id="229" />
+<TGConnectingPoint num="11" id="230" />
+<TGConnectingPoint num="12" id="231" />
+<TGConnectingPoint num="13" id="232" />
+<TGConnectingPoint num="14" id="233" />
+<TGConnectingPoint num="15" id="234" />
+<TGConnectingPoint num="16" id="235" />
+<TGConnectingPoint num="17" id="236" />
+<TGConnectingPoint num="18" id="237" />
+<TGConnectingPoint num="19" id="238" />
+<TGConnectingPoint num="20" id="239" />
+<TGConnectingPoint num="21" id="240" />
+<TGConnectingPoint num="22" id="241" />
+<TGConnectingPoint num="23" id="242" />
+<extraparam>
+<info stereotype="CPU" nodeName="CPU0" />
+<attributes nbOfIrq="6" iCacheWays="1" iCacheSets="8" iCacheWords="4" dCacheWays="1" dCacheSets="8" dCacheWords="4" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5352" id="218" >
+<father id="243" num="0" />
+<cdparam x="172" y="134" />
+<sizeparam width="176" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="74" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="AVATAR Design::Block0" />
+<TGConnectingPoint num="0" id="210" />
+<TGConnectingPoint num="1" id="211" />
+<TGConnectingPoint num="2" id="212" />
+<TGConnectingPoint num="3" id="213" />
+<TGConnectingPoint num="4" id="214" />
+<TGConnectingPoint num="5" id="215" />
+<TGConnectingPoint num="6" id="216" />
+<TGConnectingPoint num="7" id="217" />
+<extraparam>
+<info value="AVATAR Design::Block0" taskName="Block0" referenceTaskName="AVATAR Design" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5350" id="244" >
+<cdparam x="1177" y="563" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1177" y="563" id="95" />
+<P2 x="773" y="346" id="148" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5350" id="245" >
+<cdparam x="1006" y="263" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="995" y="178" id="120" />
+<P2 x="773" y="309" id="137" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5350" id="246" >
+<cdparam x="701" y="474" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="701" y="474" id="193" />
+<P2 x="648" y="359" id="141" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5350" id="247" >
+<cdparam x="418" y="436" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="418" y="436" id="171" />
+<P2 x="523" y="359" id="140" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5350" id="248" >
+<cdparam x="300" y="244" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="300" y="244" id="234" />
+<P2 x="523" y="309" id="135" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+
+</ADDDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="SystemC-AMS" nameTab="SystemC_AMS" >
+<SysCAMSComponentTaskDiagramPanel name="SystemC-AMS Component Diagram" minX="10" maxX="2500" minY="10" maxY="1500" TDF="true" DE="true" zoom="1.0" >
+<CONNECTOR type="1601" id="386" >
+<cdparam x="681" y="329" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1 x="681" y="329" id="291" />
+<P2 x="572" y="324" id="377" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="1601" id="250" >
+<cdparam x="733" y="410" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1 x="811" y="410" id="281" />
+<P2 x="816" y="455" id="310" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="1601" id="251" >
+<cdparam x="860" y="449" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1 x="907" y="333" id="271" />
+<P2 x="1232" y="447" id="252" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<COMPONENT type="1608" id="270" >
+<cdparam x="1245" y="364" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Primitive component - Block GPIO2VCI" value="Block_GPIO2VCI" />
+<TGConnectingPoint num="0" id="262" />
+<TGConnectingPoint num="1" id="263" />
+<TGConnectingPoint num="2" id="264" />
+<TGConnectingPoint num="3" id="265" />
+<TGConnectingPoint num="4" id="266" />
+<TGConnectingPoint num="5" id="267" />
+<TGConnectingPoint num="6" id="268" />
+<TGConnectingPoint num="7" id="269" />
+</COMPONENT>
+<SUBCOMPONENT type="1605" id="261" >
+<father id="270" num="0" />
+<cdparam x="1232" y="434" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port - Port DE" value="in" />
+<TGConnectingPoint num="0" id="252" />
+<TGConnectingPoint num="1" id="253" />
+<TGConnectingPoint num="2" id="254" />
+<TGConnectingPoint num="3" id="255" />
+<TGConnectingPoint num="4" id="256" />
+<TGConnectingPoint num="5" id="257" />
+<TGConnectingPoint num="6" id="258" />
+<TGConnectingPoint num="7" id="259" />
+<TGConnectingPoint num="8" id="260" />
+<extraparam>
+<Prop commName="in" commType="0" origin="0" type="int" sensitive="false" sensitive_method="positive" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1607" id="356" >
+<cdparam x="303" y="181" />
+<sizeparam width="808" height="458" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Composite component - Cluster" value="cluster" />
+<TGConnectingPoint num="0" id="348" />
+<TGConnectingPoint num="1" id="349" />
+<TGConnectingPoint num="2" id="350" />
+<TGConnectingPoint num="3" id="351" />
+<TGConnectingPoint num="4" id="352" />
+<TGConnectingPoint num="5" id="353" />
+<TGConnectingPoint num="6" id="354" />
+<TGConnectingPoint num="7" id="355" />
+</COMPONENT>
+<SUBCOMPONENT type="1603" id="358" >
+<father id="356" num="0" />
+<cdparam x="359" y="277" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="608" minY="0" maxY="308" />
+<infoparam name="Primitive component - Block DE" value="Block_DE_0" />
+<TGConnectingPoint num="0" id="359" />
+<TGConnectingPoint num="1" id="360" />
+<TGConnectingPoint num="2" id="361" />
+<TGConnectingPoint num="3" id="362" />
+<TGConnectingPoint num="4" id="363" />
+<TGConnectingPoint num="5" id="364" />
+<TGConnectingPoint num="6" id="365" />
+<TGConnectingPoint num="7" id="366" />
+<extraparam>
+<Attribute name_function="test" code="void test() {
+ test_code;
+}" listStruct="" nameTemplate="" typeTemplate="int" listTypedef="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1605" id="376" >
+<father id="358" num="0" />
+<cdparam x="546" y="311" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port - Port DE" value="port" />
+<TGConnectingPoint num="0" id="377" />
+<TGConnectingPoint num="1" id="378" />
+<TGConnectingPoint num="2" id="379" />
+<TGConnectingPoint num="3" id="380" />
+<TGConnectingPoint num="4" id="381" />
+<TGConnectingPoint num="5" id="382" />
+<TGConnectingPoint num="6" id="383" />
+<TGConnectingPoint num="7" id="384" />
+<TGConnectingPoint num="8" id="385" />
+<extraparam>
+<Prop commName="in_de" commType="0" origin="0" type="int" sensitive="false" sensitive_method="positive" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1602" id="309" >
+<father id="356" num="1" />
+<cdparam x="694" y="247" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="608" minY="0" maxY="308" />
+<infoparam name="Primitive component - Block TDF" value="Sine" />
+<TGConnectingPoint num="0" id="301" />
+<TGConnectingPoint num="1" id="302" />
+<TGConnectingPoint num="2" id="303" />
+<TGConnectingPoint num="3" id="304" />
+<TGConnectingPoint num="4" id="305" />
+<TGConnectingPoint num="5" id="306" />
+<TGConnectingPoint num="6" id="307" />
+<TGConnectingPoint num="7" id="308" />
+<extraparam>
+<Attribute period="6" time="us" processCode="void processing() {
+ double t = out_de.get_time().to_seconds();
+ double x = sin(2.0 * M_PI * 5000000.0 * t);
+ out_de.write( (int) x);
+ tdf_out.write(x);
+}
+ " listStruct="" nameTemplate="" typeTemplate="int" listTypedef="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1606" id="280" >
+<father id="309" num="0" />
+<cdparam x="881" y="320" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port - Port Converter" value="out_de" />
+<TGConnectingPoint num="0" id="271" />
+<TGConnectingPoint num="1" id="272" />
+<TGConnectingPoint num="2" id="273" />
+<TGConnectingPoint num="3" id="274" />
+<TGConnectingPoint num="4" id="275" />
+<TGConnectingPoint num="5" id="276" />
+<TGConnectingPoint num="6" id="277" />
+<TGConnectingPoint num="7" id="278" />
+<TGConnectingPoint num="8" id="279" />
+<extraparam>
+<Prop commName="out_de" commType="0" origin="1" period="6" time="us" rate="1" delay="0" type="int" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1604" id="290" >
+<father id="309" num="1" />
+<cdparam x="798" y="384" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port - Port TDF" value="tdf_out" />
+<TGConnectingPoint num="0" id="281" />
+<TGConnectingPoint num="1" id="282" />
+<TGConnectingPoint num="2" id="283" />
+<TGConnectingPoint num="3" id="284" />
+<TGConnectingPoint num="4" id="285" />
+<TGConnectingPoint num="5" id="286" />
+<TGConnectingPoint num="6" id="287" />
+<TGConnectingPoint num="7" id="288" />
+<TGConnectingPoint num="8" id="289" />
+<extraparam>
+<Prop commName="tdf_out" commType="0" origin="1" period="6" time="us" rate="1" delay="-1" type="double" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1606" id="300" >
+<father id="309" num="2" />
+<cdparam x="681" y="316" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port - Port Converter" value="out2_de" />
+<TGConnectingPoint num="0" id="291" />
+<TGConnectingPoint num="1" id="292" />
+<TGConnectingPoint num="2" id="293" />
+<TGConnectingPoint num="3" id="294" />
+<TGConnectingPoint num="4" id="295" />
+<TGConnectingPoint num="5" id="296" />
+<TGConnectingPoint num="6" id="297" />
+<TGConnectingPoint num="7" id="298" />
+<TGConnectingPoint num="8" id="299" />
+<extraparam>
+<Prop commName="out2_de" commType="0" origin="1" period="-1" time="us" rate="-1" delay="-1" type="int" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1602" id="328" >
+<father id="356" num="2" />
+<cdparam x="705" y="468" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="608" minY="0" maxY="308" />
+<infoparam name="Primitive component - Block TDF" value="Sink" />
+<TGConnectingPoint num="0" id="320" />
+<TGConnectingPoint num="1" id="321" />
+<TGConnectingPoint num="2" id="322" />
+<TGConnectingPoint num="3" id="323" />
+<TGConnectingPoint num="4" id="324" />
+<TGConnectingPoint num="5" id="325" />
+<TGConnectingPoint num="6" id="326" />
+<TGConnectingPoint num="7" id="327" />
+<extraparam>
+<Attribute period="-1" time="" processCode="void processing() {
+ in.read();
+}
+ " listStruct="" nameTemplate="" typeTemplate="int" listTypedef="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1604" id="319" >
+<father id="328" num="0" />
+<cdparam x="803" y="455" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port - Port TDF" value="in" />
+<TGConnectingPoint num="0" id="310" />
+<TGConnectingPoint num="1" id="311" />
+<TGConnectingPoint num="2" id="312" />
+<TGConnectingPoint num="3" id="313" />
+<TGConnectingPoint num="4" id="314" />
+<TGConnectingPoint num="5" id="315" />
+<TGConnectingPoint num="6" id="316" />
+<TGConnectingPoint num="7" id="317" />
+<TGConnectingPoint num="8" id="318" />
+<extraparam>
+<Prop commName="in" commType="0" origin="0" period="-1" time="us" rate="1" delay="-1" type="double" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</SysCAMSComponentTaskDiagramPanel>
+
+</Modeling>
+
+
+
+
+</TURTLEGMODELING>
\ No newline at end of file
diff --git a/simulators/c++2/src_simulator/definitions.h b/simulators/c++2/src_simulator/definitions.h
index cc088c70f6f0339ff5b2513b00fe2cfe88514b62..45495686f5ce2534ba944c0f87d9efadcc04ee43 100644
--- a/simulators/c++2/src_simulator/definitions.h
+++ b/simulators/c++2/src_simulator/definitions.h
@@ -71,6 +71,8 @@ Ludovic Apvrille, Renaud Pacalet
#include <sys/resource.h>
#include <unistd.h>
+#include "penalties.h"
+
#define WRITE_STREAM(s,v) s.write((char*) &v,sizeof(v));
//std::cout << sizeof(v) << " bytes written" << std::endl;
#define READ_STREAM(s,v) s.read((char*) &v,sizeof(v));
@@ -89,7 +91,7 @@ using std::max;
//cost of a send/wait command
#define WAIT_SEND_VLEN 1
//activate tis flag to take penalties (energy mode, branch prediction, context switch) into account
-#undef PENALTIES_ENABLED
+//#undef PENALTIES_ENABLED
//enables the state hash feature
#undef STATE_HASH_ENABLED
//enables listerns for interactive simulation, switch off for fast simulation in command line mode
diff --git a/simulators/c++2/src_simulator/penalties.h b/simulators/c++2/src_simulator/penalties.h
new file mode 100644
index 0000000000000000000000000000000000000000..716c0497842d51d95efb817d6d04ea0db61e69e5
--- /dev/null
+++ b/simulators/c++2/src_simulator/penalties.h
@@ -0,0 +1,2 @@
+// DO NOT EDIT: AUTOMATICALLY GENERATED
+#define PENALTIES_ENABLED
\ No newline at end of file
diff --git a/src/main/java/ddtranslatorSoclib/AvatarAmsCluster.java b/src/main/java/ddtranslatorSoclib/AvatarAmsCluster.java
index 92f13021d60c03dec85e00d8a6a10b53ddb16425..362f62ddf771f9fc4dfcf5e4d1da9399be355f96 100644
--- a/src/main/java/ddtranslatorSoclib/AvatarAmsCluster.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarAmsCluster.java
@@ -38,9 +38,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
/**
* Class AvatarAmsCluster
@@ -85,7 +82,7 @@ public class AvatarAmsCluster extends AvatarComponent {
}
public void setNo_target(int _no_target) {
- no_target = _no_target;
+ no_target = _no_target;
}
}
diff --git a/src/main/java/ddtranslatorSoclib/AvatarCPU.java b/src/main/java/ddtranslatorSoclib/AvatarCPU.java
index 6fa2f518b42e635e710c74f1049b320a07e29def..b78c2abeca85623320249a3fce98b83894c424b1 100755
--- a/src/main/java/ddtranslatorSoclib/AvatarCPU.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarCPU.java
@@ -63,11 +63,12 @@ public class AvatarCPU extends AvatarComponent{
private int dCacheWords;
private int nb_init;
private int no_proc;
+ private int clusterIndex;
public int monitored;
private LinkedList<AvatarTask> tasksMapped;
- public AvatarCPU(String _cpuName, int _nbOfIRQs,int _ICacheWays, int _ICacheSets, int _ICacheWords, int _DCacheWays, int _DCacheSets, int _DCacheWords , int _nb_init , int _no_proc, int _monitored){
+ public AvatarCPU(String _cpuName, int _nbOfIRQs,int _ICacheWays, int _ICacheSets, int _ICacheWords, int _DCacheWays, int _DCacheSets, int _DCacheWords , int _nb_init , int _no_proc, int _clusterIndex, int _monitored){
cpuName = _cpuName;
nbOfIRQs = _nbOfIRQs;
@@ -79,6 +80,7 @@ public class AvatarCPU extends AvatarComponent{
dCacheWords = _DCacheWords;
nb_init = _nb_init;
no_proc = _no_proc;
+ clusterIndex = _clusterIndex;//DG 2.7.
tasksMapped = new LinkedList<AvatarTask>();
monitored=_monitored;
}
@@ -89,8 +91,13 @@ public class AvatarCPU extends AvatarComponent{
public int getNo_proc(){
return no_proc;
- }
+ }
+ public int getClusterIndex(){
+
+ return clusterIndex;
+ }
+
public String getCpuName(){
return cpuName;
}
diff --git a/src/main/java/ddtranslatorSoclib/AvatarChannel.java b/src/main/java/ddtranslatorSoclib/AvatarChannel.java
index 4412a0279a696f4b09ccce24db384a3b3498a28d..9bcbf9f098cba88696ca5f0615ae1df2ff00d8a4 100755
--- a/src/main/java/ddtranslatorSoclib/AvatarChannel.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarChannel.java
@@ -50,25 +50,21 @@ public class AvatarChannel extends AvatarMappedObject{
private AvatarRAM avatarRAMReference;
private String referenceDiagram ;
- private String channelName ;
- private int no_cluster;
+ private String channelName ;
+ private int cluster_index;
private int monitored;
- public AvatarChannel(String _referenceDiagram, String _channelName, AvatarRAM _avatarRAMReference, int _no_cluster, int _monitored){
+ public AvatarChannel(String _referenceDiagram, String _channelName, AvatarRAM _avatarRAMReference, int _cluster_index, int _monitored){
referenceDiagram = _referenceDiagram;
channelName = _channelName;
avatarRAMReference = _avatarRAMReference;
- no_cluster = _no_cluster;
+ cluster_index = _cluster_index;
monitored = _monitored;
}
public AvatarRAM getAvatarRAMReference(){
return avatarRAMReference;
- }
-
- public int getRAMNo(){
- return avatarRAMReference.getNo_ram();
- }
+ }
public String getReferenceDiagram(){
return referenceDiagram;
@@ -78,12 +74,12 @@ public class AvatarChannel extends AvatarMappedObject{
return channelName;
}
- public int getNo_cluster(){
- return no_cluster;
+ public int getClusterIndex(){
+ return cluster_index;
}
public int getMonitored(){
return monitored;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ddtranslatorSoclib/AvatarCoproMWMR.java b/src/main/java/ddtranslatorSoclib/AvatarCoproMWMR.java
index a83c39db86e20fb02120efd58920fc025ea9e345..1305d904fdd043cdd7203f3b2e88a89ba36c995c 100755
--- a/src/main/java/ddtranslatorSoclib/AvatarCoproMWMR.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarCoproMWMR.java
@@ -61,14 +61,14 @@ public class AvatarCoproMWMR extends AvatarComponent{
private int nStatus;
private boolean useLLSC;
private int coprocType;
-
+ private int cluster_index;
private AvatarConnectingPoint[] connectingsPoints;
private int nbConnectingPoint = 16 ;
- private LinkedList<AvatarTask> tasksMapped;// DG 21.09.
+ private LinkedList<AvatarTask> tasksMapped;
- public AvatarCoproMWMR(String _coprocName,int srcid, int _srcid, int _tgtid, int _plaps, int _fifoToCoprocDepth,int _fifoFromCoprocDepth, int _nToCopro, int _nFromCopro, int _nConfig, int _nStatus, boolean _useLLSC, int _coprocType)
+ public AvatarCoproMWMR(String _coprocName,int srcid, int _srcid, int _tgtid, int _plaps, int _fifoToCoprocDepth,int _fifoFromCoprocDepth, int _nToCopro, int _nFromCopro, int _nConfig, int _nStatus, boolean _useLLSC, int _coprocType, int _cluster_index)
{
coprocName = _coprocName;
srcid = _srcid;
@@ -82,7 +82,8 @@ public class AvatarCoproMWMR extends AvatarComponent{
nStatus = _nStatus;
useLLSC = _useLLSC;
coprocType = _coprocType;
-
+ cluster_index = _cluster_index;
+
connectingsPoints = new AvatarConnectingPoint[nbConnectingPoint] ;
tasksMapped = new LinkedList<AvatarTask>(); //DG 21.09.
}
@@ -112,6 +113,11 @@ public class AvatarCoproMWMR extends AvatarComponent{
return srcid;
}
+
+ public int getClusterIndex(){
+ return cluster_index;
+ }
+
public int getTgtid(){
return tgtid;
}
@@ -150,7 +156,7 @@ public class AvatarCoproMWMR extends AvatarComponent{
public int getCoprocType(){
return coprocType;
}
- //DG 21.09.
+
public LinkedList<AvatarTask> getAllTasks(){
return tasksMapped;
}
diff --git a/src/main/java/ddtranslatorSoclib/AvatarCrossbar.java b/src/main/java/ddtranslatorSoclib/AvatarCrossbar.java
index 0584e84183c77d53c8b76b1e4025e808508d842e..c1fcc6206d6a1f3e5bfdb54c940df9b14f4c08f0 100755
--- a/src/main/java/ddtranslatorSoclib/AvatarCrossbar.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarCrossbar.java
@@ -71,7 +71,7 @@ public class AvatarCrossbar extends AvatarComponent{
public int getNbOfAttachedInitiators(){
return nbOfAttachedInitiators;
}
-
+
public int getNbOfAttachedTargets(){
return nbOfAttachedTargets;
}
diff --git a/src/main/java/ddtranslatorSoclib/AvatarRAM.java b/src/main/java/ddtranslatorSoclib/AvatarRAM.java
index ac9470dad56bdc31fce959eb4ff4f9e1e0488d66..d378575d391323f975ec792575f2e36374e64635 100755
--- a/src/main/java/ddtranslatorSoclib/AvatarRAM.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarRAM.java
@@ -53,23 +53,22 @@ import java.util.LinkedList;
public class AvatarRAM extends AvatarComponent{
private String memoryName ;
- private int index;
+
private int dataSize;
- public int no_ram;
+ public int index;
+ public int cluster_index;
public int no_target;
public int no_target_local;
- public int no_cluster;
public int monitored;
LinkedList<AvatarChannel> channelMapped ;
- public AvatarRAM(String _memoryName, int _index, int _dataSize, int _no_ram, int _no_cluster, int _monitored) {
+ public AvatarRAM(String _memoryName, int _dataSize, int _cluster_index, int _index, int _monitored) {
memoryName = _memoryName;
- index = _index;
dataSize = _dataSize;
- no_ram = _no_ram;
- no_cluster=_no_cluster;
+ index = _index;
+ cluster_index= _cluster_index;
monitored=_monitored;
channelMapped = new LinkedList<AvatarChannel>();
}
@@ -78,34 +77,23 @@ public class AvatarRAM extends AvatarComponent{
return memoryName;
}
- public int getNo_ram(){
- return no_ram;
- }
-
public int getNo_target(){
return no_target;
}
- public int getNo_cluster(){
- return no_cluster;
+ public int getIndex(){
+ return index;
+ }
+
+ public int getClusterIndex(){
+ return cluster_index;
}
- public void setNo_ram(int _no_ram){
- no_ram = _no_ram;
- }
/* the target number is set by the topcell generator*/
public void setNo_target(int _no_target){
no_target = _no_target;
}
- public void setNo_cluster(int _no_cluster){
- no_cluster = _no_cluster;
- }
-
- public int getIndex(){
- return index;
- }
-
public int getDataSize(){
return dataSize;
}
diff --git a/src/main/java/ddtranslatorSoclib/AvatarTTY.java b/src/main/java/ddtranslatorSoclib/AvatarTTY.java
index a9ddce603395daa10ff31fae036d0f8fe0fbb4ba..ccfd520b223802569f85bde15d80957e29c961a0 100755
--- a/src/main/java/ddtranslatorSoclib/AvatarTTY.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarTTY.java
@@ -80,7 +80,7 @@ public class AvatarTTY extends AvatarComponent {
return no_target;
}
- public int getNo_cluster(){
+ public int getClusterIndex(){
return no_cluster;
}
diff --git a/src/main/java/ddtranslatorSoclib/AvatarddSpecification.java b/src/main/java/ddtranslatorSoclib/AvatarddSpecification.java
index 2720b8094b76046b8dd52c060deb84a3d47755b9..2f6c9f79b78a8401fb8a451bee2bb9297a9310fc 100755
--- a/src/main/java/ddtranslatorSoclib/AvatarddSpecification.java
+++ b/src/main/java/ddtranslatorSoclib/AvatarddSpecification.java
@@ -49,15 +49,15 @@ package ddtranslatorSoclib;
import java.util.LinkedList;
import java.util.List;
-import ui.tmldd.TMLArchiHWANode;//DG 23.08.
+import ui.tmldd.TMLArchiHWANode;
public class AvatarddSpecification{
private List<AvatarComponent> components;
private List<AvatarConnector> connectors;
private List<AvatarMappedObject> mappedObjects;
- private int nb_init = 0;
+ //private int nb_init;
-/*there are seven targets which are fixed but invisible to the user of the TTool deployment diagram) :
+/*there are 11 targets which are fixed but invisible to the user of the TTool deployment diagram) :
Targets on RAM0 :
the text segment (target 0)
@@ -66,15 +66,20 @@ the data segment (target 2)
Other targets :
the simhelper segment (target 3)
-the icu segment (target 4)
-the timer segment (target 5)
-the fdt segment (target 6)
-
-There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) otherwise an error message is printed
+the timer segment (target 4)
+the icu segment (target 5)
+the dma segment (target 6)
+the fdt (flattened device tree) segment (target 7)
+the fd segment (target 8)
+the ethernet segment (target 9)
+the block device segment (target 10)
+
+There always is at least one RAM0, TTY and interconnect (Bus or VGMN or crossbar)
*/
-/* initialization of counters, there are at least 6 targets */
- int nb_target = 6;
+/* initialization of counters */
+ int nb_init;
+ int nb_target;
int nb_mwmr_segments = 0;
public AvatarddSpecification( List<AvatarComponent> _components, List<AvatarConnector> _connectors, List<AvatarMappedObject> _mappedObjects, int _nb_target, int _nb_init){
@@ -126,8 +131,10 @@ There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) othe
{
if (tty instanceof AvatarTTY){
ttys.add((AvatarTTY)tty);
+ nb_target++;
}
}
+
return ttys;
}
@@ -136,19 +143,21 @@ There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) othe
for (AvatarComponent cpu : components )
{
if (cpu instanceof AvatarCPU){
- cpus.add((AvatarCPU)cpu);
+ cpus.add((AvatarCPU)cpu);
+ nb_init++;
}
}
return cpus;
}
public List<AvatarRAM> getAllRAM(){
- //int i=0;
+
List<AvatarRAM> rams = new LinkedList<AvatarRAM>();
for (AvatarComponent ram : components ) {
if (ram instanceof AvatarRAM){
- rams.add((AvatarRAM)ram);
+ rams.add((AvatarRAM)ram);
+ nb_target++;
}
}
@@ -170,8 +179,7 @@ There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) othe
for (AvatarComponent vgmn : components )
{
if (vgmn instanceof AvatarVgmn){
- vgmns.add((AvatarVgmn)vgmn);
-
+ vgmns.add((AvatarVgmn)vgmn);
}
}
return vgmns;
@@ -179,15 +187,15 @@ There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) othe
public LinkedList<AvatarCrossbar> getAllCrossbar(){
LinkedList<AvatarCrossbar> crossbars = new LinkedList<AvatarCrossbar>();
- //int i=0;
+
for (AvatarComponent crossbar : components )
{
- //Currently, at least one crossbar -> clustered
+
if (crossbar instanceof AvatarCrossbar){
crossbars.add((AvatarCrossbar)crossbar);
- //crossbar.setClusterIndex(i);
- //i++;
+ nb_target++;
+ nb_init++;
}
}
@@ -205,54 +213,34 @@ There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) othe
return bridges;
}*/
-
- //Currently, we define 1 crossbar = 1 cluster
public int getNbClusters(){
return getAllCrossbar().size();
}
- /* DG 23.08. les hardware accelerators proviennent en fait de la specification DIPLODOCUS */
- // copro= new AvatarCoproMWMR("test",0,0,0,10,8,8,1,1,1,1,false);
-
public List<AvatarCoproMWMR> getAllCoproMWMR(){
List<AvatarCoproMWMR> copros = new LinkedList<AvatarCoproMWMR>();
for (AvatarComponent copro : components )
{
if (copro instanceof AvatarCoproMWMR){
-
- //DG 19.09. associate HW task name
- //copro.putName(blockname);
+
copros.add((AvatarCoproMWMR)copro);
+ nb_init++;
+ nb_target++;
}
}
return copros;
}
- /* to do, actuellement c'est un hwa generique */
- /* the hardware accelerators must be taken from DIPLODOCUS specification */
- /* public List<DiploHWA> getAllHWA(){
- List<DiploHWA> hwas = new LinkedList<DiploHWA>();
- for (DiploComponent hwa : diplocomponents )
- {
- if (hwa instanceof DiploHWA){
-
-
- hwas.add((DiploHWA)hwa);
- }
- }
- return hwas;
- }*/
-
public LinkedList<AvatarAmsCluster> getAllAmsCluster(){
- //int i=0;
LinkedList<AvatarAmsCluster> amsClusters = new LinkedList<AvatarAmsCluster>();
for (AvatarComponent amsCluster : components )
- {
+ {
if (amsCluster instanceof AvatarAmsCluster){
- amsClusters.add((AvatarAmsCluster)amsCluster);
- }
+ amsClusters.add((AvatarAmsCluster)amsCluster);
+ nb_target++;
}
+ }
return amsClusters;
}
@@ -298,6 +286,4 @@ There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) othe
return nb_target;
}
- // etc .....
-
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/Declaration.java b/src/main/java/ddtranslatorSoclib/toTopCell/Declaration.java
index b89634fbd743dc5c5603d1ec2434e06869ad79d6..0b371e589fa67781fc4279b683c13530e0cf9e4e 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/Declaration.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/Declaration.java
@@ -1,3 +1,6 @@
+
+
+
/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
* Daniela Genius, Lip6, UMR 7606
*
@@ -41,8 +44,8 @@
/* authors: v1.0 Raja GATGOUT 2014
- v2.0 Daniela GENIUS, Julien HENON 2015
- v2.1 Daniela GENIUS, 2016, 2017 */
+ v2.0 Daniela GENIUS, Julien HENON 2015
+ v2.1 Daniela GENIUS, 2016, 2017 */
package ddtranslatorSoclib.toTopCell;
@@ -51,6 +54,11 @@ import avatartranslator.AvatarRelation;
import avatartranslator.AvatarBlock;
import avatartranslator.AvatarSignal;
import avatartranslator.AvatarSpecification;
+//import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
+import ddtranslatorSoclib.AvatarCrossbar;
+
import myutil.TraceManager;
public class Declaration
@@ -58,7 +66,8 @@ public class Declaration
public static AvatarSpecification avspec;
private static String CR = "\n";
private static String CR2 = "\n\n";
-
+ public static AvatarddSpecification avatardd;
+
public static String generateName (AvatarRelation _ar, int _index)
{
return _ar.block1.getName () + "_" +
@@ -66,10 +75,51 @@ public class Declaration
_ar.block2.getName () + "_" + _ar.getSignal2 (_index).getName ();
}
- public static String getDeclarations (AvatarSpecification _avspec)
+
+ public static int cpus_in_cluster(AvatarddSpecification dd,int cluster_no){
+ avatardd = dd;
+ int cpus=0;
+ for (AvatarConnector connector : avatardd.getConnectors()){
+ AvatarConnectingPoint my_p1= connector.get_p1();
+ AvatarConnectingPoint my_p2= connector.get_p2();
+
+ AvatarComponent comp1 = my_p1.getComponent();
+ AvatarComponent comp2 = my_p2.getComponent();
+ if (comp1 instanceof AvatarCPU){
+ AvatarCPU comp1cpu = (AvatarCPU)comp1;
+ if(comp1cpu.getClusterIndex()==cluster_no)
+ cpus++;
+ }
+
+ }
+ return cpus;
+ }
+
+ public static int rams_in_cluster(AvatarddSpecification dd,int cluster_no){
+ avatardd = dd;
+ int rams=0;
+ for (AvatarConnector connector : avatardd.getConnectors()){
+ AvatarConnectingPoint my_p1= connector.get_p1();
+ AvatarConnectingPoint my_p2= connector.get_p2();
+
+ AvatarComponent comp1 = my_p1.getComponent();
+ AvatarComponent comp2 = my_p2.getComponent();
+ if (comp1 instanceof AvatarRAM){
+ AvatarRAM comp1ram = (AvatarRAM)comp1;
+ if(comp1ram.getClusterIndex()==cluster_no)
+ rams++;
+ }
+
+ }
+ return rams;
+ }
+
+
+
+ public static String getDeclarations (AvatarddSpecification _dd, AvatarSpecification _avspec)
{
avspec = _avspec;
-
+ avatardd = _dd;
String declaration =
"//----------------------------Instantiation-------------------------------"
+ CR2;
@@ -80,529 +130,589 @@ public class Declaration
boolean trace_caba = true;
if (nb_clusters == 0)
- {
- declaration += CR
- +
- "caba::VciHeterogeneousRom<vci_param> vcihetrom(\"vcihetrom\", IntTab(0), maptab);"
- + CR;
- }
+ {
+ declaration += CR
+ +
+ "caba::VciHeterogeneousRom<vci_param> vcihetrom(\"vcihetrom\", IntTab(0), maptab);"
+ + CR;
+ }
else
- {
- declaration += CR
- +
- "caba::VciHeterogeneousRom<vci_param> vcihetrom(\"vcihetrom\", IntTab(0,0), maptab);"
- + CR;
- }
+ {
+ declaration += CR
+ +
+ "caba::VciHeterogeneousRom<vci_param> vcihetrom(\"vcihetrom\", IntTab(0,0), maptab);"
+ + CR;
+ }
if (nb_clusters == 0)
- {
- declaration +=
- "caba::VciRam<vci_param> vcirom(\"vcirom\", IntTab(1), maptab, data_ldr);"
- + CR;
- }
+ {
+ declaration +=
+ "caba::VciRam<vci_param> vcirom(\"vcirom\", IntTab(1), maptab, data_ldr);"
+ + CR;
+ }
else
- {
- declaration +=
- "caba::VciRam<vci_param> vcirom(\"vcirom\", IntTab(0,1), maptab, data_ldr);"
- + CR;
- }
+ {
+ declaration +=
+ "caba::VciRam<vci_param> vcirom(\"vcirom\", IntTab(0,1), maptab, data_ldr);"
+ + CR;
+ }
if (nb_clusters == 0)
- {
- declaration +=
- " caba::VciSimhelper<vci_param> vcisimhelper (\"vcisimhelper\", IntTab(3), maptab);"
- + CR;
- }
+ {
+ declaration +=
+ " caba::VciSimhelper<vci_param> vcisimhelper (\"vcisimhelper\", IntTab(3), maptab);"
+ + CR;
+ }
else
- {
- declaration +=
- " caba::VciSimhelper<vci_param> vcisimhelper (\"vcisimhelper\", IntTab(0,3), maptab);"
- + CR;
- }
+ {
+ declaration +=
+ " caba::VciSimhelper<vci_param> vcisimhelper (\"vcisimhelper\", IntTab(0,3), maptab);"
+ + CR;
+ }
if (nb_clusters == 0)
- {
- declaration =
- declaration +
- "caba::VciXicu<vci_param> vcixicu(\"vci_xicu\", maptab, IntTab(4), 1, xicu_n_irq, cpus.size(), cpus.size());"
- + CR;
- }
+ {
+ declaration =
+ declaration +
+ "caba::VciXicu<vci_param> vcixicu(\"vci_xicu\", maptab, IntTab(5), 1, xicu_n_irq, cpus.size(), cpus.size());"
+ + CR;
+ }
else
- {
- declaration =
- declaration +
- "caba::VciXicu<vci_param> vcixicu(\"vci_xicu\", maptab, IntTab(0,4), 1, xicu_n_irq, cpus.size(), cpus.size());"
- + CR;
- }
+ {
+ declaration =
+ declaration +
+ "caba::VciXicu<vci_param> vcixicu(\"vci_xicu\", maptab, IntTab(0,5), 1, xicu_n_irq, cpus.size(), cpus.size());"
+ + CR;
+ }
if (nb_clusters == 0)
- {
- declaration =
- declaration +
- "caba::VciRtTimer<vci_param> vcirttimer (\"vcirttimer\", IntTab(5), maptab, 1, true);"
- + CR2;
- }
+ {
+ declaration =
+ declaration +
+ "caba::VciRtTimer<vci_param> vcirttimer (\"vcirttimer\", IntTab(4), maptab, 1, true);"
+ + CR2;
+ }
else
- {
- declaration =
- declaration +
- "caba::VciRtTimer<vci_param> vcirttimer (\"vcirttimer\", IntTab(0,5), maptab, 1, true);"
- + CR2;
- }
-
+ {
+ declaration =
+ declaration +
+ "caba::VciRtTimer<vci_param> vcirttimer (\"vcirttimer\", IntTab(0,4), maptab, 1, true);"
+ + CR2;
+ }
+
+
+ if (nb_clusters == 0)
+ {
+ //"caba::VciDma<vci_param> vcidma(\"vci_dma\", maptab,6,6,8);"
+ declaration += "caba::VciDma<vci_param> vcidma(\"vci_dma\", maptab,cpus.size()+3,6,8);"
+ + CR;
+ }
+ else
+ {
+ declaration +="caba::VciDma<vci_param> vcidma(\"vci_dma\", maptab,IntTab(0,cpus.size()+3),IntTab(0,6),8);"
+ + CR;
+ }
+
if (nb_clusters == 0)
- {
- declaration +=
- "caba::VciFdtRom<vci_param> vcifdtrom(\"vci_fdt_rom\", IntTab(6), maptab);"
- + CR;
- }
+ {
+ declaration +=
+ "caba::VciFdtRom<vci_param> vcifdtrom(\"vci_fdt_rom\", IntTab(7), maptab);"
+ + CR;
+ }
else
- {
- declaration +=
- "caba::VciFdtRom<vci_param> vcifdtrom(\"vci_fdt_rom\", IntTab(0,6), maptab);"
- + CR;
- }
-
- int last_tty = 0;
+ {
+ declaration +=
+ "caba::VciFdtRom<vci_param> vcifdtrom(\"vci_fdt_rom\", IntTab(0,7), maptab);"
+ + CR;
+ }
+
+ int nb_ram=0;
+ int nb_tty=0;
if (nb_clusters == 0)
- {
- int i = 0;
- for (AvatarTTY tty:TopCellGenerator.avatardd.
- getAllTTY ())
- {
- declaration +=
- "caba::VciMultiTty<vci_param> " + tty.getTTYName () +
- "(\"" + tty.getTTYName () + "\", IntTab(" +
- tty.getNo_target () + "), maptab, \"vci_multi_tty" +
- i + "\", NULL);" + CR;
- i++;
- last_tty = tty.getNo_target () + 1;
- }
-
- //target address depends on number of TTYs and RAMs
-
- if (nb_clusters == 0)
- {
- // declaration += "caba::VciLocks<vci_param> vcilocks(\"vcilocks\", IntTab("+(TopCellGenerator.avatardd.getNb_target()+3)+"), maptab);" + CR;
- // declaration += "caba::VciLocks<vci_param> vcilocks(\"vcilocks\", IntTab("+(last_tty+3)+"), maptab);" + CR;
- }
- else
- {
- // declaration += "caba::VciLocks<vci_param> vcilocks(\"vcilocks\", IntTab(0,8), maptab);" + CR;
+ {
+ int i = 0;
+ //target address depends on number of TTYs and RAMs
+ for (AvatarRAM ram:TopCellGenerator.avatardd.
+ getAllRAM ()){
+ if (ram.getIndex () == 0)
+ {
+ declaration +=
+ "soclib::caba::VciRam<vci_param>" +
+ ram.getMemoryName () + "(\"" +
+ ram.getMemoryName () + "\"" +
+ ", IntTab(2), maptab);" + CR;
+ }
+ else
+ {
+ declaration +=
+ "soclib::caba::VciRam<vci_param>" +
+ ram.getMemoryName () + "(\"" +
+ ram.getMemoryName () + "\"" + ", IntTab(" +
+ ram.getNo_target () + "), maptab);" + CR;
+ }
+ nb_ram++;
}
+ int first_tty = 10+nb_ram;
+ for (AvatarTTY tty:TopCellGenerator.avatardd.
+ getAllTTY ())
+ {
+ declaration +=
+ "caba::VciMultiTty<vci_param> " + tty.getTTYName () +
+ "(\"" + tty.getTTYName () + "\", IntTab(" + first_tty
+ + "), maptab, \"vci_multi_tty" +
+ i + "\", NULL);" + CR;
+ first_tty++;
+ nb_tty++;
+ }
+ }
+ else{//clustered
for (AvatarRAM ram:TopCellGenerator.avatardd.
- getAllRAM ())
- if (ram.getIndex () == 0)
- {
+ getAllRAM ()){
+ declaration +=
+ "soclib::caba::VciRam<vci_param>" +
+ ram.getMemoryName () + "(\"" + ram.getMemoryName () +
+ "\"" + ", IntTab(" + ram.getClusterIndex () + "," +
+ ram.getNo_target () + "), maptab);" + CR2;
+ }
+ nb_tty=0;
+ for (AvatarTTY tty:TopCellGenerator.avatardd.getAllTTY ())
+ { int cluster_no=tty.getClusterIndex();
+ nb_ram =
+ rams_in_cluster(avatardd, cluster_no);
+ nb_tty=0;
+ if(cluster_no==0){
declaration +=
- "soclib::caba::VciRam<vci_param>" +
- ram.getMemoryName () + "(\"" +
- ram.getMemoryName () + "\"" +
- ", IntTab(2), maptab);" + CR;
+ "caba::VciMultiTty<vci_param> " + tty.getTTYName () +
+ "(\"" + tty.getTTYName () + "\", IntTab(" +
+ tty.getClusterIndex () + "," + (nb_ram+10) +
+ "), maptab, \"vci_multi_tty" + cluster_no + "\", NULL);" + CR;
}
- else
- {
+ else{
declaration +=
- "soclib::caba::VciRam<vci_param>" +
- ram.getMemoryName () + "(\"" +
- ram.getMemoryName () + "\"" + ", IntTab(" +
- ram.getNo_target () + "), maptab);" + CR;
+ "caba::VciMultiTty<vci_param> " + tty.getTTYName () +
+ "(\"" + tty.getTTYName () + "\", IntTab(" +
+ tty.getClusterIndex () + "," + (nb_ram+nb_tty) +
+ "), maptab, \"vci_multi_tty" + cluster_no + "\", NULL);" + CR;
+ nb_tty++;
}
- }
- else
- {
- int i = 0;
- for (AvatarTTY tty:TopCellGenerator.avatardd.
- getAllTTY ())
- {
- declaration +=
- "caba::VciMultiTty<vci_param> " + tty.getTTYName () +
- "(\"" + tty.getTTYName () + "\", IntTab(" +
- tty.getNo_cluster () + "," + tty.getNo_target () +
- "), maptab, \"vci_multi_tty" + i + "\", NULL);" + CR;
- i++;
+
}
- for (AvatarRAM ram:TopCellGenerator.avatardd.
- getAllRAM ())
- declaration +=
- "soclib::caba::VciRam<vci_param>" +
- ram.getMemoryName () + "(\"" + ram.getMemoryName () +
- "\"" + ", IntTab(" + ram.getNo_cluster () + "," +
- ram.getNo_target () + "), maptab);" + CR2;
- }
+
+ }
if (nb_clusters == 0)
- {
-
- declaration +=
- "caba::VciFdAccess<vci_param> vcifd(\"vcifd\", maptab, IntTab(cpus.size()+1), IntTab("
- + last_tty + "));" + CR;
- declaration +=
- "caba::VciEthernet<vci_param> vcieth(\"vcieth\", maptab, IntTab(cpus.size()+2), IntTab("
- + (last_tty + 1) + "), \"soclib0\");" + CR;
- declaration +=
- "caba::VciBlockDevice<vci_param> vcibd(\"vcibd\", maptab, IntTab(cpus.size()), IntTab("
- + (last_tty + 2) + "),\"block0.iso\", 2048);" + CR;
-
- //non-clustered version
- int hwa_no = 0;
- //int target_no = TopCellGenerator.avatardd.getNb_target();
- int target_no = (last_tty + 4);
- int init_no = TopCellGenerator.avatardd.getNb_init ();
- for (AvatarCoproMWMR copro:TopCellGenerator.avatardd.
- getAllCoproMWMR ())
- {
-
- declaration +=
- "caba::VciMwmrController<vci_param> " +
- copro.getCoprocName () + "_wrapper(\"" +
- copro.getCoprocName () +
- "_wrapper\", maptab, IntTab(" + (init_no - 1) +
- "), IntTab(" + target_no + ")," + copro.getPlaps () +
- "," + copro.getFifoToCoprocDepth () + "," +
- copro.getFifoFromCoprocDepth () + "," +
- copro.getNToCopro () + "," + copro.getNFromCopro () +
- "," + copro.getNConfig () + "," +
- copro.getNStatus () + "," + copro.getUseLLSC () +
- ");" + CR2;
-
-//one virtual component for each hardware accellerator, info from diplodocus (not yet implemented)
-
- if (copro.getCoprocType () == 0)
- {
- declaration +=
- "soclib::caba::VciInputEngine<vci_param>" +
- copro.getCoprocName () + "(\"" +
- copro.getCoprocName () +
- "\", 1 , maptab,\"input.txt\",1024,1,8);" + CR;
- }
- else
- {
- if (copro.getCoprocType () == 1)
+ {
+
+ declaration +=
+ "caba::VciFdAccess<vci_param> vcifd(\"vcifd\", maptab, IntTab(cpus.size()+1), IntTab("
+ + 8 + "));" + CR;
+ declaration +=
+ "caba::VciEthernet<vci_param> vcieth(\"vcieth\", maptab, IntTab(cpus.size()+2), IntTab("
+ + 9 + "), \"soclib0\");" + CR;
+ declaration +=
+ "caba::VciBlockDevice<vci_param> vcibd(\"vcibd\", maptab, IntTab(cpus.size()), IntTab("
+ + 10 + "),\"block0.iso\", 2048);" + CR;
+
+ //non-clustered version
+ int hwa_no = 0;
+
+ int target_no = (10+ nb_ram + nb_tty);
+ int init_no = TopCellGenerator.avatardd.getNb_init ();
+ for (AvatarCoproMWMR copro:TopCellGenerator.avatardd.
+ getAllCoproMWMR ())
+ {
+ nb_clusters = TopCellGenerator.avatardd.getAllCrossbar ().size ();
+ if(nb_clusters==0){
+ declaration +=
+ "caba::VciMwmrController<vci_param> " +
+ copro.getCoprocName () + "_wrapper(\"" +
+ copro.getCoprocName () +
+ "_wrapper\", maptab, IntTab(" + (init_no - 1) +
+ "), IntTab(" + target_no + ")," + copro.getPlaps () +
+ "," + copro.getFifoToCoprocDepth () + "," +
+ copro.getFifoFromCoprocDepth () + "," +
+ copro.getNToCopro () + "," + copro.getNFromCopro () +
+ "," + copro.getNConfig () + "," +
+ copro.getNStatus () + "," + copro.getUseLLSC () +
+ ");" + CR2;
+ }
+ else{
+ declaration +=
+ "caba::VciMwmrController<vci_param> " +
+ copro.getCoprocName () + "_wrapper(\"" +
+ copro.getCoprocName () +
+ "_wrapper\", IntTab(" + copro.getClusterIndex () + "," +
+ (init_no - 1) +" ,IntTab(" + copro.getClusterIndex () + "," +
+ target_no + ")," + copro.getPlaps () +
+ "," + copro.getFifoToCoprocDepth () + "," +
+ copro.getFifoFromCoprocDepth () + "," +
+ copro.getNToCopro () + "," + copro.getNFromCopro () +
+ "," + copro.getNConfig () + "," +
+ copro.getNStatus () + "," + copro.getUseLLSC () +
+ ");" + CR2;
+ }
+
+
+ //one virtual component for each hardware accellerator, info from diplodocus (not yet implemented)
+
+ if (copro.getCoprocType () == 0)
{
declaration +=
- "soclib::caba::VciOutputEngine<vci_param>"
- + copro.getCoprocName () + "(\"" +
+ "soclib::caba::VciInputEngine<vci_param>" +
+ copro.getCoprocName () + "(\"" +
copro.getCoprocName () +
- "\", 1 , maptab,1,1,1,\"output.txt\",\"throw.txt\");"
- + CR;
+ "\", 1 , maptab,\"input.txt\",1024,1,8);" + CR;
}
-
-
- else
+ else
{
- declaration +=
- // "dsx::caba::MyHWA" + hwa_no + " hwa" +
- // hwa_no + "(\"hwa" + hwa_no + "\");" + CR2;
- "dsx::caba::MyHWA(\""+copro.getCoprocName ()+ "\");" + CR2;
+ if (copro.getCoprocType () == 1)
+ {
+ declaration +=
+ "soclib::caba::VciOutputEngine<vci_param>"
+ + copro.getCoprocName () + "(\"" +
+ copro.getCoprocName () +
+ "\", 1 , maptab,1,1,1,\"output.txt\",\"throw.txt\");"
+ + CR;
+ }
+
+
+ else
+ {
+ declaration +=
+ // "dsx::caba::MyHWA" + hwa_no + " hwa" +
+ // hwa_no + "(\"hwa" + hwa_no + "\");" + CR2;
+ "dsx::caba::MyHWA(\""+copro.getCoprocName ()+ "\");" + CR2;
+ }
}
- }
- init_no++;
- target_no++;
- }
- }
+ init_no++;
+ target_no++;
+ }
+ }
else
- {
- declaration +=
- "caba::VciFdAccess<vci_param> vcifd(\"vcifd\", maptab, IntTab(0,cpus.size()+1), IntTab(0,7));"
- + CR;
- declaration +=
- "caba::VciEthernet<vci_param> vcieth(\"vcieth\", maptab, IntTab(0,cpus.size()+2), IntTab(0,8), \"soclib0\");"
- + CR;
- declaration +=
- "caba::VciBlockDevice<vci_param> vcibd(\"vcibd\", maptab, IntTab(0,cpus.size()), IntTab(0,9),\"block0.iso\", 2048);"
- + CR;
-
- int hwa_no = 0;
- //int target_no = TopCellGenerator.avatardd.getNb_target();
- int target_no = (last_tty + 4);
- int init_no = TopCellGenerator.avatardd.getNb_init ();
- for (AvatarCoproMWMR copro:TopCellGenerator.avatardd.
- getAllCoproMWMR ())
- {
-
- declaration +=
- "caba::VciMwmrController<vci_param> " +
- copro.getCoprocName () + "_wrapper(\"" +
- copro.getCoprocName () +
- "_wrapper\", maptab, IntTab(" + (init_no - 1) +
- "), IntTab(" + target_no + ")," + copro.getPlaps () +
- "," + copro.getFifoToCoprocDepth () + "," +
- copro.getFifoFromCoprocDepth () + "," +
- copro.getNToCopro () + "," + copro.getNFromCopro () +
- "," + copro.getNConfig () + "," +
- copro.getNStatus () + "," + copro.getUseLLSC () +
- ");" + CR2;
-
- //one virtual component for each hardware accellerator, info from diplodocus (not yet implemented)
- // declaration += "soclib::caba::FifoVirtualCoprocessorWrapper hwa"+hwa_no+"(\"hwa"+hwa_no+"\",1,1,1,1);"+ CR2;
-
- if (copro.getCoprocType () == 0)
- {
- declaration +=
- "soclib::caba::VciInputEngine<vci_param>" +
- copro.getCoprocName () + "(\"" +
- copro.getCoprocName () +
- "\", 1 , maptab,\"input.txt\",1024,1,8);" + CR;
- }
- else
- {
- if (copro.getCoprocType () == 1)
+ {
+ declaration +=
+ "caba::VciFdAccess<vci_param> vcifd(\"vcifd\", maptab, IntTab(0,cpus.size()+1), IntTab(0,8));"
+ + CR;
+ declaration +=
+ "caba::VciEthernet<vci_param> vcieth(\"vcieth\", maptab, IntTab(0,cpus.size()+2), IntTab(0,9), \"soclib0\");"
+ + CR;
+ declaration +=
+ "caba::VciBlockDevice<vci_param> vcibd(\"vcibd\", maptab, IntTab(0,cpus.size()), IntTab(0,10),\"block0.iso\", 2048);"
+ + CR;
+
+ //int cluster_no; cluster_no = copro.getClusterIndex ();
+ //nb_ram = rams_in_cluster(avatardd, cluster_no);
+
+ nb_tty = 0;
+
+ int init_no = TopCellGenerator.avatardd.getNb_init ();
+ int hwa_no = 0;
+ for (AvatarCoproMWMR copro:TopCellGenerator.avatardd.
+ getAllCoproMWMR ())
+ {
+ int cluster_no = copro.getClusterIndex ();
+ nb_ram = rams_in_cluster(avatardd, cluster_no);
+ int target_no = nb_ram+nb_tty;
+ declaration +=
+ "caba::VciMwmrController<vci_param> " +
+ copro.getCoprocName () + "_wrapper(\"" +
+ copro.getCoprocName () +
+ "_wrapper\", maptab, IntTab(" + (init_no - 1) +
+ "), IntTab(" + target_no + ")," + copro.getPlaps () +
+ "," + copro.getFifoToCoprocDepth () + "," +
+ copro.getFifoFromCoprocDepth () + "," +
+ copro.getNToCopro () + "," + copro.getNFromCopro () +
+ "," + copro.getNConfig () + "," +
+ copro.getNStatus () + "," + copro.getUseLLSC () +
+ ");" + CR2;
+
+ //future work on virtual coprocessors : one virtual component for each hardware accellerator, info from diplodocus (not yet implemented)
+ // declaration += "soclib::caba::FifoVirtualCoprocessorWrapper hwa"+hwa_no+"(\"hwa"+hwa_no+"\",1,1,1,1);"+ CR2;
+
+ if (copro.getCoprocType () == 0)
{
declaration +=
- "soclib::caba::VciOutputEngine<vci_param>"
- + copro.getCoprocName () + "(\"" +
+ "soclib::caba::VciInputEngine<vci_param>" +
+ copro.getCoprocName () + "(\"" +
copro.getCoprocName () +
- "\", 1 , maptab,1,1,1,\"output.txt\",\"throw.txt\");"
- + CR;
+ "\", 1 , maptab,\"input.txt\",1024,1,8);" + CR;
}
-
-
- else
+ else
{
- declaration +=
- "dsx::caba::MyHWA" + hwa_no + " hwa" +
- hwa_no + "(\"hwa" + hwa_no + "\");" + CR2;
-
- hwa_no++;
+ if (copro.getCoprocType () == 1)
+ {
+ declaration +=
+ "soclib::caba::VciOutputEngine<vci_param>"
+ + copro.getCoprocName () + "(\"" +
+ copro.getCoprocName () +
+ "\", 1 , maptab,1,1,1,\"output.txt\",\"throw.txt\");"
+ + CR;
+ }
+
+
+ else
+ {
+ declaration +=
+ "dsx::caba::MyHWA" + hwa_no + " hwa" +
+ hwa_no + "(\"hwa" + hwa_no + "\");" + CR2;
+
+ hwa_no++;
+ }
}
- }
- target_no++;
- init_no++;
- }
+ target_no++;
+ init_no++;
+ }
- }
+ }
if (nb_clusters == 0)
- {
-
- for (AvatarBus bus:TopCellGenerator.avatardd.
- getAllBus ())
- {
- TraceManager.addDev ("initiators: " +
- TopCellGenerator.avatardd.
- getNb_init ());
- TraceManager.addDev ("targets: " +
- TopCellGenerator.avatardd.
- getNb_target ());
-
- declaration +=
- "soclib::caba::VciVgsb<vci_param> vgsb(\"" +
- bus.getBusName () + "\"" + " , maptab," + (3 +
- TopCellGenerator.
- avatardd.getNb_init
- ()) + "," +
- (TopCellGenerator.avatardd.getNb_target () + 3) +
- ");" + CR2;
- int i = 0;
+ {
- }
+ for (AvatarBus bus:TopCellGenerator.avatardd.
+ getAllBus ())
+ {
+ /* TraceManager.addDev ("initiators: " +
+ TopCellGenerator.avatardd.
+ getNb_init ());
+ TraceManager.addDev ("targets: " +
+ TopCellGenerator.avatardd.
+ getNb_target ());
- for (AvatarVgmn vgmn:TopCellGenerator.avatardd.
- getAllVgmn ())
- {
- /* set default values */
- TraceManager.addDev ("initiators: " +
- TopCellGenerator.avatardd.
- getNb_init ());
- TraceManager.addDev ("targets: " +
- TopCellGenerator.avatardd.
- getNb_target ());
-
-
- if (vgmn.getMinLatency () < 2)
- vgmn.setMinLatency (10); //default value; must be > 2
- if (vgmn.getFifoDepth () < 2)
- vgmn.setFifoDepth (8); //default value; must be > 2
-
- declaration +=
- "soclib::caba::VciVgmn<vci_param> vgmn(\"" +
- vgmn.getVgmnName () + "\"" + " , maptab, " + (3 +
- TopCellGenerator.
- avatardd.
- getNb_init
- ()) +
- "," + (TopCellGenerator.avatardd.getNb_target () +
- 3) + "," + vgmn.getMinLatency () + "," +
- vgmn.getFifoDepth () + ");" + CR2;
- }
+ declaration +=
+ "soclib::caba::VciVgsb<vci_param> vgsb(\"" +
+ bus.getBusName () + "\"" + " , maptab," + (3 +
+ TopCellGenerator.
+ avatardd.getNb_init
+ ()) + "," +
+ (TopCellGenerator.avatardd.getNb_target () + 3) +
+ ");" + CR2;
+ int i = 0;*/
+ TraceManager.addDev ("initiators: " +
+ TopCellGenerator.avatardd.
+ getNb_init ());
+ TraceManager.addDev ("targets: " +
+ TopCellGenerator.avatardd.
+ getNb_target ());
- }
- else
- {
+ declaration +=
+ "soclib::caba::VciVgsb<vci_param> vgsb(\"" +
+ bus.getBusName () + "\"" + " , maptab," + (4 +
+ TopCellGenerator.
+ avatardd.getNbCPU()) + "," +
+ (TopCellGenerator.avatardd.getNbRAM() + TopCellGenerator.avatardd.getNbTTY() + TopCellGenerator.avatardd.getNbAmsCluster()
+ + 10) +
+ ");" + CR2;
+ int i = 0;
- /***************************************/
- /* clustered interconnect architecture */
- /***************************************/
+ }
+ for (AvatarVgmn vgmn:TopCellGenerator.avatardd.
+ getAllVgmn ())
+ {
+ /* TraceManager.addDev ("initiators: " +
+ TopCellGenerator.avatardd.
+ getNb_init ());
+ TraceManager.addDev ("targets: " +
+ TopCellGenerator.avatardd.
+ getNb_target ());*/
+
+
+ if (vgmn.getMinLatency () < 2)
+ vgmn.setMinLatency (10); //default value; must be > 2
+ if (vgmn.getFifoDepth () < 2)
+ vgmn.setFifoDepth (8); //default value; must be > 2
+
+ /* declaration +=
+ "soclib::caba::VciVgmn<vci_param> vgmn(\"" +
+ vgmn.getVgmnName () + "\"" + " , maptab, " + (3 +
+ TopCellGenerator.
+ avatardd.
+ getNb_init
+ ()) +
+ "," + (TopCellGenerator.avatardd.getNb_target () +
+ 3) + "," + vgmn.getMinLatency () + "," +
+ vgmn.getFifoDepth () + ");" + CR2;*/
+
+ declaration +=
+ "soclib::caba::VciVgmn<vci_param> vgmn(\"" +
+ vgmn.getVgmnName () + "\"" + " , maptab, " + (4 +
+ TopCellGenerator.
+ avatardd.
+ getNbCPU
+ ()) +
+ "," + (TopCellGenerator.avatardd.getNbRAM() + TopCellGenerator.avatardd.getNbTTY() + TopCellGenerator.avatardd.getNbAmsCluster()
+ + 10) + "," + vgmn.getMinLatency () + "," +
+ vgmn.getFifoDepth () + ");" + CR2;
+ }
- for (AvatarBus bus:TopCellGenerator.avatardd.
- getAllBus ())
- {
+ }
+ else
+ {
- declaration +=
- "soclib::caba::VciVgsb<vci_param> vgsb(\"" +
- bus.getBusName () + "\"" + " , maptab, " +
- +nb_clusters + "," + nb_clusters + ");" + CR2;
+ /***************************************/
+ /* clustered interconnect architecture */
+ /***************************************/
- //if BUS was not last in input file, update here
- int i = 0;
- }
- for (AvatarVgmn vgmn:TopCellGenerator.avatardd.
- getAllVgmn ())
- {
- TraceManager.addDev ("initiators: " +
- TopCellGenerator.avatardd.
- getNb_init ());
- TraceManager.addDev ("targets: " +
- TopCellGenerator.avatardd.
- getNb_target ());
-
- declaration +=
- "soclib::caba::VciVgmn<vci_param> vgmn (\"" +
- vgmn.getVgmnName () + "\"" + " , maptab, " +
- nb_clusters + "," + nb_clusters + "," +
- vgmn.getMinLatency () + "," + vgmn.getFifoDepth () +
- ");" + CR2;
+ for (AvatarBus bus:TopCellGenerator.avatardd.
+ getAllBus ())
+ {
- }
+ TraceManager.addDev ("VGSB initiators: " +
+ TopCellGenerator.avatardd.
+ getNb_init ());
+ TraceManager.addDev ("VGSB targets: " +
+ TopCellGenerator.avatardd.
+ getNb_target ());
+
+ declaration +=
+ "soclib::caba::VciVgsb<vci_param> vgsb(\"" +
+ bus.getBusName () + "\"" + " , maptab, " +
+ +nb_clusters + "," + nb_clusters + ");" + CR2;
- int i = 0;
- for (AvatarCrossbar crossbar:TopCellGenerator.avatardd.
- getAllCrossbar
- ())
- {
+ //if BUS was not last in input file, update here
+ int i = 0;
+ }
- crossbar.setClusterIndex (i);
+ for (AvatarVgmn vgmn:TopCellGenerator.avatardd.
+ getAllVgmn ())
+ {
+ TraceManager.addDev ("VGMN initiators: " + nb_clusters);
+ TraceManager.addDev ("VGMN targets: " +nb_clusters);
- if (crossbar.getClusterIndex () == 0)
- {
- crossbar.setNbOfAttachedInitiators (nb_clusters);
- crossbar.setNbOfAttachedTargets (13);
- }
- else
- {
-
- crossbar.setNbOfAttachedInitiators (1);
- crossbar.setNbOfAttachedTargets (1);
- }
-
- TraceManager.addDev ("initiators: " +
- crossbar.
- getNbOfAttachedInitiators ());
- TraceManager.addDev ("targets: " +
- crossbar.getNbOfAttachedTargets ());
-
- declaration +=
- "soclib::caba::VciLocalCrossbar<vci_param> crossbar" +
- crossbar.getClusterIndex () + "(\"" +
- crossbar.getCrossbarName () + "\"" +
- " , maptab, IntTab(" + crossbar.getClusterIndex () +
- "),IntTab(" + crossbar.getClusterIndex () + "), " +
- crossbar.getNbOfAttachedInitiators () + ", " +
- crossbar.getNbOfAttachedTargets () + ");" + CR2;
-
- //if CROSSBAR was not last in input file, update here
- crossbar.
- setNbOfAttachedInitiators (TopCellGenerator.avatardd.
- getNb_init ());
- crossbar.
- setNbOfAttachedTargets (TopCellGenerator.avatardd.
- getNb_target ());
- i++;
- }
- }
+ declaration +=
+ "soclib::caba::VciVgmn<vci_param> vgmn (\"" +
+ vgmn.getVgmnName () + "\"" + " , maptab, " +
+ nb_clusters + "," + nb_clusters + "," +
+ vgmn.getMinLatency () + "," + vgmn.getFifoDepth () +
+ ");" + CR2;
+ }
+
+
+ for (AvatarCrossbar crossbar:TopCellGenerator.avatardd.
+ getAllCrossbar())
+ {
+
+ int cluster_no = crossbar.getClusterIndex ();
+ TraceManager.addDev ("CROSSBAR" +cluster_no+" cpus: " +
+ cpus_in_cluster(avatardd, cluster_no) );
+ TraceManager.addDev ("CROSSBAR " +cluster_no+" rams: " +
+ rams_in_cluster(avatardd, cluster_no) );
+
+ declaration +=
+ "soclib::caba::VciLocalCrossbar<vci_param> crossbar" +
+ crossbar.getClusterIndex () + "(\"" +
+ crossbar.getCrossbarName () + "\"" +
+ " , maptab, " + crossbar.getClusterIndex () +
+ "," + crossbar.getClusterIndex () + ", " +
+ cpus_in_cluster(avatardd, cluster_no) + ", " +
+ (rams_in_cluster(avatardd, cluster_no)+1) + ");" + CR2;
+ //if CROSSBAR was not last in input file, update here
+
+ }
+ }
int i = 0;
//monitoring CPU by logger(1)
- for (AvatarCPU cpu:TopCellGenerator.avatardd.getAllCPU ())
- {
+ for (AvatarCPU cpu:TopCellGenerator.avatardd.getAllCPU ())
+ {
- if (cpu.getMonitored () == 1)
- {
+ if (cpu.getMonitored () == 1)
+ {
- declaration +=
- "soclib::caba::VciLogger<vci_param> logger" + i +
- "(\"logger" + i + "\",maptab);" + CR2;
- i++;
- }
- }
+ declaration +=
+ "soclib::caba::VciLogger<vci_param> logger" + i +
+ "(\"logger" + i + "\",maptab);" + CR2;
+ i++;
+ }
+ }
int j = 0;
//monitoring RAM either by logger(1) or stats (2)
- for (AvatarRAM ram:TopCellGenerator.avatardd.getAllRAM ())
- {
- if (ram.getMonitored () == 0)
- {
-
- }
- if (ram.getMonitored () == 1)
- {
-
- declaration +=
- "soclib::caba::VciLogger<vci_param> logger" + i +
- "(\"logger" + i + "\",maptab);" + CR2;
- i++;
- }
- else
- {
- if (ram.getMonitored () == 2)
- {
+ for (AvatarRAM ram:TopCellGenerator.avatardd.getAllRAM ())
+ {
+ if (ram.getMonitored () == 0)
+ {
- String strArray = "";
+ }
+ if (ram.getMonitored () == 1)
+ {
- for (AvatarRelation ar:avspec.
- getRelations
- ())
+ declaration +=
+ "soclib::caba::VciLogger<vci_param> logger" + i +
+ "(\"logger" + i + "\",maptab);" + CR2;
+ i++;
+ }
+ else
+ {
+ if (ram.getMonitored () == 2)
{
- for (i = 0; i < ar.nbOfSignals (); i++)
- {
+ String strArray = "";
- AvatarSignal as1 = ar.getSignal1 (i);
- AvatarSignal as2 = ar.getSignal2 (i);
+ for (AvatarRelation ar:avspec.
+ getRelations
+ ())
+ {
- String chname = generateName (ar, i);
- strArray =
- strArray + "\"" + chname + "\",";
- }
+ for (i = 0; i < ar.nbOfSignals (); i++)
+ {
- }
+ AvatarSignal as1 = ar.getSignal1 (i);
+ AvatarSignal as2 = ar.getSignal2 (i);
- declaration +=
- "soclib::caba::VciMwmrStats<vci_param> mwmr_stats"
- + j + "(\"mwmr_stats" + j +
- "\",maptab, data_ldr, \"mwmr" + j +
- ".log\",stringArray(" + strArray + "NULL));" +
- CR2;
- j++;
- }
- }
- }
+ String chname = generateName (ar, i);
+ strArray =
+ strArray + "\"" + chname + "\",";
+ }
- /** AMS Clusters
- */
- if (nb_clusters == 0)
- {
- for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
+ }
+
+ declaration +=
+ "soclib::caba::VciMwmrStats<vci_param> mwmr_stats"
+ + j + "(\"mwmr_stats" + j +
+ "\",maptab, data_ldr, \"mwmr" + j +
+ ".log\",stringArray(" + strArray + "NULL));" +
+ CR2;
+ j++;
+ }
+ }
+ }
+
+ /** AMS Clusters
+ */
+ if (nb_clusters == 0)
{
- declaration +=
- "caba::Gpio2Vci<vci_param> " + amsCluster.getAmsClusterName () +
- "(\"" + amsCluster.getAmsClusterName () + "\", IntTab(" +
- amsCluster.getNo_target () + "), maptab);" + CR;
- }
- } else //nb_clusters != 0
- {
- for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
+ for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
+ {
+ declaration +=
+ "caba::Gpio2Vci<vci_param> gpio2vci" + amsCluster.getNo_amsCluster () +
+ "(\"gpio2vci" + amsCluster.getNo_amsCluster () + "\", IntTab(" +
+ amsCluster.getNo_target () + "), maptab);" + CR;
+
+ declaration +=
+ amsCluster.getAmsClusterName () + "<vci_param> " +
+ amsCluster.getAmsClusterName () + amsCluster.getNo_amsCluster () +
+ "(\"" + amsCluster.getAmsClusterName () + amsCluster.getNo_amsCluster () +
+ "\");" + CR2;
+ }
+ } else //nb_clusters != 0
{
- declaration +=
- "caba::Gpio2Vci<vci_param> " + amsCluster.getAmsClusterName () +
- "(\"" + amsCluster.getAmsClusterName () + "\", IntTab(" +
- amsCluster.getNo_cluster () + "," + amsCluster.getNo_target () +
- "), maptab);" + CR;
- }
- }
+ for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
+ {
+ declaration +=
+ "caba::Gpio2Vci<vci_param> gpio2vci" + amsCluster.getNo_amsCluster () +
+ "(\"gpio2vci" + amsCluster.getNo_amsCluster () + "\", IntTab(" +
+ amsCluster.getNo_cluster () + "," + amsCluster.getNo_target () +
+ "), maptab);" + CR;
+
+ declaration +=
+ amsCluster.getAmsClusterName () + "<vci_param> " +
+ amsCluster.getAmsClusterName () + amsCluster.getNo_amsCluster () +
+ "(\"" + amsCluster.getAmsClusterName () + amsCluster.getNo_amsCluster () +
+ "\");" + CR2;
+ }
+ }
return declaration;
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/Deployinfo.java b/src/main/java/ddtranslatorSoclib/toTopCell/Deployinfo.java
index a57a58bf0d8b00884b6f716dd956ff64dc4eef5a..a54bc628547f30648911d47e0ea8e7e204e32c97 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/Deployinfo.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/Deployinfo.java
@@ -1,326 +1,326 @@
-
-
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- Daniela Genius, Lip6, UMR 7606
-
- ludovic.apvrille AT enst.fr
- daniela.genius@lip6.fr
-
- This software is a computer program whose purpose is to allow the
- edition of TURTLE analysis, design and deployment diagrams, to
- allow the generation of RT-LOTOS or Java code from this diagram,
- and at last to allow the analysis of formal validation traces
- obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- from INRIA Rhone-Alpes.
-
- This software is governed by the CeCILL license under French law and
- abiding by the rules of distribution of free software. You can use,
- modify and/ or redistribute the software under the terms of the CeCILL
- license as circulated by CEA, CNRS and INRIA at the following URL
- "http://www.cecill.info".
-
- As a counterpart to the access to the source code and rights to copy,
- modify and redistribute granted by the license, users are provided only
- with a limited warranty and the software's author, the holder of the
- economic rights, and the successive licensors have only limited
- liability.
-
- In this respect, the user's attention is drawn to the risks associated
- with loading, using, modifying and/or developing or reproducing the
- software by the user in light of its specific status of free software,
- that may mean that it is complicated to manipulate, and that also
- therefore means that it is reserved for developers and experienced
- professionals having in-depth computer knowledge. Users are therefore
- encouraged to load and test the software's suitability as regards their
- requirements in conditions enabling the security of their systems and/or
- data to be ensured and, more generally, to use and operate it in the
- same conditions as regards security.
-
- The fact that you are presently reading this means that you have had
- knowledge of the CeCILL license and that you accept its terms.
-*/
-
-/* This class generates the deployment info for the ldscript*/
-
-
-/* authors: v1.0 Daniela GENIUS 2015 modified for clustered architecture 08/2016 */
-
-/*
-
-/* here is an example of an ldscript :
-#define CHANNEL_0_NAME channel0
-#define CHANNEL_1_NAME channel1
-
-#define DEPLOY_RAM_0_NAME channel_ram0
-#define DEPLOY_RAM_0_ADDR 0x6f000000
-#define DEPLOY_RAM_0_SIZE 0x01000000
-
-#define DEPLOY_RAM_1_NAME channel_ram1
-#define DEPLOY_RAM_1_ADDR 0x5f000000
-#define DEPLOY_RAM_1_SIZE 0x01000000
-
-#define MAP_A\
- .channel0 : { \
- __channel_0_start = ABSOLUTE(.);\
- *(section_channel0)\
- } > DEPLOY_RAM_0_NAME\
- .channel1 : { \
- __channel_1_start = ABSOLUTE(.);\
- *(section_channel1) \
- } > DEPLOY_RAM_1_NAME
- */
-
-package ddtranslatorSoclib.toTopCell;
-
-import ddtranslatorSoclib.*;
-import ddtranslatorSoclib.toSoclib.*;
-
-import avatartranslator.*;
-import myutil.Conversion;
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.TraceManager;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-public class Deployinfo {
-
- private final static String CR = "\n";
- private final static String CR2 = "\n\n";
-
- public static AvatarSpecification avspec;//DG 15.05.2017
- public static AvatarddSpecification avddspec;
- private Vector<?> warnings;
-
- private MainFileSoclib mainFile;
- private Vector<TaskFileSoclib> taskFiles;
- private String makefile_src;
- private String makefile_SocLib;
- //
- /* for the moment, this is specific to PowerPC */
-
- public Deployinfo(AvatarddSpecification _avddspec, AvatarSpecification _avspec) {
- avspec = _avspec;
- avddspec = _avddspec;
- taskFiles = new Vector<TaskFileSoclib>();
- }
-
- public static String getDeployInfo() {
-
- int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
-
- String deployinfo = CR;
-
- /* we will have to dimension the segments according to the number of clusters, number of RAMS etc. */
-
- /* first, determine the "step" between segments dedicated to a cluster */
-
- int CLUSTER_SIZE;
-
- //if the user does not specify the size, take default value
- if(nb_clusters<16) {
- CLUSTER_SIZE = 268435456;
- }
- else {
- CLUSTER_SIZE = 134217728;
- } // to be refined, cf DSX -> dynamically adapt
-
-
- int size;
-
- /* there can be many RAMS, but then must be smaller dimensioned */
-
- int i=0;
- for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
-
- /* data memory always starts at 0x10000000 */
- int address_start = 268435456;
- String string_adress_start = Integer.toHexString(i*268435456);
-
- /* segment size is either given by the user or a default value is calculated */
- if(ram.getDataSize()==0){
-
- if((nb_clusters<16)||(TopCellGenerator.avatardd.getAllRAM().size()<16)){
- size = 268435456;
-
- }
- else {//smaller segments
- size = 134217728;
- } // to be refined, a la DSX
- }
- else{
- size = ram.getDataSize();
- }
- ram.setDataSize(size);
- //ram.setDataSize(0);
- size = ram.getDataSize(); // this is the hardware RAM size
-
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+/* This class generates the deployment info for the ldscript*/
+
+
+/* authors: v1.0 Daniela GENIUS 2015 modified for clustered architecture 08/2016 */
+
+/*
+
+/* here is an example of an ldscript :
+#define CHANNEL_0_NAME channel0
+#define CHANNEL_1_NAME channel1
+
+#define DEPLOY_RAM_0_NAME channel_ram0
+#define DEPLOY_RAM_0_ADDR 0x6f000000
+#define DEPLOY_RAM_0_SIZE 0x01000000
+
+#define DEPLOY_RAM_1_NAME channel_ram1
+#define DEPLOY_RAM_1_ADDR 0x5f000000
+#define DEPLOY_RAM_1_SIZE 0x01000000
+
+#define MAP_A\
+ .channel0 : { \
+ __channel_0_start = ABSOLUTE(.);\
+ *(section_channel0)\
+ } > DEPLOY_RAM_0_NAME\
+ .channel1 : { \
+ __channel_1_start = ABSOLUTE(.);\
+ *(section_channel1) \
+ } > DEPLOY_RAM_1_NAME
+ */
+
+package ddtranslatorSoclib.toTopCell;
+
+import ddtranslatorSoclib.*;
+import ddtranslatorSoclib.toSoclib.*;
+
+import avatartranslator.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
+public class Deployinfo {
+
+ private final static String CR = "\n";
+ private final static String CR2 = "\n\n";
+
+ public static AvatarSpecification avspec;//DG 15.05.2017
+ public static AvatarddSpecification avddspec;
+ private Vector<?> warnings;
+
+ private MainFileSoclib mainFile;
+ private Vector<TaskFileSoclib> taskFiles;
+ private String makefile_src;
+ private String makefile_SocLib;
+ //
+ /* for the moment, this is specific to PowerPC */
+
+ public Deployinfo(AvatarddSpecification _avddspec, AvatarSpecification _avspec) {
+ avspec = _avspec;
+ avddspec = _avddspec;
+ taskFiles = new Vector<TaskFileSoclib>();
+ }
+
+ public static String getDeployInfo() {
+
+ int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
+
+ String deployinfo = CR;
+
+ /* we will have to dimension the segments according to the number of clusters, number of RAMS etc. */
+
+ /* first, determine the "step" between segments dedicated to a cluster */
+
+ int CLUSTER_SIZE;
+
+ //if the user does not specify the size, take default value
+ if(nb_clusters<16) {
+ CLUSTER_SIZE = 268435456;
+ }
+ else {
+ CLUSTER_SIZE = 134217728;
+ } // to be refined, cf DSX -> dynamically adapt
+
+
+ int size;
+
+ /* there can be many RAMS, but then must be smaller dimensioned */
+
+ int i=0;
+ for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
+
+ /* data memory always starts at 0x10000000 */
+ int address_start = 268435456;
+ String string_adress_start = Integer.toHexString(i*268435456);
+
+ /* segment size is either given by the user or a default value is calculated */
+ if(ram.getDataSize()==0){
+
+ if((nb_clusters<16)||(TopCellGenerator.avatardd.getAllRAM().size()<16)){
+ size = 268435456;
+
+ }
+ else {//smaller segments
+ size = 134217728;
+ } // to be refined, a la DSX
+ }
+ else{
+ size = ram.getDataSize();
+ }
+ ram.setDataSize(size);
+ //ram.setDataSize(0);
+ size = ram.getDataSize(); // this is the hardware RAM size
-
- String string_size_half = (Integer.toHexString(size/2)); //segments on this are half uram, half cram
-
- deployinfo += "#define CACHED_RAM" + ram.getIndex() + "_NAME cram" + ram.getIndex() + CR;
- deployinfo = deployinfo + "#define CACHED_RAM" + ram.getIndex() + "_ADDR 0x" + Integer.toHexString(address_start+i*CLUSTER_SIZE) + CR;
- // 31.08. simplifie
- deployinfo = deployinfo + "#define CACHED_RAM" + ram.getIndex() + "_SIZE 0x"+ string_size_half + CR;
- deployinfo += "#define DEPLOY_RAM" + ram.getIndex() + "_NAME uram" + ram.getIndex() + CR;
- int cacheability_bit= 2097152; //0x00200000
- deployinfo = deployinfo + "#define DEPLOY_RAM" + ram.getIndex() + "_ADDR 0x" + Integer.toHexString(address_start+i*CLUSTER_SIZE+size/2+cacheability_bit) + CR;
- // 31.08. simplifie
- deployinfo = deployinfo + "#define DEPLOY_RAM" + ram.getIndex() + "_SIZE 0x"+ (string_size_half) + CR;
-
- i++;
- }
- //Calculate Adresses of MWMR segments, one for each hardware accellerator
- i=0;
-
- for (AvatarCoproMWMR copro : TopCellGenerator.avatardd.getAllCoproMWMR()) {
- deployinfo = deployinfo + "#define MWMR_RAM" + i + "_NAME mwmr_ram" + i + CR;
- deployinfo = deployinfo + "#define MWMR_RAM" + i + "_ADDR 0xA02" + Integer.toHexString(i*4096) + CR;
- deployinfo = deployinfo + "#define MWMR_RAM" + i + "_SIZE 0x1000"+ CR;
- i++;
- }
-
- return deployinfo;
- }
-
- /* public static String getDeployInfoMap() {
- int i=0;
- String deployinfo_map = CR;
- int nb_signals=0;
- deployinfo_map += "#define MAP_A\\" + CR;
-
-
- for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
- //if (!(ram.getChannels().isEmpty())){
- // for (AvatarChannel channel : ram.getChannels()) {
-
- //DG 15.05.2017
- for (AvatarRelation relation : avspec.getRelations()) {
- //if (!(ram.getRelations().isEmpty())){
- //
- for(i=0; i<relation.nbOfSignals() ; i++) {//DG 15.05.2017
- deployinfo_map = deployinfo_map +"\n .channel"+nb_signals+" : { \\" + CR;
- deployinfo_map = deployinfo_map + "*(section_channel"+nb_signals+ ")\\"+ CR;
-
- deployinfo_map=deployinfo_map+ "} > uram"+ram.getIndex()+"\\"+ CR;
- i++;nb_signals++;
- }
- }
-
- i=0;nb_signals=0;
-
-// for (AvatarChannel channel : ram.getChannels()) {
- for (AvatarRelation relation : avspec.getRelations()) {
-//DG 15.05.2017
-
- for(i=0; i<relation.nbOfSignals() ; i++) {//DG 15.05.2017
+
+
+ String string_size_half = (Integer.toHexString(size/2)); //segments on this are half uram, half cram
+
+ deployinfo += "#define CACHED_RAM" + ram.getIndex() + "_NAME cram" + ram.getIndex() + CR;
+ deployinfo = deployinfo + "#define CACHED_RAM" + ram.getIndex() + "_ADDR 0x" + Integer.toHexString(address_start+i*CLUSTER_SIZE) + CR;
+ // 31.08. simplifie
+ deployinfo = deployinfo + "#define CACHED_RAM" + ram.getIndex() + "_SIZE 0x"+ string_size_half + CR;
+ deployinfo += "#define DEPLOY_RAM" + ram.getIndex() + "_NAME uram" + ram.getIndex() + CR;
+ int cacheability_bit= 2097152; //0x00200000
+ deployinfo = deployinfo + "#define DEPLOY_RAM" + ram.getIndex() + "_ADDR 0x" + Integer.toHexString(address_start+i*CLUSTER_SIZE+size/2+cacheability_bit) + CR;
+ // 31.08. simplifie
+ deployinfo = deployinfo + "#define DEPLOY_RAM" + ram.getIndex() + "_SIZE 0x"+ (string_size_half) + CR;
+
+ i++;
+ }
+ //Calculate Adresses of MWMR segments, one for each hardware accellerator
+ i=0;
+
+ for (AvatarCoproMWMR copro : TopCellGenerator.avatardd.getAllCoproMWMR()) {
+ deployinfo = deployinfo + "#define MWMR_RAM" + i + "_NAME mwmr_ram" + i + CR;
+ deployinfo = deployinfo + "#define MWMR_RAM" + i + "_ADDR 0xA02" + Integer.toHexString(i*4096) + CR;
+ deployinfo = deployinfo + "#define MWMR_RAM" + i + "_SIZE 0x1000"+ CR;
+ i++;
+ }
+
+ return deployinfo;
+ }
+
+ /* public static String getDeployInfoMap() {
+ int i=0;
+ String deployinfo_map = CR;
+ int nb_signals=0;
+ deployinfo_map += "#define MAP_A\\" + CR;
+
+
+ for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
+ //if (!(ram.getChannels().isEmpty())){
+ // for (AvatarChannel channel : ram.getChannels()) {
+
+ //DG 15.05.2017
+ for (AvatarRelation relation : avspec.getRelations()) {
+ //if (!(ram.getRelations().isEmpty())){
+ //
+ for(i=0; i<relation.nbOfSignals() ; i++) {//DG 15.05.2017
+ deployinfo_map = deployinfo_map +"\n .channel"+nb_signals+" : { \\" + CR;
+ deployinfo_map = deployinfo_map + "*(section_channel"+nb_signals+ ")\\"+ CR;
+
+ deployinfo_map=deployinfo_map+ "} > uram"+ram.getIndex()+"\\"+ CR;
+ i++;nb_signals++;
+ }
+ }
+
+ i=0;nb_signals=0;
+
+// for (AvatarChannel channel : ram.getChannels()) {
+ for (AvatarRelation relation : avspec.getRelations()) {
+//DG 15.05.2017
+
+ for(i=0; i<relation.nbOfSignals() ; i++) {//DG 15.05.2017
-
- deployinfo_map = deployinfo_map +"\n .lock"+nb_signals+" : { \\" + CR;
- deployinfo_map = deployinfo_map + "*(section_lock"+nb_signals+ ")\\"+ CR;
- // if(use_vcilocks) deployinfo_map=deployinfo_map+ "} > vci_locks\\"+ CR;
- deployinfo_map=deployinfo_map+ "} > uram0\\"+ CR;//DG 27.06. no ramlocks
- i++; nb_signals++;
- }
-
- }
- }
- return deployinfo_map;
- }*/
-
- public static String getDeployInfoMap(AvatarSpecification _avspec) {
- avspec = _avspec;
- int i=0;
- String deployinfo_map = CR;
- int j;
-
- deployinfo_map += "#define MAP_A\\" + CR;
- try{
- for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
- // if (/*!*/(ram.getChannels().isEmpty())){ //"!" removed because it returned the wrong results. Logic is now incorrect but results are correct (needs further investigating) CD 20.6
- if (!(ram.getChannels().isEmpty())){
- for(AvatarRelation ar: avspec.getRelations()){
- for (j=0;j<ar.nbOfSignals();j++) {
- deployinfo_map = deployinfo_map + "\n .channel"+i+" : {";
- deployinfo_map = deployinfo_map + "*(section_channel"+i+ ")";
- deployinfo_map = deployinfo_map + "} > uram" + ram.getIndex() + CR; //ram n° was incorrect (see above)
- i++;
- }
- }
-
- i=0;
- for(AvatarRelation ar: avspec.getRelations()){
- for (j=0;j<ar.nbOfSignals();j++) { //CD 15.06 dynamic to signal number
- deployinfo_map = deployinfo_map + "\n .lock"+i+" : { " ;
- deployinfo_map = deployinfo_map + "*(section_lock" + i + ")";
- deployinfo_map = deployinfo_map + "} > uram" + ram.getIndex() + CR;
- i++;
- }
- }
- }
- }
- }catch (Exception e){
- e.printStackTrace();
- }
- return deployinfo_map;
- }
-
- //ajout C.D.
- public static String getDeployInfoRam(AvatarSpecification _avspec) {
- avspec =_avspec;
- int i=0;
- int j;
- String deployinfo_ram = CR;
- try{
- for(AvatarRelation ar: avspec.getRelations()){
- for (j=0; j<ar.nbOfSignals();j++){
- deployinfo_ram += "#if defined(DEPLOY_RAM" + i + "_NAME)" + CR;
- deployinfo_ram += "\tDEPLOY_RAM" + i + "_NAME (RWAL) : ORIGIN = DEPLOY_RAM" + i + "_ADDR, LENGTH = DEPLOY_RAM" + i + "_SIZE" + CR;
- deployinfo_ram += "#endif" +CR;
- deployinfo_ram += "#if defined(CACHED_RAM" + i + "_NAME)" + CR;
- deployinfo_ram += "\tCACHED_RAM" + i + "_NAME (RWAL) : ORIGIN = CACHED_RAM" + i + "_ADDR, LENGTH = CACHED_RAM" + i + "_SIZE" + CR;
- deployinfo_ram += "#endif" +CR;
- i++;
- }
- }
- }catch (Exception e){
- e.printStackTrace();
- }
- return deployinfo_ram;
- }
-
- //fin ajout C.D.
-
-
-
-public static String getProcInfo() {
- int i=0;
-
- String procinfo = "SOCLIB_CPU_COUNT = ";
-
- for (AvatarCPU cpu : TopCellGenerator.avatardd.getAllCPU()) {
- i++;
- }
-
- procinfo += i + CR;
- return procinfo;
- }
-
-
-public static String getNbProc() {
- int i=0;
-
- String nbproc = "CONFIG_CPU_MAXCOUNT ";
-
- for (AvatarCPU cpu : TopCellGenerator.avatardd.getAllCPU()) {
- i++;
- }
-
- nbproc += i + CR;
- return nbproc;
- }
-}
+
+ deployinfo_map = deployinfo_map +"\n .lock"+nb_signals+" : { \\" + CR;
+ deployinfo_map = deployinfo_map + "*(section_lock"+nb_signals+ ")\\"+ CR;
+ // if(use_vcilocks) deployinfo_map=deployinfo_map+ "} > vci_locks\\"+ CR;
+ deployinfo_map=deployinfo_map+ "} > uram0\\"+ CR;//DG 27.06. no ramlocks
+ i++; nb_signals++;
+ }
+
+ }
+ }
+ return deployinfo_map;
+ }*/
+
+ public static String getDeployInfoMap(AvatarSpecification _avspec) {
+ avspec = _avspec;
+ int i=0;
+ String deployinfo_map = CR;
+ int j;
+
+ deployinfo_map += "#define MAP_A\\" + CR;
+ try{
+ for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
+ // if (/*!*/(ram.getChannels().isEmpty())){ //"!" removed because it returned the wrong results. Logic is now incorrect but results are correct (needs further investigating) CD 20.6
+ if (!(ram.getChannels().isEmpty())){
+ for(AvatarRelation ar: avspec.getRelations()){
+ for (j=0;j<ar.nbOfSignals();j++) {
+ deployinfo_map = deployinfo_map + "\n .channel"+i+" : {";
+ deployinfo_map = deployinfo_map + "*(section_channel"+i+ ")";
+ deployinfo_map = deployinfo_map + "} > uram" + ram.getIndex() + CR; //ram n° was incorrect (see above)
+ i++;
+ }
+ }
+
+ i=0;
+ for(AvatarRelation ar: avspec.getRelations()){
+ for (j=0;j<ar.nbOfSignals();j++) { //CD 15.06 dynamic to signal number
+ deployinfo_map = deployinfo_map + "\n .lock"+i+" : { " ;
+ deployinfo_map = deployinfo_map + "*(section_lock" + i + ")";
+ deployinfo_map = deployinfo_map + "} > uram" + ram.getIndex() + CR;
+ i++;
+ }
+ }
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return deployinfo_map;
+ }
+
+ //ajout C.D.
+ public static String getDeployInfoRam(AvatarSpecification _avspec) {
+ avspec =_avspec;
+ int i=0;
+ int j;
+ String deployinfo_ram = CR;
+ try{
+ for(AvatarRelation ar: avspec.getRelations()){
+ for (j=0; j<ar.nbOfSignals();j++){
+ deployinfo_ram += "#if defined(DEPLOY_RAM" + i + "_NAME)" + CR;
+ deployinfo_ram += "\tDEPLOY_RAM" + i + "_NAME (RWAL) : ORIGIN = DEPLOY_RAM" + i + "_ADDR, LENGTH = DEPLOY_RAM" + i + "_SIZE" + CR;
+ deployinfo_ram += "#endif" +CR;
+ deployinfo_ram += "#if defined(CACHED_RAM" + i + "_NAME)" + CR;
+ deployinfo_ram += "\tCACHED_RAM" + i + "_NAME (RWAL) : ORIGIN = CACHED_RAM" + i + "_ADDR, LENGTH = CACHED_RAM" + i + "_SIZE" + CR;
+ deployinfo_ram += "#endif" +CR;
+ i++;
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return deployinfo_ram;
+ }
+
+ //fin ajout C.D.
+
+
+
+public static String getProcInfo() {
+ int i=0;
+
+ String procinfo = "SOCLIB_CPU_COUNT = ";
+
+ for (AvatarCPU cpu : TopCellGenerator.avatardd.getAllCPU()) {
+ i++;
+ }
+
+ procinfo += i + CR;
+ return procinfo;
+ }
+
+
+public static String getNbProc() {
+ int i=0;
+
+ String nbproc = "CONFIG_CPU_MAXCOUNT ";
+
+ for (AvatarCPU cpu : TopCellGenerator.avatardd.getAllCPU()) {
+ i++;
+ }
+
+ nbproc += i + CR;
+ return nbproc;
+ }
+}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/Header.java b/src/main/java/ddtranslatorSoclib/toTopCell/Header.java
index 12ea703fd71b8158f9ece4d79e7c6819b115c929..9769b5217215b312ccfd2fc23a018d264acb1e4b 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/Header.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/Header.java
@@ -88,7 +88,7 @@ public class Header
"#include \"vci_ram.h\"" + CR +
"#include \"vci_heterogeneous_rom.h\"" + CR +
"#include \"vci_multi_tty.h\"" + CR
- //+ "#include \"vci_locks.h\"" + CR
+ + "#include \"vci_dma.h\"" + CR
+ "#include \"vci_xicu.h\"" + CR + "#include \"vci_mwmr_stats.h\"" + CR; //DG 20.09.
if (with_vgsb > 0)
{
@@ -154,10 +154,14 @@ public class Header
CR + "#include \"vci_local_crossbar.h\"" + CR2;
if (with_amsCluster > 0) {
- header += "#include \"gpio2vci.h\"" + CR2;
+ header += "#include \"gpio2vci.h\"" + CR;
+ for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
+ {
+ header += "#include \"" + amsCluster.getAmsClusterName () + ".h\"" + CR;
+ }
}
- header = header + "namespace {" + CR
+ header = header + CR + "namespace {" + CR
+ "std::vector<std::string> stringArray(" + CR
+ " const char *first, ... )" + CR
+ "{" + CR
@@ -216,6 +220,7 @@ public class Header
header + CR2 +
"static common::MappingTable maptab(32, IntTab(8,4), IntTab(8,4), 0xfff00000);";
}
+
return header;
}
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/Loader.java b/src/main/java/ddtranslatorSoclib/toTopCell/Loader.java
index 59926939acb6fee476503e91e24d77bb00cb5a91..8debc8bb0aa20d66a0639552e01063a74d5bc1c1 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/Loader.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/Loader.java
@@ -42,107 +42,113 @@
/* authors: v1.0 Daniela GENIUS, Julien HENON 2015 */
-
package ddtranslatorSoclib.toTopCell;
import avatartranslator.AvatarRelation;//DG 23.06.
import avatartranslator.AvatarSpecification;//DG 23.06.
import ddtranslatorSoclib.AvatarChannel;
+import ddtranslatorSoclib.AvatarTTY;
+import ddtranslatorSoclib.*;
public class Loader {
-public static AvatarSpecification avspec;
- static private String loader;
- private final static String NAME_CLK = "signal_clk";
+ public static AvatarSpecification avspec;
+ static private String loader;
+ private final static String NAME_CLK = "signal_clk";
private final static String CR = "\n";
- private final static String CR2 = "\n\n";
+ private final static String CR2 = "\n\n";
public Loader(AvatarSpecification _avspec){
- avspec =_avspec;
+ avspec =_avspec;
}
- public static String getLoader(AvatarSpecification _avspec) {//DG 23.06.
- avspec =_avspec;//DG 23.06.
- int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
- //nb_clusters=2;
-
- loader = CR2 + "//-------------------------Call Loader---------------------------------" + CR2 ;
- loader = loader + "std::cerr << \"caba-vgmn-mutekh_kernel_tutorial SoCLib simulator for MutekH\" << std::endl;"
- + CR2 ;
+ public static String getLoader(AvatarSpecification _avspec) {
+ avspec =_avspec;
+ int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
+
+ loader = CR2 + "//-------------------------Call Loader---------------------------------" + CR2 ;
+ loader = loader + "std::cerr << \"caba-vgmn-mutekh_kernel_tutorial SoCLib simulator for MutekH\" << std::endl;"
+ + CR2 ;
- loader = loader + "if ( (argc < 2) || ((argc % 2) == 0) ) {" + CR ;
+ loader = loader + "if ( (argc < 2) || ((argc % 2) == 0) ) {" + CR ;
- loader = loader + "exit(0); }" + CR ;
+ loader = loader + "exit(0); }" + CR ;
- loader = loader + " argc--;" + CR ;
- loader = loader + " argv++;" + CR2 ;
- loader = loader + "bool heterogeneous = (argc > 2);" + CR2 ;
+ loader = loader + " argc--;" + CR ;
+ loader = loader + " argv++;" + CR2 ;
+ loader = loader + "bool heterogeneous = (argc > 2);" + CR2 ;
- loader = loader + " for (int i = 0; i < (argc - 1); i += 2){" + CR ;
- loader = loader + " char *cpu_p = argv[i];" + CR ;
- loader = loader + " const char *kernel_p = argv[i+1];" + CR ;
- loader = loader + " const char *arch_str = strsep(&cpu_p, \":\");" + CR ;
- loader = loader + " int count = cpu_p ? atoi(cpu_p) : 1;" + CR ;
+ loader = loader + " for (int i = 0; i < (argc - 1); i += 2){" + CR ;
+ loader = loader + " char *cpu_p = argv[i];" + CR ;
+ loader = loader + " const char *kernel_p = argv[i+1];" + CR ;
+ loader = loader + " const char *arch_str = strsep(&cpu_p, \":\");" + CR ;
+ loader = loader + " int count = cpu_p ? atoi(cpu_p) : 1;" + CR ;
- loader = loader + " common::Loader *text_ldr; " + CR ;
+ loader = loader + " common::Loader *text_ldr; " + CR ;
- loader = loader + " if (heterogeneous) {" + CR ;
- loader = loader + " text_ldr = new common::Loader(std::string(kernel_p) + \";.text\");" + CR ;
- loader = loader + " text_ldr->memory_default(0x5a);;" + CR ;
- loader = loader + " data_ldr.load_file(std::string(kernel_p) + \";.rodata;.boot;.excep\");" + CR ;
- loader = loader + " if (i == 0)" + CR ;
- loader = loader + " data_ldr.load_file(std::string(kernel_p) + \";.data;";
- // We generated so far until arriving at first channel segment, if any
- //current hypothesis : one segment per channel
- int j=0;
- //for (AvatarChannel channel : TopCellGenerator.avatardd.getAllMappedChannels()) {
- //DG 23.06. per signal!!hack pour l'instant
- int i=0;
- //for (i=0;i<30;i++){
+ loader = loader + " if (heterogeneous) {" + CR ;
+ loader = loader + " text_ldr = new common::Loader(std::string(kernel_p) + \";.text\");" + CR ;
+ loader = loader + " text_ldr->memory_default(0x5a);;" + CR ;
+ loader = loader + " data_ldr.load_file(std::string(kernel_p) + \";.rodata;.boot;.excep\");" + CR ;
+ loader = loader + " if (i == 0)" + CR ;
+ loader = loader + " data_ldr.load_file(std::string(kernel_p) + \";.data;";
+
+ int j=0;
+
+ int i=0;
+
- for(AvatarRelation ar: avspec.getRelations()) {
+ for(AvatarRelation ar: avspec.getRelations()) {
- for(i=0; i<ar.nbOfSignals() ; i++) {
+ for(i=0; i<ar.nbOfSignals() ; i++) {
- loader = loader + ".channel" + j + ";";
- j++;
- }
-}
- // We resume the generation of the fixed code
- loader = loader + ".cpudata;.contextdata\");" + CR ;
- loader = loader + " } else {" + CR ;
- loader = loader + " text_ldr = new common::Loader(std::string(kernel_p));" + CR ;
- loader = loader + " text_ldr->memory_default(0x5a);" + CR ;
- loader = loader + " data_ldr.load_file(std::string(kernel_p));" + CR ;
- loader = loader + " }" + CR2 ;
-
- loader = loader + " common::Loader tools_ldr(kernel_p);" + CR ;
- loader = loader + " tools_ldr.memory_default(0x5a);" + CR2 ;
-
- loader = loader + " for (int j = 0; j < count; j++) {" + CR ;
- loader = loader + " int id = cpus.size();" + CR ;
- loader = loader + " std::cerr << \"***\" << cpus.size() << std::endl;" + CR ;
-
- loader = loader + " CpuEntry *e = newCpuEntry(arch_str, id, text_ldr);" + CR ;
-
- loader = loader + " if (j == 0)" + CR ;
- loader = loader + " e->init_tools(tools_ldr);" + CR ;
-
- loader = loader + " e->cpu = e->new_cpu(e);" + CR ;
- loader = loader + " cpus.push_back(e);" + CR ;
- loader = loader + " }" + CR ;
- loader = loader + " }" + CR2 ;
- int nb_tty =1; //DG currently only one (multi) tty
-
-if(nb_clusters==0){
- loader = loader + " const size_t xicu_n_irq = "+(1+nb_tty+3)+";" + CR2 ;
-}else{
- loader = loader + " const size_t xicu_n_irq = "+(5*nb_clusters)+";" + CR2 ;
-}
- return loader;
+ loader = loader + ".channel" + j + ";";
+ j++;
+ }
+ }
+ // We resume the generation of the fixed code
+ loader = loader + ".cpudata;.contextdata\");" + CR ;
+ loader = loader + " } else {" + CR ;
+ loader = loader + " text_ldr = new common::Loader(std::string(kernel_p));" + CR ;
+ loader = loader + " text_ldr->memory_default(0x5a);" + CR ;
+ loader = loader + " data_ldr.load_file(std::string(kernel_p));" + CR ;
+ loader = loader + " }" + CR2 ;
+
+ loader = loader + " common::Loader tools_ldr(kernel_p);" + CR ;
+ loader = loader + " tools_ldr.memory_default(0x5a);" + CR2 ;
+
+ loader = loader + " for (int j = 0; j < count; j++) {" + CR ;
+ loader = loader + " int id = cpus.size();" + CR ;
+ loader = loader + " std::cerr << \"***\" << cpus.size() << std::endl;" + CR ;
+
+ loader = loader + " CpuEntry *e = newCpuEntry(arch_str, id, text_ldr);" + CR ;
+
+ loader = loader + " if (j == 0)" + CR ;
+ loader = loader + " e->init_tools(tools_ldr);" + CR ;
+
+ loader = loader + " e->cpu = e->new_cpu(e);" + CR ;
+ loader = loader + " cpus.push_back(e);" + CR ;
+ loader = loader + " }" + CR ;
+ loader = loader + " }" + CR2 ;
+
+ int nb_tty=0;
+
+
+ /* Need to generate one interrupt per TTy and one for the DMA*/
+ if(nb_clusters==0){
+
+ nb_tty=TopCellGenerator.avatardd.getAllTTY().size();
+ loader = loader + " const size_t xicu_n_irq = "+(1+nb_tty+3+1)+";" + CR2 ;
+ }else{
+
+ nb_tty= nb_clusters;//provisional
+ loader = loader + " const size_t xicu_n_irq = "+(1+nb_tty+3+1)+";" + CR2 ;
}
+ return loader;
+ }
+
String getNAME_CLK(){
- return NAME_CLK;
+ return NAME_CLK;
}
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/MappingTable.java b/src/main/java/ddtranslatorSoclib/toTopCell/MappingTable.java
index f7678b70c436a9beb69f5717a7fa082153f89c54..a8212095c4d720831f511902631b03e0162c5917 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/MappingTable.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/MappingTable.java
@@ -44,7 +44,7 @@
/* this class produces the lines pertaining to the segment table. Except the segments containing CHANNEL channels and those corresponding to targets in shared memory, they need not be sepcified by the user of the deployment diagram */
/* authors: v1.0 Raja GATGOUT 2014
- v2.0 Daniela GENIUS, Julien HENON 2015 - 2016 */
+ v2.0 Daniela GENIUS, Julien HENON 2015 - 2016 */
package ddtranslatorSoclib.toTopCell;
@@ -52,253 +52,276 @@ package ddtranslatorSoclib.toTopCell;
import ddtranslatorSoclib.AvatarRAM;
import ddtranslatorSoclib.AvatarTTY;
import ddtranslatorSoclib.*;
+import avatartranslator.AvatarRelation;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSignal;
+import avatartranslator.AvatarSpecification;
+//import ddtranslatorSoclib.AvatarCoproMWMR;
+import myutil.TraceManager;
public class MappingTable {
private final static String CR = "\n";
private final static String CR2 = "\n\n";
private static String mapping;
-
- public static String getMappingTable() {
- int l=0;
- int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
- int nb_ram =TopCellGenerator.avatardd.getAllRAM().size();
+ public static AvatarddSpecification avatardd;
+
+ public static int rams_in_cluster(AvatarddSpecification dd,int cluster_no){
+ avatardd = dd;
+ int rams=0;
+ for (AvatarConnector connector : avatardd.getConnectors()){
+ AvatarConnectingPoint my_p1= connector.get_p1();
+ AvatarConnectingPoint my_p2= connector.get_p2();
+
+ AvatarComponent comp1 = my_p1.getComponent();
+ AvatarComponent comp2 = my_p2.getComponent();
+ if (comp1 instanceof AvatarRAM){
+ AvatarRAM comp1ram = (AvatarRAM)comp1;
+ if(comp1ram.getClusterIndex()==cluster_no)
+ rams++;
+ }
+
+ }
+ TraceManager.addDev (cluster_no+" RAMs in this cluster " +rams);
+ return rams;
+ }
+
- if(nb_clusters == 0){
- mapping = CR2 + "//-----------------------mapping table------------------------" + CR2;
- mapping = mapping + "// ppc segments" + CR2;
-
- mapping = mapping + "maptab.add(Segment(\"resetppc\", 0xffffff80, 0x0080, IntTab(1), true));" + CR;
- mapping = mapping + "maptab.add(Segment(\"resetnios\", 0x00802000, 0x1000, IntTab(1), true));" + CR;
- mapping = mapping + "maptab.add(Segment(\"resetzero\", 0x00000000, 0x1000, IntTab(1), true));" + CR;
- mapping = mapping + "maptab.add(Segment(\"resetmips\", 0xbfc00000, 0x1000, IntTab(1), true));" + CR;
+ public static String getMappingTable(AvatarddSpecification dd) {
+
+ int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
+ int nb_rams=TopCellGenerator.avatardd.getAllRAM().size();
+ int nb_ttys=TopCellGenerator.avatardd.getAllTTY().size();
+ int nb_hwa=TopCellGenerator.avatardd.getAllCoproMWMR().size();
+ avatardd = dd;
+
+ if(nb_clusters == 0){
+ mapping = CR2 + "//-----------------------mapping table------------------------" + CR2;
+ mapping = mapping + "// ppc segments" + CR2;
+
+ mapping = mapping + "maptab.add(Segment(\"resetppc\", 0xffffff80, 0x0080, IntTab(1), true));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"resetnios\", 0x00802000, 0x1000, IntTab(1), true));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"resetzero\", 0x00000000, 0x1000, IntTab(1), true));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"resetmips\", 0xbfc00000, 0x1000, IntTab(1), true));" + CR;
- /*there are seven targets which are fixed; target 3 to 6 are transparent and do not appear in the TTool deployment diagram:
-
- Targets on RAM0 :
- the text segment (target 0)
- the reset segment (target 1)
- the data segment (target 2)
-
- Other targets :
- the simhelper segment (target 3)
- the icu segment (target 4)
- the timer segment (target 5)
- the fdt segment (target 6)
-
- additional RAM segments (target 6+i)
- tty segments (target 6+i+j)
- fd access segment (target 6+i+j+1)
- ethernet segment (target 6+i+j+2)
- block device segment (target 6+i+j+3)
- */
-
- mapping += CR2 + "// RAM segments" + CR2;
- mapping += "maptab.add(Segment(\"text\", 0x60000000, 0x00100000, IntTab(0), true));" + CR;
- mapping += "maptab.add(Segment(\"rodata\", 0x80000000, 0x01000000, IntTab(1), true));" + CR;
- mapping += "maptab.add(Segment(\"data\", 0x7f000000, 0x01000000, IntTab(2), false)); " + CR2;
-
- mapping = mapping + "maptab.add(Segment(\"simhelper\", 0xd3200000, 0x00000100, IntTab(3), false));" + CR;
- mapping = mapping + " maptab.add(Segment(\"vci_xicu\", 0xd2200000, 0x00001000, IntTab(4), false));" + CR;
- mapping = mapping + "maptab.add(Segment(\"vci_rttimer\", 0xd6000000, 0x00000100, IntTab(5), false));" + CR2;
- mapping = mapping + "maptab.add(Segment(\"vci_fdt_rom\", 0xe0000000, 0x00001000, IntTab(6), false));" + CR2;
-
+ /*there are seven fixed targets
+ target 3 to 6 are transparent and do not appear
+ in the TTool deployment diagram:
+
+ Targets on RAM0 :
+ the text segment (target 0)
+ the reset segment (target 1)
+ the data segment (target 2)
+
+ Other targets :
+ the simhelper segment (target 3)
+ the timer segment (target 4)
+ the icu segment (target 5)
+ the dma segment (target 6)
+ the fdt segment (target 7)
+
+ fd access segment (target 8)
+ ethernet segment (target 9)
+ block device segment (target 10)
+
+ additional RAM segments (target 10+i)
+ tty segments (target 10+i+j)
+ */
+
+ mapping += CR2 + "// RAM segments" + CR2;
+ mapping += "maptab.add(Segment(\"text\", 0x60000000, 0x00100000, IntTab(0), true));" + CR;
+ mapping += "maptab.add(Segment(\"rodata\", 0x80000000, 0x01000000, IntTab(1), true));" + CR;
+ mapping += "maptab.add(Segment(\"data\", 0x7f000000, 0x01000000, IntTab(2), false)); " + CR2;
+
+ mapping = mapping + "maptab.add(Segment(\"simhelper\", 0xd3200000, 0x00000100, IntTab(3), false));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"vci_rttimer\", 0xd6200000, 0x00000100, IntTab(4), false));" + CR2;
+ mapping = mapping + " maptab.add(Segment(\"vci_xicu\", 0xd2200000, 0x00001000, IntTab(5), false));" + CR;
+ // mapping = mapping + "maptab.add(Segment(\"vci_dma\", 0xf2000000, 0x00001000, IntTab(6), false));" + CR2;
+ mapping = mapping + "maptab.add(Segment(\"vci_dma\", 0xf0200000, 0x00001000, IntTab(6), false));" + CR2;
+ mapping = mapping + "maptab.add(Segment(\"vci_fdt_rom\", 0xe0200000, 0x00001000, IntTab(7), false));" + CR2;
+
+ mapping = mapping + "maptab.add(Segment(\"vci_fd_access\", 0xd4200000, 0x00000100, IntTab(8), false));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"vci_ethernet\", 0xd5200000, 0x00000020, IntTab(9), false));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"vci_block_device\", 0xd1200000, 0x00000020, IntTab(10), false));" + CR2;
- int address_start = 268435456;
- int j=0; int i=0;
- int size;
- //if(TopCellGenerator.avatardd.getAllCrossbar().size()==0){
+ int address_start = 268435456;
+ int j=0; int i=0;
+ int size;
- for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
- // if no data size is given calculate default data size
- if(ram.getDataSize()==0){
+ for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
+ // if no data size is given calculate default data size
+ if(ram.getDataSize()==0){
- if((nb_clusters<16)||(TopCellGenerator.avatardd.getAllRAM().size()<16)){
- size = 1073741824;
+ if((nb_clusters<16)||(TopCellGenerator.avatardd.getAllRAM().size()<16)){
+ size = 1073741824;
+ }
+ else {//dimension segments to be smaller
+ size = 268435456;
+ }
}
- else {//dimension segments to be smaller
- size = 268435456;
+ else{
+ size = ram.getDataSize();
}
- }
- else{
- size = ram.getDataSize();
- }
- ram.setDataSize(size);
+ ram.setDataSize(size);
- size = ram.getDataSize(); // this is the hardware RAM size
+ size = ram.getDataSize(); // this is the hardware RAM size
- int step = 268435456;// DG 11.10. attention cacheability bit, cannot take any size given in DD, must be checked, toDo
+ int step = 268435456;
- int cacheability_bit= 2097152; //0x00200000
+ int cacheability_bit= 2097152; //0x00200000
/* Boot Ram segments 0,1,2 */
- if(ram.getNo_ram() ==0){
- ram.setNo_target(2);//in the following assign target number 2
+ if(ram.getIndex() ==0){
+ ram.setNo_target(2);
- mapping += "maptab.add(Segment(\"cram" + ram.getNo_ram() + "\", 0x" +Integer.toHexString(address_start+i*step)+ ", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), true));" + CR;
- mapping += "maptab.add(Segment(\"uram" + ram.getNo_ram() + "\", 0x" + Integer.toHexString(address_start+i*step+cacheability_bit+ram.getDataSize()/2)+ ", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), false));" + CR;
- i++;
+ mapping += "maptab.add(Segment(\"cram" + ram.getIndex() + "\", 0x" +Integer.toHexString(address_start+i*step)+ ", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), true));" + CR;
+ mapping += "maptab.add(Segment(\"uram" + ram.getIndex() + "\", 0x" + Integer.toHexString(address_start+i*step+cacheability_bit+ram.getDataSize()/2)+ ", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), false));" + CR;
+ i++;
}
else{
- ram.setNo_target(7+j);
-
- mapping += "maptab.add(Segment(\"cram" + ram.getNo_ram() + "\", 0x" + Integer.toHexString(address_start+i*step)+ ", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), true));" + CR;
- mapping += "maptab.add(Segment(\"uram" + ram.getNo_ram() + "\", 0x" + Integer.toHexString(address_start+i*step+ram.getDataSize()/2+cacheability_bit) + " , 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), false));" + CR;
- j++;
+
+ ram.setNo_target(10+i);
+ mapping += "maptab.add(Segment(\"cram" + ram.getIndex() + "\", 0x" + Integer.toHexString(address_start+i*step)+ ", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), true));" + CR;
+ mapping += "maptab.add(Segment(\"uram" + ram.getIndex() + "\", 0x" + Integer.toHexString(address_start+i*step+ram.getDataSize()/2+cacheability_bit) + " , 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+(ram.getNo_target())+"), false));" + CR;
+
i++;
}
}
- int m=0;
- for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()) {
- /* we calculate the target number of one or several (multi-) ttys which come after the j rams and the 7 compulsory targets */
- tty.setNo_target(7+j);
- /* we use a simple formula for calculating the TTY address in case of multiple (multi-) ttys */
-
- /* attention this will not work for more than 10 TTYs */
- mapping += "maptab.add(Segment(\"vci_multi_tty"+m+"\" , 0xd"+tty.getNo_tty()+"200000, 0x00000010, IntTab(" +tty.getNo_target() +"), false));" + CR;
-
- j++;
- m++;
- l=tty.getNo_target();
- }
- // }
- mapping = mapping + "maptab.add(Segment(\"vci_fd_access\", 0xd4200000, 0x00000100, IntTab("+(l+1)+"), false));" + CR;
- mapping = mapping + "maptab.add(Segment(\"vci_ethernet\", 0xd5000000, 0x00000020, IntTab("+(l+2)+"), false));" + CR;
- mapping = mapping + "maptab.add(Segment(\"vci_block_device\", 0xd1200000, 0x00000020, IntTab("+(l+3)+"), false));" + CR2;
- //mapping = mapping + "maptab.add(Segment(\"vci_locks\", 0xC0200000, 0x00000100, IntTab("+(l+4)+"), false));" + CR2;
-
-//AMS Cluster: TODO: Need to adapt this to new version and improve address calculation.
- i=l+4;
- for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ()) {
- amsCluster.setNo_target(i);
- mapping += "maptab.add(Segment(\"gpio2vci"+amsCluster.getNo_amsCluster()+"\" , 0xd"+
- Integer.toHexString(7+amsCluster.getNo_amsCluster()) +
- "200000, 0x00000010, IntTab(" +amsCluster.getNo_target() +"), false));" + CR;
- i++;
- }
-
- /* Instanciation of the MWMR wrappers for hardware accellerators */
- /* The accelerators themselves are specifies on DIPLODOCUS level */
- int count = l+5;
- int hwa_count=0;
- int nb_hwa=0;
- int MWMR_SIZE=4096;
- int MWMRd_SIZE=12288;
- // int MWMR_BASE=0xA0200000;
- i=0;
- for (AvatarCoproMWMR MWMRwrapper : TopCellGenerator.avatardd.getAllCoproMWMR()) {nb_hwa++;
- }
-
- for (AvatarCoproMWMR MWMRwrapper : TopCellGenerator.avatardd.getAllCoproMWMR()) {
- mapping += "maptab.add(Segment(\"mwmr_ram"+hwa_count+"\", 0xA0"+ Integer.toHexString(2097152+MWMR_SIZE*i)+", 0x00001000, IntTab("+count+"), false));" + CR;
- mapping += "maptab.add(Segment(\"mwmrd_ram"+hwa_count+"\", 0x20"+ Integer.toHexString(2097152+MWMRd_SIZE*i)+", 0x00003000, IntTab("+(count+nb_hwa)+"), false));" + CR;
- hwa_count++;
- count+=1;
- }
- hwa_count=0;
-
- return mapping;
- }
+
+ int tty_count=0;
+ for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()) {
+
+ tty.setNo_target(10+nb_rams+tty_count); //count only addtional RAMs
+ /* attention this will not work for more than 16 TTYs */
+ /* TTY0 = console has a fixed address */
- else{
- /* clustered version */
+ if (tty.getNo_tty()==0){
+ mapping += "maptab.add(Segment(\"vci_multi_tty"+tty.getNo_tty()+"\" , 0xd"+(tty.getNo_tty())+"200000, 0x00000010, IntTab(" +(tty.getNo_target()) +"), false));" + CR;
+ }
+ else{
+ String adr_tty = Integer.toHexString(tty.getNo_tty()-1);
+ mapping += "maptab.add(Segment(\"vci_multi_tty"+tty.getNo_tty()+"\" , 0xa"+adr_tty+"200000, 0x00000010, IntTab(" +(tty.getNo_target()) +"), false));" + CR;
+ }
+ tty_count++;
+ }
- mapping = CR2 + "maptab.add(Segment(\"resetppc\", 0xffffff80, 0x0080, IntTab(0,1), true));" + CR;
- mapping = mapping + "maptab.add(Segment(\"resetnios\", 0x00802000, 0x1000, IntTab(0,1), true));" + CR;
- mapping = mapping + "maptab.add(Segment(\"resetzero\", 0x00000000, 0x1000, IntTab(0,1), true));" + CR;
- mapping = mapping + "maptab.add(Segment(\"resetmips\", 0xbfc00000, 0x1000, IntTab(0,1), true));" + CR;
+ //AMS Cluster: TODO: Need to adapt this to new version and improve address calculation.
+ int amsCluster_count = 0;
+ for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ()) {
+ amsCluster.setNo_target(10+nb_rams+amsCluster_count + nb_ttys);
+ mapping += "maptab.add(Segment(\"gpio2vci"+amsCluster.getNo_amsCluster()+"\" , 0xc"+
+ Integer.toHexString(amsCluster.getNo_amsCluster()) +
+ "200000, 0x00000010, IntTab("+amsCluster.getNo_target()+"), false));" + CR;
+ amsCluster_count++;
+ }
+
+ /* Instantiation of the MWMR wrappers for hardware accellerators */
+ /* The accelerators themselves are specifies on DIPLODOCUS level */
+
+ /* There are 10 segments but 3 of them, 0, 1, 2 belong to the boot RAM */
+ int segment_count = (10-3)+(nb_rams-1)+nb_ttys;
+ int hwa_count=0;
+ int MWMR_SIZE=4096;
+ int MWMRd_SIZE=12288;
+
+ // i=0;
+
+ for (AvatarCoproMWMR MWMRwrapper : TopCellGenerator.avatardd.getAllCoproMWMR()) {
+ mapping += "maptab.add(Segment(\"mwmr_ram"+hwa_count+"\", 0xA0"+ Integer.toHexString(2097152+MWMR_SIZE*i)+", 0x00001000, IntTab("+segment_count+"), false));" + CR;
+ mapping += "maptab.add(Segment(\"mwmrd_ram"+hwa_count+"\", 0x20"+ Integer.toHexString(2097152+MWMRd_SIZE*i)+", 0x00003000, IntTab("+(segment_count+nb_hwa)+"), false));" + CR;
+ hwa_count++;
+ segment_count++;
+ }
+ hwa_count=0;
+
+ return mapping;
+ }
+
+ else{
+ /* clustered version */
+
+ mapping = CR2 + "maptab.add(Segment(\"resetppc\", 0xffffff80, 0x0080, IntTab(0,1), true));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"resetnios\", 0x00802000, 0x1000, IntTab(0,1), true));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"resetzero\", 0x00000000, 0x1000, IntTab(0,1), true));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"resetmips\", 0xbfc00000, 0x1000, IntTab(0,1), true));" + CR;
- mapping += CR2 + "// RAM shared segments on cluster 0" + CR2;
- mapping += "maptab.add(Segment(\"text\", 0x60000000, 0x00100000, IntTab(0,0), true));" + CR;
- mapping += "maptab.add(Segment(\"rodata\", 0x80000000, 0x01000000, IntTab(0,1), true));" + CR;
- mapping += "maptab.add(Segment(\"data\", 0x7f000000, 0x01000000, IntTab(0,2), false)); " + CR2;
- mapping = mapping + "maptab.add(Segment(\"simhelper\", 0x15200000, 0x00000100, IntTab(0,3), false));" + CR;
- mapping = mapping + "maptab.add(Segment(\"vci_fdt_rom\", 0x16200000, 0x00001000, IntTab(0,4), false));" + CR2;
- mapping = mapping + "maptab.add(Segment(\"vci_fd_access\", 0x17200000, 0x00000100, IntTab(0,5), false));" + CR;
- mapping = mapping + "maptab.add(Segment(\"vci_ethernet\", 0x18200000, 0x00000020, IntTab(0,6), false));" + CR;
- mapping = mapping + "maptab.add(Segment(\"vci_block_device\", 0x19200000, 0x00000020, IntTab(0,7), false));" + CR2;
- // mapping = mapping + "maptab.add(Segment(\"vci_locks\", 0x1A200000, 0x00000020, IntTab(0,8), false));" + CR2;
+ mapping += CR2 + "// RAM shared segments on cluster 0" + CR2;
+ mapping += "maptab.add(Segment(\"text\", 0x60000000, 0x00100000, IntTab(0,0), true));" + CR;
+ mapping += "maptab.add(Segment(\"rodata\", 0x80000000, 0x01000000, IntTab(0,1), true));" + CR;
+ mapping += "maptab.add(Segment(\"data\", 0x7f000000, 0x01000000, IntTab(0,2), false)); " + CR2;
+ mapping = mapping + "maptab.add(Segment(\"simhelper\", 0x15200000, 0x00000100, IntTab(0,3), false));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"vci_fdt_rom\", 0x16200000, 0x00001000, IntTab(0,7), false));" + CR2;
+ mapping = mapping + "maptab.add(Segment(\"vci_fd_access\", 0x17200000, 0x00000100, IntTab(0,8), false));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"vci_ethernet\", 0x18200000, 0x00000020, IntTab(0,9), false));" + CR;
+ mapping = mapping + "maptab.add(Segment(\"vci_block_device\", 0x19200000, 0x00000020, IntTab(0,10), false));" + CR2;
- int SEG_ICU_BASE = 285212672;
- int SEG_ICU_SIZE = 20;
-
- int NB_DMAS = 1;
- int SEG_DMA_BASE = 304087040;
- int SEG_DMA_SIZE = (NB_DMAS * 20);
-
- int NB_TIMERS = 1;
- int SEG_TIM_BASE = 318767104;
- int SEG_TIM_SIZE = (NB_TIMERS * 16 );
+ int SEG_ICU_BASE = 285212672;
+ int SEG_ICU_SIZE = 20;
- int SEG_TTY_BASE = 337641472;
- int SEG_TTY_SIZE = 16;
+ int NB_DMAS = 1;
+ int SEG_DMA_BASE = 304087040;
+ int SEG_DMA_SIZE = (NB_DMAS * 20);
- int CLUSTER_SIZE;
+ int NB_TIMERS = 1;
+ int SEG_TIM_BASE = 318767104;
+ int SEG_TIM_SIZE = (NB_TIMERS * 16 );
- //if the user does not specify the size, take default value
- if(nb_clusters<16) {
- CLUSTER_SIZE = 268435456;}
- else {
- CLUSTER_SIZE = 134217728;
- }// to be refined, cf DSX -> dynamically adapt
+ int SEG_TTY_BASE = 337641472;
+ int SEG_TTY_SIZE = 16;
- /* RAM adresses always start at 0x10000000 decimal 268435456*/
+ int CLUSTER_SIZE;
- int SEG_RAM_BASE = 268435456;
- int cluster = 0;
+ //if the user does not specify the size, take default value
+
+ if(nb_clusters<16) {
+ CLUSTER_SIZE = 268435456;}
+ else {
+ CLUSTER_SIZE = 134217728;
+ }
+ // to be refined, ideally dynamically adapt
-
- // mapping += "maptab.add(Segment(\"icu" + cluster + "\",0x"+ Integer.toHexString(SEG_ICU_BASE)+", 0x"+ Integer.toHexString(SEG_ICU_SIZE)+", IntTab(0,9), false));" + CR;
- mapping += "maptab.add(Segment(\"vci_xicu\",0x"+ Integer.toHexString(SEG_ICU_BASE)+", 0x"+ Integer.toHexString(SEG_ICU_SIZE)+", IntTab(0,9), false));" + CR;
- //mapping += "maptab.add(Segment(\"dma" + cluster + "\", 0x"+ Integer.toHexString(SEG_DMA_BASE)+", 0x"+ Integer.toHexString(SEG_DMA_SIZE)+", IntTab(0,10), false));" + CR;
-mapping += "maptab.add(Segment(\"dma\", 0x"+ Integer.toHexString(SEG_DMA_BASE)+", 0x"+ Integer.toHexString(SEG_DMA_SIZE)+", IntTab(0,10), false));" + CR;
- // mapping += "maptab.add(Segment(\"timer" + cluster + "\", 0x"+ Integer.toHexString(SEG_TIM_BASE)+", 0x"+ Integer.toHexString(SEG_TIM_SIZE)+", IntTab(0,11), true));" + CR;
+ /* RAM adresses always start at 0x10000000 decimal 268435456*/
-mapping += "maptab.add(Segment(\"vci_rttimer\", 0x"+ Integer.toHexString(SEG_TIM_BASE)+", 0x"+ Integer.toHexString(SEG_TIM_SIZE)+", IntTab(0,11), true));" + CR;
+ int SEG_RAM_BASE = 268435456;
+ int cluster = 0;
-// all other clusters
-// for(cluster=1;cluster<nb_clusters; cluster++){
+ mapping += "maptab.add(Segment(\"vci_rttimer\", 0x"+ Integer.toHexString(SEG_TIM_BASE)+", 0x"+ Integer.toHexString(SEG_TIM_SIZE)+", IntTab(0,4), true));" + CR;
- // mapping += "maptab.add(Segment(\"icu" + cluster + "\", 0x"+ Integer.toHexString(SEG_ICU_BASE + cluster * CLUSTER_SIZE)+", 0x"+Integer.toHexString(SEG_ICU_SIZE)+", IntTab("+cluster +","+1+"), true));" + CR;
+ mapping += "maptab.add(Segment(\"vci_xicu\",0x"+ Integer.toHexString(SEG_ICU_BASE)+", 0x"+ Integer.toHexString(SEG_ICU_SIZE)+", IntTab(0,5), false));" + CR;
+ mapping += "maptab.add(Segment(\"dma\", 0x"+ Integer.toHexString(SEG_DMA_BASE)+", 0x"+ Integer.toHexString(SEG_DMA_SIZE)+", IntTab(0,6), false));" + CR;
-// mapping += "maptab.add(Segment(\"dma" + cluster + "\", 0x"+ Integer.toHexString(SEG_DMA_BASE + cluster * CLUSTER_SIZE)+", 0x"+Integer.toHexString(SEG_DMA_SIZE)+", IntTab("+cluster +","+2+"), false));" + CR;
-
- // mapping += "maptab.add(Segment(\"timer" + cluster + "\", 0x"+ Integer.toHexString(SEG_TIM_BASE + cluster * CLUSTER_SIZE)+", 0x"+Integer.toHexString(SEG_TIM_SIZE)+", IntTab("+cluster +","+3+"), true));" + CR;
-
- // }
-
- int cacheability_bit= 2097152; //0x00200000 T
-
- /* RAM base address is SEG_RAM_BASE + CLUSTER_NUMBER * CLUSTER_SIZE;
- this is the memory space covered by the RAMs of a cluster */
-
- //we want to identify the RAMS on this cluster (not RAMs in total)
-
- for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
- mapping += "maptab.add(Segment(\"cram" + ram.getNo_ram() + "\", 0x"+Integer.toHexString(SEG_RAM_BASE+ ram.getNo_cluster()*CLUSTER_SIZE)+", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+ram.getNo_cluster()+","+(ram.getNo_target())+"), true));" + CR;
+ int cacheability_bit= 2097152; //address 0x00200000
+
+ /* RAM base address is SEG_RAM_BASE + CLUSTER_NUMBER * CLUSTER_SIZE;
+ this is the memory space covered by the RAMs of a cluster */
+
+ for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
+ mapping += "maptab.add(Segment(\"cram"+ram.getClusterIndex()+"_" + ram.getIndex() + "\", 0x"+Integer.toHexString(SEG_RAM_BASE+ ram.getClusterIndex()*CLUSTER_SIZE)+", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+ram.getClusterIndex()+","+(ram.getNo_target())+"), true));" + CR;
- mapping += "maptab.add(Segment(\"uram" + ram.getNo_ram() + "\", 0x"+Integer.toHexString(SEG_RAM_BASE + ram.getNo_cluster()*CLUSTER_SIZE+cacheability_bit)+", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+ram.getNo_cluster()+","+(ram.getNo_target())+"), false));" + CR;
- }
+ mapping += "maptab.add(Segment(\"uram" + ram.getClusterIndex()+"_" +ram.getIndex() + "\", 0x"+Integer.toHexString(SEG_RAM_BASE + ram.getClusterIndex()*CLUSTER_SIZE+cacheability_bit)+", 0x"+Integer.toHexString(ram.getDataSize()/2)+", IntTab("+ram.getClusterIndex()+","+(ram.getNo_target())+"), false));" + CR;
+ }
- //we want to identify the TTYS on this cluster (not TTYs in total)
- //currently one tty per cluster
-
- for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()) {
- /* the number of fixed targets varies depending on if we are on cluster 0 or on other clusters */
- if(tty.getNo_cluster()==0){
- tty.setNo_target(10+nb_ram);
- }
- else{
- tty.setNo_target(tty.getNo_cluster()+nb_ram);
- }
- mapping += "maptab.add(Segment(\"vci_multi_tty"+tty.getIndex()+"\" , 0x"+Integer.toHexString(SEG_TTY_BASE + tty.getNo_cluster()* CLUSTER_SIZE)+", 0x00000010, IntTab("+tty.getNo_cluster()+","+(tty.getNo_target())+"), false));" + CR;
- }
- /* Add as manin mwmr controllers as there are hardware accelerators */
- //int with_hw_accelerator = 0; //DG 23.08.
-
-// }
- }
- return mapping;
+ //Identify the TTYS in current cluster (as opposed to TTYs in total)
+
+ for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()) {
+ /* the number of fixed targets varies depending on if on cluster 0 or other clusters */
+
+ int tty_no;
+ int cluster_no=tty.getClusterIndex();
+ int cluster_rams=rams_in_cluster(avatardd,cluster_no);
+
+ if(tty.getClusterIndex()==0){
+ tty_no=10+cluster_rams;
+ }
+ else{
+ tty_no=cluster_rams;
+ }
+
+ mapping += "maptab.add(Segment(\"vci_multi_tty"+tty.getIndex()+"\" , 0x"+Integer.toHexString(SEG_TTY_BASE + tty.getClusterIndex()* CLUSTER_SIZE+(16*tty_no))+", 0x00000010, IntTab("+tty.getClusterIndex()+","+tty_no+"), false));" + CR; tty_no++;
+ }
+ }
+
+ return mapping;
}
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/NetList.java b/src/main/java/ddtranslatorSoclib/toTopCell/NetList.java
index 413b8882df0451824a52af442db3e35d27841221..5b98afb66d0f158bad2504dfe41372398c583742 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/NetList.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/NetList.java
@@ -39,142 +39,224 @@
*/
-
-
/* authors: v1.0 Raja GATGOUT 2014
- v2.0 Daniela GENIUS, Julien HENON 2015 */
+ v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
+import avatartranslator.AvatarRelation;
+import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.*;
import ddtranslatorSoclib.AvatarCPU;
import ddtranslatorSoclib.AvatarCoproMWMR;
import ddtranslatorSoclib.AvatarRAM;
import ddtranslatorSoclib.AvatarTTY;
import ddtranslatorSoclib.AvatarAmsCluster;
+import ddtranslatorSoclib.AvatarCrossbar;
+
public class NetList
{
+ public static AvatarddSpecification avatardd;
public static final String NAME_CLK = "signal_clk";
public static final String CR = "\n";
public static final String CR2 = "\n\n";
private static final String NAME_RST = "signal_resetn";
private static boolean tracing;
- public static String getNetlist (String icn, boolean _tracing)
+
+ public static int cpus_in_cluster(AvatarddSpecification dd,int cluster_no){
+ int cpus=0;
+ avatardd = dd;
+ for (AvatarConnector connector : avatardd.getConnectors()){
+ AvatarConnectingPoint my_p1= connector.get_p1();
+ AvatarConnectingPoint my_p2= connector.get_p2();
+
+ AvatarComponent comp1 = my_p1.getComponent();
+ AvatarComponent comp2 = my_p2.getComponent();
+ if (comp1 instanceof AvatarCPU){
+ AvatarCPU comp1cpu = (AvatarCPU)comp1;
+ if(comp1cpu.getClusterIndex()==cluster_no)
+ cpus++;
+ }
+ }
+ return cpus;
+ }
+
+
+ public static String getNetlist (AvatarddSpecification dd,String icn, boolean _tracing)
{
- int nb_clusters = TopCellGenerator.avatardd.getAllCrossbar ().size ();
+ int nb_clusters = TopCellGenerator.avatardd.getAllCrossbar().size ();
int coproc_count = 0;
-
- tracing = _tracing;
+ avatardd = dd;
+ tracing = _tracing;
String netlist;
- netlist =
+ netlist =
CR2 +
"//------------------------------Netlist---------------------------------"
+ CR2;
- netlist = netlist + "// icu" + CR2;
- netlist =
+ netlist = netlist + "// icu" + CR2;
+ netlist =
netlist +
" vcifdtrom.add_property(\"interrupt-parent\", vcifdtrom.get_device_phandle(\"vci_xicu\"));"
+ CR2;
- netlist = netlist + " vcixicu.p_clk(signal_clk);" + CR;
- netlist = netlist + " vcixicu.p_resetn(signal_resetn);" + CR2;
- netlist = netlist + " vcixicu.p_vci(signal_vci_xicu);" + CR2;
+ netlist = netlist + " vcixicu.p_clk(signal_clk);" + CR;
+ netlist = netlist + " vcixicu.p_resetn(signal_resetn);" + CR2;
+ netlist = netlist + " vcixicu.p_vci(signal_vci_xicu);" + CR2;
- netlist =
+ netlist =
netlist +
" vcifdtrom.begin_device_node(\"vci_rttimer\", \"soclib:vci_rttimer\");"
+ CR;
- netlist =
+ netlist =
netlist + " vcifdtrom.add_property(\"interrupts\", 4);" + CR;
- netlist =
+ netlist =
netlist + " vcifdtrom.add_property(\"frequency\", 1000000);" +
CR;
- netlist = netlist + " vcifdtrom.end_node();" + CR2;
+ netlist = netlist + " vcifdtrom.end_node();" + CR2;
- netlist =
+ netlist =
netlist +
" vcifdtrom.begin_device_node(\"vci_xicu\", \"soclib:vci_xicu\");"
+ CR2;
- netlist = netlist + " int irq_map[cpus.size() * 3];" + CR;
- netlist =
+ netlist = netlist + " int irq_map[cpus.size() * 3];" + CR;
+ netlist =
netlist + " for ( size_t i = 0; i < cpus.size(); ++i )" + CR;
- netlist = netlist + " {" + CR;
- netlist = netlist + " irq_map[i*3 + 0] = i;" + CR;
- netlist =
+ netlist = netlist + " {" + CR;
+ netlist = netlist + " irq_map[i*3 + 0] = i;" + CR;
+ netlist =
netlist +
" irq_map[i*3 + 1] = vcifdtrom.get_cpu_phandle(i);" + CR;
- netlist = netlist + " irq_map[i*3 + 2] = 0;" + CR;
- netlist = netlist + " }" + CR2;
- netlist =
+ netlist = netlist + " irq_map[i*3 + 2] = 0;" + CR;
+ netlist = netlist + " }" + CR2;
+ netlist =
netlist +
" vcifdtrom.add_property(\"interrupt-map\", irq_map, cpus.size() * 3);"
+ CR;
- netlist =
+ netlist =
netlist + " vcifdtrom.add_property(\"frequency\", 1000000);" +
CR2;
- netlist =
+ netlist =
netlist +
" vcifdtrom.add_property(\"param-int-pti-count\", 1);" + CR;
- netlist =
+ netlist =
netlist +
" vcifdtrom.add_property(\"param-int-hwi-count\", xicu_n_irq);" +
CR;
- netlist =
+ netlist =
netlist +
" vcifdtrom.add_property(\"param-int-wti-count\", cpus.size());"
+ CR;
- netlist =
+ netlist =
netlist +
" vcifdtrom.add_property(\"param-int-irq-count\", cpus.size());"
+ CR;
- netlist = netlist + " vcifdtrom.end_node();" + CR2;
+ netlist = netlist + " vcifdtrom.end_node();" + CR2;
- netlist =
+ netlist =
netlist + " for ( size_t i = 0; i < xicu_n_irq; ++i )" + CR;
- netlist =
+ netlist =
netlist + " vcixicu.p_hwi[i](signal_xicu_irq[i]);" + CR2;
- netlist = netlist + "///////////////// cpus" + CR2;
+ netlist = netlist + "///////////////// cpus" + CR2;
- netlist = netlist + "vcifdtrom.begin_cpus();" + CR2;
- netlist =
+ netlist = netlist + "vcifdtrom.begin_cpus();" + CR2;
+ netlist =
netlist + "for ( size_t i = 0; i < cpus.size(); ++i ){" + CR;
- netlist = netlist + " // configure het_rom" + CR;
- netlist =
- netlist +
- " vcihetrom.add_srcid(*cpus[i]->text_ldr, IntTab(i));" + CR;
-
- netlist = netlist + " // add cpu node to device tree" + CR;
- netlist =
- netlist +
- " vcifdtrom.begin_cpu_node(std::string(\"cpu:\") + cpus[i]->type, i);"
- + CR;
- netlist =
- netlist + " vcifdtrom.add_property(\"freq\", 1000000);" + CR;
- netlist = netlist + " vcifdtrom.end_node();" + CR2;
-
- netlist = netlist + "// connect cpu" + CR;
- netlist =
- netlist +
- " cpus[i]->connect(cpus[i], signal_clk, signal_resetn, signal_vci_m[i]);"
- + CR;
- if (icn == "vgmn")
- {
- netlist =
- netlist + "vgmn.p_to_initiator[i](signal_vci_m[i]);" + CR;
- }
- else
- {
- netlist =
- netlist + "vgsb.p_to_initiator[i](signal_vci_m[i]);" + CR;
- }
+ netlist = netlist + " // configure het_rom" + CR;
+
+ int i=0;
+ if(nb_clusters==0){
+ netlist =
+ netlist +
+ " vcihetrom.add_srcid(*cpus[i]->text_ldr, IntTab(i));" + CR;
+
+ netlist = netlist + " // add cpu node to device tree" + CR;
+ netlist =
+ netlist +
+ " vcifdtrom.begin_cpu_node(std::string(\"cpu:\") + cpus[i]->type, i);"
+ + CR;
+ netlist =
+ netlist + " vcifdtrom.add_property(\"freq\", 1000000);" + CR;
+ netlist = netlist + " vcifdtrom.end_node();" + CR2;
+ netlist = netlist + "cpus[i]->connect(cpus[i], signal_clk, signal_resetn, signal_vci_m[i]);" + CR2;
+ netlist = netlist + "// connect cpu" + CR;
+ // netlist =netlist + " }"+ CR;
+
+ }
+ else{
+ for (AvatarCrossbar crossbar:TopCellGenerator.avatardd.getAllCrossbar ()){
+
+ netlist =netlist + "for ( size_t j = 0; j < " +cpus_in_cluster(avatardd,i)+"; ++j ){" + CR;
+ netlist = netlist +
+ " vcihetrom.add_srcid(*cpus[i]->text_ldr, IntTab("+crossbar.getClusterIndex() +",j));" + CR;
+ netlist = netlist + " // add cpu node to device tree" + CR;
+
+ netlist = netlist +
+ " vcifdtrom.begin_cpu_node(std::string(\"cpu:\") + cpus[i]->type, i);"
+ + CR;
+ netlist =
+ netlist + " vcifdtrom.add_property(\"freq\", 1000000);" + CR;
+ netlist = netlist + " vcifdtrom.end_node();" + CR2;
+
+ netlist = netlist + "// connect cpu" + CR;
+
+ netlist =netlist + " }"+ CR;
+
+ netlist =netlist + "crossbar"+crossbar.getClusterIndex()+".p_initiator_to_up(signal_down"+crossbar.getClusterIndex()+");"+ CR;
+ netlist =netlist + "crossbar"+crossbar.getClusterIndex()+".p_target_to_up(signal_up"+crossbar.getClusterIndex()+");"+ CR;
+ if (icn == "vgmn"){
+ netlist =netlist + "vgmn.p_to_initiator["+0+"](signal_down"+crossbar.getClusterIndex()+");"+ CR;
+ netlist =netlist + "vgmn.p_to_target["+0+"](signal_up"+crossbar.getClusterIndex()+");"+ CR;
+ }
+ else{
+ netlist =netlist + "vgsb.p_to_initiator["+0+"](signal_down"+crossbar.getClusterIndex()+");"+ CR;
+ netlist =netlist + "vgsb.p_to_target["+0+"](signal_up"+crossbar.getClusterIndex()+");"+ CR;
+ }
+ netlist =netlist + "for ( size_t j = 0; j < " + cpus_in_cluster(avatardd,i) +"; ++j ){" + CR;
+ netlist =
+ netlist +
+ " cpus[i]->connect(cpus[i], signal_clk, signal_resetn, signal_vci_m"+crossbar.getClusterIndex()+"[j]);"+ CR;
+ netlist =
+ netlist +"}" + CR;
+ netlist = netlist + "// connected cluster" +crossbar.getClusterIndex()+"."+CR2;
+ i++;
+ }
+ }
+
+ if(nb_clusters==0){
+ if (icn == "vgmn")
+ {
+ netlist =
+ netlist + "vgmn.p_to_initiator[i](signal_vci_m[i]);" + CR;
+ }
+ else
+ {
+ netlist =
+ netlist + "vgsb.p_to_initiator[i](signal_vci_m[i]);" + CR;
+ }
+ }
+ else{
+ int j;
+ for (AvatarCrossbar crossbar:TopCellGenerator.avatardd.getAllCrossbar ()){
+ i=0;
+ for (j=0;j< cpus_in_cluster(avatardd,i) ;j++){
+ netlist =
+ netlist = netlist + "for ( size_t j = 0; j < " + cpus_in_cluster(avatardd,i) +"; ++j ){" + CR;
+ netlist = netlist + "crossbar"+crossbar.getClusterIndex()+".p_to_initiator[i](signal_vci_m"+crossbar.getClusterIndex()+"[j]);" + CR;
+ netlist = netlist + "}"+CR;
+ i++;
+ }
+ }
+ }
+
netlist = netlist + "vcixicu.p_irq[i](cpus[i]->irq_sig[0]);" + CR;
netlist = netlist + " }" + CR;
netlist = netlist + " vcifdtrom.end_node();" + CR2;
@@ -199,298 +281,342 @@ public class NetList
netlist = netlist + " vcirttimer.p_vci(signal_vci_vcirttimer);" + CR;
netlist =
netlist + " vcirttimer.p_irq[0](signal_xicu_irq[4]);" + CR2;
-
- if (icn == "vgmn")
- {
- netlist = netlist + " vgmn.p_clk(signal_clk);" + CR;
- netlist = netlist + " vgmn.p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + " vgmn.p_to_target[0](signal_vci_vcihetrom);" +
- CR;
- netlist =
- netlist + " vgmn.p_to_target[1](signal_vci_vcirom);" + CR;
- netlist =
- netlist +
- " vgmn.p_to_target[3](signal_vci_vcisimhelper);" + CR2;
- netlist =
- netlist + " vgmn.p_to_target[4](signal_vci_xicu);" + CR;
- netlist =
- netlist + " vgmn.p_to_target[5](signal_vci_vcirttimer);" +
- CR2;
- netlist =
- netlist + " vgmn.p_to_target[6](signal_vci_vcifdtrom);" +
- CR2;
- netlist =
- netlist +
- " vgmn.p_to_initiator[cpus.size()](signal_vci_bdi);" + CR;
- netlist =
- netlist +
- " vgmn.p_to_initiator[cpus.size()+1](signal_vci_vcifdaccessi);"
- + CR;
- netlist =
- netlist +
- " vgmn.p_to_initiator[cpus.size()+2](signal_vci_etherneti);"
- + CR2;
- }
- else
- {
- netlist = netlist + " vgsb.p_clk(signal_clk);" + CR;
- netlist = netlist + " vgsb.p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + " vgsb.p_to_target[0](signal_vci_vcihetrom);" +
- CR;
- netlist =
- netlist + " vgsb.p_to_target[1](signal_vci_vcirom);" + CR;
- netlist =
- netlist +
- " vgsb.p_to_target[3](signal_vci_vcisimhelper);" + CR2;
- netlist =
- netlist + " vgsb.p_to_target[4](signal_vci_xicu);" + CR;
- netlist =
- netlist + " vgsb.p_to_target[5](signal_vci_vcirttimer);" +
- CR2;
- netlist =
- netlist + " vgsb.p_to_target[6](signal_vci_vcifdtrom);" +
- CR2;
- netlist =
- netlist +
- " vgsb.p_to_initiator[cpus.size()](signal_vci_bdi);" + CR;
- netlist =
- netlist +
- " vgsb.p_to_initiator[cpus.size()+1](signal_vci_vcifdaccessi);"
- + CR;
- netlist =
- netlist +
- " vgsb.p_to_initiator[cpus.size()+2](signal_vci_etherneti);"
- + CR2;
- }
-
- if (nb_clusters == 0)
- {
- netlist = netlist + "// RAM netlist" + CR2;
- for (AvatarRAM ram:TopCellGenerator.avatardd.
- getAllRAM ())
+
+ if(nb_clusters==0){
+ if (icn == "vgmn")
{
-
+ netlist = netlist + " vgmn.p_clk(signal_clk);" + CR;
+ netlist = netlist + " vgmn.p_resetn(signal_resetn);" + CR;
netlist =
- netlist + ram.getMemoryName () + ".p_clk(" +
- NAME_CLK + ");" + CR;
+ netlist + " vgmn.p_to_target[0](signal_vci_vcihetrom);" +
+ CR;
netlist =
- netlist + ram.getMemoryName () + ".p_resetn(" +
- NAME_RST + ");" + CR;
+ netlist + " vgmn.p_to_target[1](signal_vci_vcirom);" + CR;
netlist =
- netlist + ram.getMemoryName () +
- ".p_vci(signal_vci_vciram" + ram.getIndex () + ");" +
- CR2;
- if (icn == "vgmn")
- {
- netlist =
- netlist + "vgmn.p_to_target[" +
- (ram.getNo_target ()) + "](signal_vci_vciram" +
- ram.getIndex () + ");" + CR2;
- }
- else
- {
- netlist =
- netlist + "vgsb.p_to_target[" +
- (ram.getNo_target ()) + "](signal_vci_vciram" +
- ram.getIndex () + ");" + CR2;
- }
- }
- }
-
- /* clustered version */
- /* one or several ram, one locks engine, one mwmr ram and one mwmrd ram per cluster */
- else
- {
- int i;
- netlist = netlist + "// RAM netlist" + CR2;
- for (AvatarRAM ram:TopCellGenerator.avatardd.
- getAllRAM ())
- {
-
+ netlist +
+ " vgmn.p_to_target[3](signal_vci_vcisimhelper);" + CR2;
+
netlist =
- netlist + ram.getMemoryName () + ".p_clk(" +
- NAME_CLK + ");" + CR;
+ netlist + " vgmn.p_to_target[4](signal_vci_vcirttimer);" + CR2;
netlist =
- netlist + ram.getMemoryName () + ".p_resetn(" +
- NAME_RST + ");" + CR;
+ netlist + " vgmn.p_to_target[5](signal_vci_xicu);" + CR;
netlist =
- netlist + ram.getMemoryName () +
- ".p_vci(signal_vci_vciram" + ram.getIndex () + ");" +
+ netlist + " vgmn.p_to_target[6](signal_vci_dma);" + CR;
+ netlist =
+ netlist + " vgmn.p_to_target[7](signal_vci_vcifdtrom);" +
CR2;
- //target number for local cluster: this is set at avatardd creation
netlist =
- netlist + "crossbar" + ram.getNo_cluster () +
- ".p_to_target[" + ram.getNo_target () +
- "](signal_vci_vciram" + ram.getIndex () + ");" + CR2;
+ netlist +
+ " vgmn.p_to_initiator[cpus.size()](signal_vci_bdi);" + CR;
+ netlist =
+ netlist +
+ " vgmn.p_to_initiator[cpus.size()+1](signal_vci_vcifdaccessi);"
+ + CR;
+ netlist =
+ netlist +
+ " vgmn.p_to_initiator[cpus.size()+2](signal_vci_etherneti);"
+ + CR2;
+ netlist =
+ netlist +
+ " vgmn.p_to_initiator[cpus.size()+3](signal_vci_dmai);"
+ + CR2;
}
-
- /*convention for local target ids on cluster :
- channel: 0
- mwmr_ram: 1
- mwmrd_ram: 2
- locks: 3
- ram: 4
- tty: 5
- */
-
- }
-
- if (nb_clusters == 0)
- {
-
- int l = 8; //number of last tty
- if (icn == "vgmn")
+ else
{
+ netlist = netlist + " vgsb.p_clk(signal_clk);" + CR;
+ netlist = netlist + " vgsb.p_resetn(signal_resetn);" + CR;
netlist =
- netlist + "vgmn.p_to_target[" + (l) +
- "](signal_vci_vcifdaccesst);" + CR;
+ netlist + " vgsb.p_to_target[0](signal_vci_vcihetrom);" +
+ CR;
netlist =
- netlist + "vgmn.p_to_target[" + (l + 1) +
- "](signal_vci_ethernett);" + CR;
+ netlist + " vgsb.p_to_target[1](signal_vci_vcirom);" + CR;
netlist =
- netlist + "vgmn.p_to_target[" + (l + 2) +
- "](signal_vci_bdt);" + CR;
-
- int i;
-
- for (i = 0; i < coproc_count; i++)
- {
-
- netlist =
- netlist + "vgmn.p_to_target[" + (l + 4 + i) +
- "](signal_mwmr_" + i + "_target);" + CR;
- }
- }
- else
- { //vgsb
+ netlist +
+ " vgsb.p_to_target[3](signal_vci_vcisimhelper);" + CR2;
netlist =
- netlist + "vgsb.p_to_target[" + (l) +
- "](signal_vci_vcifdaccesst);" + CR;
+ netlist + " vgsb.p_to_target[4](signal_vci_xicu);" + CR;
netlist =
- netlist + "vgsb.p_to_target[" + (l + 1) +
- "](signal_vci_ethernett);" + CR;
+ netlist + " vgsb.p_to_target[5](signal_vci_vcirttimer);" +
+ CR2;
netlist =
- netlist + "vgsb.p_to_target[" + (l + 2) +
- "](signal_vci_bdt);" + CR;
-
- int i;
- for (i = 0; i < coproc_count; i++)
- {
- netlist =
- netlist + "vgmn.p_to_target[" + (l + 4 + i) +
- "](signal_mwmr_" + i + "_target);" + CR;
- }
- }
-
- }
- else
- {
- /* cluster */
- if (icn == "vgmn")
- {
+ netlist + " vgsb.p_to_target[6](signal_vci_vcifdtrom);" +
+ CR2;
netlist =
- netlist + "vgmn.p_to_target[" + 5 +
- "](signal_vci_vcifdaccesst);" + CR;
+ netlist +
+ " vgsb.p_to_initiator[cpus.size()](signal_vci_bdi);" + CR;
netlist =
- netlist + "vgmn.p_to_target[" + 6 +
- "](signal_vci_ethernett);" + CR;
+ netlist +
+ " vgsb.p_to_initiator[cpus.size()+1](signal_vci_vcifdaccessi);"
+ + CR;
netlist =
- netlist + "vgmn.p_to_target[" + 7 +
- "](signal_vci_bdt);" + CR;
+ netlist +
+ " vgsb.p_to_initiator[cpus.size()+2](signal_vci_etherneti);"
+ + CR2;
+ }
+ }
+ else{//clustered
+ if (icn == "vgmn")
+ {
+ netlist = netlist + " vgmn.p_clk(signal_clk);" + CR;
+ netlist = netlist + " vgmn.p_resetn(signal_resetn);" + CR;
+ }
+ else{
+ netlist = netlist + " vgmn.p_clk(signal_clk);" + CR;
+ netlist = netlist + " vgmn.p_resetn(signal_resetn);" + CR;
+ }
+ //in any case for clustered, initiators and targets are attached to crossbar
+
+ if (nb_clusters == 0){
+ netlist = netlist + " crossbar.p_clk(signal_clk);" + CR;
+ netlist = netlist + " crossbar.p_resetn(signal_resetn);" + CR;
+ }
+ else{
+ for ( i = 0; i < nb_clusters; ++i ){
+ netlist = netlist + " crossbar"+i+".p_clk(signal_clk);" + CR;
+ netlist = netlist + " crossbar"+i+".p_resetn(signal_resetn);" + CR;
}
- else
+ }
+ }
+ for (AvatarCrossbar crossbar:TopCellGenerator.avatardd.getAllCrossbar ()){
+ i=0;
+ netlist = netlist + "crossbar"+crossbar.getClusterIndex()+".p_to_initiator["+crossbar.getClusterIndex()+"](signal_vci_m"+crossbar.getClusterIndex()+"["+ cpus_in_cluster(avatardd,i) +"]);" + CR;
+ }
+
+
+ if (nb_clusters == 0){
+ netlist = netlist + "// RAM netlist" + CR2;
+ for (AvatarRAM ram:TopCellGenerator.avatardd.
+ getAllRAM ())
{
+
netlist =
- netlist + "vgsb.p_to_target[" + 5 +
- "](signal_vci_vcifdaccesst);" + CR;
+ netlist + ram.getMemoryName () + ".p_clk(" +
+ NAME_CLK + ");" + CR;
netlist =
- netlist + "vgsb.p_to_target[" + 6 +
- "](signal_vci_ethernett);" + CR;
+ netlist + ram.getMemoryName () + ".p_resetn(" +
+ NAME_RST + ");" + CR;
netlist =
- netlist + "vgsb.p_to_target[" + 7 +
- "](signal_vci_bdt);" + CR;
+ netlist + ram.getMemoryName () +
+ ".p_vci(signal_vci_vciram" + ram.getIndex () + ");" +
+ CR2;
+ if (icn == "vgmn")
+ {
+ netlist =
+ netlist + "vgmn.p_to_target[" +
+ (ram.getNo_target ()) + "](signal_vci_vciram" +
+ ram.getIndex () + ");" + CR2;
+ }
+ else
+ {
+ netlist =
+ netlist + "vgsb.p_to_target[" +
+ (ram.getNo_target ()) + "](signal_vci_vciram" +
+ ram.getIndex () + ");" + CR2;
+ }
}
- }
+ }
+
+ /* clustered version */
+ /* one or several ram, one locks engine, one mwmr ram and one mwmrd ram per cluster */
+ else
+ {
+ netlist = netlist + "// RAM netlist" + CR2;
+ for (AvatarRAM ram:TopCellGenerator.avatardd.
+ getAllRAM ())
+ {
+
+ netlist =
+ netlist + ram.getMemoryName () + ".p_clk(" +
+ NAME_CLK + ");" + CR;
+ netlist =
+ netlist + ram.getMemoryName () + ".p_resetn(" +
+ NAME_RST + ");" + CR;
+ netlist =
+ netlist + ram.getMemoryName () +
+ ".p_vci(signal_vci_vciram" + ram.getClusterIndex () +"_"+ram.getIndex () + ");" +
+ CR2;
+ //target number for local cluster: this is set at avatardd creation
+ netlist =
+ netlist + "crossbar" + ram.getClusterIndex () +
+ ".p_to_target[" + ram.getNo_target () +
+ "](signal_vci_vciram"+ram.getClusterIndex()+"_"+ ram.getIndex () + ");" + CR2;
+ }
+
+
+ }
+
+ if (nb_clusters == 0)
+ {
+
+ int l = 8; //number of last tty
+ if (icn == "vgmn")
+ {
+ netlist =
+ netlist + "vgmn.p_to_target[" + (l) +
+ "](signal_vci_vcifdaccesst);" + CR;
+ netlist =
+ netlist + "vgmn.p_to_target[" + (l + 1) +
+ "](signal_vci_ethernett);" + CR;
+ netlist =
+ netlist + "vgmn.p_to_target[" + (l + 2) +
+ "](signal_vci_bdt);" + CR;
+
+ for (i = 0; i < coproc_count; i++)
+ {
+
+ netlist =
+ netlist + "vgmn.p_to_target[" + (l + 4 + i) +
+ "](signal_mwmr_" + i + "_target);" + CR;
+ }
+ }
+ else
+ { //vgsb
+ netlist =
+ netlist + "vgsb.p_to_target[" + (l) +
+ "](signal_vci_vcifdaccesst);" + CR;
+ netlist =
+ netlist + "vgsb.p_to_target[" + (l + 1) +
+ "](signal_vci_ethernett);" + CR;
+ netlist =
+ netlist + "vgsb.p_to_target[" + (l + 2) +
+ "](signal_vci_bdt);" + CR;
+
+ for (i = 0; i < coproc_count; i++)
+ {
+ netlist =
+ netlist + "vgmn.p_to_target[" + (l + 4 + i) +
+ "](signal_mwmr_" + i + "_target);" + CR;
+ }
+ }
+
+ }
+ else
+ {
+ /* cluster */
+ if (icn == "vgmn")
+ {
+ netlist =
+ netlist + "vgmn.p_to_target[" + 5 +
+ "](signal_vci_vcifdaccesst);" + CR;
+ netlist =
+ netlist + "vgmn.p_to_target[" + 6 +
+ "](signal_vci_ethernett);" + CR;
+ netlist =
+ netlist + "vgmn.p_to_target[" + 7 +
+ "](signal_vci_bdt);" + CR;
+ }
+ else
+ {
+ netlist =
+ netlist + "vgsb.p_to_target[" + 5 +
+ "](signal_vci_vcifdaccesst);" + CR;
+ netlist =
+ netlist + "vgsb.p_to_target[" + 6 +
+ "](signal_vci_ethernett);" + CR;
+ netlist =
+ netlist + "vgsb.p_to_target[" + 7 +
+ "](signal_vci_bdt);" + CR;
+ }
+ }
netlist =
netlist + "vcifdtrom.add_property(\"interrupts\", 0);" + CR2;
netlist = netlist + "vcifdtrom.end_node();;" + CR2;
netlist = netlist + "// TTY netlist" + CR2;
- int i = 0;
-
- for (AvatarTTY tty:TopCellGenerator.avatardd.getAllTTY ())
- {
- netlist =
- netlist + tty.getTTYName () + ".p_clk(signal_clk);" + CR;
- netlist =
- netlist + tty.getTTYName () + ".p_resetn(signal_resetn);" +
- CR;
- netlist =
- netlist + tty.getTTYName () + ".p_vci(signal_vci_tty" + i +
- ");" + CR2;
- int no_irq_tty = 0;
- if (nb_clusters == 0)
- {
-
- if (icn == "vgmn")
- {
- netlist =
- netlist +
- "vcifdtrom.begin_device_node(\"vci_multi_tty" +
- i + "\",\"soclib:vci_multi_tty" + i + "\");" +
- CR2;
- netlist =
- netlist + "vgmn.p_to_target[" +
- tty.getNo_target () + "](signal_vci_tty" + i +
- ");" + CR2;
- netlist =
- netlist + tty.getTTYName () +
- ".p_irq[0](signal_xicu_irq[" + no_irq_tty +
- "]);" + CR2;
- }
- else
- {
- netlist =
- netlist +
- "vcifdtrom.begin_device_node(\"vci_multi_tty" +
- i + "\",\"soclib:vci_multi_tty" +
- tty.getNo_tty () + "\");" + CR2;
- netlist =
- netlist + "vgsb.p_to_target[" +
- tty.getNo_target () + "](signal_vci_tty" + i +
- ");" + CR2;
- netlist =
- netlist + tty.getTTYName () +
- ".p_irq[0](signal_xicu_irq[" + no_irq_tty +
- "]);" + CR2;
- }
- }
-
- //we have a clustered architecture: identify local crossbar
- else
- {
- int j;
- for (j = 0; j < nb_clusters; j++)
- {
- netlist =
- netlist + "crossbar" + j + ".p_to_target[" +
- tty.getNo_target () + "](signal_vci_tty" + j +
- ");" + CR2;
- //recalculate irq addresses, 5 devices generating irq per cluster
- netlist =
- netlist + tty.getTTYName () +
- ".p_irq[0](signal_xicu_irq[" +
- (tty.getNo_cluster () * 5) + "]);" + CR2;
- }
+ i=0;
+ int no_irq_tty = 0; //first TTY has interrupt number 0
+ for (AvatarTTY tty:TopCellGenerator.avatardd.getAllTTY ())
+ {
+ if (no_irq_tty == 1){no_irq_tty+=5;}//all other TTYs have higher interrupt numbers; provisional; will later have to count DMAs if several; take into account clusters with one DMA each
+ if (nb_clusters == 0)
+ { netlist =
+ netlist + tty.getTTYName () + ".p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + tty.getTTYName () + ".p_resetn(signal_resetn);" +
+ CR;
+ netlist =
+ netlist + tty.getTTYName () + ".p_vci(signal_vci_tty"+tty.getNo_tty() +
+ ");" + CR2;}
+ else{
+ netlist =
+ netlist + tty.getTTYName () + ".p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + tty.getTTYName () + ".p_resetn(signal_resetn);" +
+ CR;
+ netlist =
+ netlist + tty.getTTYName () + ".p_vci(signal_vci_tty" + tty.getClusterIndex() +"_"+tty.getNo_tty() +
+ ");" + CR2;
}
- i++;
- //One ICU per cluster per default
- no_irq_tty += 6; //if there is more than one tty, irq >5
- }
-
+ if (nb_clusters == 0)
+ {
+
+ if (icn == "vgmn")
+ {
+ netlist =
+ netlist +
+ "vcifdtrom.begin_device_node(\"vci_multi_tty" +
+ i + "\",\"soclib:vci_multi_tty" + tty.getNo_tty() + "\");" +
+ CR2;
+ netlist =
+ netlist + "vgmn.p_to_target[" +
+ tty.getNo_target () + "](signal_vci_tty" + tty.getNo_tty() +
+ ");" + CR2;
+ netlist =
+ netlist + tty.getTTYName () +
+ ".p_irq[0](signal_xicu_irq[" + no_irq_tty +
+ "]);" + CR2;
+ }
+ else
+ {
+ netlist =
+ netlist +
+ "vcifdtrom.begin_device_node(\"vci_multi_tty" +
+ i + "\",\"soclib:vci_multi_tty" +tty.getNo_tty ()+"_"+
+ tty.getClusterIndex() + "\");" + CR2;
+ netlist =
+ netlist + "vgsb.p_to_target[" +
+ tty.getNo_target () + "](signal_vci_tty" +tty.getNo_tty ()+"_"+
+ tty.getClusterIndex() +
+ ");" + CR2;
+ netlist =
+ netlist + tty.getTTYName () +
+ ".p_irq[0](signal_xicu_irq[" + no_irq_tty +
+ "]);" + CR2;
+ }
+ }
+
+ //we have a clustered architecture: identify local crossbar
+ else
+ {
+ int j;
+ for (j = 0; j < nb_clusters; j++)
+ {
+ netlist =
+ netlist + "crossbar" + tty.getClusterIndex() + ".p_to_target["+tty.getNo_target ()
+ + "](signal_vci_tty" +tty.getClusterIndex() +"_"+tty.getNo_tty()+
+ ");" + CR2;
+ //recalculate irq addresses, 5 devices generating irq per cluster
+ //there are still strong assumptions that have to be corrected
+ netlist =
+ netlist + tty.getTTYName () +
+ ".p_irq[0](signal_xicu_irq[" +
+ (tty.getClusterIndex () * 5) + "]);" + CR2;
+ }
+ }
+ i++;
+ //One ICU per cluster per default
+ no_irq_tty ++; //if there is more than one tty, irq >5
+ }
+
+ //////////////// DMA access
+
+ netlist = netlist + "vcidma.p_clk(signal_clk);" + CR;
+ netlist = netlist + "vcidma.p_resetn(signal_resetn);" + CR;
+ netlist = netlist + "vcidma.p_vci_target(signal_vci_dma);" + CR;
+ netlist = netlist + "vcidma.p_vci_initiator(signal_vci_dmai);" + CR;
+ netlist = netlist + "vcidma.p_irq(signal_xicu_irq[5]);" + CR;
+ // netlist = netlist + "vgmn.p_to_initiator[cpus.size()+3](signal_vci_dmai);;" + CR;
//////////////// fdrom
netlist = netlist + "{" + CR2;
@@ -558,258 +684,307 @@ public class NetList
i = 0;
int j = 0;
- for (AvatarCoproMWMR copro:TopCellGenerator.
- avatardd.getAllCoproMWMR ())
- {
-
- //IE and OE are special cases as they have VCI an fifo initiator interface
-
- if (copro.getCoprocType () == 0)
+ for (AvatarCoproMWMR copro:TopCellGenerator.
+ avatardd.getAllCoproMWMR ())
+ {
+ //IE and OE packet engines are special cases as they have VCI an fifo initiator interface
+ if (copro.getCoprocType () == 0)
+ {
+ i = 0;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_resetn(signal_resetn);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_vci(signal_vci_IE);" + CR;
+
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_pktdesc[0](signal_fifo_" + j + "_" + i +
+ "_to_ctrl);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_slin(signal_fifo_" + j + "_" + i +
+ "_from_ctrl);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_slext(signal_fifo_" + j + "_" + (i + 1) +
+ "_from_ctrl);" + CR;
+
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_running(signal_IE_from_ctrl);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_status(signal_IE_to_ctrl);" + CR2;
+ i = 0;
+ }
+ else if (copro.getCoprocType () == 1)
+ {
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_resetn(signal_resetn);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_vci(signal_vci_OE);" + CR;
+
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_desc(signal_fifo_" + j + "_" + i +
+ "_from_ctrl);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_slin(signal_fifo_" + j + "_" + i + "_to_ctrl);" +
+ CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_slext(signal_fifo_" + j + "_" + (i + 1) +
+ "_to_ctrl);" + CR;
+
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_running(signal_OE_from_ctrl);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_status(signal_OE_to_ctrl);" + CR2;
+ i = 0;
+ }
+ else
+ {
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ ".p_resetn(signal_resetn);" + CR;
+ netlist =
+ netlist + copro.getCoprocName ()+ ".p_from_ctrl[" + i +
+ "](signal_fifo_" + j + "_" + i + "_from_ctrl);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () + ".p_to_ctrl[" + i +
+ "](signal_fifo_" + j + "_" + i + "_to_ctrl);" + CR2;
+ }
+
+
+ //additional interfaces for IE and OE
+
+ if (copro.getCoprocType () == 0)
+ {
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_resetn(signal_resetn);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_vci_initiator(signal_mwmr_" + i +
+ "_initiator);" + CR;
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_from_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_from_ctrl);" + CR; //pktdesc
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_from_coproc[" + (i + 1) + "](signal_fifo_" + j + "_" + (i + 1) + "_from_ctrl);" + CR; //running
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_status[0](signal_IE_to_ctrl);" + CR; //status
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_to_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_to_ctrl);" + CR; //slin
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_config[0](signal_IE_from_ctrl);" + CR; //slext
+ }
+ else
+ {
+ if (copro.getCoprocType () == 1)
+ {
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_resetn(signal_resetn);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_vci_initiator(signal_mwmr_" + i +
+ "_initiator);" + CR;
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_from_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_from_ctrl);" + CR; //desc
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_status[0](signal_OE_to_ctrl);" + CR; //running
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_to_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_to_ctrl);" + CR; //status
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_to_coproc[" + (i + 1) + "](signal_fifo_" + j + "_" + (i + 1) + "_to_ctrl);" + CR; //slin
+ netlist = netlist + copro.getCoprocName () + "_wrapper.p_config[0](signal_OE_from_ctrl);" + CR; //slext
+ }
+ else
+ {
+
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_clk(signal_clk);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_resetn(signal_resetn);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_vci_initiator(signal_mwmr_" + i +
+ "_initiator);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_vci_target(signal_mwmr_" + i +
+ "_target);" + CR2;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_from_coproc[" + i +
+ "](signal_fifo_" + j + "_" + i +
+ "_from_ctrl);" + CR;
+ netlist =
+ netlist + copro.getCoprocName () +
+ "_wrapper.p_to_coproc[" + i + "](signal_fifo_" +
+ j + "_" + i + "_to_ctrl);" + CR;
+ }
+ i++;
+ }
+ j++;
+ coproc_count++;
+ }
+
+
+ //If there is a spy, add logger or stats to vci interface
+ if(nb_clusters==0){
+ i = 0;
+ for (AvatarCPU cpu:TopCellGenerator.avatardd.getAllCPU ())
{
- i = 0;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_clk(signal_clk);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_vci(signal_vci_IE);" + CR;
+ int number = cpu.getNo_proc ();
+ if (cpu.getMonitored () == 1)
+ {
+ netlist = netlist + CR +
+ "logger" + i + ".p_clk(signal_clk);" + CR +
+ "logger" + i + ".p_resetn(signal_resetn);" + CR +
+ "logger" + i + ".p_vci(signal_vci_m[" + number +
+ "]);" + CR2;
+ i++;
+ }
- netlist =
- netlist + copro.getCoprocName () +
- ".p_pktdesc[0](signal_fifo_" + j + "_" + i +
- "_to_ctrl);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_slin(signal_fifo_" + j + "_" + i +
- "_from_ctrl);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_slext(signal_fifo_" + j + "_" + (i + 1) +
- "_from_ctrl);" + CR;
-
- netlist =
- netlist + copro.getCoprocName () +
- ".p_running(signal_IE_from_ctrl);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_status(signal_IE_to_ctrl);" + CR2;
- i = 0;
}
- else if (copro.getCoprocType () == 1)
+ j = 0;
+ }
+ else{
+ i = 0;
+ for (AvatarCPU cpu:TopCellGenerator.avatardd.getAllCPU ())
{
- netlist =
- netlist + copro.getCoprocName () +
- ".p_clk(signal_clk);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_vci(signal_vci_OE);" + CR;
-
- netlist =
- netlist + copro.getCoprocName () +
- ".p_desc(signal_fifo_" + j + "_" + i +
- "_from_ctrl);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_slin(signal_fifo_" + j + "_" + i + "_to_ctrl);" +
- CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_slext(signal_fifo_" + j + "_" + (i + 1) +
- "_to_ctrl);" + CR;
+ int number = cpu.getNo_proc ();
+ if (cpu.getMonitored () == 1)
+ {
+ netlist = netlist + CR +
+ "logger" + i + ".p_clk(signal_clk);" + CR +
+ "logger" + i + ".p_resetn(signal_resetn);" + CR +
+ "logger" + i + ".p_vci(signal_vci_m"+cpu.getClusterIndex()+"[" + number +
+ "]);" + CR2;
+ i++;
+ }
- netlist =
- netlist + copro.getCoprocName () +
- ".p_running(signal_OE_from_ctrl);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_status(signal_OE_to_ctrl);" + CR2;
- i = 0;
- }
- else
- {
- netlist =
- netlist + copro.getCoprocName () +
- ".p_clk(signal_clk);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- ".p_resetn(signal_resetn);" + CR;
- netlist =
- // netlist + "hwa" + i + ".p_from_ctrl[" + i +
- // "](signal_fifo_" + j + "_" + i + "_from_ctrl);" + CR;
- netlist + copro.getCoprocName ()+ ".p_from_ctrl[" + i +
- "](signal_fifo_" + j + "_" + i + "_from_ctrl);" + CR;
- netlist =
- // netlist + "hwa" + i + ".p_to_ctrl[" + i +
- // "](signal_fifo_" + j + "_" + i + "_to_ctrl);" + CR2;
- netlist + copro.getCoprocName () + ".p_to_ctrl[" + i +
- "](signal_fifo_" + j + "_" + i + "_to_ctrl);" + CR2;
}
+ j = 0;
+ }
-
- //additional interfaces for IE and OE
-
- if (copro.getCoprocType () == 0)
+ if(nb_clusters==0){
+ i = 0;
+ for (AvatarRAM ram:TopCellGenerator.avatardd.getAllRAM ())
{
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_clk(signal_clk);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_vci_initiator(signal_mwmr_" + i +
- "_initiator);" + CR;
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_from_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_from_ctrl);" + CR; //pktdesc
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_from_coproc[" + (i + 1) + "](signal_fifo_" + j + "_" + (i + 1) + "_from_ctrl);" + CR; //running
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_status[0](signal_IE_to_ctrl);" + CR; //status
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_to_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_to_ctrl);" + CR; //slin
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_config[0](signal_IE_from_ctrl);" + CR; //slext
- }
- else
- {
- if (copro.getCoprocType () == 1)
- {
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_clk(signal_clk);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_vci_initiator(signal_mwmr_" + i +
- "_initiator);" + CR;
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_from_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_from_ctrl);" + CR; //desc
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_status[0](signal_OE_to_ctrl);" + CR; //running
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_to_coproc[" + i + "](signal_fifo_" + j + "_" + i + "_to_ctrl);" + CR; //status
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_to_coproc[" + (i + 1) + "](signal_fifo_" + j + "_" + (i + 1) + "_to_ctrl);" + CR; //slin
- netlist = netlist + copro.getCoprocName () + "_wrapper.p_config[0](signal_OE_from_ctrl);" + CR; //slext
- }
+ if (ram.getMonitored () == 1)
+ {
+ int number = number = ram.getIndex ();
+ netlist += "logger" + i + ".p_clk(signal_clk);" + CR;
+ netlist +=
+ "logger" + i + ".p_resetn(signal_resetn);" + CR;
+ netlist +=
+ "logger" + i + ".p_vci(signal_vci_vciram"+ ram.getClusterIndex() +"_" + number +
+ ");" + CR2;
+ i++;
+ }
else
- {
-
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_clk(signal_clk);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_vci_initiator(signal_mwmr_" + i +
- "_initiator);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_vci_target(signal_mwmr_" + i +
- "_target);" + CR2;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_from_coproc[" + i +
- "](signal_fifo_" + j + "_" + i +
- "_from_ctrl);" + CR;
- netlist =
- netlist + copro.getCoprocName () +
- "_wrapper.p_to_coproc[" + i + "](signal_fifo_" +
- j + "_" + i + "_to_ctrl);" + CR;
- }
- i++;
+ {
+
+ if (ram.getMonitored () == 2)
+ {
+ int number = number = ram.getIndex ();
+ netlist +=
+ "mwmr_stats" + j + ".p_clk(signal_clk);" + CR;
+ netlist +=
+ "mwmr_stats" + j + ".p_resetn(signal_resetn);" +
+ CR;
+ netlist +=
+ "mwmr_stats" + j + ".p_vci(signal_vci_vciram"+ ram.getClusterIndex() +"_" +
+ number + ");" + CR2;
+ j++;
+ }
+ }
}
- j++;
- coproc_count++;
- }
-
-
- //If there is a spy, add logger or stats to vci interface
-
- i = 0;
- for (AvatarCPU cpu:TopCellGenerator.avatardd.getAllCPU ())
- {
- int number = cpu.getNo_proc ();
- if (cpu.getMonitored () == 1)
- {
- netlist = netlist + CR +
- "logger" + i + ".p_clk(signal_clk);" + CR +
- "logger" + i + ".p_resetn(signal_resetn);" + CR +
- "logger" + i + ".p_vci(signal_vci_m[" + number +
- "]);" + CR2;
- i++;
- }
-
- }
- j = 0;
-
- for (AvatarRAM ram:TopCellGenerator.avatardd.getAllRAM ())
- {
- if (ram.getMonitored () == 1)
- {
- int number = number = ram.getIndex ();
- netlist += "logger" + i + ".p_clk(signal_clk);" + CR;
- netlist +=
- "logger" + i + ".p_resetn(signal_resetn);" + CR;
- netlist +=
- "logger" + i + ".p_vci(signal_vci_vciram" + number +
- ");" + CR2;
- i++;
- }
- else
+ }
+ else{
+ i = 0;
+ for (AvatarRAM ram:TopCellGenerator.avatardd.getAllRAM ())
{
-
- if (ram.getMonitored () == 2)
- {
- int number = number = ram.getIndex ();
- netlist +=
- "mwmr_stats" + j + ".p_clk(signal_clk);" + CR;
- netlist +=
- "mwmr_stats" + j + ".p_resetn(signal_resetn);" +
- CR;
- netlist +=
- "mwmr_stats" + j + ".p_vci(signal_vci_vciram" +
- number + ");" + CR2;
- j++;
- }
- }
- }
-
+ if (ram.getMonitored () == 1)
+ {
+ int number = number = ram.getIndex ();
+ netlist += "logger" + i + ".p_clk(signal_clk);" + CR;
+ netlist +=
+ "logger" + i + ".p_resetn(signal_resetn);" + CR;
+ netlist +=
+ "logger" + i + ".p_vci(signal_vci_vciram" + number +
+ ");" + CR2;
+ i++;
+ }
+ else
+ {
+
+ if (ram.getMonitored () == 2)
+ {
+ int number = number = ram.getIndex ();
+ netlist +=
+ "mwmr_stats" + j + ".p_clk(signal_clk);" + CR;
+ netlist +=
+ "mwmr_stats" + j + ".p_resetn(signal_resetn);" +
+ CR;
+ netlist +=
+ "mwmr_stats" + j + ".p_vci(signal_vci_vciram" +
+ number + ");" + CR2;
+ j++;
+ }
+ }
+ }
+ }
int p = 0;
//AMS Cluster Netlist
netlist = netlist + "// AMS Cluster netlist" + CR2;
- i = 0;
for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
{
- netlist =
- netlist + amsCluster.getAmsClusterName () + ".p_clk(signal_clk);" + CR;
- netlist =
- netlist + amsCluster.getAmsClusterName () + ".p_resetn(signal_resetn);" + CR;
- netlist =
- netlist + amsCluster.getAmsClusterName () + ".p_vci(signal_vci_gpio2vci" + i + ");" + CR;
- netlist =
- netlist + amsCluster.getAmsClusterName () + ".p_rdata_ams(signal_from_ams" + i + ");" + CR;
- netlist =
- netlist + amsCluster.getAmsClusterName () + ".p_wdata_ams(signal_to_ams" + i + ");" + CR2;
+ netlist += "gpio2vci"+amsCluster.getNo_amsCluster ()+".p_clk(signal_clk);" + CR;
+ netlist += "gpio2vci"+amsCluster.getNo_amsCluster ()+".p_resetn(signal_resetn);" + CR;
+ netlist += "gpio2vci"+amsCluster.getNo_amsCluster ()+".p_vci(signal_vci_gpio2vci" +
+ amsCluster.getNo_amsCluster () + ");" + CR;
+ netlist += "gpio2vci"+amsCluster.getNo_amsCluster ()+".p_wdata_ams(signal_to_ams" +
+ amsCluster.getNo_amsCluster () + ");" + CR;
+ netlist += "gpio2vci"+amsCluster.getNo_amsCluster ()+".p_rdata_ams(signal_from_ams" +
+ amsCluster.getNo_amsCluster () + ");" + CR2;
+
+ netlist += amsCluster.getAmsClusterName () + amsCluster.getNo_amsCluster () +
+ ".in_ams(signal_to_ams"+amsCluster.getNo_amsCluster ()+ ");" + CR;
+ netlist += amsCluster.getAmsClusterName () + amsCluster.getNo_amsCluster () +
+ ".out_ams(signal_from_ams"+amsCluster.getNo_amsCluster ()+ ");" + CR2;
if (nb_clusters == 0)
{
if (icn == "vgmn")
{
- netlist =
- netlist + "vgmn.p_to_target[" +
- amsCluster.getNo_target () + "](signal_vci_gpio2vci" + i +
- ");" + CR2;
+ netlist += "vgmn.p_to_target[" +
+ amsCluster.getNo_target () + "](signal_vci_gpio2vci" +
+ amsCluster.getNo_amsCluster () + ");" + CR2;
}
else
{
- netlist =
- netlist + "vgsb.p_to_target[" +
- amsCluster.getNo_target () + "](signal_vci_gpio2vci" + i +
- ");" + CR2;
+ netlist += "vgsb.p_to_target[" +
+ amsCluster.getNo_target () + "](signal_vci_gpio2vci" +
+ amsCluster.getNo_amsCluster () + ");" + CR2;
}
}
@@ -818,117 +993,110 @@ public class NetList
{
for (j = 0; j < nb_clusters; j++)
{
- netlist =
- netlist + "crossbar" + j + ".p_to_target[" +
+ netlist += "crossbar" + j + ".p_to_target[" +
amsCluster.getNo_target () + "](signal_vci_gpio2vci" + j +
");" + CR2;
}
}
- i++;
}
//generate trace file if marked trace option
if (tracing)
- {
- netlist += "sc_trace_file *tf;" + CR;
- netlist += "tf=sc_create_vcd_trace_file(\"mytrace\");" + CR;
- netlist += "sc_trace(tf,signal_clk,\"CLK\");" + CR;
- netlist += "sc_trace(tf,signal_resetn,\"RESETN\");" + CR;
-
- netlist +=
- "sc_trace(tf, signal_vci_xicu,\"signal_vci_xicu\");" + CR;
- netlist +=
- "sc_trace(tf, signal_vci_vcifdtrom,\"signal_vci_vcifdtrom\");"
- + CR;
- netlist +=
- "sc_trace(tf, signal_vci_vcihetrom,\"signal_vci_vcihetrom\");"
- + CR;
- netlist +=
- "sc_trace(tf, signal_vci_vcirom ,\"signal_vci_vcirom\");" +
- CR;
- netlist +=
- "sc_trace(tf, signal_vci_vcisimhelper,\"signal_vci_vcisimhelper\");"
- + CR;
- netlist +=
- "sc_trace(tf, signal_vci_vcirttimer ,\"signal_vci_vcirttimer\");"
- + CR;
- netlist +=
- "sc_trace(tf, signal_vci_vcifdaccessi,\"signal_vci_vcifdaccessi\");"
- + CR;
- netlist +=
- "sc_trace(tf,signal_vci_vcifdaccesst ,\"signal_vci_vcifdaccesst\");"
- + CR;
- netlist +=
- "sc_trace(tf,signal_vci_bdi ,\"signal_vci_bdi\");" + CR;
- netlist +=
- "sc_trace(tf, signal_vci_bdt,\"signal_vci_bdt\");" + CR;
- netlist +=
- "sc_trace(tf, signal_vci_etherneti,\"signal_vci_etherneti\");"
- + CR;
- netlist +=
- "sc_trace(tf,signal_vci_ethernett ,\"signal_vci_ethernett\");"
- + CR;
-
- for (i = 0; i < TopCellGenerator.avatardd.getNb_init (); i++)
- {
- netlist +=
- "sc_trace(tf,signal_vci_m[" + i +
- "] ,\"signal_vci_m[" + i + "]\");" + CR;
- }
-
- i = 0;
- for (AvatarTTY tty:TopCellGenerator.avatardd.
- getAllTTY ())
- {
-
- netlist +=
- "sc_trace(tf,signal_vci_tty" + tty.getNo_tty () +
- ",\"TTY" + tty.getNo_tty () + "\");" + CR;
- netlist +=
- "sc_trace(tf,signal_xicu_irq[" + i +
- "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
- i++;
- }
-
- netlist +=
- "sc_trace(tf,signal_xicu_irq[" + i +
- "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
- netlist +=
- "sc_trace(tf,signal_xicu_irq[" + i +
- "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
- netlist +=
- "sc_trace(tf,signal_xicu_irq[" + i +
- "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
-
- for (AvatarRAM ram:TopCellGenerator.avatardd.
- getAllRAM ())
- {
- if (ram.getMonitored () == 0)
- {
- netlist +=
- "sc_trace(tf,signal_vci_vciram" +
- ram.getIndex () + ",\"Memory" +
- ram.getIndex () + "\");" + CR;
- }
- }
- }
-
- i = 0;
- for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
- {
-
- netlist +=
- "sc_trace(tf,signal_vci_gpio2vci" + i +
- ",\"signal_vci_gpio2vci" + i + "\");" + CR;
- netlist +=
- "sc_trace(tf,signal_from_ams" + i +
- ",\"signal_from_ams" + i + "\");" + CR;
- netlist +=
- "sc_trace(tf,signal_to_ams" + i +
- ",\"signal_to_ams" + i + "\");" + CR;
- i++;
- }
+ {
+ netlist += "sc_trace_file *tf;" + CR;
+ netlist += "tf=sc_create_vcd_trace_file(\"mytrace\");" + CR;
+ netlist += "sc_trace(tf,signal_clk,\"CLK\");" + CR;
+ netlist += "sc_trace(tf,signal_resetn,\"RESETN\");" + CR;
+
+ netlist +=
+ "sc_trace(tf, signal_vci_xicu,\"signal_vci_xicu\");" + CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_vcifdtrom,\"signal_vci_vcifdtrom\");"
+ + CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_vcihetrom,\"signal_vci_vcihetrom\");"
+ + CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_vcirom ,\"signal_vci_vcirom\");" +
+ CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_vcisimhelper,\"signal_vci_vcisimhelper\");"
+ + CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_vcirttimer ,\"signal_vci_vcirttimer\");"
+ + CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_vcifdaccessi,\"signal_vci_vcifdaccessi\");"
+ + CR;
+ netlist +=
+ "sc_trace(tf,signal_vci_vcifdaccesst ,\"signal_vci_vcifdaccesst\");"
+ + CR;
+ netlist +=
+ "sc_trace(tf,signal_vci_bdi ,\"signal_vci_bdi\");" + CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_bdt,\"signal_vci_bdt\");" + CR;
+ netlist +=
+ "sc_trace(tf, signal_vci_etherneti,\"signal_vci_etherneti\");"
+ + CR;
+ netlist +=
+ "sc_trace(tf,signal_vci_ethernett ,\"signal_vci_ethernett\");"
+ + CR;
+
+ for (i = 0; i < TopCellGenerator.avatardd.getNb_init (); i++)
+ {
+ netlist +=
+ "sc_trace(tf,signal_vci_m[" + i +
+ "] ,\"signal_vci_m[" + i + "]\");" + CR;
+ }
+
+ i = 0;
+ for (AvatarTTY tty:TopCellGenerator.avatardd.
+ getAllTTY ())
+ {
+
+ netlist +=
+ "sc_trace(tf,signal_vci_tty" + tty.getNo_tty () +
+ ",\"TTY" + tty.getNo_tty () + "\");" + CR;
+ netlist +=
+ "sc_trace(tf,signal_xicu_irq[" + i +
+ "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
+ i++;
+ }
+
+ netlist +=
+ "sc_trace(tf,signal_xicu_irq[" + i +
+ "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
+ netlist +=
+ "sc_trace(tf,signal_xicu_irq[" + i +
+ "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
+ netlist +=
+ "sc_trace(tf,signal_xicu_irq[" + i +
+ "] ,\"signal_xicu_irq[" + i + "]\");" + CR;
+
+ for (AvatarRAM ram:TopCellGenerator.avatardd.getAllRAM ())
+ {
+ if (ram.getMonitored () == 0)
+ {
+ netlist +=
+ "sc_trace(tf,signal_vci_vciram" +
+ ram.getIndex () + ",\"Memory" +
+ ram.getIndex () + "\");" + CR;
+ }
+ }
+ for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ())
+ {
+ netlist +=
+ "sc_trace(tf,signal_vci_gpio2vci" + amsCluster.getNo_amsCluster () +
+ ",\"signal_vci_gpio2vci" + amsCluster.getNo_amsCluster () + "\");" + CR;
+ netlist +=
+ "sc_trace(tf,signal_to_ams" + amsCluster.getNo_amsCluster () +
+ ",\"signal_to_ams" + amsCluster.getNo_amsCluster () + "\");" + CR;
+ netlist +=
+ "sc_trace(tf,signal_from_ams" + amsCluster.getNo_amsCluster () +
+ ",\"signal_from_ams" + amsCluster.getNo_amsCluster () + "\");" + CR;
+ }
+ }
netlist =
netlist +
@@ -940,11 +1108,12 @@ public class NetList
netlist = netlist + " signal_resetn = true;" + CR;
netlist = netlist + " sc_core::sc_start();" + CR;
if (tracing)
- {
- netlist += "sc_close_vcd_trace_file(tf);" + CR;
- }
+ {
+ netlist += "sc_close_vcd_trace_file(tf);" + CR;
+ }
netlist = netlist + CR + " return EXIT_SUCCESS;" + CR;
netlist = netlist + "}" + CR;
+
return netlist;
}
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/Platforminfo.java b/src/main/java/ddtranslatorSoclib/toTopCell/Platforminfo.java
index b45598dba8c4f311461f3ad36c5dde4784e985f3..f15b03c037e50eea0ab004f1be0280beb5c5f282 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/Platforminfo.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/Platforminfo.java
@@ -73,6 +73,7 @@ public class Platforminfo
+ "Uses('caba:vci_heterogeneous_rom')," + CR
+ "Uses('caba:vci_multi_tty')," + CR
+ "Uses('caba:vci_xicu')," + CR
+ + "Uses('caba:vci_dma')," + CR
+ "Uses('caba:vci_block_device')," + CR
+ "Uses('caba:vci_ethernet')," + CR
+ "Uses('caba:vci_rttimer')," + CR
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/Signal.java b/src/main/java/ddtranslatorSoclib/toTopCell/Signal.java
index a6df8964e299b4d80109b823e05791809b46d5d0..1733e153e4c6f1a044d7bf9c3d71c972bc7618fc 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/Signal.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/Signal.java
@@ -38,151 +38,172 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
/* This class generates the lines of the topcell where the signals are declared*/
/* authors: v1.0 Raja GATGOUT 2014
- v2.0 Daniela GENIUS, Julien HENON 2015 */
+ v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
+import avatartranslator.AvatarRelation;
+import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.*;
import ddtranslatorSoclib.AvatarCoproMWMR;
import ddtranslatorSoclib.AvatarRAM;
import ddtranslatorSoclib.AvatarTTY;
import ddtranslatorSoclib.AvatarAmsCluster;
+import ddtranslatorSoclib.AvatarCrossbar;
-public class Signal {
+public class Signal {
+ public static AvatarddSpecification avatardd;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
private final static String NAME_CLK = "signal_clk";
private static final String NAME_RST = "signal_resetn";
- public static String getSignal() {
- int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
- //nb_clusters=2;
- String signal = CR2 + "//-------------------------------signaux------------------------------------" + CR2;
-
- signal = signal + "caba::VciSignals<vci_param> signal_vci_m[cpus.size() + 1];"+ CR;
- signal = signal + "caba::VciSignals<vci_param> signal_vci_xicu(\"signal_vci_xicu\");"+ CR;
- signal = signal + "caba::VciSignals<vci_param> signal_vci_vcifdtrom(\"signal_vci_vcifdtrom\");"+ CR;
- signal = signal +" caba::VciSignals<vci_param> signal_vci_vcihetrom(\"signal_vci_vcihetrom\");"+ CR;
- signal = signal +" caba::VciSignals<vci_param> signal_vci_vcirom(\"signal_vci_vcirom\");"+ CR;
- signal = signal +" caba::VciSignals<vci_param> signal_vci_vcisimhelper(\"signal_vci_vcisimhelper\");"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_vci_vcirttimer(\"signal_vci_vcirttimer\");"+ CR;
- //signal = signal +"caba::VciSignals<vci_param> signal_vci_vcilocks(\"signal_vci_vcilocks\");"+ CR;
-//signal = signal +"caba::VciSignals<vci_param> signal_vci_mwmr_ram(\"signal_vci_mwmr_ram\");"+ CR;
-//signal = signal +"caba::VciSignals<vci_param> signal_vci_mwmrd_ram(\"signal_vci_mwmrd_ram\");"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_vci_vcifdaccessi;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_vci_vcifdaccesst;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_vci_bdi;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_vci_bdt;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_vci_etherneti;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_vci_ethernett;"+ CR;
- signal = signal +""+ CR;
- signal = signal + "sc_clock signal_clk(\"signal_clk\");" + CR;
- signal = signal + "sc_signal<bool> signal_resetn(\"" + NAME_RST + "\");" + CR2;
- int i=0;
+ public static int cpus_in_cluster(AvatarddSpecification dd,int cluster_no){
+ avatardd = dd;
+ int cpus=0;
+ for (AvatarConnector connector : avatardd.getConnectors()){
+ AvatarConnectingPoint my_p1= connector.get_p1();
+ AvatarConnectingPoint my_p2= connector.get_p2();
+
+ AvatarComponent comp1 = my_p1.getComponent();
+ AvatarComponent comp2 = my_p2.getComponent();
+ if (comp1 instanceof AvatarCPU){
+ AvatarCPU comp1cpu = (AvatarCPU)comp1;
+ if(comp1cpu.getClusterIndex()==cluster_no)
+ cpus++;
+ }
+
+ }
+ return cpus;
+ }
+
-for (AvatarCoproMWMR copro : TopCellGenerator.avatardd.getAllCoproMWMR()) {
-
- //DG 27.04. additional VCI signals for IE and OE
- if(copro.getCoprocType()==0){
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_IE(\"signal_vci_IE\");"+CR;
+
+ public static String getSignal(AvatarddSpecification dd) {
+ avatardd = dd;
+ int nb_clusters=TopCellGenerator.avatardd.getAllCrossbar().size();
+
+ int i;
+ String signal = CR2 + "//-------------------------------signaux------------------------------------" + CR2;
+ if (nb_clusters==0){
+ signal = signal + "caba::VciSignals<vci_param> signal_vci_m[cpus.size() + 1];"+ CR;
+ }
+ else{
+ for(i=0;i<nb_clusters;i++){
+ signal = signal + "caba::VciSignals<vci_param> signal_vci_m"+i+"["+ (cpus_in_cluster(avatardd,i)+ 1)+"];"+ CR;
+ }
+ }
+
+ signal = signal + "caba::VciSignals<vci_param> signal_vci_xicu(\"signal_vci_xicu\");"+ CR;
+ signal = signal + "caba::VciSignals<vci_param> signal_vci_vcifdtrom(\"signal_vci_vcifdtrom\");"+ CR;
+ signal = signal +" caba::VciSignals<vci_param> signal_vci_vcihetrom(\"signal_vci_vcihetrom\");"+ CR;
+ signal = signal +" caba::VciSignals<vci_param> signal_vci_vcirom(\"signal_vci_vcirom\");"+ CR;
+ signal = signal +" caba::VciSignals<vci_param> signal_vci_vcisimhelper(\"signal_vci_vcisimhelper\");"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_vcirttimer(\"signal_vci_vcirttimer\");"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_dma(\"signal_vci_dma\");"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_dmai(\"signal_vci_dmai\");"+ CR;
+ //signal = signal +"caba::VciSignals<vci_param> signal_vci_mwmr_ram(\"signal_vci_mwmr_ram\");"+ CR;
+ //signal = signal +"caba::VciSignals<vci_param> signal_vci_mwmrd_ram(\"signal_vci_mwmrd_ram\");"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_vcifdaccessi;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_vcifdaccesst;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_bdi;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_bdt;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_etherneti;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_vci_ethernett;"+ CR;
+ signal = signal +""+ CR;
+ signal = signal + "sc_clock signal_clk(\"signal_clk\");" + CR;
+ signal = signal + "sc_signal<bool> signal_resetn(\"" + NAME_RST + "\");" + CR2;
+
+ i=0;
+ for (AvatarCoproMWMR copro : TopCellGenerator.avatardd.getAllCoproMWMR()) {
+
+ if(copro.getCoprocType()==0){
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_IE(\"signal_vci_IE\");"+CR;
signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_initiator;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_target;"+ CR;
- signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_from_ctrl;"+ CR;
- signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_1_from_ctrl;"+ CR;
- signal = signal +"sc_core::sc_signal<uint32_t> signal_IE_from_ctrl;"+ CR;
- signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_to_ctrl;"+ CR;
- signal = signal +"sc_core::sc_signal<uint32_t> signal_IE_to_ctrl;"+ CR;
- }
- else { if(copro.getCoprocType()==1){
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_OE(\"signal_vci_OE\");"+CR;
- signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_initiator;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_target;"+ CR;
- signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_from_ctrl;"+ CR;
- signal = signal +"sc_core::sc_signal<uint32_t> signal_OE_from_ctrl;"+ CR;
- signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_to_ctrl;"+ CR;
- signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_1_to_ctrl;"+ CR;
- signal = signal +"sc_core::sc_signal<uint32_t> signal_OE_to_ctrl;"+ CR;
- }
-
- else{
- signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_initiator;"+ CR;
- signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_target;"+ CR;
- signal = signal +" soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_from_ctrl;"+ CR;
- signal = signal +" soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_to_ctrl;"+ CR;
- }
+ signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_target;"+ CR;
+ signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_from_ctrl;"+ CR;
+ signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_1_from_ctrl;"+ CR;
+ signal = signal +"sc_core::sc_signal<uint32_t> signal_IE_from_ctrl;"+ CR;
+ signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_to_ctrl;"+ CR;
+ signal = signal +"sc_core::sc_signal<uint32_t> signal_IE_to_ctrl;"+ CR;
+ }
+ else {
+ if(copro.getCoprocType()==1){
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_OE(\"signal_vci_OE\");"+CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_initiator;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_target;"+ CR;
+ signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_from_ctrl;"+ CR;
+ signal = signal +"sc_core::sc_signal<uint32_t> signal_OE_from_ctrl;"+ CR;
+ signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_0_to_ctrl;"+ CR;
+ signal = signal +"soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_1_to_ctrl;"+ CR;
+ signal = signal +"sc_core::sc_signal<uint32_t> signal_OE_to_ctrl;"+ CR;
+ }
- }
- i++;
+ else{
+ signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_initiator;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_target;"+ CR;
+ signal = signal +" soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_from_ctrl;"+ CR;
+ signal = signal +" soclib::caba::FifoSignals<uint32_t> signal_fifo_"+i+"_to_ctrl;"+ CR;
+ }
+ }
+ i++;
- /* signal = signal + " soclib::caba::VciSignals<vci_param> signal_mwmr"+p+"_target(\"signal_mwmr"+p+"_target\""+CR;
- signal = signal + " soclib::caba::VciSignals<vci_param> signal_mwmr"+p+"_initiator(\"signal_mwmr"+p+"_initiator\"" +CR;
-
- signal = signal + " soclib::caba::FifoSignals<uint32_t> signal_fifo_to_ctrl"+p+"(\"signal_fifo_to_ctrl"+p+"\");"+CR;
- signal = signal + " soclib::caba::FifoSignals<uint32_t> signal_fifo_from_ctrl"+p+"(\"signal_fifo_from_ctrl"+p+"\");"+CR;
- p++;*/
-}
-
- signal = signal + " sc_core::sc_signal<bool> signal_xicu_irq[xicu_n_irq];" + CR2;
-
- //System.out.print("number of processors : " + TopCellGenerator.avatardd.getNbCPU()+"\n");
- // System.out.print("number of clusters : " + TopCellGenerator.avatardd.getNbClusters()+"\n");
-
- i = 0;
- if(TopCellGenerator.avatardd.getAllCrossbar().size()==0){
- for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()){
- // signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + ram.getIndex()
- // + "(\"signal_vci_vciram" + ram.getIndex() + "\");" + CR2;
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + i
- + "(\"signal_vci_vciram" + i + "\");" + CR2;
- i++;
- }
- i = 0;
-
- for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()){
- //signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+tty.getNo_tty()+"(\"signal_vci_tty"+tty.getNo_tty()+"\");" + CR2;
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+i+"(\"signal_vci_tty"+i+"\");" + CR2;
- i++;
- }
+ /* signal = signal + " soclib::caba::VciSignals<vci_param> signal_mwmr"+p+"_target(\"signal_mwmr"+p+"_target\""+CR;
+ signal = signal + " soclib::caba::VciSignals<vci_param> signal_mwmr"+p+"_initiator(\"signal_mwmr"+p+"_initiator\"" +CR;
+ signal = signal + " soclib::caba::FifoSignals<uint32_t> signal_fifo_to_ctrl"+p+"(\"signal_fifo_to_ctrl"+p+"\");"+CR;
+ signal = signal + " soclib::caba::FifoSignals<uint32_t> signal_fifo_from_ctrl"+p+"(\"signal_fifo_from_ctrl"+p+"\");"+CR;
+ p++;*/
+ }
+ signal = signal + " sc_core::sc_signal<bool> signal_xicu_irq[xicu_n_irq];" + CR2;
+
+ i = 0;
+ if(TopCellGenerator.avatardd.getAllCrossbar().size()==0){
+
+ for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM())
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + ram.getIndex()
+ + "(\"signal_vci_vciram" + ram.getIndex() + "\");" + CR2; i=0;
+ for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()){
+ // signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+tty.getNo_tty()+"(\"signal_vci_tty"+tty.getNo_tty()+"\");" + CR2;
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+i+"(\"signal_vci_tty"+i+"\");" + CR2;
+ i++;
+ }
+ //int p=0;
+
+ }
+ else{
+
+ for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()){
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" +ram.getClusterIndex() +"_"+ram.getIndex()
+ + "(\"signal_vci_vciram" + ram.getClusterIndex() +"_"+ ram.getIndex() + "\");" + CR2;
+
+ }
+
+
+ for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()){
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+tty.getClusterIndex()+"_"+tty.getNo_tty()+"(\"signal_vci_tty"+ tty.getClusterIndex() +"_"+tty.getNo_tty()+"\");" + CR2;
- // signal = signal + " sc_core::sc_signal<bool> signal_xicu_irq[xicu_n_irq];" + CR2;
- // System.out.print("number of processors : " + TopCellGenerator.avatardd.getNbCPU()+"\n");
-
- i = 0;
- for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ()) {
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_gpio2vci"+i+"(\"signal_vci_gpio2vci"+i+"\");" + CR;
- signal = signal + "sc_signal< vci_param::data_t > signal_to_ams"+i+"(\"signal_to_ams"+i+"\");" + CR;
- signal = signal + "sc_signal< vci_param::data_t > signal_from_ams"+i+"(\"signal_from_ams"+i+"\");" + CR2;
- i++;
- }
- } else {
- for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM())
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + ram.getIndex()
- + "(\"signal_vci_vciram" + ram.getIndex() + "\");" + CR2; i=0;
- for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()){
- // signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+tty.getNo_tty()+"(\"signal_vci_tty"+tty.getNo_tty()+"\");" + CR2;
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+i+"(\"signal_vci_tty"+i+"\");" + CR2;
- i++;
- }
- int p=0;
- // if (with_hw_accellerator>0){ //DG 23.08.
-
- i = 0;
- for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ()) {
- signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_gpio2vci"+i+"(\"signal_vci_gpio2vci"+i+"\");" + CR;
- signal = signal + "sc_signal< vci_param::data_t > signal_to_ams"+i+"(\"signal_to_ams"+i+"\");" + CR;
- signal = signal + "sc_signal< vci_param::data_t > signal_from_ams"+i+"(\"signal_from_ams"+i+"\");" + CR2;
- i++;
- }
-
- }
-
-return signal;
+ }
+ // signal = signal + " sc_core::sc_signal<bool> signal_xicu_irq[xicu_n_irq];" + CR2;
+
}
+
+ for (AvatarCrossbar crossbar:TopCellGenerator.avatardd.getAllCrossbar()){
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_up"+crossbar.getClusterIndex()+"(\"signal_up"+crossbar.getClusterIndex()+"\");"+CR;
+ signal = signal + "soclib::caba::VciSignals<vci_param> signal_down"+crossbar.getClusterIndex()+"(\"signal_down"+crossbar.getClusterIndex()+"\");"+CR;
+ }
+ for (AvatarAmsCluster amsCluster:TopCellGenerator.avatardd.getAllAmsCluster ()) {
+ signal += "soclib::caba::VciSignals<vci_param> signal_vci_gpio2vci"+amsCluster.getNo_amsCluster ()+
+ "(\"signal_vci_gpio2vci"+amsCluster.getNo_amsCluster ()+"\");" + CR;
+ signal += "sc_signal< vci_param::data_t > signal_to_ams"+amsCluster.getNo_amsCluster ()+
+ "(\"signal_to_ams"+amsCluster.getNo_amsCluster ()+"\");" + CR;
+ signal += "sc_signal< vci_param::data_t > signal_from_ams"+amsCluster.getNo_amsCluster ()+
+ "(\"signal_from_ams"+amsCluster.getNo_amsCluster ()+"\");" + CR2;
+ }
+ return signal;
+ }
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/Simulation.java b/src/main/java/ddtranslatorSoclib/toTopCell/Simulation.java
index d7f606f3cd306c6b7cbf09f0bf6514fae7b09ebb..fbe5d1514c57de2c205b46ca6b6605689c8ea0bf 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/Simulation.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/Simulation.java
@@ -92,6 +92,7 @@ public class Simulation {
simulation = simulation+ CR +" return 1;"+ CR + "}" ;
//return simulation;
}
+
return simulation;
}
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java b/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
index 8651231b834c49bf0fca3e793ed9a92da34fccbe..c10743c12180836285d3728e47b403ae3f82c118 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
@@ -181,11 +181,11 @@ public class TopCellGenerator
VCIparameters +
config +
Code.getCode() +
- MappingTable.getMappingTable() +
- Loader.getLoader(avspec) + //DG 23.06.
- Declaration.getDeclarations(avspec) + //DG 27.06.
- Signal.getSignal() +
- NetList.getNetlist(icn,tracing) +
+ MappingTable.getMappingTable(avatardd) +
+ Loader.getLoader(avspec) +
+ Declaration.getDeclarations(avatardd,avspec) +
+ Signal.getSignal(avatardd) +
+ NetList.getNetlist(avatardd,icn,tracing) +
Simulation.getSimulation();
return (top);
}
diff --git a/src/main/java/elntranslator/ELNSpecification.java b/src/main/java/elntranslator/ELNSpecification.java
new file mode 100644
index 0000000000000000000000000000000000000000..002a22c6f29bd7e26c5c0f23fa28083753feb046
--- /dev/null
+++ b/src/main/java/elntranslator/ELNSpecification.java
@@ -0,0 +1,306 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Class ELNSpecification
+ * List of all the elements in a ELN diagram
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNSpecification{
+ private List<ELNTComponent> components;
+ private List<ELNTConnector> connectors;
+
+ public ELNSpecification(List<ELNTComponent> _components, List<ELNTConnector> _connectors){
+ components = _components ;
+ connectors = _connectors ;
+ }
+
+ public List<ELNTComponent> getComponents(){
+ return components;
+ }
+
+ public List<ELNTConnector> getConnectors(){
+ return connectors;
+ }
+
+ public LinkedList<ELNTComponentCapacitor> getAllComponentCapacitor(){
+ LinkedList<ELNTComponentCapacitor> capacitors = new LinkedList<ELNTComponentCapacitor>();
+ for (ELNTComponent capacitor : components) {
+ if (capacitor instanceof ELNTComponentCapacitor) {
+ capacitors.add((ELNTComponentCapacitor) capacitor);
+ }
+ }
+ return capacitors;
+ }
+
+ public LinkedList<ELNTComponentCurrentSinkTDF> getAllComponentCurrentSinkTDF(){
+ LinkedList<ELNTComponentCurrentSinkTDF> TDF_isinks = new LinkedList<ELNTComponentCurrentSinkTDF>();
+ for (ELNTComponent TDF_isink : components) {
+ if (TDF_isink instanceof ELNTComponentCurrentSinkTDF) {
+ TDF_isinks.add((ELNTComponentCurrentSinkTDF) TDF_isink);
+ }
+ }
+ return TDF_isinks;
+ }
+
+ public LinkedList<ELNTComponentCurrentSourceTDF> getAllComponentCurrentSourceTDF(){
+ LinkedList<ELNTComponentCurrentSourceTDF> TDF_isources = new LinkedList<ELNTComponentCurrentSourceTDF>();
+ for (ELNTComponent TDF_isource : components) {
+ if (TDF_isource instanceof ELNTComponentCurrentSourceTDF) {
+ TDF_isources.add((ELNTComponentCurrentSourceTDF) TDF_isource);
+ }
+ }
+ return TDF_isources;
+ }
+
+ public LinkedList<ELNTComponentIdealTransformer> getAllComponentIdealTransformer(){
+ LinkedList<ELNTComponentIdealTransformer> idealTransformers = new LinkedList<ELNTComponentIdealTransformer>();
+ for (ELNTComponent idealTransformer : components) {
+ if (idealTransformer instanceof ELNTComponentIdealTransformer) {
+ idealTransformers.add((ELNTComponentIdealTransformer) idealTransformer);
+ }
+ }
+ return idealTransformers;
+ }
+
+ public LinkedList<ELNTComponentIndependentCurrentSource> getAllComponentIndependentCurrentSource(){
+ LinkedList<ELNTComponentIndependentCurrentSource> isources = new LinkedList<ELNTComponentIndependentCurrentSource>();
+ for (ELNTComponent isource : components) {
+ if (isource instanceof ELNTComponentIndependentCurrentSource) {
+ isources.add((ELNTComponentIndependentCurrentSource) isource);
+ }
+ }
+ return isources;
+ }
+
+ public LinkedList<ELNTComponentIndependentVoltageSource> getAllComponentIndependentVoltageSource(){
+ LinkedList<ELNTComponentIndependentVoltageSource> vsources = new LinkedList<ELNTComponentIndependentVoltageSource>();
+ for (ELNTComponent vsource : components) {
+ if (vsource instanceof ELNTComponentIndependentVoltageSource) {
+ vsources.add((ELNTComponentIndependentVoltageSource) vsource);
+ }
+ }
+ return vsources;
+ }
+
+ public LinkedList<ELNTComponentInductor> getAllComponentInductor(){
+ LinkedList<ELNTComponentInductor> inductors = new LinkedList<ELNTComponentInductor>();
+ for (ELNTComponent inductor : components) {
+ if (inductor instanceof ELNTComponentInductor) {
+ inductors.add((ELNTComponentInductor) inductor);
+ }
+ }
+ return inductors;
+ }
+
+ public LinkedList<ELNTComponentNodeRef> getAllComponentNodeRef(){
+ LinkedList<ELNTComponentNodeRef> nodeRefs = new LinkedList<ELNTComponentNodeRef>();
+ for (ELNTComponent nodeRef : components) {
+ if (nodeRef instanceof ELNTComponentNodeRef) {
+ nodeRefs.add((ELNTComponentNodeRef) nodeRef);
+ }
+ }
+ return nodeRefs;
+ }
+
+ public LinkedList<ELNTComponentResistor> getAllComponentResistor(){
+ LinkedList<ELNTComponentResistor> resistors = new LinkedList<ELNTComponentResistor>();
+ for (ELNTComponent resistor : components) {
+ if (resistor instanceof ELNTComponentResistor) {
+ resistors.add((ELNTComponentResistor) resistor);
+ }
+ }
+ return resistors;
+ }
+
+ public LinkedList<ELNTComponentTransmissionLine> getAllComponentTransmissionLine(){
+ LinkedList<ELNTComponentTransmissionLine> transmissionLines = new LinkedList<ELNTComponentTransmissionLine>();
+ for (ELNTComponent transmissionLine : components) {
+ if (transmissionLine instanceof ELNTComponentTransmissionLine) {
+ transmissionLines.add((ELNTComponentTransmissionLine) transmissionLine);
+ }
+ }
+ return transmissionLines;
+ }
+
+ public LinkedList<ELNTComponentVoltageControlledCurrentSource> getAllComponentVoltageControlledCurrentSource(){
+ LinkedList<ELNTComponentVoltageControlledCurrentSource> vccss = new LinkedList<ELNTComponentVoltageControlledCurrentSource>();
+ for (ELNTComponent vccs : components) {
+ if (vccs instanceof ELNTComponentVoltageControlledCurrentSource) {
+ vccss.add((ELNTComponentVoltageControlledCurrentSource) vccs);
+ }
+ }
+ return vccss;
+ }
+
+ public LinkedList<ELNTComponentVoltageControlledVoltageSource> getAllComponentVoltageControlledVoltageSource(){
+ LinkedList<ELNTComponentVoltageControlledVoltageSource> vcvss = new LinkedList<ELNTComponentVoltageControlledVoltageSource>();
+ for (ELNTComponent vcvs : components) {
+ if (vcvs instanceof ELNTComponentVoltageControlledVoltageSource) {
+ vcvss.add((ELNTComponentVoltageControlledVoltageSource) vcvs);
+ }
+ }
+ return vcvss;
+ }
+
+ public LinkedList<ELNTComponentVoltageSinkTDF> getAllComponentVoltageSinkTDF(){
+ LinkedList<ELNTComponentVoltageSinkTDF> TDF_vsinks = new LinkedList<ELNTComponentVoltageSinkTDF>();
+ for (ELNTComponent TDF_vsink : components) {
+ if (TDF_vsink instanceof ELNTComponentVoltageSinkTDF) {
+ TDF_vsinks.add((ELNTComponentVoltageSinkTDF) TDF_vsink);
+ }
+ }
+ return TDF_vsinks;
+ }
+
+ public LinkedList<ELNTComponentVoltageSourceTDF> getAllComponentVoltageSourceTDF(){
+ LinkedList<ELNTComponentVoltageSourceTDF> TDF_vsources = new LinkedList<ELNTComponentVoltageSourceTDF>();
+ for (ELNTComponent TDF_vsource : components) {
+ if (TDF_vsource instanceof ELNTComponentVoltageSourceTDF) {
+ TDF_vsources.add((ELNTComponentVoltageSourceTDF) TDF_vsource);
+ }
+ }
+ return TDF_vsources;
+ }
+
+ public LinkedList<ELNTMidPortTerminal> getAllMidPortTerminal(){
+ LinkedList<ELNTMidPortTerminal> midPortTerminals = new LinkedList<ELNTMidPortTerminal>();
+ for (ELNTComponent midPortTerminal : components) {
+ if (midPortTerminal instanceof ELNTMidPortTerminal) {
+ midPortTerminals.add((ELNTMidPortTerminal) midPortTerminal);
+ }
+ }
+ return midPortTerminals;
+ }
+
+ public LinkedList<ELNTModule> getAllModule(){
+ LinkedList<ELNTModule> modules = new LinkedList<ELNTModule>();
+ for (ELNTComponent module : components) {
+ if (module instanceof ELNTModule) {
+ modules.add((ELNTModule) module);
+ }
+ }
+ return modules;
+ }
+
+ public LinkedList<ELNTModuleTerminal> getAllModuleTerminal(){
+ LinkedList<ELNTModuleTerminal> moduleTerminals = new LinkedList<ELNTModuleTerminal>();
+ for (ELNTComponent moduleTerminal : components) {
+ if (moduleTerminal instanceof ELNTModuleTerminal) {
+ moduleTerminals.add((ELNTModuleTerminal) moduleTerminal);
+ }
+ }
+ return moduleTerminals;
+ }
+
+ public int getNbComponentCapacitor(){
+ return (getAllComponentCapacitor()).size();
+ }
+
+ public int getNbComponentCurrentSinkTDF(){
+ return (getAllComponentCurrentSinkTDF()).size();
+ }
+
+ public int getNbComponentCurrentSourceTDF(){
+ return (getAllComponentCurrentSourceTDF()).size();
+ }
+
+ public int getNbComponentIdealTransformer(){
+ return (getAllComponentIdealTransformer()).size();
+ }
+
+ public int getNbComponentIndependentCurrentSource(){
+ return (getAllComponentIndependentCurrentSource()).size();
+ }
+
+ public int getNbComponentIndependentVoltageSource(){
+ return (getAllComponentIndependentVoltageSource()).size();
+ }
+
+ public int getNbComponentInductor(){
+ return (getAllComponentInductor()).size();
+ }
+
+ public int getNbComponentNodeRef(){
+ return (getAllComponentNodeRef()).size();
+ }
+
+ public int getNbComponentResistor(){
+ return (getAllComponentResistor()).size();
+ }
+
+ public int getNbComponentTransmissionLine(){
+ return (getAllComponentTransmissionLine()).size();
+ }
+
+ public int getNbComponentVoltageControlledCurrentSource(){
+ return (getAllComponentVoltageControlledCurrentSource()).size();
+ }
+
+ public int getNbComponentVoltageControlledVoltageSource(){
+ return (getAllComponentVoltageControlledVoltageSource()).size();
+ }
+
+ public int getNbComponentVoltageSinkTDF(){
+ return (getAllComponentVoltageSinkTDF()).size();
+ }
+
+ public int getNbComponentVoltageSourceTDF(){
+ return (getAllComponentVoltageSourceTDF()).size();
+ }
+
+ public int getNbMidPortTerminal(){
+ return (getAllMidPortTerminal()).size();
+ }
+
+ public int getNbModule(){
+ return (getAllModule()).size();
+ }
+
+ public int getNbModuleTerminal(){
+ return (getAllModuleTerminal()).size();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponent.java b/src/main/java/elntranslator/ELNTComponent.java
new file mode 100644
index 0000000000000000000000000000000000000000..49f6baf756fc24113db0922f34c7dbbafb24638a
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponent.java
@@ -0,0 +1,53 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponent {
+ public String name;
+
+ public String getName() {
+ return name;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentCapacitor.java b/src/main/java/elntranslator/ELNTComponentCapacitor.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2284979204753b53f88e324ac287e695c5cadef
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentCapacitor.java
@@ -0,0 +1,88 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentCapacitor
+ * Parameters of a ELN primitive component : capacitor
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentCapacitor extends ELNTComponent {
+ private String name;
+ private double val, q0;
+ private String unit0, unit1;
+
+ private ELNTModule module;
+
+ public ELNTComponentCapacitor(String _name, double _val, double _q0, String _unit0, String _unit1, ELNTModule _module) {
+ name = _name;
+ val = _val;
+ q0 = _q0;
+ unit0 = _unit0;
+ unit1 = _unit1;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getVal() {
+ return val;
+ }
+
+ public double getQ0() {
+ return q0;
+ }
+
+ public String getUnit0() {
+ return unit0;
+ }
+
+ public String getUnit1() {
+ return unit1;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentCurrentSinkTDF.java b/src/main/java/elntranslator/ELNTComponentCurrentSinkTDF.java
new file mode 100644
index 0000000000000000000000000000000000000000..6f83646d7d93fc028d324e146fdf5cdea2187dd3
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentCurrentSinkTDF.java
@@ -0,0 +1,72 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentCurrentSinkTDF
+ * Parameters of a ELN primitive component : TDF current sink
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentCurrentSinkTDF extends ELNTComponent {
+ private String name;
+ private double scale;
+
+ private ELNTModule module;
+
+ public ELNTComponentCurrentSinkTDF(String _name, double _scale, ELNTModule _module) {
+ name = _name;
+ scale = _scale;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getScale() {
+ return scale;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentCurrentSourceTDF.java b/src/main/java/elntranslator/ELNTComponentCurrentSourceTDF.java
new file mode 100644
index 0000000000000000000000000000000000000000..c4eb1674172276b9d73cadcfbfc63d64acaebadc
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentCurrentSourceTDF.java
@@ -0,0 +1,72 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentCurrentSourceTDF
+ * Parameters of a ELN primitive component : TDF current source
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentCurrentSourceTDF extends ELNTComponent {
+ private String name;
+ private double scale;
+
+ private ELNTModule module;
+
+ public ELNTComponentCurrentSourceTDF(String _name, double _scale, ELNTModule _module) {
+ name = _name;
+ scale = _scale;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getScale() {
+ return scale;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentIdealTransformer.java b/src/main/java/elntranslator/ELNTComponentIdealTransformer.java
new file mode 100644
index 0000000000000000000000000000000000000000..ac915027e15f3fedc43c421a86462431773ef64c
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentIdealTransformer.java
@@ -0,0 +1,72 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentIdealTransformer
+ * Parameters of a ELN primitive component : ideal transformer
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentIdealTransformer extends ELNTComponent {
+ private String name;
+ private double ratio;
+
+ private ELNTModule module;
+
+ public ELNTComponentIdealTransformer(String _name, double _ratio, ELNTModule _module) {
+ name = _name;
+ ratio = _ratio;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getRatio() {
+ return ratio;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentIndependentCurrentSource.java b/src/main/java/elntranslator/ELNTComponentIndependentCurrentSource.java
new file mode 100644
index 0000000000000000000000000000000000000000..6e83ffcf1b09f5277532723076db4f259489a9a9
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentIndependentCurrentSource.java
@@ -0,0 +1,120 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentIndependentCurrentSource
+ * Parameters of a ELN primitive component : independent current source
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentIndependentCurrentSource extends ELNTComponent {
+ private String name;
+ private double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
+ private String delay;
+ private String unit0;
+
+ private ELNTModule module;
+
+ public ELNTComponentIndependentCurrentSource(String _name, double _initValue, double _offset, double _amplitude, double _frequency, double _phase,
+ double _acAmplitude, double _acPhase, double _acNoiseAmplitude, String _delay, String _unit0, ELNTModule _module) {
+ name = _name;
+ initValue = _initValue;
+ offset = _offset;
+ amplitude = _amplitude;
+ frequency = _frequency;
+ phase = _phase;
+ acAmplitude = _acAmplitude;
+ acPhase = _acPhase;
+ acNoiseAmplitude = _acNoiseAmplitude;
+ delay = _delay;
+ unit0 = _unit0;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getInitValue() {
+ return initValue;
+ }
+
+ public double getOffset() {
+ return offset;
+ }
+
+ public double getAmplitude() {
+ return amplitude;
+ }
+
+ public double getFrequency() {
+ return frequency;
+ }
+
+ public double getPhase() {
+ return phase;
+ }
+
+ public double getAcAmplitude() {
+ return acAmplitude;
+ }
+
+ public double getAcPhase() {
+ return acPhase;
+ }
+
+ public double getAcNoiseAmplitude() {
+ return acNoiseAmplitude;
+ }
+
+ public String getDelay() {
+ return delay;
+ }
+
+ public String getUnit0() {
+ return unit0;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentIndependentVoltageSource.java b/src/main/java/elntranslator/ELNTComponentIndependentVoltageSource.java
new file mode 100644
index 0000000000000000000000000000000000000000..875fd8c8f53ac5155dbfd6b8c11c10a7c069dd2a
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentIndependentVoltageSource.java
@@ -0,0 +1,120 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentIndependentVoltageSource
+ * Parameters of a ELN primitive component : independent voltage source
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentIndependentVoltageSource extends ELNTComponent {
+ private String name;
+ private double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
+ private String delay;
+ private String unit0;
+
+ private ELNTModule module;
+
+ public ELNTComponentIndependentVoltageSource(String _name, double _initValue, double _offset, double _amplitude, double _frequency, double _phase,
+ double _acAmplitude, double _acPhase, double _acNoiseAmplitude, String _delay, String _unit0, ELNTModule _module) {
+ name = _name;
+ initValue = _initValue;
+ offset = _offset;
+ amplitude = _amplitude;
+ frequency = _frequency;
+ phase = _phase;
+ acAmplitude = _acAmplitude;
+ acPhase = _acPhase;
+ acNoiseAmplitude = _acNoiseAmplitude;
+ delay = _delay;
+ unit0 = _unit0;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getInitValue() {
+ return initValue;
+ }
+
+ public double getOffset() {
+ return offset;
+ }
+
+ public double getAmplitude() {
+ return amplitude;
+ }
+
+ public double getFrequency() {
+ return frequency;
+ }
+
+ public double getPhase() {
+ return phase;
+ }
+
+ public double getAcAmplitude() {
+ return acAmplitude;
+ }
+
+ public double getAcPhase() {
+ return acPhase;
+ }
+
+ public double getAcNoiseAmplitude() {
+ return acNoiseAmplitude;
+ }
+
+ public String getDelay() {
+ return delay;
+ }
+
+ public String getUnit0() {
+ return unit0;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentInductor.java b/src/main/java/elntranslator/ELNTComponentInductor.java
new file mode 100644
index 0000000000000000000000000000000000000000..9bdba90dfa4fa7c4d935f0300a684fa9ed534b05
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentInductor.java
@@ -0,0 +1,88 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentInductor
+ * Parameters of a ELN primitive component : inductor
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentInductor extends ELNTComponent {
+ private String name;
+ private double val, phi0;
+ private String unit0, unit1;
+
+ private ELNTModule module;
+
+ public ELNTComponentInductor(String _name, double _val, double _phi0, String _unit0, String _unit1, ELNTModule _module) {
+ name = _name;
+ val = _val;
+ phi0 = _phi0;
+ unit0 = _unit0;
+ unit1 = _unit1;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getVal() {
+ return val;
+ }
+
+ public double getPhi0() {
+ return phi0;
+ }
+
+ public String getUnit0() {
+ return unit0;
+ }
+
+ public String getUnit1() {
+ return unit1;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentNodeRef.java b/src/main/java/elntranslator/ELNTComponentNodeRef.java
new file mode 100644
index 0000000000000000000000000000000000000000..548bc524714a759f7ae1d1fc22f3d35c0e779787
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentNodeRef.java
@@ -0,0 +1,66 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentNodeRef
+ * Parameters of a ELN primitive component : node ref
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentNodeRef extends ELNTComponent {
+ private String name;
+
+ private ELNTModule module;
+
+ public ELNTComponentNodeRef(String _name, ELNTModule _module) {
+ name = _name;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentResistor.java b/src/main/java/elntranslator/ELNTComponentResistor.java
new file mode 100644
index 0000000000000000000000000000000000000000..607882b250d584029715402c701717b050d449d2
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentResistor.java
@@ -0,0 +1,78 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentResistor
+ * Parameters of a ELN primitive component : resistor
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentResistor extends ELNTComponent {
+ private String name;
+ private double val;
+ private String unit;
+
+ private ELNTModule module;
+
+ public ELNTComponentResistor(String _name, double _val, String _unit, ELNTModule _module) {
+ name = _name;
+ val = _val;
+ unit = _unit;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getVal() {
+ return val;
+ }
+
+ public String getUnit() {
+ return unit;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentTransmissionLine.java b/src/main/java/elntranslator/ELNTComponentTransmissionLine.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e1af794235c22ff692ef9581cbe69da11c141e1
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentTransmissionLine.java
@@ -0,0 +1,94 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentTransmissionLine
+ * Parameters of a ELN primitive component : transmission line
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentTransmissionLine extends ELNTComponent {
+ private String name;
+ private double z0, delta0;
+ private String delay;
+ private String unit0, unit2;
+
+ private ELNTModule module;
+
+ public ELNTComponentTransmissionLine(String _name, double _z0, double _delta0, String _delay, String _unit0, String _unit2, ELNTModule _module) {
+ name = _name;
+ z0 = _z0;
+ delta0 = _delta0;
+ delay = _delay;
+ unit0 = _unit0;
+ unit2 = _unit2;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getZ0() {
+ return z0;
+ }
+
+ public double getDelta0() {
+ return delta0;
+ }
+
+ public String getDelay() {
+ return delay;
+ }
+
+ public String getUnit0() {
+ return unit0;
+ }
+
+ public String getUnit2() {
+ return unit2;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentVoltageControlledCurrentSource.java b/src/main/java/elntranslator/ELNTComponentVoltageControlledCurrentSource.java
new file mode 100644
index 0000000000000000000000000000000000000000..327840d4bc9836bec4a3bd54546dc922fa2685e1
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentVoltageControlledCurrentSource.java
@@ -0,0 +1,78 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentVoltageControlledCurrentSource
+ * Parameters of a ELN primitive component : voltage controlled current source
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentVoltageControlledCurrentSource extends ELNTComponent {
+ private String name;
+ private double val;
+ private String unit;
+
+ private ELNTModule module;
+
+ public ELNTComponentVoltageControlledCurrentSource(String _name, double _val, String _unit, ELNTModule _module) {
+ name = _name;
+ val = _val;
+ unit = _unit;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getVal() {
+ return val;
+ }
+
+ public String getUnit() {
+ return unit;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentVoltageControlledVoltageSource.java b/src/main/java/elntranslator/ELNTComponentVoltageControlledVoltageSource.java
new file mode 100644
index 0000000000000000000000000000000000000000..564559de46729e5ec7fb0b1f861ff5ee3db359bb
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentVoltageControlledVoltageSource.java
@@ -0,0 +1,72 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentVoltageControlledVoltageSource
+ * Parameters of a ELN primitive component : voltage controlled voltage source
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentVoltageControlledVoltageSource extends ELNTComponent {
+ private String name;
+ private double val;
+
+ private ELNTModule module;
+
+ public ELNTComponentVoltageControlledVoltageSource(String _name, double _val, ELNTModule _module) {
+ name = _name;
+ val = _val;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getVal() {
+ return val;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentVoltageSinkTDF.java b/src/main/java/elntranslator/ELNTComponentVoltageSinkTDF.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6072a905208232cd5bb88f01d7f9f71b7dda344
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentVoltageSinkTDF.java
@@ -0,0 +1,72 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentVoltageSinkTDF
+ * Parameters of a ELN primitive component : TDF voltage sink
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentVoltageSinkTDF extends ELNTComponent {
+ private String name;
+ private double scale;
+
+ private ELNTModule module;
+
+ public ELNTComponentVoltageSinkTDF(String _name, double _scale, ELNTModule _module) {
+ name = _name;
+ scale = _scale;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getScale() {
+ return scale;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTComponentVoltageSourceTDF.java b/src/main/java/elntranslator/ELNTComponentVoltageSourceTDF.java
new file mode 100644
index 0000000000000000000000000000000000000000..43e4bd26403b783785e9c6024809b945e4ed8673
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTComponentVoltageSourceTDF.java
@@ -0,0 +1,72 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTComponentVoltageSourceTDF
+ * Parameters of a ELN primitive component : TDF voltage source
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTComponentVoltageSourceTDF extends ELNTComponent {
+ private String name;
+ private double scale;
+
+ private ELNTModule module;
+
+ public ELNTComponentVoltageSourceTDF(String _name, double _scale, ELNTModule _module) {
+ name = _name;
+ scale = _scale;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public double getScale() {
+ return scale;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTConnectingPoint.java b/src/main/java/elntranslator/ELNTConnectingPoint.java
new file mode 100644
index 0000000000000000000000000000000000000000..92c5d1cbccd6bc398ee06d9b9a47d2b0ad37c183
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTConnectingPoint.java
@@ -0,0 +1,74 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class SysCAMSTConnectingPoint
+ * Parameters of a SystemC-AMS connecting point
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTConnectingPoint{
+ private String name;
+
+ private ELNTConnector ownerConnector ;
+ private ELNTComponent ownerComponent;
+
+ public ELNTConnectingPoint(ELNTComponent _ownerComponent, String _name) {
+ ownerComponent = _ownerComponent;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public ELNTConnector getConnector() {
+ return ownerConnector;
+ }
+
+ public ELNTComponent getComponent() {
+ return ownerComponent;
+ }
+
+ boolean ConnectingPointIsFree(){
+ return ownerConnector == null;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTConnector.java b/src/main/java/elntranslator/ELNTConnector.java
new file mode 100644
index 0000000000000000000000000000000000000000..0451de435e9aed75675bc67b1ffed0e0c93f0106
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTConnector.java
@@ -0,0 +1,78 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+import java.util.LinkedList;
+
+/**
+ * Class ELNTConnector
+ * Parameters of a ELN connector
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTConnector{
+ private ELNTConnectingPoint connectingPoint1;
+ private ELNTConnectingPoint connectingPoint2;
+
+ private LinkedList<ELNTMidPortTerminal> term;
+
+ public ELNTConnector(ELNTConnectingPoint _connectingPoint1, ELNTConnectingPoint _connectingPoint2) {
+ connectingPoint1 = _connectingPoint1;
+ connectingPoint2 = _connectingPoint2;
+ term = new LinkedList<ELNTMidPortTerminal>();
+ }
+
+ public ELNTConnectingPoint get_p1() {
+ return connectingPoint1;
+ }
+
+ public ELNTConnectingPoint get_p2() {
+ return connectingPoint2;
+ }
+
+ public LinkedList<ELNTMidPortTerminal> getMidPortTerminal() {
+ return term;
+ }
+
+ public void addMidPortTerminal(ELNTMidPortTerminal _term){
+ term.add(_term);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTMidPortTerminal.java b/src/main/java/elntranslator/ELNTMidPortTerminal.java
new file mode 100644
index 0000000000000000000000000000000000000000..3c40c0c97a8d19619bfda2077dba17dcc6eac287
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTMidPortTerminal.java
@@ -0,0 +1,59 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTMidPortTerminal
+ * Parameters of a ELN primitive component : mid port terminal
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTMidPortTerminal extends ELNTComponent {
+ private ELNTConnector connector;
+
+ public ELNTMidPortTerminal(ELNTConnector _connector) {
+ connector = _connector;
+ }
+
+ public ELNTConnector getConnector() {
+ return connector;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTModule.java b/src/main/java/elntranslator/ELNTModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..bdeb99cf6ab7bb4ba9040eceb91cc37a2178edf9
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTModule.java
@@ -0,0 +1,214 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+import java.util.LinkedList;
+
+import syscamstranslator.SysCAMSTBlockTDF;
+
+/**
+ * Class ELNTModule
+ * Parameters of a ELN component : module
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTModule extends ELNTComponent {
+ private String name;
+
+ private LinkedList<ELNTComponentCapacitor> capacitor;
+ private LinkedList<ELNTComponentIdealTransformer> idealTransformer;
+ private LinkedList<ELNTComponentIndependentCurrentSource> isource;
+ private LinkedList<ELNTComponentIndependentVoltageSource> vsource;
+ private LinkedList<ELNTComponentInductor> inductor;
+ private LinkedList<ELNTComponentNodeRef> nodeRef;
+ private LinkedList<ELNTComponentResistor> resistor;
+ private LinkedList<ELNTComponentTransmissionLine> transmissionLine;
+ private LinkedList<ELNTComponentVoltageControlledCurrentSource> vccs;
+ private LinkedList<ELNTComponentVoltageControlledVoltageSource> vcvs;
+ private LinkedList<ELNTComponentCurrentSinkTDF> TDF_isink;
+ private LinkedList<ELNTComponentCurrentSourceTDF> TDF_isource;
+ private LinkedList<ELNTComponentVoltageSinkTDF> TDF_vsink;
+ private LinkedList<ELNTComponentVoltageSourceTDF> TDF_vsource;
+ private LinkedList<ELNTComponentModuleTerminal> moduleTerminal;
+
+ public ELNTModule(String _name) {
+ name = _name;
+ capacitor = new LinkedList<ELNTComponentCapacitor>();
+ idealTransformer = new LinkedList<ELNTComponentIdealTransformer>();
+ isource = new LinkedList<ELNTComponentIndependentCurrentSource>();
+ vsource = new LinkedList<ELNTComponentIndependentVoltageSource>();
+ inductor = new LinkedList<ELNTComponentInductor>();
+ nodeRef = new LinkedList<ELNTComponentNodeRef>();
+ resistor = new LinkedList<ELNTComponentResistor>();
+ transmissionLine = new LinkedList<ELNTComponentTransmissionLine>();
+ vccs = new LinkedList<ELNTComponentVoltageControlledCurrentSource>();
+ vcvs = new LinkedList<ELNTComponentVoltageControlledVoltageSource>();
+ TDF_isink = new LinkedList<ELNTComponentCurrentSinkTDF>();
+ TDF_isource = new LinkedList<ELNTComponentCurrentSourceTDF>();
+ TDF_vsink = new LinkedList<ELNTComponentVoltageSinkTDF>();
+ TDF_vsource = new LinkedList<ELNTComponentVoltageSourceTDF>();
+ moduleTerminal = new LinkedList<ELNTComponentModuleTerminal>();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public LinkedList<ELNTComponentCapacitor> getCapacitor() {
+ return capacitor;
+ }
+
+ public void addCapacitor(ELNTComponentCapacitor _capacitor){
+ capacitor.add(_capacitor);
+ }
+
+ public LinkedList<ELNTComponentIdealTransformer> getIdealTransformer() {
+ return idealTransformer;
+ }
+
+ public void addIdealTransformer(ELNTComponentIdealTransformer _idealTransformer){
+ idealTransformer.add(_idealTransformer);
+ }
+
+ public LinkedList<ELNTComponentIndependentCurrentSource> getIsource() {
+ return isource;
+ }
+
+ public void addIsource(ELNTComponentIndependentCurrentSource _isource){
+ isource.add(_isource);
+ }
+
+ public LinkedList<ELNTComponentIndependentVoltageSource> getVsource() {
+ return vsource;
+ }
+
+ public void addVsource(ELNTComponentIndependentVoltageSource _vsource){
+ vsource.add(_vsource);
+ }
+
+ public LinkedList<ELNTComponentInductor> getInductor() {
+ return inductor;
+ }
+
+ public void addInductor(ELNTComponentInductor _inductor){
+ inductor.add(_inductor);
+ }
+
+ public LinkedList<ELNTComponentNodeRef> getNodeRef() {
+ return nodeRef;
+ }
+
+ public void addNodeRef(ELNTComponentNodeRef _nodeRef){
+ nodeRef.add(_nodeRef);
+ }
+
+ public LinkedList<ELNTComponentResistor> getResistor() {
+ return resistor;
+ }
+
+ public void addResistor(ELNTComponentResistor _resistor){
+ resistor.add(_resistor);
+ }
+
+ public LinkedList<ELNTComponentTransmissionLine> getTransmissionLine() {
+ return transmissionLine;
+ }
+
+ public void addTransmissionLine(ELNTComponentTransmissionLine _transmissionLine){
+ transmissionLine.add(_transmissionLine);
+ }
+
+ public LinkedList<ELNTComponentVoltageControlledCurrentSource> getVccs() {
+ return vccs;
+ }
+
+ public void addVccs(ELNTComponentVoltageControlledCurrentSource _vccs){
+ vccs.add(_vccs);
+ }
+
+ public LinkedList<ELNTComponentVoltageControlledVoltageSource> getVcvs() {
+ return vcvs;
+ }
+
+ public void addVcvs(ELNTComponentVoltageControlledVoltageSource _vcvs){
+ vcvs.add(_vcvs);
+ }
+
+ public LinkedList<ELNTComponentCurrentSinkTDF> getTDF_isink() {
+ return TDF_isink;
+ }
+
+ public void addTDF_isink(ELNTComponentCurrentSinkTDF _TDF_isink){
+ TDF_isink.add(_TDF_isink);
+ }
+
+ public LinkedList<ELNTComponentCurrentSourceTDF> getTDF_isource() {
+ return TDF_isource;
+ }
+
+ public void addTDF_isource(ELNTComponentCurrentSourceTDF _TDF_isource){
+ TDF_isource.add(_TDF_isource);
+ }
+
+ public LinkedList<ELNTComponentVoltageSinkTDF> getTDF_vsink() {
+ return TDF_vsink;
+ }
+
+ public void addTDF_vsink(ELNTComponentVoltageSinkTDF _TDF_vsink){
+ TDF_vsink.add(_TDF_vsink);
+ }
+
+ public LinkedList<ELNTComponentVoltageSourceTDF> getTDF_vsource() {
+ return TDF_vsource;
+ }
+
+ public void addTDF_vsource(ELNTComponentVoltageSourceTDF _TDF_vsource){
+ TDF_vsource.add(_TDF_vsource);
+ }
+
+ public LinkedList<ELNTComponentModuleTerminal> getModuleTerminal() {
+ return moduleTerminal;
+ }
+
+ public void addModuleTerminal(ELNTComponentModuleTerminal _moduleTerminal){
+ moduleTerminal.add(_moduleTerminal);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/elntranslator/ELNTModuleTerminal.java b/src/main/java/elntranslator/ELNTModuleTerminal.java
new file mode 100644
index 0000000000000000000000000000000000000000..033766b971a1d64d17788849b9f578ce912f62fe
--- /dev/null
+++ b/src/main/java/elntranslator/ELNTModuleTerminal.java
@@ -0,0 +1,66 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package elntranslator;
+
+/**
+ * Class ELNTModuleTerminal
+ * Parameters of a ELN primitive component : module terminal
+ * Creation: 23/07/2018
+ * @version 1.0 23/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class ELNTModuleTerminal extends ELNTComponent {
+ private String name;
+
+ private ELNTModule module;
+
+ public ELNTModuleTerminal(String _name, ELNTModule _module) {
+ name = _name;
+ module = _module;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public ELNTModule getModule() {
+ return module;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/SysCAMSSpecification.java b/src/main/java/syscamstranslator/SysCAMSSpecification.java
index fcc5b90f46393baf2fc173ad439fb80792ed5e51..41ea6420f37be16a138c5fc3b0ba1b4755c00466 100644
--- a/src/main/java/syscamstranslator/SysCAMSSpecification.java
+++ b/src/main/java/syscamstranslator/SysCAMSSpecification.java
@@ -47,26 +47,26 @@ import java.util.List;
* Creation: 14/05/2018
* @version 1.0 14/05/2018
* @author Irina Kit Yan LEE
-*/
+ */
public class SysCAMSSpecification{
- private List<SysCAMSTComponent> components;
- private List<SysCAMSTConnector> connectors;
-
- public SysCAMSSpecification(List<SysCAMSTComponent> _components, List<SysCAMSTConnector> _connectors){
+ private List<SysCAMSTComponent> components;
+ private List<SysCAMSTConnector> connectors;
+
+ public SysCAMSSpecification(List<SysCAMSTComponent> _components, List<SysCAMSTConnector> _connectors){
components = _components ;
connectors = _connectors ;
}
-
- public List<SysCAMSTComponent> getComponents(){
- return components;
- }
- public List<SysCAMSTConnector> getConnectors(){
- return connectors;
- }
+ public List<SysCAMSTComponent> getComponents(){
+ return components;
+ }
+
+ public List<SysCAMSTConnector> getConnectors(){
+ return connectors;
+ }
- public LinkedList<SysCAMSTBlockTDF> getAllBlockTDF(){
+ public LinkedList<SysCAMSTBlockTDF> getAllBlockTDF(){
LinkedList<SysCAMSTBlockTDF> blocksTDF = new LinkedList<SysCAMSTBlockTDF>();
for (SysCAMSTComponent blockTDF : components) {
if (blockTDF instanceof SysCAMSTBlockTDF) {
@@ -74,93 +74,116 @@ public class SysCAMSSpecification{
}
}
return blocksTDF;
- }
-
- public LinkedList<SysCAMSTBlockDE> getAllBlockDE(){
- LinkedList<SysCAMSTBlockDE> blocksDE = new LinkedList<SysCAMSTBlockDE>();
- for (SysCAMSTComponent blockDE : components) {
- if (blockDE instanceof SysCAMSTBlockDE) {
- blocksDE.add((SysCAMSTBlockDE) blockDE);
- }
- }
- return blocksDE;
- }
-
- public LinkedList<SysCAMSTCluster> getAllCluster(){
- LinkedList<SysCAMSTCluster> clusters = new LinkedList<SysCAMSTCluster>();
- for (SysCAMSTComponent cluster : components) {
- if (cluster instanceof SysCAMSTCluster) {
- clusters.add((SysCAMSTCluster) cluster);
- }
- }
- return clusters;
- }
-
- public LinkedList<SysCAMSTPortConverter> getAllPortConverter(){
- LinkedList<SysCAMSTPortConverter> portsConv = new LinkedList<SysCAMSTPortConverter>();
- for (SysCAMSTComponent portConv : components) {
- if (portConv instanceof SysCAMSTPortConverter) {
- portsConv.add((SysCAMSTPortConverter) portConv);
- }
- }
- return portsConv;
- }
-
- public LinkedList<SysCAMSTPortTDF> getAllPortTDF(){
- LinkedList<SysCAMSTPortTDF> portsTDF = new LinkedList<SysCAMSTPortTDF>();
- for (SysCAMSTComponent portTDF : components) {
- if (portTDF instanceof SysCAMSTPortTDF) {
- portsTDF.add((SysCAMSTPortTDF) portTDF);
- }
- }
- return portsTDF;
- }
-
- public LinkedList<SysCAMSTPortDE> getAllPortDE(){
- LinkedList<SysCAMSTPortDE> portsDE = new LinkedList<SysCAMSTPortDE>();
- for (SysCAMSTComponent portDE : components) {
- if (portDE instanceof SysCAMSTPortDE) {
- portsDE.add((SysCAMSTPortDE) portDE);
- }
- }
- return portsDE;
- }
-
- public LinkedList<SysCAMSTConnector> getAllConnector(){
- LinkedList<SysCAMSTConnector> cons = new LinkedList<SysCAMSTConnector>();
- for (SysCAMSTConnector con : connectors) {
- if (con instanceof SysCAMSTConnector) {
- cons.add(con);
- }
- }
- return cons;
- }
-
- public int getNbBlockTDF(){
- return (getAllBlockTDF()).size();
- }
-
- public int getNbBlockDE(){
- return (getAllBlockDE()).size();
- }
-
- public int getNbCluster(){
- return (getAllCluster()).size();
- }
-
- public int getNbPortConverter(){
- return (getAllPortConverter()).size();
- }
-
- public int getNbPortTDF(){
- return (getAllPortTDF()).size();
- }
-
- public int getNbPortDE(){
- return (getAllPortDE()).size();
- }
-
- public int getNbConnector(){
- return (getAllConnector()).size();
- }
-}
+ }
+
+ public LinkedList<SysCAMSTBlockDE> getAllBlockDE(){
+ LinkedList<SysCAMSTBlockDE> blocksDE = new LinkedList<SysCAMSTBlockDE>();
+ for (SysCAMSTComponent blockDE : components) {
+ if (blockDE instanceof SysCAMSTBlockDE) {
+ blocksDE.add((SysCAMSTBlockDE) blockDE);
+ }
+ }
+ return blocksDE;
+ }
+
+ public LinkedList<SysCAMSTBlockGPIO2VCI> getAllBlockGPIO2VCI(){
+ LinkedList<SysCAMSTBlockGPIO2VCI> blocksGPIO2VCI = new LinkedList<SysCAMSTBlockGPIO2VCI>();
+ for (SysCAMSTComponent blockGPIO2VCI : components) {
+ if (blockGPIO2VCI instanceof SysCAMSTBlockGPIO2VCI) {
+ blocksGPIO2VCI.add((SysCAMSTBlockGPIO2VCI) blockGPIO2VCI);
+ }
+ }
+ return blocksGPIO2VCI;
+ }
+
+ public SysCAMSTCluster getCluster(){
+ for (SysCAMSTComponent comp : components) {
+ if (comp instanceof SysCAMSTCluster) {
+ return (SysCAMSTCluster) comp;
+ }
+ }
+ return null;
+ }
+
+ public LinkedList<SysCAMSTPortConverter> getAllPortConverter(){
+ LinkedList<SysCAMSTPortConverter> portsConv = new LinkedList<SysCAMSTPortConverter>();
+ for (SysCAMSTComponent portConv : components) {
+ if (portConv instanceof SysCAMSTPortConverter) {
+ portsConv.add((SysCAMSTPortConverter) portConv);
+ }
+ }
+ return portsConv;
+ }
+
+ public LinkedList<SysCAMSTPortTDF> getAllPortTDF(){
+ LinkedList<SysCAMSTPortTDF> portsTDF = new LinkedList<SysCAMSTPortTDF>();
+ for (SysCAMSTComponent portTDF : components) {
+ if (portTDF instanceof SysCAMSTPortTDF) {
+ portsTDF.add((SysCAMSTPortTDF) portTDF);
+ }
+ }
+ return portsTDF;
+ }
+
+ public LinkedList<SysCAMSTPortDE> getAllPortDE(){
+ LinkedList<SysCAMSTPortDE> portsDE = new LinkedList<SysCAMSTPortDE>();
+ for (SysCAMSTComponent portDE : components) {
+ if (portDE instanceof SysCAMSTPortDE) {
+ portsDE.add((SysCAMSTPortDE) portDE);
+ }
+ }
+ return portsDE;
+ }
+
+ public LinkedList<SysCAMSTConnector> getAllConnectorCluster(){
+ LinkedList<SysCAMSTConnector> cons = new LinkedList<SysCAMSTConnector>();
+ for (SysCAMSTConnector con : connectors) {
+ if (con instanceof SysCAMSTConnector) {
+ if (con.get_p1().getComponent() instanceof SysCAMSTPortTDF && con.get_p2().getComponent() instanceof SysCAMSTPortTDF) {
+ cons.add(con);
+ } else if (con.get_p1().getComponent() instanceof SysCAMSTPortConverter && con.get_p2().getComponent() instanceof SysCAMSTPortDE) {
+ if (((SysCAMSTPortDE) con.get_p2().getComponent()).getBlockDE() != null) {
+ if ((((SysCAMSTPortDE) con.get_p2().getComponent()).getBlockDE()).getCluster() != null ) {
+ cons.add(con);
+ }
+ }
+ } else if (con.get_p2().getComponent() instanceof SysCAMSTPortConverter && con.get_p1().getComponent() instanceof SysCAMSTPortDE) {
+ if (((SysCAMSTPortDE) con.get_p1().getComponent()).getBlockDE() != null) {
+ if ((((SysCAMSTPortDE) con.get_p2().getComponent()).getBlockDE()).getCluster() != null ) {
+ cons.add(con);
+ }
+ }
+ }
+ }
+ }
+ return cons;
+ }
+
+ public int getNbBlockTDF(){
+ return (getAllBlockTDF()).size();
+ }
+
+ public int getNbBlockDE(){
+ return (getAllBlockDE()).size();
+ }
+
+ public int getNbBlockGPIO2VCI(){
+ return (getAllBlockGPIO2VCI()).size();
+ }
+
+ public int getNbPortConverter(){
+ return (getAllPortConverter()).size();
+ }
+
+ public int getNbPortTDF(){
+ return (getAllPortTDF()).size();
+ }
+
+ public int getNbPortDE(){
+ return (getAllPortDE()).size();
+ }
+
+ public int getNbConnectorCluster(){
+ return (getAllConnectorCluster()).size();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/SysCAMSTBlockGPIO2VCI.java b/src/main/java/syscamstranslator/SysCAMSTBlockGPIO2VCI.java
new file mode 100644
index 0000000000000000000000000000000000000000..2dec60f9ee1fe2e15f108f3f33b510590782344f
--- /dev/null
+++ b/src/main/java/syscamstranslator/SysCAMSTBlockGPIO2VCI.java
@@ -0,0 +1,66 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package syscamstranslator;
+
+import java.util.LinkedList;
+
+/**
+ * Class SysCAMSTBlockGPIO2VCI
+ * Parameters of a SystemC-AMS block GPIO2VCI
+ * Creation: 13/07/2018
+ * @version 1.0 13/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class SysCAMSTBlockGPIO2VCI extends SysCAMSTComponent {
+
+ private LinkedList<SysCAMSTPortDE> portDE;
+
+ public SysCAMSTBlockGPIO2VCI() {
+ portDE = new LinkedList<SysCAMSTPortDE>();
+ }
+
+ public LinkedList<SysCAMSTPortDE> getPortDE(){
+ return portDE;
+ }
+
+ public void addPortDE(SysCAMSTPortDE de){
+ portDE.add(de);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/SysCAMSTPortDE.java b/src/main/java/syscamstranslator/SysCAMSTPortDE.java
index fd8f1ba90f808ff609afd3efe7b5589498871602..3ef0d4c8adc383253d7dc3168419cd8aa2055f9e 100644
--- a/src/main/java/syscamstranslator/SysCAMSTPortDE.java
+++ b/src/main/java/syscamstranslator/SysCAMSTPortDE.java
@@ -59,6 +59,7 @@ public class SysCAMSTPortDE extends SysCAMSTComponent {
private String sensitiveMethod;
private SysCAMSTBlockDE blockDE;
+ private SysCAMSTBlockGPIO2VCI blockGPIO2VCI;
public SysCAMSTPortDE(String _name, int _origin, String _DEType, boolean _sensitive, String _sensitiveMethod, SysCAMSTBlockDE _blockDE) {
name = _name;
@@ -72,6 +73,19 @@ public class SysCAMSTPortDE extends SysCAMSTComponent {
sensitiveMethod = _sensitiveMethod;
blockDE = _blockDE;
}
+
+ public SysCAMSTPortDE(String _name, int _origin, String _DEType, boolean _sensitive, String _sensitiveMethod, SysCAMSTBlockGPIO2VCI _blockGPIO2VCI) {
+ name = _name;
+// period = _period;
+// time = _time;
+// rate = _rate;
+// delay = _delay;
+ origin = _origin;
+ DEType = _DEType;
+ sensitive = _sensitive;
+ sensitiveMethod = _sensitiveMethod;
+ blockGPIO2VCI = _blockGPIO2VCI;
+ }
public String getName() {
return name;
@@ -109,7 +123,11 @@ public class SysCAMSTPortDE extends SysCAMSTComponent {
return sensitiveMethod;
}
- public SysCAMSTBlockDE getBlockTDF() {
+ public SysCAMSTBlockDE getBlockDE() {
return blockDE;
}
+
+ public SysCAMSTBlockGPIO2VCI getBlockGPIO2VCI() {
+ return blockGPIO2VCI;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/toSysCAMS/ClusterCode.java b/src/main/java/syscamstranslator/toSysCAMS/ClusterCode.java
index c0ef273a672a11bb6bf33694de112c9e2b128ccc..1e32f520c86fd5bde2ea7f63541c885c00edd8e5 100644
--- a/src/main/java/syscamstranslator/toSysCAMS/ClusterCode.java
+++ b/src/main/java/syscamstranslator/toSysCAMS/ClusterCode.java
@@ -70,6 +70,7 @@ public class ClusterCode {
if (cluster != null) {
LinkedList<SysCAMSTBlockTDF> tdf = cluster.getBlockTDF();
+ LinkedList<SysCAMSTBlockDE> de = cluster.getBlockDE();
corpsCluster = "// Simulation entry point." + CR + "int sc_main(int argc, char *argv[]) {" + CR2
+ "\tusing namespace sc_core;" + CR + "\tusing namespace sca_util;" + CR2;
@@ -77,26 +78,79 @@ public class ClusterCode {
corpsCluster = corpsCluster + "\t// Declare signal to interconnect." + CR;
for (SysCAMSTConnector c : connectors) {
- corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortTDF) c.get_p1().getComponent()).getTDFType() + "> "
- + "sig_" + nb_con + "(\""
- + "sig_" + nb_con + "\");" + CR;
- nb_con++;
+ if (c.get_p1().getComponent() instanceof SysCAMSTPortTDF) {
+ corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortTDF) c.get_p1().getComponent()).getTDFType() + "> "
+ + "sig_" + nb_con + "(\""
+ + "sig_" + nb_con + "\");" + CR;
+ nb_con++;
+ } else if (c.get_p1().getComponent() instanceof SysCAMSTPortConverter) {
+ corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortConverter) c.get_p1().getComponent()).getConvType() + "> "
+ + "sig_" + nb_con + "(\""
+ + "sig_" + nb_con + "\");" + CR;
+ nb_con++;
+ } else if (c.get_p1().getComponent() instanceof SysCAMSTPortDE) {
+ corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortDE) c.get_p1().getComponent()).getDEType() + "> "
+ + "sig_" + nb_con + "(\""
+ + "sig_" + nb_con + "\");" + CR;
+ nb_con++;
+ }
}
-
+
corpsCluster = corpsCluster + CR + "\t// Instantiate headers files as well as bind their ports to the signal." + CR;
for (SysCAMSTBlockTDF t : tdf) {
corpsCluster = corpsCluster + "\t" + t.getName() + " " + t.getName() + "_" + nb_block + "(\"" + t.getName() + "_" + nb_block + "\");" + CR;
- LinkedList<SysCAMSTPortTDF> port = t.getPortTDF();
- for (SysCAMSTPortTDF p : port) {
- corpsCluster = corpsCluster + "\t" + t.getName() + "_" + nb_block + "." + p.getName() + "(";
+ LinkedList<SysCAMSTPortTDF> portTDF = t.getPortTDF();
+ LinkedList<SysCAMSTPortConverter> portConv = t.getPortConverter();
+
+ for (SysCAMSTPortTDF p : portTDF) {
+ for (int i = 0; i < connectors.size(); i++) {
+ nb_con = i+1;
+ if (connectors.get(i).get_p1().getComponent() instanceof SysCAMSTPortTDF) {
+ if (((SysCAMSTPortTDF) connectors.get(i).get_p1().getComponent()).getName().equals(p.getName()) && ((SysCAMSTPortTDF) connectors.get(i).get_p1().getComponent()).getBlockTDF().getName().equals(t.getName())) {
+ corpsCluster = corpsCluster + "\t" + t.getName() + "_" + nb_block + "." + p.getName() + "(" + "sig_" + nb_con + ");" + CR;
+ } else if (((SysCAMSTPortTDF) connectors.get(i).get_p2().getComponent()).getName().equals(p.getName()) && ((SysCAMSTPortTDF) connectors.get(i).get_p2().getComponent()).getBlockTDF().getName().equals(t.getName())) {
+ corpsCluster = corpsCluster + "\t" + t.getName() + "_" + nb_block + "." + p.getName() + "(" + "sig_" + nb_con + ");" + CR;
+ }
+ }
+ }
+ }
+
+ for (SysCAMSTPortConverter p : portConv) {
+ for (int i = 0; i < connectors.size(); i++) {
+ nb_con = i+1;
+ if (connectors.get(i).get_p1().getComponent() instanceof SysCAMSTPortConverter) {
+ if (((SysCAMSTPortConverter) connectors.get(i).get_p1().getComponent()).getName().equals(p.getName()) && ((SysCAMSTPortConverter) connectors.get(i).get_p1().getComponent()).getBlockTDF().getName().equals(t.getName())) {
+ corpsCluster = corpsCluster + "\t" + t.getName() + "_" + nb_block + "." + p.getName() + "(" + "sig_" + nb_con + ");" + CR;
+ }
+ } else if (connectors.get(i).get_p2().getComponent() instanceof SysCAMSTPortConverter) {
+ if (((SysCAMSTPortConverter) connectors.get(i).get_p2().getComponent()).getName().equals(p.getName()) && ((SysCAMSTPortConverter) connectors.get(i).get_p2().getComponent()).getBlockTDF().getName().equals(t.getName())) {
+ corpsCluster = corpsCluster + "\t" + t.getName() + "_" + nb_block + "." + p.getName() + "(" + "sig_" + nb_con + ");" + CR;
+ }
+ }
+ }
+ }
+ corpsCluster = corpsCluster + CR;
+ nb_block++;
+ }
+
+ for (SysCAMSTBlockDE t : de) {
+ corpsCluster = corpsCluster + "\t" + t.getName() + " " + t.getName() + "_" + nb_block + "(\"" + t.getName() + "_" + nb_block + "\");" + CR;
+
+ LinkedList<SysCAMSTPortDE> portDE = t.getPortDE();
+
+ for (SysCAMSTPortDE p : portDE) {
for (int i = 0; i < connectors.size(); i++) {
nb_con = i+1;
- if (((SysCAMSTPortTDF) connectors.get(i).get_p1().getComponent()).getName().equals(p.getName())) {
- corpsCluster = corpsCluster + "sig_" + nb_con + ");" + CR;
- } else if (((SysCAMSTPortTDF) connectors.get(i).get_p2().getComponent()).getName().equals(p.getName())) {
- corpsCluster = corpsCluster + "sig_" + nb_con + ");" + CR;
+ if (connectors.get(i).get_p1().getComponent() instanceof SysCAMSTPortDE) {
+ if (((SysCAMSTPortDE) connectors.get(i).get_p1().getComponent()).getName().equals(p.getName()) && ((SysCAMSTPortDE) connectors.get(i).get_p1().getComponent()).getBlockDE().getName().equals(t.getName())) {
+ corpsCluster = corpsCluster + "\t" + t.getName() + "_" + nb_block + "." + p.getName() + "(" + "sig_" + nb_con + ");" + CR;
+ }
+ } else if (connectors.get(i).get_p2().getComponent() instanceof SysCAMSTPortDE) {
+ if (((SysCAMSTPortDE) connectors.get(i).get_p2().getComponent()).getName().equals(p.getName()) && ((SysCAMSTPortDE) connectors.get(i).get_p2().getComponent()).getBlockDE().getName().equals(t.getName())) {
+ corpsCluster = corpsCluster + "\t" + t.getName() + "_" + nb_block + "." + p.getName() + "(" + "sig_" + nb_con + ");" + CR;
+ }
}
}
}
@@ -109,10 +163,10 @@ public class ClusterCode {
nb_con = 1;
for (int i = 0; i < connectors.size(); i++) {
- corpsCluster = corpsCluster + "\tsca_trace(tfp, "+ "sig_" + nb_con + ", \"" + "sig_" + nb_con + "\");";
+ corpsCluster = corpsCluster + "\tsca_trace(tfp, "+ "sig_" + nb_con + ", \"" + "sig_" + nb_con + "\");" + CR;
nb_con++;
}
- corpsCluster = corpsCluster + CR2 + "\t// Start simulation." + CR + "\tsc_start(100.0, SC_MS);" + CR2
+ corpsCluster = corpsCluster + CR + "\t// Start simulation." + CR + "\tsc_start(100.0, SC_MS);" + CR2
+ "\t// Close trace file and stop simulation to enable clean-up by" + CR
+ "\t// asking SystemC to execute all end_of_simulation() callbacks." + CR
+ "\tsca_close_tabular_trace_file(tfp);" + CR
diff --git a/src/main/java/syscamstranslator/toSysCAMS/MakefileCode.java b/src/main/java/syscamstranslator/toSysCAMS/MakefileCode.java
index 78ee4168d6fb64c97cc5e4ae998ac81ba3a688c4..6080c5e4dd30844b5e12be61e623727f1f168627 100644
--- a/src/main/java/syscamstranslator/toSysCAMS/MakefileCode.java
+++ b/src/main/java/syscamstranslator/toSysCAMS/MakefileCode.java
@@ -50,41 +50,64 @@ import java.util.LinkedList;
import syscamstranslator.*;
/**
- * Class MakefileCode
- * Principal code of a makefile
- * Creation: 02/06/2018
+ * Class MakefileCode Principal code of a makefile Creation: 02/06/2018
+ *
* @version 1.0 02/06/2018
* @author Irina Kit Yan LEE
-*/
+ */
public class MakefileCode {
static private String corpsMakefile;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
- MakefileCode() {}
+ MakefileCode() {
+ }
- public static String getMakefileCode(SysCAMSTCluster cluster) {
- if (cluster != null) {
- LinkedList<SysCAMSTBlockTDF> tdf = cluster.getBlockTDF();
-
- corpsMakefile = "# Compiler and linker flags" + CR + "CXXFLAGS = -g -Wall -I. $(SYSTEMC_INCLUDE_DIRS)" + CR
+ public static String getMakefileCode(LinkedList<SysCAMSTCluster> clusters) {
+ if (clusters != null) {
+ corpsMakefile = "# Compiler and linker flags" + CR + "CXXFLAGS = -g -Wall -I. $(SYSTEMC_INCLUDE_DIRS)" + CR
+ "LDFLAGS = $(SYSTEMC_LIBRARY_DIRS)" + CR2 + "# List of all ecutables to be compiled" + CR
- + "EXECUTABLES = " + cluster.getClusterName() + "_tb" + CR2 + "# .PHONY targets don't generate files" + CR
- + ".PHONY: all clean" + CR2 + "# Default targets" + CR + "all: $(EXECUTABLES)" + CR2;
-
- corpsMakefile = corpsMakefile + cluster.getClusterName() + "_tb: " + cluster.getClusterName() + "_tb.cpp";
-
- for (SysCAMSTBlockTDF t : tdf) {
- corpsMakefile = corpsMakefile + " " + t.getName() + ".h";
+ + "EXECUTABLES = ";
+
+ for (int i = 0; i < clusters.size(); i++) {
+ if (i == 0) {
+ corpsMakefile = corpsMakefile + clusters.get(i).getClusterName() + "_tb";
+ }
+ if (i > 0) {
+ corpsMakefile = corpsMakefile + " " + clusters.get(i).getClusterName() + "_tb";
+ }
+ if (i == clusters.size() - 1) {
+ corpsMakefile = corpsMakefile + CR2;
+ }
}
-
- corpsMakefile = corpsMakefile + CR + "\t$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -lsystemc-ams -lsystemc | c++filt"
- + CR2 + "# Clean rule to delete temporary and generated files" + CR + "clean:" + CR
- + "\trm -rf *~ *.o *.dat *.vcd *.dSYM $(EXECUTABLES)" + CR;
+
+ corpsMakefile = corpsMakefile + "# .PHONY targets don't generate files" + CR + ".PHONY: all clean" + CR2
+ + "# Default targets" + CR + "all: $(EXECUTABLES)" + CR2;
+
+ for (int i = 0; i < clusters.size(); i++) {
+ LinkedList<SysCAMSTBlockTDF> tdf = clusters.get(i).getBlockTDF();
+ LinkedList<SysCAMSTBlockDE> de = clusters.get(i).getBlockDE();
+
+ corpsMakefile = corpsMakefile + clusters.get(i).getClusterName() + "_tb: "
+ + clusters.get(i).getClusterName() + "_tb.cpp";
+
+ for (SysCAMSTBlockTDF t : tdf) {
+ corpsMakefile = corpsMakefile + " " + t.getName() + ".h";
+ }
+
+ for (SysCAMSTBlockDE t : de) {
+ corpsMakefile = corpsMakefile + " " + t.getName() + ".h";
+ }
+ corpsMakefile = corpsMakefile + CR
+ + "\t$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -lsystemc-ams -lsystemc | c++filt" + CR2;
+ }
+
+ corpsMakefile = corpsMakefile + "# Clean rule to delete temporary and generated files" + CR + "clean:" + CR
+ + "\trm -rf *~ *.o *.dat *.vcd *.dSYM $(EXECUTABLES)" + CR;
} else {
corpsMakefile = "";
}
return corpsMakefile;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java b/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java
index 00e81e49ced8524e31ac19f7603f0a877148163e..d088f050c8c8bedfb37121efd5b8fc9a7b814262 100644
--- a/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java
+++ b/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java
@@ -74,7 +74,7 @@ public class PrimitiveCode {
int cpt = 0;
int cpt2 = 0;
- if ((!tdf.getTypeTemplate().equals("")) || (!tdf.getNameTemplate().equals(""))) {
+ if ((!tdf.getTypeTemplate().equals("")) && (!tdf.getNameTemplate().equals(""))) {
corpsPrimitiveTDF = corpsPrimitiveTDF + "template<" + tdf.getTypeTemplate() + " " + tdf.getNameTemplate() + ">" + CR;
}
//corpsPrimitive = "SCA_TDF_MODULE(" + tdf.getName() + ") {" + CR2;
@@ -132,13 +132,14 @@ public class PrimitiveCode {
}
if (i == tdf.getListStruct().getSize()-1 && i != 0) {
corpsPrimitiveTDF = corpsPrimitiveTDF + "\t\t, " + identifier + "(" + value + ")" + CR + "\t\t{}" + CR;
+ } else {
+ corpsPrimitiveTDF = corpsPrimitiveTDF + "\t\t{}" + CR;
}
}
- corpsPrimitiveTDF = corpsPrimitiveTDF + "\t};" + CR;
+ corpsPrimitiveTDF = corpsPrimitiveTDF + "\t};" + CR2;
}
if (!tdfports.isEmpty()) {
- corpsPrimitiveTDF = corpsPrimitiveTDF + CR;
for (SysCAMSTPortTDF t : tdfports) {
if (t.getOrigin() == 0) {
corpsPrimitiveTDF = corpsPrimitiveTDF + "\tsca_tdf::sca_in<" + t.getTDFType() + "> " + t.getName() + ";" + CR;
@@ -148,7 +149,6 @@ public class PrimitiveCode {
}
}
if (!convports.isEmpty()) {
- corpsPrimitiveTDF = corpsPrimitiveTDF + CR;
for (SysCAMSTPortConverter conv : convports) {
if (conv.getOrigin() == 0) {
corpsPrimitiveTDF = corpsPrimitiveTDF + "\tsca_tdf::sca_de::sca_in<" + conv.getConvType() + "> " + conv.getName() + ";" + CR;
@@ -205,7 +205,7 @@ public class PrimitiveCode {
String select = tdf.getListStruct().get(i);
String[] splita = select.split(" = ");
identifier = splita[0];
- if (tdf.getListStruct().getSize() > 1) {
+ if (tdf.getListStruct().getSize() >= 1) {
if (cpt == 0) {
corpsPrimitiveTDF = corpsPrimitiveTDF + identifier + "(p." + identifier + ")" + CR;
cpt++;
@@ -385,7 +385,7 @@ public class PrimitiveCode {
int cpt = 0;
int cpt2 = 0;
- if ((!de.getTypeTemplate().equals("")) || (!de.getNameTemplate().equals(""))) {
+ if ((!de.getTypeTemplate().equals("")) && (!de.getNameTemplate().equals(""))) {
corpsPrimitiveDE = corpsPrimitiveDE + "template<" + de.getTypeTemplate() + " " + de.getNameTemplate() + ">" + CR;
}
//corpsPrimitive = "SCA_TDF_MODULE(" + de.getName() + ") {" + CR2;
@@ -443,13 +443,14 @@ public class PrimitiveCode {
}
if (i == de.getListStruct().getSize()-1 && i != 0) {
corpsPrimitiveDE = corpsPrimitiveDE + "\t\t, " + identifier + "(" + value + ")" + CR + "\t\t{}" + CR;
+ } else {
+ corpsPrimitiveDE = corpsPrimitiveDE + "\t\t{}" + CR;
}
}
- corpsPrimitiveDE = corpsPrimitiveDE + "\t};" + CR;
+ corpsPrimitiveDE = corpsPrimitiveDE + "\t};" + CR2;
}
if (!deports.isEmpty()) {
- corpsPrimitiveDE = corpsPrimitiveDE + CR;
for (SysCAMSTPortDE t : deports) {
if (t.getOrigin() == 0) {
corpsPrimitiveDE = corpsPrimitiveDE + "\tsca_core::sca_in<" + t.getDEType() + "> " + t.getName() + ";" + CR;
@@ -532,6 +533,34 @@ public class PrimitiveCode {
corpsPrimitiveDE = corpsPrimitiveDE + "\t{}" + CR2;
}
+ corpsPrimitiveDE = corpsPrimitiveDE + "private:" + CR;
+
+ if (de.getListStruct().getSize() != 0) {
+ String identifier, type, constant;
+ for (int i = 0; i < de.getListStruct().size(); i++) {
+ String select = de.getListStruct().get(i);
+ String[] splita = select.split(" = ");
+ identifier = splita[0];
+ String[] splitb = splita[1].split(" : ");
+ String[] splitc = splitb[1].split(" ");
+ if (splitc[0].equals("const")) {
+ constant = splitc[0];
+ type = splitc[1];
+ } else {
+ constant = "";
+ type = splitc[0];
+ }
+ if (constant.equals("")) {
+ corpsPrimitiveDE = corpsPrimitiveDE + "\t" + type + " " + identifier + ";" + CR;
+ } else {
+ corpsPrimitiveDE = corpsPrimitiveDE + "\t" + constant + " " + type + " " + identifier + ";" + CR;
+ }
+ if (i == de.getListStruct().size()-1) {
+ corpsPrimitiveDE = corpsPrimitiveDE + CR;
+ }
+ }
+ }
+
StringBuffer pcbuf = new StringBuffer(de.getCode());
StringBuffer buffer = new StringBuffer("");
int tab = 0;
@@ -565,33 +594,9 @@ public class PrimitiveCode {
}
String pc = buffer.toString();
- corpsPrimitiveDE = corpsPrimitiveDE + "protected:" + CR + "\t" + pc + CR;
-
- if (de.getListStruct().getSize() != 0) {
- corpsPrimitiveDE = corpsPrimitiveDE + "private:" + CR;
-
- String identifier, type, constant;
- for (int i = 0; i < de.getListStruct().size(); i++) {
- String select = de.getListStruct().get(i);
- String[] splita = select.split(" = ");
- identifier = splita[0];
- String[] splitb = splita[1].split(" : ");
- String[] splitc = splitb[1].split(" ");
- if (splitc[0].equals("const")) {
- constant = splitc[0];
- type = splitc[1];
- } else {
- constant = "";
- type = splitc[0];
- }
- if (constant.equals("")) {
- corpsPrimitiveDE = corpsPrimitiveDE + "\t" + type + " " + identifier + ";" + CR;
- } else {
- corpsPrimitiveDE = corpsPrimitiveDE + "\t" + constant + " " + type + " " + identifier + ";" + CR;
- }
- }
- }
- corpsPrimitiveDE = corpsPrimitiveDE + "};" + CR2 + "#endif" + " // " + de.getName().toUpperCase() + "_H";
+ corpsPrimitiveDE = corpsPrimitiveDE + "\t" + pc;
+
+ corpsPrimitiveDE = corpsPrimitiveDE + CR + "};" + CR2 + "#endif" + " // " + de.getName().toUpperCase() + "_H";
} else {
corpsPrimitiveDE = "";
}
diff --git a/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
index 381d6f5fbcaada292aef83d37b1a3ee908449bbf..bdd086cb14809db39231753ad3e2768ddb88af3c 100644
--- a/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
+++ b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
@@ -47,7 +47,6 @@
package syscamstranslator.toSysCAMS;
import syscamstranslator.*;
-
import java.io.*;
import java.util.LinkedList;
@@ -70,7 +69,7 @@ public class TopCellGenerator {
}
public String generateTopCell(SysCAMSTCluster c, LinkedList<SysCAMSTConnector> connectors) {
- if (TopCellGenerator.syscams.getNbCluster() == 0) {
+ if (c == null) {
System.out.println("***Warning: require at least one cluster***");
}
if (TopCellGenerator.syscams.getNbBlockTDF() == 0) {
@@ -88,7 +87,7 @@ public class TopCellGenerator {
if (TopCellGenerator.syscams.getNbPortConverter() == 0) {
System.out.println("***Warning: require at least one converter port***");
}
- if (TopCellGenerator.syscams.getNbConnector() == 0) {
+ if (TopCellGenerator.syscams.getNbConnectorCluster() == 0) {
System.out.println("***Warning: require at least one connector***");
}
String top = Header.getClusterHeader(c) + ClusterCode.getClusterCode(c, connectors);
@@ -96,35 +95,23 @@ public class TopCellGenerator {
}
public void saveFile(String path) {
- LinkedList<SysCAMSTCluster> clusters = TopCellGenerator.syscams.getAllCluster();
- LinkedList<SysCAMSTConnector> connectors = TopCellGenerator.syscams.getAllConnector();
-
- String top, makefile;
-
- for (SysCAMSTCluster c : clusters) {
- try {
- // Save file .cpp
- System.err.println(path + GENERATED_PATH1 + c.getClusterName() + ".cpp");
- FileWriter fw = new FileWriter(path + GENERATED_PATH1 + "/" + c.getClusterName() + "_tb.cpp");
- top = generateTopCell(c, connectors);
- fw.write(top);
- fw.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- try {
- // Save Makefile
- System.err.println(path + "Makefile");
- FileWriter fw = new FileWriter(path + "/" + "Makefile");
- makefile = MakefileCode.getMakefileCode(c);
- fw.write(makefile);
- fw.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- // Save files .h
- saveFileBlock(path, c);
+ SysCAMSTCluster cluster = TopCellGenerator.syscams.getCluster();
+ LinkedList<SysCAMSTConnector> connectors = TopCellGenerator.syscams.getAllConnectorCluster();
+
+ String top;
+
+ try {
+ // Save file .cpp
+ System.err.println(path + GENERATED_PATH1 + cluster.getClusterName() + ".cpp");
+ FileWriter fw = new FileWriter(path + GENERATED_PATH1 + "/" + cluster.getClusterName() + "_tb.cpp");
+ top = generateTopCell(cluster, connectors);
+ fw.write(top);
+ fw.close();
+ } catch (Exception ex) {
+ ex.printStackTrace();
}
+ // Save files .h
+ saveFileBlock(path, cluster);
}
public void saveFileBlock(String path, SysCAMSTCluster c) {
diff --git a/src/main/java/tmltranslator/TMLModeling.java b/src/main/java/tmltranslator/TMLModeling.java
index 31b7ead148bda8a7ed2ee2405933d96172a3b3cd..408f74b0e11737839a9e9e55a0c9b4cf2b38a877 100755
--- a/src/main/java/tmltranslator/TMLModeling.java
+++ b/src/main/java/tmltranslator/TMLModeling.java
@@ -50,6 +50,7 @@ import myutil.TraceManager;
import proverifspec.ProVerifOutputAnalyzer;
import proverifspec.ProVerifQueryAuthResult;
import proverifspec.ProVerifQueryResult;
+import proverifspec.ProVerifResultTrace;
import ui.TAttribute;
import ui.tmlcompd.TMLCPrimitiveComponent;
import ui.tmlcompd.TMLCPrimitivePort;
@@ -806,6 +807,12 @@ public class TMLModeling<E> {
if (port.checkConf && !invalidate){
port.checkConfStatus = r;
port.mappingName= mappingName;
+ //Add Result Trace also
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -857,14 +864,16 @@ public class TMLModeling<E> {
}
}*/
}
+ //
}
public TGComponent getTGComponent(){
return (TGComponent) getTasks().get(0).getReferenceObject();
}
- public void backtraceAuthenticity(Map<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> authenticityResults, String mappingName) {
+ public void backtraceAuthenticity(ProVerifOutputAnalyzer pvoa, String mappingName) {
// TraceManager.addDev("Backtracing Authenticity");
+ Map<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> authenticityResults = pvoa.getAuthenticityResults();
for (AvatarPragmaAuthenticity pragma: authenticityResults.keySet()) {
ProVerifQueryAuthResult result = authenticityResults.get(pragma);
// TODO: deal directly with pragma instead of s
@@ -885,6 +894,11 @@ public class TMLModeling<E> {
if (port.checkAuth){
port.checkStrongAuthStatus = 3;
port.mappingName= mappingName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -932,6 +946,11 @@ public class TMLModeling<E> {
port.checkStrongAuthStatus = 3;
TraceManager.addDev("not verified " + signalName);
port.secName= signalName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -958,6 +977,11 @@ public class TMLModeling<E> {
if (port.checkAuth){
port.checkWeakAuthStatus = 3;
port.secName= signalName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -976,7 +1000,12 @@ public class TMLModeling<E> {
if (port.checkAuth){
port.checkWeakAuthStatus = 2;
port.mappingName= mappingName;
- }
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
+ }
}
}
signalName = s.split("_reqData")[0];
@@ -1028,6 +1057,11 @@ public class TMLModeling<E> {
if (port.checkAuth){
port.checkWeakAuthStatus = 2;
port.secName= signalName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -1054,6 +1088,11 @@ public class TMLModeling<E> {
if (port.checkAuth){
port.checkWeakAuthStatus = 2;
port.secName= signalName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -1076,6 +1115,11 @@ public class TMLModeling<E> {
if (port.checkAuth){
port.checkStrongAuthStatus = 2;
port.mappingName= mappingName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -1128,9 +1172,14 @@ public class TMLModeling<E> {
if (channel!=null){
for (TMLCPrimitivePort port:channel.ports){
// TraceManager.addDev("adding to port " + channelName);
- if (port.checkAuth){
+ if (port.checkAuth){
port.checkStrongAuthStatus = 2;
port.secName= signalName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -1158,6 +1207,11 @@ public class TMLModeling<E> {
if (port.checkAuth){
port.checkStrongAuthStatus = 2;
port.secName= signalName;
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace !=null){
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
@@ -1181,6 +1235,8 @@ public class TMLModeling<E> {
port.checkStrongAuthStatus = 1;
port.checkWeakAuthStatus=1;
}
+ port.setResultTrace(null);
+ port.setPragmaString("");
}
}
for (TMLRequest req: getRequests()){
diff --git a/src/main/java/tmltranslator/toavatar/TML2Avatar.java b/src/main/java/tmltranslator/toavatar/TML2Avatar.java
index f82f2a6bdec1f7a69901ca6647025ca1500c9ef1..cac9761a2308ad90b69ee9b3e26dbca7ed6c6143 100644
--- a/src/main/java/tmltranslator/toavatar/TML2Avatar.java
+++ b/src/main/java/tmltranslator/toavatar/TML2Avatar.java
@@ -94,7 +94,7 @@ public class TML2Avatar {
this.tmlmap = tmlmap;
this.tmlmodel = tmlmap.getTMLModeling();
-
+
allStates = new ArrayList<String>();
attrsToCheck = new ArrayList<String>();
@@ -674,7 +674,7 @@ public class TML2Avatar {
} else if (ae instanceof TMLActivityElementWithAction) {
//Might be encrypt or decrypt
- AvatarState as = new AvatarState(ae.getValue().replaceAll(" ", "") + "_" + ae.getName().replaceAll(" ", ""), ae.getReferenceObject());
+ AvatarState as = new AvatarState(ae.getValue().replaceAll(" ", "").replaceAll("\\*","").replaceAll("\\+","").replaceAll("\\-","") + "_" + ae.getName().replaceAll(" ", "").replaceAll("\\*","").replaceAll("\\+","").replaceAll("\\-",""), ae.getReferenceObject());
tran = new AvatarTransition(block, "__after_" + ae.getName(), ae.getReferenceObject());
as.addNext(tran);
elementList.add(as);
@@ -1481,7 +1481,31 @@ public class TML2Avatar {
this.avspec = new AvatarSpecification("spec", null);
}
attrsToCheck.clear();
- //tmlmodel.removeForksAndJoins();
+ tmlmodel.removeForksAndJoins();
+
+ System.out.println("MODIFIED model " + tmlmodel);
+
+ for (TMLChannel chan: tmlmodel.getChannels()){
+ System.out.println("chan " + chan);
+ TMLTask task = chan.getOriginTask();
+
+ TMLTask task2 = chan.getDestinationTask();
+ HwExecutionNode node = (HwExecutionNode) tmlmap.getHwNodeOf(task);
+ HwExecutionNode node2 = (HwExecutionNode) tmlmap.getHwNodeOf(task2);
+ if (node==null){
+ tmlmap.addTaskToHwExecutionNode(task, node2);
+ }
+
+ if (node2==null){
+ tmlmap.addTaskToHwExecutionNode(task2, node);
+ }
+
+ if (chan.getName().contains("fork__") || chan.getName().contains("FORKCHANNEL")){
+ chan.setName(chan.getName().replaceAll("__",""));
+ }
+
+ }
+
//Only set the loop limit if it's a number
String pattern = "^[0-9]{1,2}$";
Pattern r = Pattern.compile(pattern);
@@ -1760,6 +1784,7 @@ public class TML2Avatar {
AvatarBlock fifo = new AvatarBlock("FIFO", avspec,null);
for (TMLChannel channel:tmlmodel.getChannels()){
if (channel.getName().contains("JOINCHANNEL")){
+ //System.out.println("JOINCHANNEL");
AvatarRelation ar= new AvatarRelation(channel.getName(), taskBlockMap.get(channel.getOriginTask()), taskBlockMap.get(channel.getDestinationTask()), channel.getReferenceObject());
ar.setPrivate(false);
if (channel.getType()==TMLChannel.BRBW){
@@ -1823,7 +1848,56 @@ public class TML2Avatar {
}
avspec.addRelation(ar);
}
+
+ else if (channel.getName().contains("FORKCHANNEL") || channel.getName().contains("fork__")){
+ System.out.println("FORKCHANNEL " + channel.getName());
+ AvatarRelation ar= new AvatarRelation(channel.getName(), taskBlockMap.get(channel.getOriginTask()), taskBlockMap.get(channel.getDestinationTask()), channel.getReferenceObject());
+ ar.setPrivate(false);
+
+ //System.out.println(channel.getName() + " " +channel.getOriginTask().getName() + " " + channel.getDestinationTask().getName());
+ //Find in signal
+ //Sig1 contains IN Signals, Sig2 contains OUT signals
+ List<AvatarSignal> sig1 = new ArrayList<AvatarSignal>();
+ List<AvatarSignal> sig2 = new ArrayList<AvatarSignal>();
+ for (AvatarSignal sig: taskBlockMap.get(channel.getDestinationTask()).getSignals()){
+ if (sig.getInOut()==AvatarSignal.IN){
+ String name = sig.getName();
+ String tmp = getName(channel.getName());
+ if (name.equals(tmp.split("FORK")[tmp.split("FORK").length-1]) || name.equals(tmp)){
+ sig1.add(sig);
+ }
+ }
+ }
+ for (AvatarSignal sig: taskBlockMap.get(channel.getOriginTask()).getSignals()){
+ if (sig.getInOut()==AvatarSignal.OUT){
+ String name = sig.getName();
+ String tmp = getName(channel.getName());
+ if (name.equals(tmp.split("FORK")[tmp.split("FORK").length-1]) || name.equals(tmp)){
+ sig2.add(sig);
+ }
+ }
+ }
+ if (sig1.size()==1 && sig2.size()==1){
+ if (channel.getType()==TMLChannel.NBRNBW && mc){
+ AvatarSignal read = fifo.getSignalByName("readSignal");
+
+ ar.block2= fifo;
+ //Set IN signal with read
+ ar.addSignals(sig1.get(0), read);
+ AvatarRelation ar2= new AvatarRelation(channel.getName()+"2", fifo, taskBlockMap.get(channel.getDestinationTask()), channel.getReferenceObject());
+ AvatarSignal write = fifo.getSignalByName("writeSignal");
+ //set OUT signal with write
+ ar2.addSignals(write, sig2.get(0));
+ ar2.setAsynchronous(false);
+ avspec.addRelation(ar2);
+ }
+ else {
+ ar.addSignals(sig2.get(0), sig1.get(0));
+ }
+ }
+ avspec.addRelation(ar);
+ }
else if (channel.isBasicChannel()){
//System.out.println("checking channel " + channel.getName());
AvatarRelation ar= new AvatarRelation(channel.getName(), taskBlockMap.get(channel.getOriginTask()), taskBlockMap.get(channel.getDestinationTask()), channel.getReferenceObject());
@@ -1920,7 +1994,7 @@ public class TML2Avatar {
avspec.addRelation(ar);
}
else {
- System.out.println("Found non-basic channel");
+ // System.out.println("Found non-basic channel");
//If not a basic channel, create a relation between TOP block and itself
AvatarRelation relation= new AvatarRelation(channel.getName(), top, top, channel.getReferenceObject());
AvatarSignal s1 = new AvatarSignal(getName(channel.getName())+"in", AvatarSignal.IN, null);
@@ -2062,7 +2136,11 @@ public class TML2Avatar {
}
avspec.addRelation(ar);
}
+
+ // System.out.println("Avatar relations " + avspec.getRelations());
+
for (AvatarSignal sig: signals){
+ // System.out.println("signal " + sig.getName());
//check that all signals are put in relations
AvatarRelation ar = avspec.getAvatarRelationWithSignal(sig);
if (ar==null){
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
index 25672e6d04ca82b2ce28a4d78447d60835d1496d..9e0732bf046a6f7fdf6f5ea9309592552c8ec769 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
@@ -84,6 +84,8 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator
private final NamesGenerationHelper namesGen;
+
+
DiploSimulatorCodeGenerator(TMLModeling<?> _tmlm) {
this(_tmlm.getDefaultMapping());
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/Penalties.java b/src/main/java/tmltranslator/tomappingsystemc2/Penalties.java
new file mode 100644
index 0000000000000000000000000000000000000000..db0cefbb7586e8e2d8fc3af689ee4f221dedaa13
--- /dev/null
+++ b/src/main/java/tmltranslator/tomappingsystemc2/Penalties.java
@@ -0,0 +1,118 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package tmltranslator.tomappingsystemc2;
+
+
+import myutil.FileException;
+import myutil.FileUtils;
+
+import java.io.File;
+
+/**
+ * Class Penalties
+ * Management of penalty file
+ * Creation: 23/07/2018
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 23/07/2018
+ */
+public class Penalties {
+ public static final String FILE_NAME = "penalties.h";
+ private static final String NOT_ACTIVATED = "#undef PENALTIES_ENABLED";
+ private static final String ACTIVATED = "#define PENALTIES_ENABLED";
+ private static final String FILE_HEADER = "// DO NOT EDIT: AUTOMATICALLY GENERATED";
+
+ private String pathToFile;
+
+ public Penalties(String pathToFile) {
+ this.pathToFile = pathToFile;
+ }
+
+ // Return 0 in case no change, 1 if changes were made
+ // -1 in case of error
+ public int handlePenalties(boolean mustHandlePenalties) {
+ // Load file and check for current status
+ String fullPath = pathToFile + File.separator + FILE_NAME;
+ String data = "";
+ try {
+ data = FileUtils.loadFile(fullPath);
+ } catch (FileException e) {
+ return -1;
+ }
+
+ int indexU = data.indexOf(NOT_ACTIVATED);
+ int indexD = data.indexOf(ACTIVATED);
+ boolean mustChange = false;
+
+ // No penalty
+ if ((indexD == -1) && (indexD == -1)) {
+ mustChange = true;
+ } else if ((indexD > -1) && (indexD > -1)) {
+ mustChange = true;
+ } else {
+ if (indexD > -1) {
+ mustChange = mustHandlePenalties == false;
+ } else {
+ mustChange = mustHandlePenalties == true;
+ }
+ }
+
+ // Set new value if necessary
+ if (!mustChange) {
+ return 0;
+ }
+
+ data = FILE_HEADER + "\n";
+ if (mustHandlePenalties) {
+ data += ACTIVATED;
+ } else {
+ data += NOT_ACTIVATED;
+ }
+
+ try {
+ FileUtils.saveFile(fullPath, data);
+ } catch (FileException e) {
+ return -1;
+ }
+
+ return 1;
+ }
+
+}
diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index 0705e6e0cdaf4528a332a2c85b0785c5cb2c1000..2d63316ac47cc763cd7af2ac7dfe51d3a8fe3cb1 100644
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -407,6 +407,8 @@ public class ActionPerformer {
mgui.actionOnButton(TGComponentManager.EDIT, -1);
} else if (command.equals(mgui.actions[TGUIAction.ARD_REQUIREMENT].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARRD_REQUIREMENT);
+ } else if (command.equals(mgui.actions[TGUIAction.ARD_REQUIREMENT_REFERENCE].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARRD_REQUIREMENT_REFERENCE);
} else if (command.equals(mgui.actions[TGUIAction.ARD_PROPERTY].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARRD_PROPERTY);
} else if (command.equals(mgui.actions[TGUIAction.ARD_ELEMENT_REFERENCE].getActionCommand())) {
@@ -918,7 +920,7 @@ public class ActionPerformer {
} else if (command.equals(mgui.actions[TGUIAction.CAMS_BLOCK_DE].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.CAMS_BLOCK_DE);
} else if (command.equals(mgui.actions[TGUIAction.CAMS_CONNECTOR].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.CAMS_CONNECTOR);
+ mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.CAMS_CONNECTOR);
} else if (command.equals(mgui.actions[TGUIAction.CAMS_PORT_TDF].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.CAMS_PORT_TDF);
} else if (command.equals(mgui.actions[TGUIAction.CAMS_PORT_DE].getActionCommand())) {
@@ -936,7 +938,7 @@ public class ActionPerformer {
} else if (command.equals(mgui.actions[TGUIAction.ELN_EDIT].getActionCommand())){
mgui.actionOnButton(TGComponentManager.EDIT, -1);
} else if (command.equals(mgui.actions[TGUIAction.ELN_CONNECTOR].getActionCommand())){
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ELN_CONNECTOR);
+ mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.ELN_CONNECTOR);
} else if (command.equals(mgui.actions[TGUIAction.ELN_RESISTOR].getActionCommand())){
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ELN_RESISTOR);
} else if (command.equals(mgui.actions[TGUIAction.ELN_CAPACITOR].getActionCommand())){
@@ -963,6 +965,14 @@ public class ActionPerformer {
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ELN_TDF_CURRENT_SINK);
} else if (command.equals(mgui.actions[TGUIAction.ELN_MODULE].getActionCommand())){
mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ELN_MODULE);
+ } else if (command.equals(mgui.actions[TGUIAction.ELN_MODULE_TERMINAL].getActionCommand())){
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ELN_MODULE_TERMINAL);
+ } else if (command.equals(mgui.actions[TGUIAction.ELN_TOGGLE_ATTR].getActionCommand())){
+ mgui.toggleELN();
+ } else if (command.equals(mgui.actions[TGUIAction.ELN_TDF_VOLTAGE_SOURCE].getActionCommand())){
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ELN_TDF_VOLTAGE_SOURCE);
+ } else if (command.equals(mgui.actions[TGUIAction.ELN_TDF_CURRENT_SOURCE].getActionCommand())){
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.ELN_TDF_CURRENT_SOURCE);
// Attack Tree Diagrams
} else if (command.equals(mgui.actions[TGUIAction.ATD_BLOCK].getActionCommand())) {
diff --git a/src/main/java/ui/AvatarDeploymentPanelTranslator.java b/src/main/java/ui/AvatarDeploymentPanelTranslator.java
index 5855820431a89f972f34bf1089bc238e38c1e896..1950e706f161fbd115f5b12368138c0b6d939e1c 100644
--- a/src/main/java/ui/AvatarDeploymentPanelTranslator.java
+++ b/src/main/java/ui/AvatarDeploymentPanelTranslator.java
@@ -68,15 +68,15 @@ public class AvatarDeploymentPanelTranslator
*
* Other targets :
* the simhelper segment (target 3)
- * the icu segment (target 4)
- * the timer segment (target 5)
- * the fdt segment (target 6)
+ * the timer segment (target 4)
+ * the ICU segment (target 5)
+ * the DMA segment (target 6)
*
* There always is a RAM0
*/
- private int nb_target = 6;
-
+
+ private int nb_target = 0;
private int no_tty = 0;
private int no_amsCluster = 0;
@@ -127,6 +127,7 @@ public class AvatarDeploymentPanelTranslator
ICacheSets, ICacheWords, dCacheWays,
dCacheSets, dCacheWords, nb_init,
addCPUNode.getIndex (),
+ addCPUNode.getClusterIndex (),
addCPUNode.getMonitored ());
@@ -161,7 +162,7 @@ public class AvatarDeploymentPanelTranslator
int index = tty.getIndex ();
String ttyName = tty.getNodeName ();
- AvatarTTY avtty = new AvatarTTY (ttyName, index, index, index); //DG 3.7.
+ AvatarTTY avtty = new AvatarTTY (ttyName, index, index, index);
nb_target++;
avatarMap.put (dp, avtty);
@@ -293,8 +294,10 @@ public class AvatarDeploymentPanelTranslator
int nStatus = addCoproMWMRNode.getNStatus (); // nb of status registers
boolean useLLSC = addCoproMWMRNode.getUseLLSC (); // more efficient protocol. 0: not used. 1 or more -> used
int coprocType = addCoproMWMRNode.getCoprocType (); //virtual or real?
+ int cluster_address = addCoproMWMRNode.getClusterAddress ();
+
nb_init++;
- nb_target += 2; //DG 28.08. two targets as two segments of memory are created mwmr and mwmrd
+ nb_target += 2;
AvatarCoproMWMR acpMWMR;
//DG 19.09. map tasks to coproc
@@ -303,7 +306,7 @@ public class AvatarDeploymentPanelTranslator
plaps, fifoToCoprocDepth,
fifoFromCoprocDepth, nToCopro,
nFromCopro, nConfig, nStatus,
- useLLSC, coprocType);
+ useLLSC, coprocType, cluster_address);
// DG 27.04. : pourquoi deux fois new coproc? Bien: on peut mapper les tasks :)
Vector < ADDBlockArtifact > tasks =
@@ -332,7 +335,7 @@ public class AvatarDeploymentPanelTranslator
plaps, fifoToCoprocDepth,
fifoFromCoprocDepth, nToCopro,
nFromCopro, nConfig, nStatus,
- useLLSC, coprocType);
+ useLLSC, coprocType,cluster_address);
avatarMap.put (dp, acpMWMR);
avatarComponents.add (acpMWMR);
@@ -347,18 +350,17 @@ public class AvatarDeploymentPanelTranslator
ADDRAMNode addRamNode = (ADDRAMNode) dp;
String name = addRamNode.getNodeName ();
int index = addRamNode.getIndex ();
+ int cluster_index = addRamNode.getClusterIndex ();
int byteDataSize = addRamNode.getDataSize ();
//int monitored = addRamNode.getMonitored();
AvatarRAM avram =
- new AvatarRAM (name, index, byteDataSize, index,
+ new AvatarRAM (name, byteDataSize,
+ cluster_index,
index,
addRamNode.getMonitored ());
- avram.setNo_ram (index);
- int cluster_index = avram.getIndex ();
-
-
+
nb_target++;
Vector < ADDChannelArtifact > channels =
@@ -370,7 +372,7 @@ public class AvatarDeploymentPanelTranslator
String referenceDiagram =
c.getReferenceDiagram ();
String channelName = c.getChannelName ();
- //channel is inevitably on same cluster as RAM it is mapped on :)
+
AvatarChannel avcl =
new AvatarChannel (referenceDiagram,
channelName, avram,
@@ -455,7 +457,7 @@ public class AvatarDeploymentPanelTranslator
if ((((AvatarRAM) avowner_p1).getMonitored () == 2)
|| (spy == true))
- //if (((AvatarRAM)avowner_p1).getMonitored() == 2)
+
{
monitored = 2;
diff --git a/src/main/java/ui/AvatarDesignPanel.java b/src/main/java/ui/AvatarDesignPanel.java
index 5e590ebbe4eb2545c68f9ba77a42fdb5adb72072..0b3194ef27d7efe7c20a4d37d372227b87a2b6b8 100644
--- a/src/main/java/ui/AvatarDesignPanel.java
+++ b/src/main/java/ui/AvatarDesignPanel.java
@@ -45,11 +45,14 @@ import avatartranslator.AvatarAttribute;
import avatartranslator.AvatarPragmaAuthenticity;
import avatartranslator.AvatarPragmaReachability;
import avatartranslator.AvatarPragmaSecret;
+import avatartranslator.AvatarPragma;
import avatartranslator.AvatarPragmaLatency;
import myutil.GraphicLib;
import proverifspec.ProVerifOutputAnalyzer;
import proverifspec.ProVerifQueryAuthResult;
import proverifspec.ProVerifQueryResult;
+import proverifspec.ProVerifResultTrace;
+
import ui.avatarbd.*;
import ui.avatardd.ADDDiagramPanel;
import ui.avatarsmd.AvatarSMDPanel;
@@ -453,17 +456,17 @@ public class AvatarDesignPanel extends TURTLEPanel {
// Confidential attributes
Map<AvatarPragmaSecret, ProVerifQueryResult> confResults = pvoa.getConfidentialityResults();
- List<AvatarAttribute> secretAttributes = new LinkedList<AvatarAttribute> ();
- List<AvatarAttribute> nonSecretAttributes = new LinkedList<AvatarAttribute> ();
+ HashMap<AvatarAttribute, AvatarPragma> secretAttributes = new HashMap<AvatarAttribute, AvatarPragma> ();
+ HashMap<AvatarAttribute, AvatarPragma> nonSecretAttributes = new HashMap<AvatarAttribute, AvatarPragma> ();
for (AvatarPragmaSecret pragma: confResults.keySet())
{
ProVerifQueryResult result = confResults.get(pragma);
if (result.isProved())
{
if (result.isSatisfied())
- secretAttributes.add(pragma.getArg());
+ secretAttributes.put(pragma.getArg(), pragma);
else
- nonSecretAttributes.add(pragma.getArg());
+ nonSecretAttributes.put(pragma.getArg(),pragma);
}
}
@@ -474,15 +477,23 @@ public class AvatarDesignPanel extends TURTLEPanel {
int toBeFound = types.size ();
boolean ko = false;
for (TAttribute type: types) {
- for(AvatarAttribute attribute: secretAttributes)
+ for(AvatarAttribute attribute: secretAttributes.keySet())
if (attribute.getBlock ().getName ().equals (bdBlock.getBlockName ()) && attribute.getName ().equals (tattr.getId () + "__" + type.getId ())) {
toBeFound --;
+ ProVerifResultTrace trace = confResults.get(secretAttributes.get(attribute)).getTrace();
+ if (trace!=null){
+ bdBlock.addProVerifTrace(tattr, trace);
+ }
break;
}
- for(AvatarAttribute attribute: nonSecretAttributes)
+ for(AvatarAttribute attribute: nonSecretAttributes.keySet())
if (attribute.getBlock ().getName ().equals (bdBlock.getBlockName ()) && attribute.getName ().equals (tattr.getId () + "__" + type.getId ())) {
ko = true;
+ ProVerifResultTrace trace = confResults.get(nonSecretAttributes.get(attribute)).getTrace();
+ if (trace!=null){
+ bdBlock.addProVerifTrace(tattr, trace);
+ }
break;
}
@@ -490,17 +501,31 @@ public class AvatarDesignPanel extends TURTLEPanel {
break;
}
- if (ko)
+ if (ko){
tattr.setConfidentialityVerification(TAttribute.CONFIDENTIALITY_KO);
- else if (toBeFound == 0)
+
+ }
+ else if (toBeFound == 0) {
tattr.setConfidentialityVerification(TAttribute.CONFIDENTIALITY_OK);
+
+ }
} else {
- for(AvatarAttribute attribute: secretAttributes)
- if (attribute.getBlock ().getName ().equals (bdBlock.getBlockName ()) && attribute.getName ().equals (tattr.getId ()))
+ for(AvatarAttribute attribute: secretAttributes.keySet())
+ if (attribute.getBlock ().getName ().equals (bdBlock.getBlockName ()) && attribute.getName ().equals (tattr.getId ())){
tattr.setConfidentialityVerification(TAttribute.CONFIDENTIALITY_OK);
- for(AvatarAttribute attribute: nonSecretAttributes)
- if (attribute.getBlock ().getName ().equals (bdBlock.getBlockName ()) && attribute.getName ().equals (tattr.getId ()))
+ ProVerifResultTrace trace = confResults.get(secretAttributes.get(attribute)).getTrace();
+ if (trace!=null){
+ bdBlock.addProVerifTrace(tattr, trace);
+ }
+ }
+ for(AvatarAttribute attribute: nonSecretAttributes.keySet())
+ if (attribute.getBlock ().getName ().equals (bdBlock.getBlockName ()) && attribute.getName ().equals (tattr.getId ())){
tattr.setConfidentialityVerification(TAttribute.CONFIDENTIALITY_KO);
+ ProVerifResultTrace trace = confResults.get(nonSecretAttributes.get(attribute)).getTrace();
+ if (trace!=null){
+ bdBlock.addProVerifTrace(tattr, trace);
+ }
+ }
}
}
@@ -565,7 +590,7 @@ public class AvatarDesignPanel extends TURTLEPanel {
boolean weakKo = false;
boolean isNotProved = false;
boolean weakIsNotProved = false;
-
+ ProVerifQueryAuthResult result= new ProVerifQueryAuthResult(false, false);
for (TAttribute type: types) {
for (AvatarPragmaAuthenticity pragmaAuth: authResults.keySet())
{
@@ -577,7 +602,7 @@ public class AvatarDesignPanel extends TURTLEPanel {
|| !pragmaAuth.getAttrB().getState().getName().equals(argB[1].replaceAll("\\.", "__")))
continue;
- ProVerifQueryAuthResult result = authResults.get(pragmaAuth);
+ result = authResults.get(pragmaAuth);
toBeFound --;
if (result.isProved())
@@ -625,7 +650,10 @@ public class AvatarDesignPanel extends TURTLEPanel {
else
pragma.authWeakMap.put(prop, 1);
}
-
+ ProVerifResultTrace trace = result.getTrace();
+ if (trace!=null){
+ pragma.pragmaTraceMap.put(prop, trace);
+ }
} else {
for (AvatarPragmaAuthenticity pragmaAuth: authResults.keySet())
{
@@ -670,7 +698,11 @@ public class AvatarDesignPanel extends TURTLEPanel {
{
pragma.authWeakMap.put(prop, 3);
}
-
+ //Add ProVerif Result Trace to pragma
+ ProVerifResultTrace trace = pvoa.getResults().get(pragmaAuth).getTrace();
+ if (trace!=null){
+ pragma.pragmaTraceMap.put(prop, trace);
+ }
break;
}
}
diff --git a/src/main/java/ui/AvatarRequirementPanel.java b/src/main/java/ui/AvatarRequirementPanel.java
index 6639fa8e0f02aa0e22000e7a38067cae0ed99962..f0fca0f415df0ead4a7a15bf07eb07207f38ddae 100755
--- a/src/main/java/ui/AvatarRequirementPanel.java
+++ b/src/main/java/ui/AvatarRequirementPanel.java
@@ -226,5 +226,14 @@ public class AvatarRequirementPanel extends TURTLEPanel {
}
}
+ public void updateReferences() {
+ for (int i = 0; i < panels.size(); i++) {
+ TDiagramPanel tdp = panelAt(i);
+ if (tdp instanceof AvatarRDPanel) {
+ ((AvatarRDPanel)(tdp)).updateReferences();
+ }
+ }
+ }
+
}
diff --git a/src/main/java/ui/ELNPanelTranslator.java b/src/main/java/ui/ELNPanelTranslator.java
new file mode 100644
index 0000000000000000000000000000000000000000..e90c3f1818b22c6e116461839e875ffc708dd345
--- /dev/null
+++ b/src/main/java/ui/ELNPanelTranslator.java
@@ -0,0 +1,360 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui;
+
+import ui.eln.*;
+import ui.eln.sca_eln.*;
+import ui.eln.sca_eln_sca_tdf.*;
+import java.util.*;
+
+/**
+ * Class ELNPanelTranslator
+ * Translation of semantics of ELN Diagrams
+ * Creation: 24/07/2018
+ * @version 1.0 24/07/2018
+ * @author Irina Kit Yan LEE
+ */
+
+public class ELNPanelTranslator {
+ private List<TGComponent> tgcComponents;
+ private List<ELNTComponent> elnComponents;
+ private List<ELNTConnector> elnConnectors;
+
+ public ELNPanelTranslator(ELNDiagramPanel _elnDiagramPanel) {
+ tgcComponents = _elnDiagramPanel.getComponentList();
+
+ elnComponents = new LinkedList<ELNTComponent>();
+ elnConnectors = new LinkedList<ELNTConnector>();
+
+ MakeListOfComponent(_elnDiagramPanel);
+ }
+
+ private void MakeListOfComponent(ELNDiagramPanel elnDiagramPanel) {
+
+ Map<TGComponent, ELNTComponent> elnMap = new HashMap<TGComponent, ELNTComponent>();
+
+ TGComponent tgc;
+ Iterator<TGComponent> iterator1 = tgcComponents.listIterator();
+ Iterator<TGComponent> iterator2 = tgcComponents.listIterator();
+ List<TGComponent> list = new ArrayList<TGComponent>();
+
+ while (iterator1.hasNext()) {
+ tgc = iterator1.next();
+ if (!(tgc instanceof TGConnector)) {
+ list.add(tgc);
+ }
+ }
+
+ while (iterator2.hasNext()) {
+ tgc = iterator2.next();
+ if (tgc instanceof TGConnector) {
+ list.add(tgc);
+ }
+ }
+
+ for (TGComponent dp : list) {
+ if (dp instanceof ELNModule) {
+ ELNModule module = (ELNModule) dp;
+
+ String name = module.getValue();
+
+ ELNTModule elnModule = new ELNTModule(name);
+
+ List<ELNComponentCapacitor> capacitors = module.getAllComponentCapacitor();
+ for (int i = 0; i < capacitors.size(); i++) {
+ ELNComponentCapacitor capacitor = capacitors.get(i);
+
+ String name = capacitor.getValue();
+ double val = capacitor.getVal();
+ double q0 = capacitor.getQ0();
+ String unit0 = capacitor.getUnit0();
+ String unit1 = capacitor.getUnit1();
+
+ ELNTComponentCapacitor elnCapacitor = new ELNTComponentCapacitor(name, val, q0, unit0, unit1, elnModule);
+
+ elnMap.put(capacitor, elnCapacitor);
+ elnModule.addComponentCapacitor(elnCapacitor);
+ elnComponents.add(elnCapacitor);
+ }
+ List<ELNComponentCurrentSinkTDF> TDF_isinks = module.getAllComponentCurrentSinkTDF();
+ for (int i = 0; i < TDF_isinks.size(); i++) {
+ ELNComponentCurrentSinkTDF TDF_isink = TDF_isinks.get(i);
+
+ String name = TDF_isink.getValue();
+ double scale = TDF_isink.getScale();
+
+ ELNTComponentCurrentSinkTDF elnTDF_isink = new ELNTComponentCurrentSinkTDF(name, scale, elnModule);
+
+ elnMap.put(TDF_isink, elnTDF_isink);
+ elnModule.addComponentCurrentSinkTDF(elnTDF_isink);
+ elnComponents.add(elnTDF_isink);
+ }
+ List<ELNComponentCurrentSourceTDF> TDF_isources = module.getAllComponentCurrentSourceTDF();
+ for (int i = 0; i < TDF_isources.size(); i++) {
+ ELNComponentCurrentSourceTDF TDF_isource = TDF_isources.get(i);
+
+ String name = TDF_isource.getValue();
+ double scale = TDF_isource.getScale();
+
+ ELNTComponentCurrentSourceTDF elnTDF_isource = new ELNTComponentCurrentSourceTDF(name, scale, elnModule);
+
+ elnMap.put(TDF_isource, elnTDF_isource);
+ elnModule.addComponentCurrentSourceTDF(elnTDF_isource);
+ elnComponents.add(elnTDF_isource);
+ }
+ List<ELNComponentIdealTransformer> idealTransformers = module.getAllComponentIdealTransformer();
+ for (int i = 0; i < idealTransformers.size(); i++) {
+ ELNComponentIdealTransformer idealTransformer = idealTransformers.get(i);
+
+ String name = idealTransformer.getValue();
+ double ratio = idealTransformer.getRatio();
+
+ ELNTComponentIdealTransformer elnIdealTransformer = new ELNTComponentIdealTransformer(name, ratio, elnModule);
+
+ elnMap.put(idealTransformer, elnIdealTransformer);
+ elnModule.addComponentIdealTransformer(elnIdealTransformer);
+ elnComponents.add(elnIdealTransformer);
+ }
+ List<ELNComponentIndependentCurrentSource> isources = module.getAllComponentIndependentCurrentSource();
+ for (int i = 0; i < isources.size(); i++) {
+ ELNComponentIndependentCurrentSource isource = isources.get(i);
+
+ String name = isource.getValue();
+ double initValue = isource.getInitValue();
+ double offset = isource.getOffset();
+ double amplitude = isource.getAmplitude();
+ double frequency = isource.getFrequency();
+ double phase = isource.getPhase();
+ double acAmplitude = isource.getAcAmplitude();
+ double acPhase = isource.getAcPhase();
+ double acNoiseAmpliture = isource.getAcNoiseAmplitude();
+ String delay = isource.getDelay();
+ String unit0 = isource.getUnit0();
+
+ ELNTComponentIndependentCurrentSource elnISource = new ELNTComponentIndependentCurrentSource(name, initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmpliture, delay, unit0, elnModule);
+
+ elnMap.put(isource, elnISource);
+ elnModule.addComponentIndependentCurrentSource(elnISource);
+ elnComponents.add(elnISource);
+ }
+ List<ELNComponentIndependentVoltageSource> vsources = module.getAllComponentIndependentVoltageSource();
+ for (int i = 0; i < vsources.size(); i++) {
+ ELNComponentIndependentVoltageSource vsource = vsources.get(i);
+
+ String name = vsource.getValue();
+ double initValue = vsource.getInitValue();
+ double offset = vsource.getOffset();
+ double amplitude = vsource.getAmplitude();
+ double frequency = vsource.getFrequency();
+ double phase = vsource.getPhase();
+ double acAmplitude = vsource.getAcAmplitude();
+ double acPhase = vsource.getAcPhase();
+ double acNoiseAmpliture = vsource.getAcNoiseAmplitude();
+ String delay = vsource.getDelay();
+ String unit0 = vsource.getUnit0();
+
+ ELNTComponentIndependentVoltageSource elnVSource = new ELNTComponentIndependentVoltageSource(name, initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmpliture, delay, unit0, elnModule);
+
+ elnMap.put(vsource, elnVSource);
+ elnModule.addComponentIndependentVoltageSource(elnVSource);
+ elnComponents.add(elnVSource);
+ }
+ List<ELNComponentInductor> inductors = module.getAllComponentInductor();
+ for (int i = 0; i < inductors.size(); i++) {
+ ELNComponentInductor inductor = inductors.get(i);
+
+ String name = inductor.getValue();
+ double val = inductor.getVal();
+ double phi0 = inductor.getPhi0();
+ String unit0 = inductor.getUnit0();
+ String unit1 = inductor.getUnit1();
+
+ ELNTComponentInductor elnInductor = new ELNTComponentInductor(name, val, q0, unit0, unit1, elnModule);
+
+ elnMap.put(inductor, elnInductor);
+ elnModule.addComponentInductor(elnInductor);
+ elnComponents.add(elnInductor);
+ }
+ List<ELNComponentNodeRef> nodeRefs = module.getAllComponentNodeRef();
+ for (int i = 0; i < nodeRefs.size(); i++) {
+ ELNComponentNodeRef nodeRef = nodeRefs.get(i);
+
+ String name = nodeRef.getValue();
+
+ ELNTComponentNodeRef elnNodeRef = new ELNTComponentNodeRef(name, elnModule);
+
+ elnMap.put(nodeRef, elnNodeRef);
+ elnModule.addComponentNodeRef(elnNodeRef);
+ elnComponents.add(elnNodeRef);
+ }
+ List<ELNComponentResistor> resistors = module.getAllComponentResistor();
+ for (int i = 0; i < resistors.size(); i++) {
+ ELNComponentResistor resistor = resistors.get(i);
+
+ String name = resistor.getValue();
+ double val = resistor.getVal();
+ String unit = resistor.getUnit();
+
+ ELNTComponentResistor elnResistor = new ELNTComponentResistor(name, val, unit, elnModule);
+
+ elnMap.put(resistor, elnResistor);
+ elnModule.addComponentResistor(elnResistor);
+ elnComponents.add(elnResistor);
+ }
+ List<ELNComponentTransmissionLine> transmissionLines = module.getAllComponentTransmissionLine();
+ for (int i = 0; i < transmissionLines.size(); i++) {
+ ELNComponentTransmissionLine transmissionLine = transmissionLines.get(i);
+
+ String name = transmissionLine.getValue();
+ double z0 = transmissionLine.getZ0();
+ double delta0 = transmissionLine.getDelta0();
+ String delay = transmissionLine.getDelay();
+ String unit0 = transmissionLine.getUnit0();
+ String unit2 = transmissionLine.getUnit2();
+
+ ELNTComponentTransmissionLine elnTransmissionLine = new ELNTComponentTransmissionLine(name, z0, delta0, delay, unit0, unit2, elnModule);
+
+ elnMap.put(transmissionLine, elnTransmissionLine);
+ elnModule.addComponentTransmissionLine(elnTransmissionLine);
+ elnComponents.add(elnTransmissionLine);
+ }
+ List<ELNComponentVoltageControlledCurrentSource> vccss = module.getAllComponentVoltageControlledCurrentSource();
+ for (int i = 0; i < vccss.size(); i++) {
+ ELNComponentVoltageControlledCurrentSource vccs = vccss.get(i);
+
+ String name = vccs.getValue();
+ double val = vccs.getVal();
+ String unit = vccs.getUnit();
+
+ ELNTComponentVoltageControlledCurrentSource elnVCCS = new ELNTComponentVoltageControlledCurrentSource(name, val, unit, elnModule);
+
+ elnMap.put(vccs, elnVCCS);
+ elnModule.addComponentVoltageControlledCurrentSource(elnVCCS);
+ elnComponents.add(elnVCCS);
+ }
+ List<ELNComponentVoltageControlledVoltageSource> vcvss = module.getAllComponentVoltageControlledVoltageSource();
+ for (int i = 0; i < vcvss.size(); i++) {
+ ELNComponentVoltageControlledVoltageSource vcvs = vcvss.get(i);
+
+ String name = vcvs.getValue();
+ double val = vcvs.getVal();
+
+ ELNTComponentVoltageControlledVoltageSource elnVCVS = new ELNTComponentVoltageControlledVoltageSource(name, val, elnModule);
+
+ elnMap.put(vcvs, elnVCVS);
+ elnModule.addComponentVoltageControlledVoltageSource(elnVCVS);
+ elnComponents.add(elnVCVS);
+ }
+ List<ELNComponentVoltageSinkTDF> TDF_vsinks = module.getAllComponentVoltageSinkTDF();
+ for (int i = 0; i < TDF_vsinks.size(); i++) {
+ ELNComponentVoltageSinkTDF TDF_vsink = TDF_vsinks.get(i);
+
+ String name = TDF_vsink.getValue();
+ double scale = TDF_vsink.getScale();
+
+ ELNTComponentVoltageSinkTDF elnTDF_vsink = new ELNTComponentVoltageSinkTDF(name, scale, elnModule);
+
+ elnMap.put(TDF_vsink, elnTDF_vsink);
+ elnModule.addComponentVoltageSinkTDF(elnTDF_vsink);
+ elnComponents.add(elnTDF_vsink);
+ }
+ List<ELNComponentVoltageSourceTDF> TDF_vsources = module.getAllComponentVoltageSourceTDF();
+ for (int i = 0; i < TDF_vsources.size(); i++) {
+ ELNComponentVoltageSourceTDF TDF_vsource = TDF_vsources.get(i);
+
+ String name = TDF_vsource.getValue();
+ double scale = TDF_vsource.getScale();
+
+ ELNTComponentVoltageSourceTDF elnTDF_vsource = new ELNTComponentVoltageSourceTDF(name, scale, elnModule);
+
+ elnMap.put(TDF_vsource, elnTDF_vsource);
+ elnModule.addComponentVoltageSourceTDF(elnTDF_vsource);
+ elnComponents.add(elnTDF_vsource);
+ }
+ List<ELNModuleTerminal> moduleTerminals = module.getAllModuleTerminal();
+ for (int i = 0; i < moduleTerminals.size(); i++) {
+ ELNModuleTerminal moduleTerminal = moduleTerminals.get(i);
+
+ String name = moduleTerminal.getValue();
+
+ ELNTModuleTerminal elnModuleTerminal = new ELNTModuleTerminal(name, elnModule);
+
+ elnMap.put(moduleTerminal, elnModuleTerminal);
+ elnModule.addModuleTerminal(elnModuleTerminal);
+ elnComponents.add(elnModuleTerminal);
+ }
+ elnMap.put(module, elnModule);
+ elnComponents.add(elnModule);
+ } else if (dp instanceof ELNConnector) {
+ ELNConnector connector = (ELNConnector) dp;
+
+ TGConnectingPoint connectingPoint1 = connector.get_p1();
+ TGConnectingPoint connectingPoint2 = connector.get_p2();
+
+ TGComponent owner_p1 = elnDiagramPanel.getComponentToWhichBelongs(connectingPoint1);
+ TGComponent owner_p2 = elnDiagramPanel.getComponentToWhichBelongs(connectingPoint2);
+
+ ELNTComponent avowner_p1 = elnMap.get(owner_p1);
+ ELNTComponent avowner_p2 = elnMap.get(owner_p2);
+
+ ELNTConnectingPoint avConnectingPoint1 = new ELNTConnectingPoint(avowner_p1);
+ ELNTConnectingPoint avConnectingPoint2 = new ELNTConnectingPoint(avowner_p2);
+
+ ELNTConnector avconnector = new ELNTConnector(avConnectingPoint1, avConnectingPoint2);
+
+ List<ELNMidPortTerminal> midPortTerminals = connector.getAllMidPortTerminal();
+ for (int i = 0; i < midPortTerminals.size(); i++) {
+ ELNMidPortTerminal midPortTerminal = midPortTerminals.get(i);
+
+ ELNTMidPortTerminal elnMidPortTerminal = new ELNTMidPortTerminal(avconnector);
+
+ elnMap.put(midPortTerminal, elnMidPortTerminal);
+ avconnector.addMidPortTerminal(elnMidPortTerminal);
+ elnComponents.add(elnMidPortTerminal);
+ }
+
+ elnConnectors.add(avconnector);
+ }
+ }
+ }
+
+ public ELNSpecification getELNSpecification() {
+ return new ELNSpecification(elnComponents, elnConnectors);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 541e695226d3128b1cd49e11921163194a68f9f1..cb402e28879a0b22960c755942723c46cf14321f 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -741,7 +741,7 @@ outerloop:
}
public boolean pathExists(TMLMapping<TGComponent> map, HwBridge firewallNode, TMLTask t1){
- System.out.println("Checking path " + firewallNode.getName() + t1.getName());
+ //System.out.println("Checking path " + firewallNode.getName() + t1.getName());
List<HwLink> links = map.getTMLArchitecture().getHwLinks();
List<HwNode> found = new ArrayList<HwNode>();
List<HwNode> done = new ArrayList<HwNode>();
@@ -756,7 +756,6 @@ outerloop:
}
}
while (found.size() > 0) {
- System.out.println("found " + found);
HwNode curr = found.remove(0);
for (HwLink link : links) {
//System.out.println("LINK " + link.hwnode.getName() + " " + link.bus.getName());
@@ -776,7 +775,7 @@ outerloop:
}
done.add(curr);
}
- System.out.println("!pathExists " + t1.getName() + " " + firewallNode);
+
return false;
}
@@ -817,7 +816,7 @@ outerloop:
}
for (HwBridge firewallNode : map.getTMLArchitecture().getFirewalls()) {
-
+ List<String> chansToRemove= new ArrayList<String>();
TraceManager.addDev("Found firewall " + firewallNode.getName());
TMLCPrimitiveComponent firewallComp = null;
TMLADStartState adStart = null;
@@ -835,6 +834,8 @@ outerloop:
//Add a single connection to update rules
boolean updateRulesAdded=false;
+
+
int links = map.getArch().getLinkByHwNode(firewallNode).size();
TraceManager.addDev("Links " + links);
@@ -910,7 +911,6 @@ outerloop:
//Build requests between every connected task and firewall task
for (TMLTask task: map.getTMLModeling().getTasks()){
-
TMLCPrimitiveComponent taskcomp =null;
for (TGComponent tg : tcdp.getComponentList()) {
if (tg instanceof TMLCPrimitiveComponent) {
@@ -918,6 +918,7 @@ outerloop:
taskcomp =((TMLCPrimitiveComponent) tg);
break;
}
+
}
else if (tg instanceof TMLCCompositeComponent) {
TMLCCompositeComponent cc = (TMLCCompositeComponent) tg;
@@ -929,12 +930,15 @@ outerloop:
}
}
}
+
}
+
if (taskcomp==null){
continue;
}
+
if (pathExists(map, firewallNode, task)){
//Add Request Ports
@@ -978,6 +982,8 @@ outerloop:
newtcdp.addComponent(originPort, taskcomp.getX(), taskcomp.getY(), true, true);
newtcdp.addComponent(destPort, firewallComp.getX(), firewallComp.getY(), true, true);
updateRulesAdded=true;
+
+
}
}
@@ -997,12 +1003,12 @@ outerloop:
toAdd.add(chan);
continue;
}
-
- channelIndexMap.put(chan.getName(), index);
+ chansToRemove.add(chan.getName().split("__")[1]);
+ channelIndexMap.put(chan.getName().split("__")[1], index);
index++;
TMLPort origPort = chan.getOriginPort();
TMLPort destPort = chan.getDestinationPort();
- TMLChannel wr = new TMLChannel(chan.getName() + "_firewallIn", chan.getReferenceObject());
+ TMLChannel wr = new TMLChannel(chan.getName().split("__")[1] + "_firewallIn", chan.getReferenceObject());
//Specify new channel attributes
wr.setSize(chan.getSize());
wr.setMax(chan.getMax());
@@ -1010,7 +1016,7 @@ outerloop:
wr.setType(TMLChannel.BRBW);
wr.setPriority(chan.getPriority());
wr.setTasks(orig, firewall);
- TMLChannel rd = new TMLChannel(chan.getName() + "_firewallOut", chan.getReferenceObject());
+ TMLChannel rd = new TMLChannel(chan.getName().split("__")[1] + "_firewallOut", chan.getReferenceObject());
rd.setTasks(firewall, dest);
rd.setSize(chan.getSize());
rd.setMax(chan.getMax());
@@ -1028,12 +1034,29 @@ outerloop:
}
- tmlm.removeAllChannels();
- for (TMLChannel c : toAdd) {
- tmlm.addChannel(c);
- }
+ List<TGComponent> tmpRemove = new ArrayList<TGComponent>();
+ for (TGComponent tg : newtcdp.getComponentList()) {
+ if (tg instanceof TMLCPrimitiveComponent) {
+ TMLCPrimitiveComponent taskcomp =(TMLCPrimitiveComponent) tg;
+ for (TMLCPrimitivePort port: taskcomp.getAllChannelsOriginPorts()){
+ //System.out.println("chantoremove " + chansToRemove + " " + port.getPortName());
+ if (chansToRemove.contains(port.getPortName())){
+ //System.out.println("Removing " + port);
+ tmpRemove.add(port);
+ }
+ }
+ for (TMLCPrimitivePort port: taskcomp.getAllChannelsDestinationPorts()){
+ if (chansToRemove.contains(port.getPortName())){
+ tmpRemove.add(port);
+ }
+ }
+ }
+ }
+ for (TGComponent tg: tmpRemove){
+ newtcdp.removeComponent(tg);
+ }
//Build activity diagram
//Get start state
@@ -1135,7 +1158,7 @@ outerloop:
firewallADP.addComponent(tmp, action.getX(), action.getY(), false, true);
- adChoiceRules.setGuard("[channelIndex=="+ channelIndexMap.get(chan.getName())+"]",i-1);
+ adChoiceRules.setGuard("[channelIndex=="+ channelIndexMap.get(chan.getName().split("__")[1])+"]",i-1);
//add stop state
adStop = new TMLADStopState(100*i, 600, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
@@ -1148,7 +1171,7 @@ outerloop:
- index++;
+ i++;
}
for (TMLChannel chan : inChans.keySet()) {
@@ -1204,28 +1227,29 @@ outerloop:
tcp.tmlctdp.addComponent(conn, 0, 0, false, true);
i++;
}
- int xpos = 500;
+ int xpos = 700;
+ int ypos= 100;
i = 1;
for (TMLChannel chan : inChans.keySet()) {
if (i>3){
break;
}
- adChoice.setGuard("[index=="+channelIndexMap.get(chan.getName())+"]",i-1);
+ adChoice.setGuard("[index=="+channelIndexMap.get(chan.getName().split("__")[1])+"]",i-1);
TMLChannel newChan = inChans.get(chan);
- adRC = new TMLADReadChannel(xpos, 350, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
+ adRC = new TMLADReadChannel(xpos, 450, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
adRC.setChannelName(newChan.getName());
adRC.setSamples("1");
tmp = new TGConnectorTMLAD(adRC.getX(), adRC.getY(), firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP, adChoice.getTGConnectingPointAtIndex(i), adRC.getTGConnectingPointAtIndex(0), new Vector<Point>());
firewallADP.addComponent(tmp, adRC.getX(), adRC.getY(), false, true);
- firewallADP.addComponent(adRC, xpos, 350, false, true);
+ firewallADP.addComponent(adRC, xpos, 450, false, true);
//Execute for latency value
- exec = new TMLADExecI(xpos, 400, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
+ exec = new TMLADExecI(xpos, 500, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
exec.setDelayValue(Integer.toString(firewallNode.latency));
- firewallADP.addComponent(exec, xpos, 400, false, true);
+ firewallADP.addComponent(exec, xpos, 500, false, true);
tmp = new TGConnectorTMLAD(exec.getX(), exec.getY(), firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP, adRC.getTGConnectingPointAtIndex(1), exec.getTGConnectingPointAtIndex(0), new Vector<Point>());
firewallADP.addComponent(tmp, exec.getX(), exec.getY(), false, true);
@@ -1233,37 +1257,36 @@ outerloop:
- adChoice2 = new TMLADChoice(xpos, 500, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
- firewallADP.addComponent(adChoice2, 500, 300, false, true);
+ adChoice2 = new TMLADChoice(xpos, 550, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
+ firewallADP.addComponent(adChoice2, 550, 300, false, true);
tmp = new TGConnectorTMLAD(exec.getX(), exec.getY(), firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP, exec.getTGConnectingPointAtIndex(1), adChoice2.getTGConnectingPointAtIndex(0), new Vector<Point>());
firewallADP.addComponent(tmp, exec.getX(), exec.getY(), false, true);
- // if (channelAllowed(map, chan)) {
TMLChannel wrChan = outChans.get(chan);
- adWC = new TMLADWriteChannel(xpos, 600, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
+ adWC = new TMLADWriteChannel(xpos-50, 600, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
adWC.setChannelName(wrChan.getName());
adWC.setSamples("1");
- firewallADP.addComponent(adWC, xpos, 600, false, true);
+ firewallADP.addComponent(adWC, xpos-50, 600, false, true);
tmp = new TGConnectorTMLAD(exec.getX(), exec.getY(), firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP, adChoice2.getTGConnectingPointAtIndex(1), adWC.getTGConnectingPointAtIndex(0), new Vector<Point>());
firewallADP.addComponent(tmp, exec.getX(), exec.getY(), false, true);
- adStop = new TMLADStopState(xpos, 650, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
- firewallADP.addComponent(adStop, xpos, 650, false, true);
+ adStop = new TMLADStopState(xpos-50, 650, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
+ firewallADP.addComponent(adStop, xpos-50, 650, false, true);
tmp = new TGConnectorTMLAD(adStop.getX(), adStop.getY(), firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP, adWC.getTGConnectingPointAtIndex(1), adStop.getTGConnectingPointAtIndex(0), new Vector<Point>());
firewallADP.addComponent(tmp, adStop.getX(), adStop.getY(), false, true);
// } else {
- adStop2 = new TMLADStopState(xpos, 650, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
- firewallADP.addComponent(adStop2, xpos, 650, false, true);
+ adStop2 = new TMLADStopState(xpos+50, 650, firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP);
+ firewallADP.addComponent(adStop2, xpos+50, 650, false, true);
tmp = new TGConnectorTMLAD(adStop.getX(), adStop.getY(), firewallADP.getMinX(), firewallADP.getMaxX(), firewallADP.getMinY(), firewallADP.getMaxY(), false, null, firewallADP, adChoice2.getTGConnectingPointAtIndex(2), adStop2.getTGConnectingPointAtIndex(0), new Vector<Point>());
firewallADP.addComponent(tmp, adStop.getX(), adStop.getY(), false, true);
// }
- xpos += 100;
+ xpos += 200;
i++;
}
@@ -1273,44 +1296,85 @@ outerloop:
map.getCorrespondanceList().addCor(start, adStart);
-
-
-
-
-
- }
-
- //Replace channel operator with new firewallIn and firewallOut operators
- for (TMLTask task: map.getTMLModeling().getTasks()){
- //Get activity diagram
- TMLActivityDiagramPanel tad = tcp.getTMLActivityDiagramPanel(task.getName());
- TGConnector fromStart = new TGConnectorTMLAD(0, 0, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
+ //Replace channel operator with new firewallIn and firewallOut operators
+ for (TMLTask task: map.getTMLModeling().getTasks()){
+ if (!pathExists(map, firewallNode, task)){
+ continue;
+ }
+ //Get activity diagram
+ TMLActivityDiagramPanel tad = tcp.getTMLActivityDiagramPanel(task.getName());
+ TGConnector fromStart = new TGConnectorTMLAD(0, 0, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
- List<TGComponent> wrChans = new ArrayList<TGComponent>();
+ List<TMLADWriteChannel> wrChans = new ArrayList<TMLADWriteChannel>();
- List<TGComponent> rdChans = new ArrayList<TGComponent>();
+ List<TMLADReadChannel> rdChans = new ArrayList<TMLADReadChannel>();
- for (TGComponent tg : tad.getComponentList()) {
- if (tg instanceof TMLADWriteChannel) {
- TMLADWriteChannel writeChannel = (TMLADWriteChannel) tg;
- if (fromStart != null) {
- wrChans.add(tg);
- }
- }
- if (tg instanceof TMLADReadChannel) {
- TMLADReadChannel readChannel = (TMLADReadChannel) tg;
- if (fromStart != null) {
- rdChans.add(tg);
+ for (TGComponent tg : tad.getComponentList()) {
+ if (tg instanceof TMLADWriteChannel) {
+ TMLADWriteChannel writeChannel = (TMLADWriteChannel) tg;
+ if (fromStart != null) {
+ wrChans.add(writeChannel);
+ }
+ }
+ if (tg instanceof TMLADReadChannel) {
+ TMLADReadChannel readChannel = (TMLADReadChannel) tg;
+ if (fromStart != null) {
+ rdChans.add(readChannel);
+ }
+ }
+ }
+ //For each writeChannel, add request operator, rename channel
+
+
+
+ for (TMLADWriteChannel wr: wrChans){
+
+ String chanName = wr.getChannelName();
+
+ xpos = wr.getX();
+ ypos = wr.getY();
+ fromStart = tad.findTGConnectorEndingAt(wr.getTGConnectingPointAtIndex(0));
+ TGConnectingPoint point = fromStart.getTGConnectingPointP2();
+ int yShift = 50;
+
+ TMLADSendRequest sendreq = new TMLADSendRequest(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
+ sendreq.setRequestName("req" + firewallNode.getName());
+
+ sendreq.setParam(0, Integer.toString(channelIndexMap.get(chanName)));
+ sendreq.makeValue();
+
+ tad.addComponent(sendreq, xpos, ypos, false, true);
+ //Re-route connector to sendreq
+ fromStart.setP2(sendreq.getTGConnectingPointAtIndex(0));
+
+
+ //Add connector between sendreq and writechannel
+ fromStart = new TGConnectorTMLAD(wr.getX(), wr.getY(), tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, sendreq.getTGConnectingPointAtIndex(1), wr.getTGConnectingPointAtIndex(0), new Vector<Point>());
+ tad.addComponent(fromStart, xpos, ypos, false, true);
+
+ wr.setChannelName(chanName + "_firewallIn");
+ wr.makeValue();
+
+ //Shift everything below sendreq down
+ for (TGComponent tg : tad.getComponentList()) {
+ if (tg.getY() >= ypos && tg!=sendreq) {
+ tg.setCd(tg.getX(), tg.getY() + yShift);
+ }
}
- }
- }
- //For each writeChannel, add request operator, rename channel
-
-
- //for each readchannel, rename channel
+ }
+ //for each readchannel, rename channel
+ for (TMLADReadChannel rd: rdChans){
+ String chanName = rd.getChannelName();
+ rd.setChannelName(chanName + "_firewallOut");
+ rd.makeValue();
+ }
+
+ }
+ //Remove old channel ports
+
}
@@ -1649,7 +1713,7 @@ memloop:
} else if (tmap != null) {
t2a = new TML2Avatar(tmap, false, true);
avatarspec = t2a.generateAvatarSpec(loopLimit);
- // drawPanel(avatarspec, mgui.getFirstAvatarDesignPanelFound());
+ // drawPanel(avatarspec, mgui.getFirstAvatarDesignPanelFound());
} else if (tmlm != null) {
//Generate default mapping
@@ -6126,7 +6190,7 @@ memloop:
String name;
name = elt.getAttribute("name");
- //TraceManager.addDev("Loading SMD of:" + name);
+ TraceManager.addDev("Loading SMD of:" + name);
AvatarSMDPanel asmdp = mgui.getAvatarSMDPanel(indexDesign, name);
if (asmdp == null) {
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 201960cee15cc6062732d79539d8ea3a3765094e..891aa6172d0fe629ba288660a992fcb9f4e6699b 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -340,6 +340,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
// Plugin management
//public static PluginManager pluginManager;
+ private boolean hidden = false;
public MainGUI(boolean _openLast, boolean _turtleOn, boolean _systemcOn, boolean _lotosOn, boolean _proactiveOn, boolean _tpnOn, boolean _osOn,
boolean
@@ -3078,7 +3079,13 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
createFileDialog();
- return mainSave();
+ boolean b = mainSave();
+
+ if (b) {
+ updateLastOpenFile(file);
+ }
+
+ return b;
}
@@ -3099,6 +3106,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
dir = null;
config = null;
SpecConfigTTool.setBasicConfig(systemcOn);
+ updateLastOpenFile(file);
}
return b;
}
@@ -4541,12 +4549,12 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
gtm.getTMLMapping().getTMLModeling().clearBacktracing();
gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, getTabName(tp));
gtm.getTML2Avatar().backtraceReachability(pvoa.getReachabilityResults());
- gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getAuthenticityResults(), getTabName(tp));
+ gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa, getTabName(tp));
} else if (tp instanceof TMLComponentDesignPanel) {
gtm.getTMLMapping().getTMLModeling().clearBacktracing();
gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, "Default Mapping");
gtm.getTML2Avatar().backtraceReachability(pvoa.getReachabilityResults());
- gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getAuthenticityResults(), "Default Mapping");
+ gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa, "Default Mapping");
}
return;
}
@@ -6074,6 +6082,16 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
public void generateDocumentationReq() {
TraceManager.addDev("Frame Req");
+
+ // Repaint all requirement diags
+ TURTLEPanel tp;
+ for (int i = 0; i < tabs.size(); i++) {
+ tp = tabs.elementAt(i);
+ if (tp instanceof AvatarRequirementPanel) {
+ ((AvatarRequirementPanel)(tp)).updateReferences();
+ }
+ }
+
JDialogRequirementTable jdrt = new JDialogRequirementTable(frame, "Selecting table columns");
GraphicLib.centerOnParent(jdrt);
jdrt.setVisible(true);
@@ -8564,18 +8582,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
return null;
}
}
-
- public SysCAMSComponentTaskDiagramPanel getFirstSysCAMSPanelFound() {
- SysCAMSComponentTaskDiagramPanel syscamsdp = null;
- for (int i = 0; i < tabs.size(); i++)
- if (tabs.get(i) instanceof SysCAMSComponentDesignPanel) {
- syscamsdp = ((SysCAMSComponentDesignPanel) tabs.get(i)).syscamsctdp;
- }
- if (syscamsdp == null)
- System.err.println("No SysCAMS Panel Found : MainGUI.getFirstSysCAMSPanelFound()");
- return syscamsdp;
- }
-
+
public void syscamsExecutableCodeGeneration() {
JDialogSysCAMSExecutableCodeGeneration jgen = new JDialogSysCAMSExecutableCodeGeneration(frame, this, "Executable Code generation, compilation and execution",
"../SysCAMSGenerationCode/");
@@ -9062,7 +9069,19 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
changeMade(tmltdp, TDiagramPanel.CHANGE_VALUE_COMPONENT);
}
}
+
+ public void toggleELN() {
+ if (hidden == false) {
+ hidden = true;
+ } else {
+ hidden = false;
+ }
+ }
+ public boolean getHidden() {
+ return hidden;
+ }
+
public boolean isAValidTabName(String name) {
return name.matches("((\\w)*(\\s)*)*");
}
diff --git a/src/main/java/ui/SecurityGeneration.java b/src/main/java/ui/SecurityGeneration.java
index 94cd6fdc1544aaaa7517f81cc36a00a9a4ec4dcd..583c9197609d57a3b4fb6b0379fbc8db4dc0551d 100644
--- a/src/main/java/ui/SecurityGeneration.java
+++ b/src/main/java/ui/SecurityGeneration.java
@@ -1000,6 +1000,7 @@ public class SecurityGeneration implements Runnable {
wr = new TMLADWriteChannel(xpos, ypos + yShift, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
wr.setChannelName("data_" + chanName + "_" + task.getName().split("__")[1]);
wr.setSecurityContext(channelSecMap.get(chanName));
+ wr.makeValue();
tad.addComponent(wr, xpos, ypos + yShift, false, true);
//Add connector between request and write
diff --git a/src/main/java/ui/SysCAMSPanelTranslator.java b/src/main/java/ui/SysCAMSPanelTranslator.java
index ad8028ed61774dec6aba61527749550407703613..ef4ea91df3a183c75a680488199c495aa9658187 100644
--- a/src/main/java/ui/SysCAMSPanelTranslator.java
+++ b/src/main/java/ui/SysCAMSPanelTranslator.java
@@ -92,7 +92,30 @@ public class SysCAMSPanelTranslator {
}
for (TGComponent dp : list) {
- if (dp instanceof SysCAMSBlockDE) {
+ if (dp instanceof SysCAMSBlockGPIO2VCI) {
+ SysCAMSBlockGPIO2VCI blockGPIO2VCI = (SysCAMSBlockGPIO2VCI) dp;
+
+ SysCAMSTBlockGPIO2VCI syscamsBlockGPIO2VCI = new SysCAMSTBlockGPIO2VCI();
+
+ List<SysCAMSPortDE> portsDE = blockGPIO2VCI.getAllInternalPortsDE();
+ for (int i = 0; i < portsDE.size(); i++) {
+ SysCAMSPortDE portDE = portsDE.get(i);
+
+ String portName = portDE.getPortName();
+ String type = portDE.getDEType();
+ int origin = portDE.getOrigin();
+ boolean sensitive = portDE.getSensitive();
+ String sensitiveMethod = portDE.getSensitiveMethod();
+
+ SysCAMSTPortDE syscamsPortDE = new SysCAMSTPortDE(portName, origin, type, sensitive, sensitiveMethod, syscamsBlockGPIO2VCI);
+
+ syscamsMap.put(portDE, syscamsPortDE);
+ syscamsBlockGPIO2VCI.addPortDE(syscamsPortDE);
+ syscamsComponents.add(syscamsPortDE);
+ }
+ syscamsMap.put(blockGPIO2VCI, syscamsBlockGPIO2VCI);
+ syscamsComponents.add(syscamsBlockGPIO2VCI);
+ } else if (dp instanceof SysCAMSBlockDE) {
SysCAMSBlockDE blockDE = (SysCAMSBlockDE) dp;
String blockDEName = blockDE.getValue();
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index 4f2845b243c4ceb4e2eed02378b0f7b3a0c501c4..f21ffc3db29a4d5ceabf6cb47438c7c966771273 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -44,6 +44,7 @@ import ui.atd.ATDAttack;
import ui.atd.ATDBlock;
import ui.avatarad.AvatarADActivity;
import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDPragma;
import ui.avatarbd.AvatarBDDataType;
import ui.avatarbd.AvatarBDLibraryFunction;
import ui.avatarcd.AvatarCDBlock;
@@ -52,7 +53,9 @@ import ui.avatarrd.AvatarRDRequirement;
import ui.avatarsmd.AvatarSMDState;
import ui.cd.*;
import ui.ftd.FTDFault;
+import ui.eln.*;
import ui.eln.sca_eln.*;
+import ui.eln.sca_eln_sca_tdf.*;
import ui.syscams.*;
import ui.ncdd.NCEqNode;
import ui.ncdd.NCRouteArtifact;
@@ -63,6 +66,7 @@ import ui.req.Requirement;
import ui.tmlcd.TMLTaskOperator;
import ui.tmlcompd.TMLCCompositeComponent;
import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
import ui.tmlcompd.TMLCRecordComponent;
import ui.window.JDialogCode;
import ui.window.JDialogNote;
@@ -129,6 +133,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
protected JMenuItem remove, edit, clone, bringFront, bringBack, makeSquare, setJavaCode, removeJavaCode, setInternalComment, removeInternalComment, attach, detach, hide, unhide, search, enableDisable, setAsCryptoBlock, setAsRegularBlock;
protected JMenuItem checkAccessibility, checkInvariant, checkMasterMutex, checkLatency;
protected JMenuItem gotoReference;
+ protected JMenuItem showProVerifTrace;
protected JMenuItem breakpoint;
protected JMenuItem paste, insertLibrary, upX, upY, downX, downY, fitToContent, backToMainDiagram;
protected JMenuItem cut, copy, saveAsLibrary, captureSelected;
@@ -1452,6 +1457,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
componentMenu.add(checkInvariant);
componentMenu.add(checkLatency);
componentMenu.add(gotoReference);
+ componentMenu.add(showProVerifTrace);
componentMenu.add(checkMasterMutex);
componentMenu.add(breakpoint);
@@ -1567,6 +1573,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
gotoReference = new JMenuItem("Go to reference");
gotoReference.addActionListener(menuAL);
+
+ showProVerifTrace= new JMenuItem("Show ProVerif Trace");
+ showProVerifTrace.addActionListener(menuAL);
search = new JMenuItem("External Search");
search.addActionListener(menuAL);
@@ -1846,7 +1855,19 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
}
}
-
+
+ if (e.getSource() == showProVerifTrace) {
+ if (componentPopup instanceof TMLCPrimitivePort){
+ ((TMLCPrimitivePort) componentPopup).showTrace();
+ }
+ else if (componentPopup instanceof AvatarBDBlock){
+ ((AvatarBDBlock) componentPopup).showTrace(currentY);
+ }
+ else if (componentPopup instanceof AvatarBDPragma){
+ ((AvatarBDPragma) componentPopup).showTrace(currentY);
+ }
+ }
+
if (e.getSource() == checkMasterMutex) {
if (componentPopup instanceof CheckableInvariant) {
@@ -2099,6 +2120,14 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
gotoReference.setEnabled(false);
}
+
+ if (componentPointed instanceof TMLCPrimitivePort || componentPointed instanceof AvatarBDBlock || componentPointed instanceof AvatarBDPragma){
+ showProVerifTrace.setEnabled(true);
+ } else {
+ showProVerifTrace.setEnabled(false);
+ }
+
+
if (componentPointed instanceof CheckableInvariant) {
checkInvariant.setEnabled(true);
@@ -2603,6 +2632,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
|| (o instanceof SysCAMSBlockTDF && this.checkSysCAMSBlockTDFComponent((SysCAMSBlockTDF) o, name))
|| (o instanceof SysCAMSBlockDE && this.checkSysCAMSBlockDEComponent((SysCAMSBlockDE) o, name))
|| (o instanceof SysCAMSCompositeComponent && this.checkSysCAMSCompositeComponent((SysCAMSCompositeComponent) o, name))
+ || (o instanceof ELNModule && this.checkELNModule((ELNModule) o, name))
|| (o instanceof ELNComponentNodeRef && this.checkELNComponentNodeRef((ELNComponentNodeRef) o, name))
|| (o instanceof ELNComponentResistor && this.checkELNComponentResistor((ELNComponentResistor) o, name))
|| (o instanceof ELNComponentCapacitor && this.checkELNComponentCapacitor((ELNComponentCapacitor) o, name))
@@ -2613,6 +2643,10 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
|| (o instanceof ELNComponentTransmissionLine && this.checkELNComponentTransmissionLine ((ELNComponentTransmissionLine) o, name))
|| (o instanceof ELNComponentIndependentVoltageSource && this.checkELNComponentIndependentVoltageSource((ELNComponentIndependentVoltageSource) o, name))
|| (o instanceof ELNComponentIndependentCurrentSource && this.checkELNComponentIndependentCurrentSource((ELNComponentIndependentCurrentSource) o, name))
+ || (o instanceof ELNComponentCurrentSinkTDF && this.checkELNComponentCurrentSinkTDF((ELNComponentCurrentSinkTDF) o, name))
+ || (o instanceof ELNComponentCurrentSourceTDF && this.checkELNComponentCurrentSourceTDF((ELNComponentCurrentSourceTDF) o, name))
+ || (o instanceof ELNComponentVoltageSinkTDF && this.checkELNComponentVoltageSinkTDF((ELNComponentVoltageSinkTDF) o, name))
+ || (o instanceof ELNComponentVoltageSourceTDF && this.checkELNComponentVoltageSourceTDF((ELNComponentVoltageSourceTDF) o, name))
|| (o instanceof ATDBlock && this.checkATDBlock((ATDBlock) o, name))
|| (o instanceof ATDAttack && this.checkATDAttack((ATDAttack) o, name))
|| (o instanceof FTDFault && this.checkFTDFault((FTDFault) o, name))
@@ -2676,6 +2710,10 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
return false;
}
+ public boolean checkELNModule(ELNModule o, String name) {
+ return false;
+ }
+
public boolean checkELNComponentNodeRef(ELNComponentNodeRef o, String name) {
return false;
}
@@ -2715,6 +2753,22 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
public boolean checkELNComponentIndependentCurrentSource(ELNComponentIndependentCurrentSource o, String name) {
return false;
}
+
+ public boolean checkELNComponentCurrentSinkTDF(ELNComponentCurrentSinkTDF o, String name) {
+ return false;
+ }
+
+ public boolean checkELNComponentCurrentSourceTDF(ELNComponentCurrentSourceTDF o, String name) {
+ return false;
+ }
+
+ public boolean checkELNComponentVoltageSinkTDF(ELNComponentVoltageSinkTDF o, String name) {
+ return false;
+ }
+
+ public boolean checkELNComponentVoltageSourceTDF(ELNComponentVoltageSourceTDF o, String name) {
+ return false;
+ }
public boolean checkATDBlock(ATDBlock o, String name) {
return false;
@@ -2867,6 +2921,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
public String findELNComponentName(String name) {
return this.findGoodName(name, new NameChecker() {
+ public boolean checkELNModule(ELNModule o, String name) {
+ return o.getValue().equals(name);
+ }
public boolean checkELNComponentNodeRef(ELNComponentNodeRef o, String name) {
return o.getValue().equals(name);
}
@@ -2897,6 +2954,18 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
public boolean checkELNComponentIndependentCurrentSource(ELNComponentIndependentCurrentSource o, String name) {
return o.getValue().equals(name);
}
+ public boolean checkELNComponentCurrentSinkTDF(ELNComponentCurrentSinkTDF o, String name) {
+ return o.getValue().equals(name);
+ }
+ public boolean checkELNComponentCurrentSourceTDF(ELNComponentCurrentSourceTDF o, String name) {
+ return o.getValue().equals(name);
+ }
+ public boolean checkELNComponentVoltageSinkTDF(ELNComponentVoltageSinkTDF o, String name) {
+ return o.getValue().equals(name);
+ }
+ public boolean checkELNComponentVoltageSourceTDF(ELNComponentVoltageSourceTDF o, String name) {
+ return o.getValue().equals(name);
+ }
});
}
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index d3152b2a23df791e8f5b59a645fd0d41815d4e4b..8d2d1a50c33e829c81af0e0ac3b356c27f423745 100644
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -348,20 +348,22 @@ public class TGComponentManager {
// ELN
public static final int ELN_CONNECTOR = 1610;
- public static final int ELN_PORT_TERMINAL = 1611;
- public static final int ELN_RESISTOR = 1612;
- public static final int ELN_CAPACITOR = 1613;
- public static final int ELN_INDUCTOR = 1614;
- public static final int ELN_VOLTAGE_CONTROLLED_VOLTAGE_SOURCE = 1615;
- public static final int ELN_VOLTAGE_CONTROLLED_CURRENT_SOURCE = 1616;
- public static final int ELN_IDEAL_TRANSFORMER = 1617;
- public static final int ELN_TRANSMISSION_LINE = 1618;
- public static final int ELN_INDEPENDENT_VOLTAGE_SOURCE = 1619;
- public static final int ELN_INDEPENDENT_CURRENT_SOURCE = 1620;
- public static final int ELN_NODE_REF = 1621;
- public static final int ELN_TDF_VOLTAGE_SINK = 1622;
- public static final int ELN_TDF_CURRENT_SINK = 1623;
- public static final int ELN_MODULE = 1624;
+ public static final int ELN_RESISTOR = 1611;
+ public static final int ELN_CAPACITOR = 1612;
+ public static final int ELN_INDUCTOR = 1613;
+ public static final int ELN_VOLTAGE_CONTROLLED_VOLTAGE_SOURCE = 1614;
+ public static final int ELN_VOLTAGE_CONTROLLED_CURRENT_SOURCE = 1615;
+ public static final int ELN_IDEAL_TRANSFORMER = 1616;
+ public static final int ELN_TRANSMISSION_LINE = 1617;
+ public static final int ELN_INDEPENDENT_VOLTAGE_SOURCE = 1618;
+ public static final int ELN_INDEPENDENT_CURRENT_SOURCE = 1619;
+ public static final int ELN_NODE_REF = 1620;
+ public static final int ELN_TDF_VOLTAGE_SINK = 1621;
+ public static final int ELN_TDF_CURRENT_SINK = 1622;
+ public static final int ELN_MODULE = 1623;
+ public static final int ELN_MODULE_TERMINAL = 1624;
+ public static final int ELN_TDF_VOLTAGE_SOURCE = 1625;
+ public static final int ELN_TDF_CURRENT_SOURCE = 1626;
// SMD diagram
public static final int PROSMD_START_STATE = 2000;
@@ -431,6 +433,7 @@ public class TGComponentManager {
// AVATAR RD -> starts at 5200
public static final int AVATARRD_REQUIREMENT = 5200;
+ public static final int AVATARRD_REQUIREMENT_REFERENCE = 5208;
public static final int AVATARRD_PROPERTY = 5201;
public static final int AVATARRD_ELEMENT_REFERENCE = 5207;
public static final int AVATARRD_DERIVE_CONNECTOR = 5202;
@@ -440,6 +443,7 @@ public class TGComponentManager {
public static final int AVATARRD_COPY_CONNECTOR = 5204;
public static final int AVATARRD_COMPOSITION_CONNECTOR = 5205;
+
// AVATAR AMD -> starts at 5250
public static final int AVATARMAD_ASSUMPTION = 5250;
public static final int AVATARMAD_DIAGRAM_REFERENCE = 5251;
@@ -612,6 +616,9 @@ public class TGComponentManager {
case AVATARRD_REQUIREMENT:
tgc = new AvatarRDRequirement(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
+ case AVATARRD_REQUIREMENT_REFERENCE:
+ tgc = new AvatarRDRequirementReference(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
case AVATARRD_PROPERTY:
tgc = new AvatarRDProperty(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
@@ -1284,9 +1291,6 @@ public class TGComponentManager {
tgc = new SysCAMSBlockGPIO2VCI(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
// ELN
- case ELN_PORT_TERMINAL:
- tgc = new ELNPortTerminal(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
- break;
case ELN_RESISTOR:
tgc = new ELNComponentResistor(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
@@ -1326,6 +1330,15 @@ public class TGComponentManager {
case ELN_MODULE:
tgc = new ELNModule(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
break;
+ case ELN_MODULE_TERMINAL:
+ tgc = new ELNModuleTerminal(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
+ case ELN_TDF_VOLTAGE_SOURCE:
+ tgc = new ELNComponentVoltageSourceTDF(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
+ case ELN_TDF_CURRENT_SOURCE:
+ tgc = new ELNComponentCurrentSourceTDF(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+ break;
// Communication patterns + SD
case TMLCP_CHOICE:
tgc = new TMLCPChoice(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
@@ -1622,6 +1635,8 @@ public class TGComponentManager {
// AVATAR RD
} else if (tgc instanceof AvatarRDRequirement) {
return AVATARRD_REQUIREMENT;
+ } else if (tgc instanceof AvatarRDRequirementReference) {
+ return AVATARRD_REQUIREMENT_REFERENCE;
} else if (tgc instanceof AvatarRDProperty) {
return AVATARRD_PROPERTY;
} else if (tgc instanceof AvatarRDElementReference) {
@@ -1728,8 +1743,6 @@ public class TGComponentManager {
// ELN
} else if (tgc instanceof ELNConnector) {
return ELN_CONNECTOR;
- } else if (tgc instanceof ELNPortTerminal) {
- return ELN_PORT_TERMINAL;
} else if (tgc instanceof ELNComponentResistor) {
return ELN_RESISTOR;
} else if (tgc instanceof ELNComponentCapacitor) {
@@ -1756,6 +1769,12 @@ public class TGComponentManager {
return ELN_TDF_CURRENT_SINK;
} else if (tgc instanceof ELNModule) {
return ELN_MODULE;
+ } else if (tgc instanceof ELNModuleTerminal) {
+ return ELN_MODULE_TERMINAL;
+ } else if (tgc instanceof ELNComponentVoltageSourceTDF) {
+ return ELN_TDF_VOLTAGE_SOURCE;
+ } else if (tgc instanceof ELNComponentCurrentSourceTDF) {
+ return ELN_TDF_CURRENT_SOURCE;
// Others
} else if (tgc instanceof TADDeterministicDelay) {
diff --git a/src/main/java/ui/TGConnector.java b/src/main/java/ui/TGConnector.java
index cf9c8d6902ae407d3a136f2a8b1e179b59774490..0166e22e6b7ebe458a025128f1d841d3ed3ea2af 100755
--- a/src/main/java/ui/TGConnector.java
+++ b/src/main/java/ui/TGConnector.java
@@ -43,6 +43,7 @@
package ui;
import myutil.*;
+import ui.eln.ELNMidPortTerminal;
import javax.swing.*;
import java.awt.*;
@@ -112,7 +113,11 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
for(int i=0; i<nbInternalTGComponent; i++) {
final Point p = _listPoint.elementAt(i);
//TraceManager.addDev("p.x " + p.x + " p.y" + p.y + " minX" + _minX + " maxX" + _maxX);
- tgcomponent[i] = new TGCPointOfConnector(p.x, p.y, minX, maxX, minY, maxY, false, this, tdp );
+ if (getTDiagramPanel().getName().equals("ELN Diagram")) {
+ tgcomponent[i] = new ELNMidPortTerminal(p.x, p.y, minX, maxX, minY, maxY, false, this, tdp );
+ } else {
+ tgcomponent[i] = new TGCPointOfConnector(p.x, p.y, minX, maxX, minY, maxY, false, this, tdp );
+ }
}
}
@@ -122,7 +127,9 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
public int getIndexOfFirstTGCPointOfConnector() {
for(int i=0; i<nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof TGCPointOfConnector) {
+ if (tgcomponent[i] instanceof ELNMidPortTerminal) {
+ return i;
+ } else if (tgcomponent[i] instanceof TGCPointOfConnector) {
return i;
}
}
@@ -141,7 +148,10 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
TGCPointOfConnector []tab = new TGCPointOfConnector[nb];
nb = 0;
for(int i=0; i<nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof TGCPointOfConnector) {
+ if (tgcomponent[i] instanceof ELNMidPortTerminal) {
+ tab[nb] = (ELNMidPortTerminal)(tgcomponent[i]);
+ nb++;
+ } else if (tgcomponent[i] instanceof TGCPointOfConnector) {
tab[nb] = (TGCPointOfConnector)(tgcomponent[i]);
nb++;
}
@@ -154,7 +164,9 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
Vector<Point> v = new Vector<Point>();
for(int i=0; i<nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof TGCPointOfConnector) {
+ if (tgcomponent[i] instanceof ELNMidPortTerminal) {
+ v.add(new Point(tgcomponent[i].getX(), tgcomponent[i].getY()));
+ } else if (tgcomponent[i] instanceof TGCPointOfConnector) {
v.add(new Point(tgcomponent[i].getX(), tgcomponent[i].getY()));
}
}
@@ -166,7 +178,9 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
if (nbInternalTGComponent == 0) { return -1;}
int index;
for(index = 0; index<tgcomponent.length; index++) {
- if (!(tgcomponent[index] instanceof TGCPointOfConnector)) {
+ if (!(tgcomponent[index] instanceof ELNMidPortTerminal)) {
+ break;
+ } else if (!(tgcomponent[index] instanceof TGCPointOfConnector)) {
break;
}
}
@@ -254,7 +268,10 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
return new Point((p1.getX()+p2.getX())/2, (p1.getY()+p2.getY())/2);
}
- if (tgcomponent[0] instanceof TGCPointOfConnector) {
+ if (tgcomponent[0] instanceof ELNMidPortTerminal) {
+ //TraceManager.addDev("TGCPointOfConnector");
+ return new Point((p1.getX()+tgcomponent[0].getX())/2, (p1.getY()+tgcomponent[0].getY())/2);
+ } else if (tgcomponent[0] instanceof TGCPointOfConnector) {
//TraceManager.addDev("TGCPointOfConnector");
return new Point((p1.getX()+tgcomponent[0].getX())/2, (p1.getY()+tgcomponent[0].getY())/2);
}
@@ -490,34 +507,62 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
public CDElement[] getPointedSegment(int x1, int y1) {
TGCPointOfConnector p3, p4;
+ ELNMidPortTerminal p3a, p4a;
CDElement [] pt = new CDElement[2];
try {
if (hasTGCPointOfConnector()) {
- p3 = (TGCPointOfConnector)tgcomponent[0];
- p4 = p3;
- if ((int)(Line2D.ptSegDistSq(p1.getX(), p1.getY(), p3.getX(), p3.getY(), x1, y1)) < distanceSelected) {
- pt[0] = p1;
- pt[1] = p3;
- return pt;
- }
- for(int i=0; i<getIndexOfLastTGCPointOfConnector(); i++) {
- p3 = (TGCPointOfConnector)(tgcomponent[i]);
- p4 = (TGCPointOfConnector)(tgcomponent[i+1]);
+ if (tgcomponent[0] instanceof ELNMidPortTerminal) {
+ p3a = (ELNMidPortTerminal)tgcomponent[0];
+ p4a = p3a;
- if ((int)(Line2D.ptSegDistSq(p3.getX(), p3.getY(), p4.getX(), p4.getY(), x1, y1)) < distanceSelected) {
- pt[0] = p3;
- pt[1] = p4;
+ if ((int)(Line2D.ptSegDistSq(p1.getX(), p1.getY(), p3a.getX(), p3a.getY(), x1, y1)) < distanceSelected) {
+ pt[0] = p1;
+ pt[1] = p3a;
return pt;
}
- }
-
- if ((int)(Line2D.ptSegDistSq(p4.getX(), p4.getY(), p2.getX(), p2.getY(), x1, y1)) < distanceSelected) {
- pt[0] = p4;
- pt[1] = p2;
- return pt;
- }
+ for(int i=0; i<getIndexOfLastTGCPointOfConnector(); i++) {
+ p3a = (ELNMidPortTerminal)(tgcomponent[i]);
+ p4a = (ELNMidPortTerminal)(tgcomponent[i+1]);
+
+ if ((int)(Line2D.ptSegDistSq(p3a.getX(), p3a.getY(), p4a.getX(), p4a.getY(), x1, y1)) < distanceSelected) {
+ pt[0] = p3a;
+ pt[1] = p4a;
+ return pt;
+ }
+ }
+ if ((int)(Line2D.ptSegDistSq(p4a.getX(), p4a.getY(), p2.getX(), p2.getY(), x1, y1)) < distanceSelected) {
+ pt[0] = p4a;
+ pt[1] = p2;
+ return pt;
+ }
+ } else {
+ p3 = (TGCPointOfConnector)tgcomponent[0];
+ p4 = p3;
+
+ if ((int)(Line2D.ptSegDistSq(p1.getX(), p1.getY(), p3.getX(), p3.getY(), x1, y1)) < distanceSelected) {
+ pt[0] = p1;
+ pt[1] = p3;
+ return pt;
+ }
+ for(int i=0; i<getIndexOfLastTGCPointOfConnector(); i++) {
+ p3 = (TGCPointOfConnector)(tgcomponent[i]);
+ p4 = (TGCPointOfConnector)(tgcomponent[i+1]);
+
+ if ((int)(Line2D.ptSegDistSq(p3.getX(), p3.getY(), p4.getX(), p4.getY(), x1, y1)) < distanceSelected) {
+ pt[0] = p3;
+ pt[1] = p4;
+ return pt;
+ }
+ }
+
+ if ((int)(Line2D.ptSegDistSq(p4.getX(), p4.getY(), p2.getX(), p2.getY(), x1, y1)) < distanceSelected) {
+ pt[0] = p4;
+ pt[1] = p2;
+ return pt;
+ }
+ }
} else {
if (p2 != null) {
if ((int)(Line2D.ptSegDistSq(p1.getX(), p1.getY(), p2.getX(), p2.getY(), x1, y1)) < distanceSelected) {
@@ -626,11 +671,42 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
return;
}
+ public void pointHasBeenRemoved(ELNMidPortTerminal tgc) {
+ return;
+ }
// indexCon indicates from which points the potential connecitng point is the closer
public void pointHasBeenAdded(TGCPointOfConnector tgc, int index, int indexCon) {
return;
}
+
+ public void pointHasBeenAdded(ELNMidPortTerminal tgc, int index, int indexCon) {
+ return;
+ }
+
+ private boolean addELNMidPortTerminal(int x, int y) {
+ CDElement [] pt = getPointedSegment(x, y);
+ if (pt != null) {
+ Point p = new Point((pt[0].getX() + pt[1].getX()) / 2, (pt[0].getY() + pt[1].getY()) / 2);
+ int distance1 = (int)(new Point(x, y).distance(pt[0].getX(), pt[0].getY()));
+ int distance2 = (int)(new Point(x, y).distance(pt[1].getX(), pt[1].getY()));
+ int index = indexPointedSegment(x, y);
+ int indexCon;
+
+ if (distance1 < distance2) {
+ indexCon = 0;
+ } else {
+ indexCon = 1;
+ }
+
+ ELNMidPortTerminal t = new ELNMidPortTerminal(p.x, p.y, minX, maxX, minY, maxY, false, this, tdp);
+ if (addInternalComponent(t, index) ) {
+ pointHasBeenAdded(t, index, indexCon);
+ return true;
+ }
+ }
+ return false;
+ }
private boolean addTGCPointOfConnector(int x, int y) {
//TraceManager.addDev("Adding point of connector at "+ x + "," + y);
@@ -737,9 +813,9 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
public StringBuffer translatePoints() {
StringBuffer sb = new StringBuffer();
for(int i=0; i<getIndexOfLastTGCPointOfConnector()+1; i++) {
- if (tgcomponent[i] instanceof TGCPointOfConnector) {
- sb.append("<Point x=\"" + tgcomponent[i].getX() + "\" y=\"" + tgcomponent[i].getY() + "\" />\n");
- }
+ if (tgcomponent[i] instanceof TGCPointOfConnector || tgcomponent[i] instanceof ELNMidPortTerminal) {
+ sb.append("<Point x=\"" + tgcomponent[i].getX() + "\" y=\"" + tgcomponent[i].getY() + "\" type=\"" + tgcomponent[i].getType() + "\" />\n");
+ }
}
return sb;
}
@@ -759,6 +835,9 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
JMenuItem addPoint = new JMenuItem("Add Point");
addPoint.addActionListener(menuAL);
componentMenu.add(addPoint);
+ JMenuItem CPPoint = new JMenuItem("Add Connecting Point");
+ CPPoint.addActionListener(menuAL);
+ componentMenu.add(CPPoint);
JMenuItem align = new JMenuItem("Align");
align.addActionListener(menuAL);
componentMenu.add(align);
@@ -787,7 +866,9 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
public boolean eventOnPopup(ActionEvent e) {
if (e.getActionCommand().equals("Add Point")) {
return addTGCPointOfConnector(popupx, popupy);
- } else if (e.getActionCommand().equals("Add Point")){
+ } else if (e.getActionCommand().equals("Add Connecting Point")) {
+ return addELNMidPortTerminal(popupx, popupy);
+ } else if (e.getActionCommand().equals("Align")){
return alignTGComponents();
} else if (e.getActionCommand().equals("NO automatic drawing")){
automaticDrawing = false;
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 3a12f21a0ba93e67a666f173a850d0de6e72f473..f554a7f5aa4bd64301a1ec03447c15cb1cf482cd 100644
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -283,25 +283,29 @@ public class TGUIAction extends AbstractAction {
public static final int CAMS_PORT_DE = 478;
public static final int CAMS_PORT_CONVERTER = 479;
public static final int CAMS_CLUSTER = 480;
- public static final int CAMS_GENCODE = 481;
+ public static final int CAMS_GENCODE = 482;
public static final int CAMS_BLOCK_GPIO2VCI = 497;
// ELN
- public static final int ELN_EDIT = 482;
- public static final int ELN_CONNECTOR = 483;
- public static final int ELN_RESISTOR = 484;
- public static final int ELN_CAPACITOR = 485;
- public static final int ELN_INDUCTOR = 486;
- public static final int ELN_VOLTAGE_CONTROLLED_VOLTAGE_SOURCE = 487;
- public static final int ELN_VOLTAGE_CONTROLLED_CURRENT_SOURCE = 488;
- public static final int ELN_IDEAL_TRANSFORMER = 489;
- public static final int ELN_TRANSMISSION_LINE = 490;
- public static final int ELN_INDEPENDENT_VOLTAGE_SOURCE = 491;
- public static final int ELN_INDEPENDENT_CURRENT_SOURCE = 492;
- public static final int ELN_NODE_REF = 494;
- public static final int ELN_TDF_VOLTAGE_SINK = 495;
- public static final int ELN_TDF_CURRENT_SINK = 496;
- public static final int ELN_MODULE = 498;
+ public static final int ELN_EDIT = 483;
+ public static final int ELN_CONNECTOR = 484;
+ public static final int ELN_RESISTOR = 485;
+ public static final int ELN_CAPACITOR = 486;
+ public static final int ELN_INDUCTOR = 487;
+ public static final int ELN_VOLTAGE_CONTROLLED_VOLTAGE_SOURCE = 488;
+ public static final int ELN_VOLTAGE_CONTROLLED_CURRENT_SOURCE = 489;
+ public static final int ELN_IDEAL_TRANSFORMER = 490;
+ public static final int ELN_TRANSMISSION_LINE = 491;
+ public static final int ELN_INDEPENDENT_VOLTAGE_SOURCE = 492;
+ public static final int ELN_INDEPENDENT_CURRENT_SOURCE = 493;
+ public static final int ELN_NODE_REF = 495;
+ public static final int ELN_TDF_VOLTAGE_SINK = 496;
+ public static final int ELN_TDF_CURRENT_SINK = 498;
+ public static final int ELN_MODULE = 499;
+ public static final int ELN_MODULE_TERMINAL = 500;
+ public static final int ELN_TOGGLE_ATTR = 501;
+ public static final int ELN_TDF_VOLTAGE_SOURCE = 502;
+ public static final int ELN_TDF_CURRENT_SOURCE = 503;
public static final int EBRDD_EDIT = 271;
public static final int EBRDD_CONNECTOR = 272;
@@ -435,6 +439,7 @@ public class TGUIAction extends AbstractAction {
public static final int ARD_SATISFY_CONNECTOR = 422;
public static final int ARD_COPY_CONNECTOR = 305;
public static final int ARD_COMPOSITION_CONNECTOR = 306;
+ public static final int ARD_REQUIREMENT_REFERENCE = 481;
// AVATAR Assumptions
public static final int AMAD_EDIT = 370;
@@ -464,7 +469,7 @@ public class TGUIAction extends AbstractAction {
public static final int ADD_CHANNELARTIFACT = 411;
public static final int ADD_VGMNNODE = 401;
public static final int ADD_CROSSBARNODE = 421;
- public static final int ADD_CLUSTERNODE = 493;
+ public static final int ADD_CLUSTERNODE = 494;
// -------------------------------------------------------------
public static final int DEPLOY_AVATAR_DIAGRAM = 418;
@@ -656,7 +661,7 @@ public class TGUIAction extends AbstractAction {
public static final int MOVE_ENABLED = 463;
public static final int FIRST_DIAGRAM = 464;
- public static final int NB_ACTION = 499;
+ public static final int NB_ACTION = 504;
private static final TAction [] actions = new TAction[NB_ACTION];
@@ -860,7 +865,8 @@ public class TGUIAction extends AbstractAction {
actions[ACT_AVATAR_SIM] = new TAction("avatar-simu", "Interactive simulation", IconManager.imgic18, IconManager.imgic18, "Interactive simulation", "Interactive simulation of the AVATAR design under edition", '2');
actions[ACT_AVATAR_FV_UPPAAL] = new TAction("avatar-formal-verification-uppaal", "Safety formal verification with UPPAAL (Safety)", IconManager.imgic86, IconManager.imgic86, "Formal verification with UPPAAL (Safety)", "Formal verification with UPPAAL (Safety) of the AVATAR design under edition", '3');
actions[ACT_AVATAR_FV_PROVERIF] = new TAction("avatar-formal-verification-proverif", "Security verification (ProVerif)", IconManager.imgic88, IconManager.imgic88, "Security verification (ProVerif)", "Security formal verification (with ProVerif)", '4');
- actions[ACT_AVATAR_FV_STATICANALYSIS] = new TAction("avatar-formal-verification-staticanalysis", "Safety analysis (invariants)", IconManager.imgic96, IconManager.imgic96, "Safaty analysis (invariants)", "Safety analysis using the invariant tecnique", '5');
+ actions[ACT_AVATAR_FV_STATICANALYSIS] = new TAction("avatar-formal-verification-staticanalysis", "Safety analysis (invariants)",
+ IconManager.imgic96, IconManager.imgic96, "Safaty analysis (invariants)", "Safety analysis using the invariant technique", '5');
actions[ACT_AVATAR_EXECUTABLE_GENERATION] = new TAction("avatar-executable-generation", "Code generation" , IconManager.imgic94, IconManager.imgic94, "Code generation", "Generation of C-POSIX executable code from AVATAR design under edition", '6');
@@ -1177,7 +1183,11 @@ public class TGUIAction extends AbstractAction {
actions[ELN_TDF_VOLTAGE_SINK] = new TAction("eln-tdf-vsink", "Add a conversion voltage to a TDF output signal", IconManager.imgic8030, IconManager.imgic8030, "Converts voltage to a TDF output signal", "Add a converts voltage to a TDF output signal to the currently opened ELN Diagram", 0);
actions[ELN_TDF_CURRENT_SINK] = new TAction("eln-tdf-isink", "Add a conversion current to a TDF output signal", IconManager.imgic8031, IconManager.imgic8031, "Converts current to a TDF output signal", "Add a converts current to a TDF output signal to the currently opened ELN Diagram", 0);
actions[ELN_MODULE] = new TAction("eln-module", "Add a SystemC module", IconManager.imgic8006, IconManager.imgic8006, "SystemC module", "Add a SystemC module to the currently opened ELN Diagram", 0);
-
+ actions[ELN_MODULE_TERMINAL] = new TAction("eln-module-terminal", "Add a module terminal", IconManager.imgic8032, IconManager.imgic8032, "Module terminal", "Add a module terminal to the currently opened ELN Diagram", 0);
+ actions[ELN_TOGGLE_ATTR] = new TAction("eln-toggle-attr-command", "Show / hide attributes in ELN", IconManager.imgic138, IconManager.imgic138, "Show / hide element attributes in ELN", "Show / hide attributes to the currently opened ELN Diagram", 0);
+ actions[ELN_TDF_VOLTAGE_SOURCE] = new TAction("eln-tdf-vsource", "Add a voltage source driven by a TDF input signal", IconManager.imgic8033, IconManager.imgic8033, "Voltage source driven by a TDF input signal", "Add a voltage source driven by a TDF input signal to the currently opened ELN Diagram", 0);
+ actions[ELN_TDF_CURRENT_SOURCE] = new TAction("eln-tdf-isource", "Add a current source driven by a TDF input signal", IconManager.imgic8034, IconManager.imgic8034, "Current source driven by a TDF input signal", "Add a current source driven by a TDF input signal to the currently opened ELN Diagram", 0);
+
//ProActive State Machine Diagram
actions[PROSMD_EDIT] = new TAction("edit-prosmd-diagram", "Edit ProActive state machine diagram", IconManager.imgic100, IconManager.imgic101, "Edit ProActive state machine diagram", "Make it possible to edit the currently opened ProActive state machine diagram", 0);
actions[PROSMD_START] = new TAction("add-prosmd-start", "Add Start state", IconManager.imgic222, IconManager.imgic222, "Start", "Add a start state to the currently opened ProActive state machine diagram", 0);
@@ -1296,6 +1306,7 @@ public class TGUIAction extends AbstractAction {
// AVATAR Requirement Diagrams
actions[ARD_EDIT] = new TAction("edit-ard-diagram", "Edit Requirement Diagram", IconManager.imgic100, IconManager.imgic101, "Edit Requirement Diagram", "Make it possible to edit the currently opened Requirement Diagram", 0);
actions[ARD_REQUIREMENT] = new TAction("add-ard-requirement", "Add a requirement", IconManager.imgic5006, IconManager.imgic5006, "Requirement", "Add a requirement to the currently opened requirement diagram", 0);
+ actions[ARD_REQUIREMENT_REFERENCE] = new TAction("add-ard-requirement-reference", "Add a reference to a requirement", IconManager.imgic5074, IconManager.imgic5074, "Requirement Reference", "Add a requirement reference to the currently opened requirement diagram", 0);
actions[ARD_PROPERTY] = new TAction("add-ard-property", "Add a property", IconManager.imgic5008, IconManager.imgic5008, "Property", "Add a reference to a property of the currently opened requirement diagram", 0);
actions[ARD_ELEMENT_REFERENCE] = new TAction("add-ard-element-reference", "Add a reference to an element", IconManager.imgic5068, IconManager.imgic5068, "Element Reference", "Add a reference to an element of the currently opened requirement diagram", 0);
actions[ARD_DERIVE_CONNECTOR] = new TAction("add-ard-derive", "Add a <<deriveReqt>> link", IconManager.imgic1008, IconManager.imgic1008, "DeriveReqt", "Add a <<deriveReqt>> link between two requirements of the currently opened requirement diagram", 0);
diff --git a/src/main/java/ui/TURTLEPanel.java b/src/main/java/ui/TURTLEPanel.java
index 6871eef6915d2cd93e500579d6e75c51a535f15f..632faec35f68da4eb32a615b0c61a0c376fb2b69 100755
--- a/src/main/java/ui/TURTLEPanel.java
+++ b/src/main/java/ui/TURTLEPanel.java
@@ -385,6 +385,12 @@ public abstract class TURTLEPanel implements GenericTree {
}
}
+ public void repaintAll() {
+ for (int i = 0; i < panels.size(); i++) {
+ panelAt(i).repaint();
+ }
+ }
+
public void resetLiveness() {
for (int i = 0; i < panels.size(); i++) {
panelAt(i).resetLiveness();
diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index deda218d01c4b860558ff5c975783172cd8e899c..e5e329766904ad9895140bb6227f5caf972fb344 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -52,13 +52,25 @@ import ui.util.IconManager;
import ui.window.JDialogAvatarBlock;
import ui.window.JDialogIDAndStereotype;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+
+
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList;
-
+import java.util.HashMap;
+import proverifspec.ProVerifResultTrace;
+import proverifspec.ProVerifResultTraceStep;
+import ui.interactivesimulation.JFrameSimulationSDPanel;
/**
* Class AvatarBDBlock
@@ -104,7 +116,9 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
protected LinkedList<AvatarSignal> mySignals;
protected String[] globalCode;
-
+ protected HashMap<TAttribute, ProVerifResultTrace> attrTraceMap = new HashMap<TAttribute, ProVerifResultTrace>();
+ protected HashMap<TAttribute, Integer> attrLocMap = new HashMap<TAttribute, Integer>();
+
public String oldValue;
public AvatarBDBlock(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
@@ -168,6 +182,10 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
this.internalDrawingAux(graph);
graph.setFont(font);
}
+
+ public void addProVerifTrace(TAttribute attr, ProVerifResultTrace trace){
+ attrTraceMap.put(attr,trace);
+ }
public void setSignalsAsNonAttached() {
for (AvatarSignal mySig : mySignals) mySig.attachedToARelation = false;
@@ -338,6 +356,8 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
// Try to draw it
w = graph.getFontMetrics().stringWidth(attrString);
+
+ attrLocMap.put(attr,this.y+h);
if (w + 2 * textX < this.width) {
graph.drawString(attrString, this.x + textX, this.y + h);
this.drawConfidentialityVerification(attr.getConfidentialityVerification(), graph, this.x, this.y + h);
@@ -504,6 +524,45 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
g.setColor(c);
}
+ public void showTrace(int y){
+
+ if (y< limitAttr){
+ for (TAttribute attr: attrLocMap.keySet()){
+ if (attrLocMap.get(attr) < y && y < attrLocMap.get(attr) +currentFontSize && attrTraceMap.get(attr)!=null){
+ PipedOutputStream pos = new PipedOutputStream();
+ try {
+ PipedInputStream pis = new PipedInputStream(pos, 4096);
+ BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(pos));
+
+ JFrameSimulationSDPanel jfssdp = new JFrameSimulationSDPanel(null, tdp.getMGUI(), "Confidentiality " + attr.toString());
+ jfssdp.setIconImage(IconManager.img8);
+ GraphicLib.centerOnParent(jfssdp, 600, 600);
+ jfssdp.setFileReference(new BufferedReader(new InputStreamReader(pis)));
+ jfssdp.setVisible(true);
+ //jfssdp.setModalExclusionType(ModalExclusionType
+ // .APPLICATION_EXCLUDE);
+ jfssdp.toFront();
+
+ // TraceManager.addDev("\n--- Trace ---");
+ int i = 0;
+ for (ProVerifResultTraceStep step : attrTraceMap.get(attr).getTrace()) {
+ step.describeAsTMLSDTransaction(bw, i);
+ i++;
+ }
+ bw.close();
+ } catch (IOException e) {
+ TraceManager.addDev("Error when writing trace step SD transaction");
+ } finally {
+ try {
+ pos.close();
+ } catch (IOException ignored) {
+ }
+ }
+
+ }
+ }
+ }
+ }
private void drawConfidentialityVerification(int confidentialityVerification, Graphics g, int _x, int _y) {
Color c = g.getColor();
@@ -609,16 +668,20 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
setValue(s);
recalculateSize();
+ if (!(tdp.actionOnDoubleClick(this))) {
+ JOptionPane.showMessageDialog(frame,
+ "Could not change the name of the Block: this name is already in use",
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
+ setValue(oldValue);
+ return false;
+ }
+
+
+
}
- /*if (!(tdp.actionOnDoubleClick(this))) {
- JOptionPane.showMessageDialog(frame,
- "Could not change the name of the Requirement: this name is already in use",
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- setValue(oldValue);
- return false;
- }*/
+
// Setting stereotype
s = dialog.getStereotype().trim();
diff --git a/src/main/java/ui/avatarbd/AvatarBDPragma.java b/src/main/java/ui/avatarbd/AvatarBDPragma.java
index 65fe6e83b48bf43107216edef2bf8ab8001f77da..7dd4d58ffcd5f8878fcc683c6cc9c7b1d1a121a1 100755
--- a/src/main/java/ui/avatarbd/AvatarBDPragma.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPragma.java
@@ -41,13 +41,31 @@ package ui.avatarbd;
import myutil.Conversion;
import myutil.GraphicLib;
+import myutil.TraceManager;
+
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
+
import ui.*;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+
import ui.util.IconManager;
import ui.window.JDialogPragma;
+import proverifspec.ProVerifResultTrace;
+import proverifspec.ProVerifResultTraceStep;
+
+import ui.interactivesimulation.JFrameSimulationSDPanel;
+
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
@@ -93,6 +111,10 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
public final static int NOT_PROVED = 3;
public HashMap<String, Integer> authStrongMap = new HashMap<String, Integer>();
public HashMap<String, Integer> authWeakMap = new HashMap<String, Integer>();
+
+ protected HashMap<String, Integer> pragmaLocMap = new HashMap<String, Integer>();
+
+ public HashMap<String, ProVerifResultTrace> pragmaTraceMap = new HashMap<String, ProVerifResultTrace>();
public AvatarBDPragma(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -232,6 +254,7 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
g.drawString("Security features", x + textX, y + textY + currentFontSize);
g.setFont(fold);
for (String s : models) {
+ pragmaLocMap.put(s,y + textY + (i + 1) * currentFontSize);
g.drawString(s, x + textX, y + textY + (i + 1) * currentFontSize);
if (syntaxErrors.contains(s)) {
Color ctmp = g.getColor();
@@ -259,7 +282,7 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
g.setFont(fold);
}
g.drawString(s, x + textX, y + textY + (i + 1) * currentFontSize);
-
+ pragmaLocMap.put(s,y + textY + i * currentFontSize);
if (syntaxErrors.contains(s)) {
Color ctmp = g.getColor();
g.setColor(Color.red);
@@ -481,4 +504,46 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
throw new MalformedModelingException();
}
}
+
+ public void showTrace(int y){
+
+ //TraceManager.addDev(pragmaTraceMap + " " + pragmaLocMap + " " + y);
+ //On right click, display verification trace
+ for (String pragma: pragmaLocMap.keySet()){
+ if (pragmaLocMap.get(pragma) < y && y <pragmaLocMap.get(pragma) +currentFontSize && pragmaTraceMap.get(pragma)!=null){
+ PipedOutputStream pos = new PipedOutputStream();
+ try {
+ PipedInputStream pis = new PipedInputStream(pos, 4096);
+ BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(pos));
+
+ JFrameSimulationSDPanel jfssdp = new JFrameSimulationSDPanel(null, tdp.getMGUI(), pragma);
+ jfssdp.setIconImage(IconManager.img8);
+ GraphicLib.centerOnParent(jfssdp, 600, 600);
+ jfssdp.setFileReference(new BufferedReader(new InputStreamReader(pis)));
+ jfssdp.setVisible(true);
+ //jfssdp.setModalExclusionType(ModalExclusionType
+ // .APPLICATION_EXCLUDE);
+ jfssdp.toFront();
+
+ // TraceManager.addDev("\n--- Trace ---");
+ int i = 0;
+ for (ProVerifResultTraceStep step : pragmaTraceMap.get(pragma).getTrace()) {
+ step.describeAsTMLSDTransaction(bw, i);
+ i++;
+ }
+ bw.close();
+ } catch (IOException e) {
+ TraceManager.addDev("Error when writing trace step SD transaction");
+ } finally {
+ try {
+ pos.close();
+ } catch (IOException ignored) {
+ }
+ }
+ break;
+
+ }
+ }
+ //
+ }
}
diff --git a/src/main/java/ui/avatardd/ADDCPUNode.java b/src/main/java/ui/avatardd/ADDCPUNode.java
index 03b3e788cfd32bd74e897debc35d9f06eac277c0..4993a955f80b3c05b51cbebe047a9b38c822f19e 100755
--- a/src/main/java/ui/avatardd/ADDCPUNode.java
+++ b/src/main/java/ui/avatardd/ADDCPUNode.java
@@ -76,6 +76,7 @@ public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttri
private int dCacheWords = 0;
protected int index = 0;
+ protected int cluster_index = 0;
protected int monitored = 0;
@@ -346,6 +347,22 @@ public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttri
}
}
+ if (dialog.getIndex().length() != 0) {
+ try {
+ tmp = cluster_index;
+ cluster_index = Integer.decode(dialog.getIndex()).intValue();
+ if (cluster_index < 0) {
+ cluster_index = tmp;
+ error = true;
+ errors += "cluster index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "cluster index ";
+ }
+ }
+
+
if (dialog.getMonitored() != 0) {
try {
@@ -547,6 +564,10 @@ public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttri
return index;
}
+ public int getClusterIndex() {
+ return cluster_index;
+ }
+
public int getMonitored() {
return monitored;
}
diff --git a/src/main/java/ui/avatardd/ADDClusterNode.java b/src/main/java/ui/avatardd/ADDClusterNode.java
index 2ad962dc9e818257d2e4ea916ea054f541521a10..d0f3a64b4fc5bfdb49591763c4e05d3f79624f7d 100644
--- a/src/main/java/ui/avatardd/ADDClusterNode.java
+++ b/src/main/java/ui/avatardd/ADDClusterNode.java
@@ -175,7 +175,7 @@ public class ADDClusterNode extends ADDNode implements WithAttributes {
MainGUI mgui = getTDiagramPanel().getMainGUI();
// On the name ?
- if (_y <= (y + currentFontSize + textX)) {
+ if (_y <= y + textY2) {
String s = (String)JOptionPane.showInputDialog(frame, "Name:", "Setting component name",
JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
null,
diff --git a/src/main/java/ui/avatardd/ADDCoproMWMRNode.java b/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
index 5b0396078b7b954751cd1b34e983d18a7ccd01d4..734e7028eefa0e94b725073283736a605e5a91ba 100755
--- a/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
+++ b/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
@@ -513,7 +513,11 @@ public class ADDCoproMWMRNode extends ADDCommunicationNode implements WithAttrib
return coprocType;
}
- //DG 19.09.
+ public int getClusterAddress() {
+ return 2;//ToDo find crossbar to which coproc is attached
+ }
+
+
public Vector<ADDBlockArtifact> getArtifactList() {
Vector<ADDBlockArtifact> v = new Vector<ADDBlockArtifact>();
diff --git a/src/main/java/ui/avatardd/ADDCrossbarNode.java b/src/main/java/ui/avatardd/ADDCrossbarNode.java
index c99ab5b6b67528151210af63029544604b2a0180..894d1bf5ae8ba9bc8fe4762795e622a3df54378d 100755
--- a/src/main/java/ui/avatardd/ADDCrossbarNode.java
+++ b/src/main/java/ui/avatardd/ADDCrossbarNode.java
@@ -305,7 +305,7 @@ public class ADDCrossbarNode extends ADDCommunicationNode implements WithAttribu
//sb.append(" nbOfAttachedInitiators=\"" + nbOfAttachedInitiators + "\" ");
//sb.append(" nbOfAttachedTargets=\"" + nbOfAttachedTargets + "\" ");
- sb.append(" cluster_index=\"" + cluster_index + "\" ");
+ sb.append("<attributes cluster_index=\"" + cluster_index + "\" ");
sb.append(" cluster_address=\"" + cluster_address + "\" ");
sb.append("/>\n");
sb.append("</extraparam>\n");
diff --git a/src/main/java/ui/avatardd/ADDMemoryNode.java b/src/main/java/ui/avatardd/ADDMemoryNode.java
index b04130d39127d20139875a4726c941891338431d..403be2baafa54577a1e8dfff2ff509583a11cb56 100755
--- a/src/main/java/ui/avatardd/ADDMemoryNode.java
+++ b/src/main/java/ui/avatardd/ADDMemoryNode.java
@@ -66,6 +66,7 @@ public abstract class ADDMemoryNode extends ADDCommunicationNode implements With
protected String stereotype = "RAM";
protected int index = 0;
+ protected int cluster_index = 0;
protected int monitored = 0;
protected int byteDataSize = HwMemory.DEFAULT_BYTE_DATA_SIZE;
@@ -137,6 +138,10 @@ public abstract class ADDMemoryNode extends ADDCommunicationNode implements With
return index;
}
+ public int getClusterIndex() {
+ return cluster_index;
+ }
+
public int getDataSize() {
return byteDataSize;
}
@@ -186,6 +191,23 @@ public abstract class ADDMemoryNode extends ADDCommunicationNode implements With
}
}
+ if (dialog.getClusterIndex().length() != 0) {
+ try {
+ tmp = cluster_index;
+ index = Integer.decode(dialog.getClusterIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "cluster index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "cluster index ";
+ }
+ }
+
+
+
if (dialog.getDataSize().length() != 0) {
try {
tmp = byteDataSize;
@@ -233,6 +255,7 @@ public abstract class ADDMemoryNode extends ADDCommunicationNode implements With
sb.append("\" />\n");
sb.append("<attributes byteDataSize=\"" + byteDataSize + "\" ");
sb.append(" index=\"" + index + "\" ");
+ sb.append(" cluster_index=\"" + cluster_index + "\" ");
if (stereotype.equals("RAM")) {
sb.append(" processCode=\"" + getProcessCode() + "\" ");
}
@@ -276,6 +299,7 @@ public abstract class ADDMemoryNode extends ADDCommunicationNode implements With
byteDataSize = Integer.decode(elt.getAttribute("byteDataSize")).intValue();
//monitored = Integer.decode(elt.getAttribute("monitored")).intValue();
index = Integer.decode(elt.getAttribute("index")).intValue();
+ //cluster_index = Integer.decode(elt.getAttribute("cluster_index")).intValue();
if (sstereotype.equals("RAM")) {
processCode = elt.getAttribute("processCode");
setProcessCode(processCode);
diff --git a/src/main/java/ui/avatardd/ADDMemoryNode.java-new b/src/main/java/ui/avatardd/ADDMemoryNode.java-new
new file mode 100755
index 0000000000000000000000000000000000000000..403be2baafa54577a1e8dfff2ff509583a11cb56
--- /dev/null
+++ b/src/main/java/ui/avatardd/ADDMemoryNode.java-new
@@ -0,0 +1,335 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.avatardd;
+
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwMemory;
+import ui.*;
+import ui.util.IconManager;
+import ui.window.JDialogADDMemoryNode;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Class ADDMemoryNode
+ * Node. To be used in avatar deployment diagrams.
+ * Creation: 21/08/2014
+ * @version 1.0 21/08/2014
+ * @author Ludovic APVRILLE
+ */
+
+public abstract class ADDMemoryNode extends ADDCommunicationNode implements WithAttributes {
+ protected int textY1 = 15;
+ protected int textY2 = 30;
+ protected int derivationx = 2;
+ protected int derivationy = 3;
+ protected String stereotype = "RAM";
+
+ protected int index = 0;
+ protected int cluster_index = 0;
+ protected int monitored = 0;
+ protected int byteDataSize = HwMemory.DEFAULT_BYTE_DATA_SIZE;
+
+ private String processCode;
+
+ public ADDMemoryNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ setProcessCode("");
+ }
+
+ public void internalDrawing(Graphics g) {
+ Color c = g.getColor();
+ g.draw3DRect(x, y, width, height, true);
+
+ // Top lines
+ g.drawLine(x, y, x + derivationx, y - derivationy);
+ g.drawLine(x + width, y, x + width + derivationx, y - derivationy);
+ g.drawLine(x + derivationx, y - derivationy, x + width + derivationx, y - derivationy);
+
+ // Right lines
+ g.drawLine(x + width, y + height, x + width + derivationx, y - derivationy + height);
+ g.drawLine(x + derivationx + width, y - derivationy, x + width + derivationx, y - derivationy + height);
+
+ // Filling color
+ g.setColor(ColorManager.MEMORY_BOX);
+ g.fill3DRect(x+1, y+1, width-1, height-1, true);
+ g.setColor(c);
+
+ // Strings
+ String ster = "<<" + stereotype + ">>";
+ int w = g.getFontMetrics().stringWidth(ster);
+ Font f = g.getFont();
+ g.setFont(f.deriveFont(Font.BOLD));
+ g.drawString(ster, x + (width - w)/2, y + textY1);
+ w = g.getFontMetrics().stringWidth(name);
+ g.setFont(f);
+ g.drawString(name, x + (width - w)/2, y + textY2);
+
+ // Icon
+ //g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
+ g.drawImage(IconManager.imgic1108.getImage(), x + 4, y + 4, null);
+ g.drawImage(IconManager.img9, x + width - 20, y + 4, null);
+ }
+
+ public TGComponent isOnOnlyMe(int x1, int y1) {
+ Polygon pol = new Polygon();
+ pol.addPoint(x, y);
+ pol.addPoint(x + derivationx, y - derivationy);
+ pol.addPoint(x + derivationx + width, y - derivationy);
+ pol.addPoint(x + derivationx + width, y + height - derivationy);
+ pol.addPoint(x + width, y + height);
+ pol.addPoint(x, y + height);
+ if (pol.contains(x1, y1)) {
+ return this;
+ }
+ return null;
+ }
+
+ public String getStereotype() {
+ return stereotype;
+ }
+
+ public String getNodeName() {
+ return name;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public int getClusterIndex() {
+ return cluster_index;
+ }
+
+ public int getDataSize() {
+ return byteDataSize;
+ }
+
+ public int getMonitored() {
+ return monitored;
+ }
+
+ public boolean editOndoubleClick(JFrame frame) {
+ boolean error = false;
+ String errors = "";
+ int tmp;
+ String tmpName;
+
+ JDialogADDMemoryNode dialog = new JDialogADDMemoryNode(frame, "Setting " + stereotype + " attributes", this);
+ // dialog.setSize(500, 450);
+ GraphicLib.centerOnParent(dialog, 500, 450);
+ dialog.setVisible( true ); // blocked until dialog has been closed
+
+ if (!dialog.isRegularClose()) {
+ return false;
+ }
+
+ if (dialog.getNodeName().length() != 0) {
+ tmpName = dialog.getNodeName();
+ tmpName = tmpName.trim();
+ if (!TAttribute.isAValidId(tmpName, false, false)) {
+ error = true;
+ errors += "Name of the node ";
+ } else {
+ name = tmpName;
+ }
+ }
+
+ if (dialog.getIndex().length() != 0) {
+ try {
+ tmp = index;
+ index = Integer.decode(dialog.getIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "index ";
+ }
+ }
+
+ if (dialog.getClusterIndex().length() != 0) {
+ try {
+ tmp = cluster_index;
+ index = Integer.decode(dialog.getClusterIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "cluster index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "cluster index ";
+ }
+ }
+
+
+
+ if (dialog.getDataSize().length() != 0) {
+ try {
+ tmp = byteDataSize;
+ byteDataSize = Integer.decode(dialog.getDataSize()).intValue();
+ if (index < 0) {
+ byteDataSize = tmp;
+ error = true;
+ errors += "byteDataSize ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "byteDataSize ";
+ }
+ }
+
+ //if (dialog.getMonitored().length() != 0) {
+ if (dialog.getMonitored() != 0) {
+ try {
+ tmp = monitored;
+ monitored = dialog.getMonitored();//Integer.decode(dialog.getMonitored()).intValue();
+ if (index < 0) {
+ monitored = tmp;
+ error = true;
+ errors += "monitored ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "monitored ";
+ }
+ }
+
+ if (error) {
+ JOptionPane.showMessageDialog(frame,
+ "Invalid value for the following attributes: " + errors,
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
+ return false;
+ }
+ return true;
+ }
+
+ protected String translateExtraParam() {
+ StringBuffer sb = new StringBuffer("<extraparam>\n");
+ sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
+ sb.append("\" />\n");
+ sb.append("<attributes byteDataSize=\"" + byteDataSize + "\" ");
+ sb.append(" index=\"" + index + "\" ");
+ sb.append(" cluster_index=\"" + cluster_index + "\" ");
+ if (stereotype.equals("RAM")) {
+ sb.append(" processCode=\"" + getProcessCode() + "\" ");
+ }
+ sb.append("/>\n");
+ sb.append("</extraparam>\n");
+ return new String(sb);
+ }
+
+ public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+ //
+ try {
+ NodeList nli;
+ Node n1, n2;
+ Element elt;
+ //int t1id;
+ String sstereotype = null, snodeName = null;
+ monitored = 0;
+ String processCode;
+
+ for(int i=0; i<nl.getLength(); i++) {
+ n1 = nl.item(i);
+ //
+ if (n1.getNodeType() == Node.ELEMENT_NODE) {
+ nli = n1.getChildNodes();
+ for(int j=0; j<nli.getLength(); j++) {
+ n2 = nli.item(j);
+ //
+ if (n2.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element) n2;
+ if (elt.getTagName().equals("info")) {
+ sstereotype = elt.getAttribute("stereotype");
+ snodeName = elt.getAttribute("nodeName");
+ }
+ if (sstereotype != null) {
+ stereotype = sstereotype;
+ }
+ if (snodeName != null){
+ name = snodeName;
+ }
+ if (elt.getTagName().equals("attributes")) {
+ byteDataSize = Integer.decode(elt.getAttribute("byteDataSize")).intValue();
+ //monitored = Integer.decode(elt.getAttribute("monitored")).intValue();
+ index = Integer.decode(elt.getAttribute("index")).intValue();
+ //cluster_index = Integer.decode(elt.getAttribute("cluster_index")).intValue();
+ if (sstereotype.equals("RAM")) {
+ processCode = elt.getAttribute("processCode");
+ setProcessCode(processCode);
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ throw new MalformedModelingException();
+ }
+ }
+
+ public int getByteDataSize(){
+ return byteDataSize;
+ }
+
+ public String getAttributes() {
+ String attr = "";
+ attr += "Data size (in byte) = " + byteDataSize + "\n";
+ attr += "Index = " + index + "\n";
+ return attr;
+ }
+
+ public String getProcessCode() {
+ return processCode;
+ }
+
+ public void setProcessCode(String _processCode) {
+ processCode = _processCode;
+ }
+}
diff --git a/src/main/java/ui/avatardd/ADDRAMNode.java b/src/main/java/ui/avatardd/ADDRAMNode.java
index 9076e1dd900a9bce0850c756f46c86349a0745de..6fee322b5a6ac5216cf1e846c1413d81acf4cc36 100755
--- a/src/main/java/ui/avatardd/ADDRAMNode.java
+++ b/src/main/java/ui/avatardd/ADDRAMNode.java
@@ -54,7 +54,9 @@ import java.util.Vector;
public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, WithAttributes {
protected int monitored = 0;
-
+ protected int index = 0;
+ protected int cluster_index = 0;
+
public ADDRAMNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -147,6 +149,14 @@ public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, Wit
}
}
+ public int getIndex() {
+ return index;
+ }
+
+ public int getClusterIndex() {
+ return cluster_index;
+ }
+
public int getMonitored() {
return monitored;
}
@@ -154,4 +164,4 @@ public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, Wit
public void setMonitored(int _monitored){
monitored = _monitored;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ui/avatardd/ADDRAMNode.java-new b/src/main/java/ui/avatardd/ADDRAMNode.java-new
new file mode 100755
index 0000000000000000000000000000000000000000..6fee322b5a6ac5216cf1e846c1413d81acf4cc36
--- /dev/null
+++ b/src/main/java/ui/avatardd/ADDRAMNode.java-new
@@ -0,0 +1,167 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.avatardd;
+
+import ui.*;
+import ui.util.IconManager;
+
+import java.util.Vector;
+
+/**
+ * Class ADDRAMNode
+ * Node. To be used in avatar deployment diagrams.
+ * Creation: 01/07/2014
+ * @version 1.0 01/07/2014
+ * @author Ludovic APVRILLE
+ */
+
+public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, WithAttributes {
+
+ protected int monitored = 0;
+ protected int index = 0;
+ protected int cluster_index = 0;
+
+ public ADDRAMNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ width = 200;
+ height = 200;
+ minWidth = 100;
+ minHeight = 35;
+
+ nbConnectingPoint = 16;
+ connectingPoint = new TGConnectingPoint[16];
+
+ connectingPoint[0] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.0);
+ connectingPoint[1] = new ADDConnectingPoint(this, 0, 0, false, true, 0.5, 0.0);
+ connectingPoint[2] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.0);
+ connectingPoint[3] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.5);
+ connectingPoint[4] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.5);
+ connectingPoint[5] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 1.0);
+ connectingPoint[6] = new ADDConnectingPoint(this, 0, 0, false, true, 0.5, 1.0);
+ connectingPoint[7] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 1.0);
+
+ connectingPoint[8] = new ADDConnectingPoint(this, 0, 0, false, true, 0.25, 0.0);
+ connectingPoint[9] = new ADDConnectingPoint(this, 0, 0, false, true, 0.75, 0.0);
+ connectingPoint[10] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.25);
+ connectingPoint[11] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.25);
+ connectingPoint[12] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.75);
+ connectingPoint[13] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.75);
+ connectingPoint[14] = new ADDConnectingPoint(this, 0, 0, false, true, 0.25, 1.0);
+ connectingPoint[15] = new ADDConnectingPoint(this, 0, 0, false, true, 0.75, 1.0);
+
+ addTGConnectingPointsComment();
+
+ nbInternalTGComponent = 0;
+
+ moveable = true;
+ editable = true;
+ removable = true;
+ userResizable = true;
+
+ stereotype = "RAM";
+
+ name = tdp.findNodeName("Memory");
+ value = "name";
+
+ myImageIcon = IconManager.imgic700;
+ }
+
+ public int getType() {
+ return TGComponentManager.ADD_RAMNODE;
+ }
+
+ public boolean acceptSwallowedTGComponent(TGComponent tgc) {
+ //TraceManager.addDev("Accept swallowed?");
+ return tgc instanceof ADDBlockArtifact;
+ }
+
+ public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
+ //TraceManager.addDev("Add swallowed?");
+ //Set its coordinates
+ if (tgc instanceof ADDChannelArtifact) {
+ tgc.setFather(this);
+ tgc.setDrawingZone(true);
+ tgc.resizeWithFather();
+ //TraceManager.addDev("Add swallowed!!!");
+ addInternalComponent(tgc, 0);
+ return true;
+ }
+ return false;
+ }
+
+ public void removeSwallowedTGComponent(TGComponent tgc) {
+ removeInternalComponent(tgc);
+ }
+
+ public Vector<ADDChannelArtifact> getArtifactList() {
+ Vector<ADDChannelArtifact> v = new Vector<ADDChannelArtifact>();
+
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ADDChannelArtifact) {
+ v.add( (ADDChannelArtifact) tgcomponent[i] );
+ }
+ }
+ return v;
+ }
+
+ public void hasBeenResized() {
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ADDChannelArtifact) {
+ tgcomponent[i].resizeWithFather();
+ }
+ }
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public int getClusterIndex() {
+ return cluster_index;
+ }
+
+ public int getMonitored() {
+ return monitored;
+ }
+
+ public void setMonitored(int _monitored){
+ monitored = _monitored;
+ }
+}
diff --git a/src/main/java/ui/avatardd/ADDTTYNode.java b/src/main/java/ui/avatardd/ADDTTYNode.java
index e42a5e0ff797f7606d8ef98b9ab5d4158a4ff220..234c60314ecd88aa1385959de8069b4441133235 100755
--- a/src/main/java/ui/avatardd/ADDTTYNode.java
+++ b/src/main/java/ui/avatardd/ADDTTYNode.java
@@ -67,7 +67,7 @@ public class ADDTTYNode extends ADDNode implements WithAttributes {
private String stereotype = "TTY";
private int index = 0;
-
+ protected int cluster_index = 0;
public ADDTTYNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -175,7 +175,10 @@ public class ADDTTYNode extends ADDNode implements WithAttributes {
public int getIndex() {
return index;
}
-
+
+ public int getClusterIndex() {
+ return cluster_index;
+ }
public boolean editOndoubleClick(JFrame frame) {
boolean error = false;
@@ -220,6 +223,22 @@ public class ADDTTYNode extends ADDNode implements WithAttributes {
}
}
+ if (dialog.getClusterIndex().length() != 0) {
+ try {
+ tmp = cluster_index;
+ index = Integer.decode(dialog.getClusterIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "cluster index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "cluster index ";
+ }
+ }
+
+
if (error) {
JOptionPane.showMessageDialog(frame,
"Invalid value for the following attributes: " + errors,
@@ -241,6 +260,7 @@ public class ADDTTYNode extends ADDNode implements WithAttributes {
sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
sb.append("\" />\n");
sb.append("<attributes index=\"" + index + "\" ");
+ sb.append("cluster_index=\"" + cluster_index + "\" ");
//sb.append(" clockRatio=\"" + clockRatio + "\"");
sb.append("/>\n");
sb.append("</extraparam>\n");
@@ -282,6 +302,7 @@ public class ADDTTYNode extends ADDNode implements WithAttributes {
if (elt.getTagName().equals("attributes")) {
index = Integer.decode(elt.getAttribute("index")).intValue();
+ cluster_index = Integer.decode(elt.getAttribute("cluster_index")).intValue();
}
}
}
diff --git a/src/main/java/ui/avatardd/ADDTTYNode.java-new b/src/main/java/ui/avatardd/ADDTTYNode.java-new
new file mode 100755
index 0000000000000000000000000000000000000000..234c60314ecd88aa1385959de8069b4441133235
--- /dev/null
+++ b/src/main/java/ui/avatardd/ADDTTYNode.java-new
@@ -0,0 +1,328 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+
+package ui.avatardd;
+
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.util.IconManager;
+import ui.window.JDialogADDTTYNode;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+* Class ADDTTYNode
+* Node. To be used in Avatar deployment diagrams.
+* Creation: 01/07/2014
+* @version 1.0 01/07/2014
+* @author Ludovic APVRILLE
+ */
+public class ADDTTYNode extends ADDNode implements WithAttributes {
+ private int textY1 = 15;
+ private int textY2 = 30;
+ private int derivationx = 2;
+ private int derivationy = 3;
+ private String stereotype = "TTY";
+
+ private int index = 0;
+ protected int cluster_index = 0;
+
+ public ADDTTYNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ width = 250;
+ height = 200;
+ minWidth = 150;
+ minHeight = 100;
+
+ nbConnectingPoint = 16;
+ connectingPoint = new TGConnectingPoint[16];
+
+ connectingPoint[0] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.0);
+ connectingPoint[1] = new ADDConnectingPoint(this, 0, 0, false, true, 0.5, 0.0);
+ connectingPoint[2] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.0);
+ connectingPoint[3] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.5);
+ connectingPoint[4] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.5);
+ connectingPoint[5] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 1.0);
+ connectingPoint[6] = new ADDConnectingPoint(this, 0, 0, false, true, 0.5, 1.0);
+ connectingPoint[7] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 1.0);
+
+ connectingPoint[8] = new ADDConnectingPoint(this, 0, 0, false, true, 0.25, 0.0);
+ connectingPoint[9] = new ADDConnectingPoint(this, 0, 0, false, true, 0.75, 0.0);
+ connectingPoint[10] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.25);
+ connectingPoint[11] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.25);
+ connectingPoint[12] = new ADDConnectingPoint(this, 0, 0, false, true, 0.0, 0.75);
+ connectingPoint[13] = new ADDConnectingPoint(this, 0, 0, false, true, 1.0, 0.75);
+ connectingPoint[14] = new ADDConnectingPoint(this, 0, 0, false, true, 0.25, 1.0);
+ connectingPoint[15] = new ADDConnectingPoint(this, 0, 0, false, true, 0.75, 1.0);
+
+ addTGConnectingPointsComment();
+
+ nbInternalTGComponent = 0;
+
+ moveable = true;
+ editable = true;
+ removable = true;
+ userResizable = true;
+
+ name = tdp.findNodeName("TTY");
+ value = "name";
+
+ myImageIcon = IconManager.imgic700;
+ }
+
+ public void internalDrawing(Graphics g) {
+ Color c = g.getColor();
+ g.draw3DRect(x, y, width, height, true);
+
+
+ // Top lines
+ g.drawLine(x, y, x + derivationx, y - derivationy);
+ g.drawLine(x + width, y, x + width + derivationx, y - derivationy);
+ g.drawLine(x + derivationx, y - derivationy, x + width + derivationx, y - derivationy);
+
+ // Right lines
+ g.drawLine(x + width, y + height, x + width + derivationx, y - derivationy + height);
+ g.drawLine(x + derivationx + width, y - derivationy, x + width + derivationx, y - derivationy + height);
+
+ // Filling color
+ g.setColor(ColorManager.CPU_BOX_1);
+ g.fill3DRect(x+1, y+1, width-1, height-1, true);
+ g.setColor(c);
+
+ // Strings
+ String ster = "<<" + stereotype + ">>";
+ int w = g.getFontMetrics().stringWidth(ster);
+ Font f = g.getFont();
+ g.setFont(f.deriveFont(Font.BOLD));
+ g.drawString(ster, x + (width - w)/2, y + textY1);
+ g.setFont(f);
+ w = g.getFontMetrics().stringWidth(name);
+ g.drawString(name, x + (width - w)/2, y + textY2);
+
+ // Icon
+ g.drawImage(IconManager.imgic1100.getImage(), x + 4, y + 4, null);
+ g.drawImage(IconManager.img9, x + width - 20, y + 4, null);
+ }
+
+ public TGComponent isOnOnlyMe(int x1, int y1) {
+
+ Polygon pol = new Polygon();
+ pol.addPoint(x, y);
+ pol.addPoint(x + derivationx, y - derivationy);
+ pol.addPoint(x + derivationx + width, y - derivationy);
+ pol.addPoint(x + derivationx + width, y + height - derivationy);
+ pol.addPoint(x + width, y + height);
+ pol.addPoint(x, y + height);
+ if (pol.contains(x1, y1)) {
+ return this;
+ }
+
+ return null;
+ }
+
+ public String getStereotype() {
+ return stereotype;
+
+ }
+
+ public String getNodeName() {
+ return name;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public int getClusterIndex() {
+ return cluster_index;
+ }
+
+ public boolean editOndoubleClick(JFrame frame) {
+ boolean error = false;
+ String errors = "";
+ int tmp;
+ String tmpName;
+
+ JDialogADDTTYNode dialog = new JDialogADDTTYNode(frame, "Setting TTY attributes", this);
+ // dialog.setSize(500, 450);
+ GraphicLib.centerOnParent(dialog, 500, 450);
+ dialog.setVisible( true ); // blocked until dialog has been closed
+
+ if (!dialog.isRegularClose()) {
+ return false;
+ }
+
+ if (dialog.getNodeName().length() != 0) {
+ tmpName = dialog.getNodeName();
+ tmpName = tmpName.trim();
+ if (!TAttribute.isAValidId(tmpName, false, false)) {
+ error = true;
+ errors += "Name of the node ";
+ } else {
+ name = tmpName;
+ }
+ }
+
+
+
+ if (dialog.getIndex().length() != 0) {
+ try {
+ tmp = index;
+ index = Integer.decode(dialog.getIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "index ";
+ }
+ }
+
+ if (dialog.getClusterIndex().length() != 0) {
+ try {
+ tmp = cluster_index;
+ index = Integer.decode(dialog.getClusterIndex()).intValue();
+ if (index < 0) {
+ index = tmp;
+ error = true;
+ errors += "cluster index ";
+ }
+ } catch (Exception e) {
+ error = true;
+ errors += "cluster index ";
+ }
+ }
+
+
+ if (error) {
+ JOptionPane.showMessageDialog(frame,
+ "Invalid value for the following attributes: " + errors,
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
+ return false;
+ }
+
+ return true;
+ }
+
+
+ public int getType() {
+ return TGComponentManager.ADD_TTYNODE;
+ }
+
+ protected String translateExtraParam() {
+ StringBuffer sb = new StringBuffer("<extraparam>\n");
+ sb.append("<info stereotype=\"" + stereotype + "\" nodeName=\"" + name);
+ sb.append("\" />\n");
+ sb.append("<attributes index=\"" + index + "\" ");
+ sb.append("cluster_index=\"" + cluster_index + "\" ");
+ //sb.append(" clockRatio=\"" + clockRatio + "\"");
+ sb.append("/>\n");
+ sb.append("</extraparam>\n");
+ return new String(sb);
+ }
+
+ @Override
+ public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException{
+ //
+ try {
+
+ NodeList nli;
+ Node n1, n2;
+ Element elt;
+ // int t1id;
+ String sstereotype = null, snodeName = null;
+
+ for(int i=0; i<nl.getLength(); i++) {
+ n1 = nl.item(i);
+ //
+ if (n1.getNodeType() == Node.ELEMENT_NODE) {
+ nli = n1.getChildNodes();
+ for(int j=0; j<nli.getLength(); j++) {
+ n2 = nli.item(j);
+ //
+ if (n2.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element) n2;
+ if (elt.getTagName().equals("info")) {
+ sstereotype = elt.getAttribute("stereotype");
+ snodeName = elt.getAttribute("nodeName");
+ }
+ if (sstereotype != null) {
+ stereotype = sstereotype;
+ }
+ if (snodeName != null){
+ name = snodeName;
+ }
+
+ if (elt.getTagName().equals("attributes")) {
+
+ index = Integer.decode(elt.getAttribute("index")).intValue();
+ cluster_index = Integer.decode(elt.getAttribute("cluster_index")).intValue();
+ }
+ }
+ }
+ }
+ }
+
+ } catch (Exception e) {
+ throw new MalformedModelingException();
+ }
+ }
+
+ public int getDefaultConnector() {
+ return TGComponentManager.ADD_CONNECTOR;
+ }
+
+
+ public String getAttributes() {
+ String attr = "";
+ attr += "index = " + index + "\n";
+ return attr;
+ }
+
+}
diff --git a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 9cca0d125abb7bd562ac9211638a0c2084590cfe..88098c59041daa1c5e35efa1e70b4bbc4f458d51 100755
--- a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -905,7 +905,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
// Latencies
latencyPanel = new JPanel();
- infoTab.addTab("Latencies", IconManager.imgic1202, latencyPanel, "Latencies");
+ infoTab.addTab("Latencies", IconManager.imgic1202, new JScrollPane(latencyPanel), "Latencies");
GridBagLayout gridbag0 = new GridBagLayout();
GridBagConstraints c0 = new GridBagConstraints();
latencyPanel.setLayout(gridbag0);
@@ -955,8 +955,8 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
((latTable.getColumnModel()).getColumn(3)).setPreferredWidth(100);
((latTable.getColumnModel()).getColumn(4)).setPreferredWidth(100);
((latTable.getColumnModel()).getColumn(5)).setPreferredWidth(100);
- latTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
- jspLatency = new JScrollPane(latTable);
+ // latTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ jspLatency = new JScrollPane(latTable, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
jspLatency.setWheelScrollingEnabled(true);
jspLatency.getVerticalScrollBar().setUnitIncrement(10);
jspLatency.setMinimumSize(new Dimension(1200, 100));
diff --git a/src/main/java/ui/avatarrd/AvatarRDPanel.java b/src/main/java/ui/avatarrd/AvatarRDPanel.java
index 461517ed8ecab1b98e06fde6746a513768117a94..a177712dde1b5f9c8e9ab3541fbd1e76832e4bd1 100755
--- a/src/main/java/ui/avatarrd/AvatarRDPanel.java
+++ b/src/main/java/ui/avatarrd/AvatarRDPanel.java
@@ -43,7 +43,6 @@ package ui.avatarrd;
import myutil.TraceManager;
import ui.*;
-import ui.req.TGConnectorVerify;
import java.util.*;
@@ -184,7 +183,11 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
autoAdjust();
}
- public ArrayList<AvatarRDProperty> getAllPropertiesVerify(AvatarRDRequirement req) {
+ //
+ // For requirement table defined in RequirementsTableModel
+ //
+
+ public ArrayList<AvatarRDProperty> getAllPropertiesVerify(TGComponent req) {
ArrayList<AvatarRDProperty> listOfProps = new ArrayList<>();
// We parse all AvatarRDVerifyConnector
@@ -217,7 +220,7 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
//TraceManager.addDev("FoundC=" + foundC);
if (foundC instanceof AvatarRDProperty) {
//TraceManager.addDev("Adding foundC");
- listOfProps.add((AvatarRDProperty)foundC);
+ listOfProps.add((AvatarRDProperty) foundC);
}
}
}
@@ -227,7 +230,7 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
}
- public ArrayList<AvatarRDElementReference> getAllElementsSatified(AvatarRDRequirement req) {
+ public ArrayList<AvatarRDElementReference> getAllElementsSatified(TGComponent req) {
ArrayList<AvatarRDElementReference> listOfProps = new ArrayList<>();
// We parse all AvatarRDVerifyConnector
@@ -260,7 +263,7 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
//TraceManager.addDev("FoundC=" + foundC);
if (foundC instanceof AvatarRDElementReference) {
//TraceManager.addDev("Adding foundC");
- listOfProps.add((AvatarRDElementReference)foundC);
+ listOfProps.add((AvatarRDElementReference) foundC);
}
}
}
@@ -270,9 +273,20 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
}
- public ArrayList<AvatarRDRequirement> getAllImmediateSons(AvatarRDRequirement req) {
+ public ArrayList<AvatarRDRequirement> getAllImmediateSons(TGComponent req) {
+ HashSet<TGComponent> met = new HashSet<>();
+ return getAllImmediateSons(req, met);
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllImmediateSons(TGComponent req, HashSet<TGComponent> met) {
ArrayList<AvatarRDRequirement> listOfProps = new ArrayList<>();
+ if (met.contains(req)) {
+ return listOfProps;
+ }
+
+ met.add(req);
+
// We parse all AvatarRDVerifyConnector
ListIterator iterator = getComponentList().listIterator();
TGComponent tgc;
@@ -300,18 +314,34 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
//TraceManager.addDev("FoundC=" + foundC);
if (foundC instanceof AvatarRDRequirement) {
//TraceManager.addDev("Adding foundC");
- listOfProps.add((AvatarRDRequirement)foundC);
+ listOfProps.add((AvatarRDRequirement) foundC);
+ }
+ if (foundC instanceof AvatarRDRequirementReference) {
+ AvatarRDRequirement refReq = ((AvatarRDRequirementReference)foundC).getReference();
+ if (refReq != null) {
+ listOfProps.add(refReq);
+ }
+ listOfProps.addAll(getAllImmediateSons(foundC, met));
}
}
}
}
+ if (req instanceof AvatarRDRequirement) {
+ AvatarRDRequirement myReq = (AvatarRDRequirement)req;
+ for (AvatarRDRequirementReference ref : myReq.getAllReferences()) {
+ AvatarRDPanel myPanel = (AvatarRDPanel) (ref.getTDiagramPanel());
+ listOfProps.addAll(myPanel.getAllImmediateSons(ref));
+ }
+ }
+
return listOfProps;
}
public ArrayList<AvatarRDRequirement> getAllSons(AvatarRDRequirement req) {
+ //TraceManager.addDev("\nGet all sons of: " + req);
HashSet<AvatarRDRequirement> met = new HashSet<>();
met.add(req);
@@ -320,20 +350,36 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
ArrayList<AvatarRDRequirement> tmpNew = new ArrayList<>();
tmpList.add(req);
- for(;;) {
+ for (; ; ) {
tmpNew.clear();
- for(AvatarRDRequirement rq: tmpList) {
- tmpNew.addAll(getAllImmediateSons(rq));
+ for (AvatarRDRequirement rq : tmpList) {
+ tmpNew.addAll(rq.getAllImmediateSons());
}
tmpList.clear();
- for(AvatarRDRequirement rq: tmpNew) {
+ for (AvatarRDRequirement rq : tmpNew) {
if (!(met.contains(rq))) {
+ //TraceManager.addDev("Adding req:" + rq);
met.add(rq);
listOfSons.add(rq);
tmpList.add(rq);
+ if (rq.getAllReferences().size() > 0) {
+ //TraceManager.addDev("Adding references of " + rq);
+ }
+ for (AvatarRDRequirementReference ref : rq.getAllReferences()) {
+ AvatarRDRequirement newReq = ref.getReference();
+ //TraceManager.addDev("Adding son of references = " + newReq);
+ if (newReq != null) {
+ if (!(met.contains(newReq))) {
+ listOfSons.add(newReq);
+ tmpList.add(newReq);
+ }
+ }
+ }
+
+
}
}
- if(tmpList.size() == 0) {
+ if (tmpList.size() == 0) {
break;
}
}
@@ -341,9 +387,22 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
return listOfSons;
}
- public ArrayList<AvatarRDRequirement> getAllImmediateFathers(AvatarRDRequirement req) {
+ public ArrayList<AvatarRDRequirement> getAllImmediateFathers(TGComponent req) {
+ HashSet<TGComponent> met = new HashSet<>();
+ return getAllImmediateFathers(req, met);
+ }
+
+
+ public ArrayList<AvatarRDRequirement> getAllImmediateFathers(TGComponent req, HashSet<TGComponent> met) {
+
ArrayList<AvatarRDRequirement> listOfProps = new ArrayList<>();
+ if (met.contains(req)) {
+ return listOfProps;
+ }
+
+ met.add(req);
+
// We parse all AvatarRDVerifyConnector
ListIterator iterator = getComponentList().listIterator();
TGComponent tgc;
@@ -371,12 +430,27 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
//TraceManager.addDev("FoundC=" + foundC);
if (foundC instanceof AvatarRDRequirement) {
//TraceManager.addDev("Adding foundC");
- listOfProps.add((AvatarRDRequirement)foundC);
+ listOfProps.add((AvatarRDRequirement) foundC);
+ }
+ if (foundC instanceof AvatarRDRequirementReference) {
+ AvatarRDRequirement refReq = ((AvatarRDRequirementReference)foundC).getReference();
+ if (refReq != null) {
+ listOfProps.add(refReq);
+ }
+ listOfProps.addAll(getAllImmediateFathers(foundC, met));
}
}
}
}
+ if (req instanceof AvatarRDRequirement) {
+ AvatarRDRequirement myReq = (AvatarRDRequirement)req;
+ for (AvatarRDRequirementReference ref : myReq.getAllReferences()) {
+ AvatarRDPanel myPanel = (AvatarRDPanel) (ref.getTDiagramPanel());
+ listOfProps.addAll(myPanel.getAllImmediateFathers(ref));
+ }
+ }
+
return listOfProps;
}
@@ -390,20 +464,46 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
ArrayList<AvatarRDRequirement> tmpNew = new ArrayList<>();
tmpList.add(req);
- for(;;) {
+ for (; ; ) {
tmpNew.clear();
- for(AvatarRDRequirement rq: tmpList) {
+ for (AvatarRDRequirement rq : tmpList) {
tmpNew.addAll(getAllImmediateFathers(rq));
}
tmpList.clear();
- for(AvatarRDRequirement rq: tmpNew) {
+
+ for (AvatarRDRequirement rq : tmpNew) {
if (!(met.contains(rq))) {
+ //TraceManager.addDev("Adding req:" + rq);
met.add(rq);
listOfSons.add(rq);
tmpList.add(rq);
+ if (rq.getAllReferences().size() > 0) {
+ //TraceManager.addDev("Adding references of " + rq);
+ }
+ for (AvatarRDRequirementReference ref : rq.getAllReferences()) {
+ AvatarRDRequirement newReq = ref.getReference();
+ //TraceManager.addDev("Adding son of references = " + newReq);
+ if (newReq != null) {
+ if (!(met.contains(newReq))) {
+ listOfSons.add(newReq);
+ tmpList.add(newReq);
+ }
+ }
+ }
+
+
}
}
- if(tmpList.size() == 0) {
+
+ /*for (AvatarRDRequirement rq : tmpNew) {
+ if (!(met.contains(rq))) {
+ met.add(rq);
+ listOfSons.add(rq);
+ tmpList.add(rq);
+ }
+ }*/
+
+ if (tmpList.size() == 0) {
break;
}
}
@@ -429,12 +529,12 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
p2 = ((AvatarRDRefineConnector) (tgc)).getTGConnectingPointP2();
pother = null;
- if (origin ==0) {
+ if (origin == 0) {
if (req.belongsToMe(p1)) {
pother = p2;
//TraceManager.addDev("pother = p1");
}
- } else {
+ } else {
if (req.belongsToMe(p2)) {
pother = p1;
//TraceManager.addDev("pother = p1");
@@ -449,7 +549,7 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
//TraceManager.addDev("FoundC=" + foundC);
if (foundC instanceof AvatarRDRequirement) {
//TraceManager.addDev("Adding foundC");
- listOfProps.add((AvatarRDRequirement)foundC);
+ listOfProps.add((AvatarRDRequirement) foundC);
}
}
}
@@ -476,12 +576,12 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
p2 = ((AvatarRDDeriveConnector) (tgc)).getTGConnectingPointP2();
pother = null;
- if (origin ==0) {
+ if (origin == 0) {
if (req.belongsToMe(p1)) {
pother = p2;
//TraceManager.addDev("pother = p1");
}
- } else {
+ } else {
if (req.belongsToMe(p2)) {
pother = p1;
//TraceManager.addDev("pother = p1");
@@ -496,7 +596,7 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
//TraceManager.addDev("FoundC=" + foundC);
if (foundC instanceof AvatarRDRequirement) {
//TraceManager.addDev("Adding foundC");
- listOfProps.add((AvatarRDRequirement)foundC);
+ listOfProps.add((AvatarRDRequirement) foundC);
}
}
}
@@ -505,6 +605,16 @@ public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
return listOfProps;
}
+
+ public void updateReferences() {
+ ListIterator iterator = getComponentList().listIterator();
+ while (iterator.hasNext()) {
+ TGComponent tgc = (TGComponent) (iterator.next());
+ if (tgc instanceof AvatarRDRequirementReference) {
+ ((AvatarRDRequirementReference)tgc).updateReference();
+ }
+ }
+ }
}
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index 77da73244b12411900a0c08604f7a4d62316a8ad..823532f76c1f04bd8efa7bc6777a027e05ec83f8 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -132,6 +132,10 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
private int iconSize = 18;
// private boolean iconIsDrawn = false;
+
+ // References
+ private ArrayList<AvatarRDRequirementReference> references;
+
public AvatarRDRequirement(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -225,6 +229,8 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
text = "Requirement description:\nDouble-click to edit";
+ references = new ArrayList<>();
+
actionOnAdd();
}
@@ -860,6 +866,10 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
return text;
}
+ public String[] getTexts() {
+ return texts;
+ }
+
public String getID() {
return id;
}
@@ -992,8 +1002,16 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
}
public ArrayList<AvatarRDProperty> getAllPropertiesVerified() {
+ ArrayList<AvatarRDProperty> props = new ArrayList<>();
+
AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
- return myPanel.getAllPropertiesVerify(this);
+ props.addAll(myPanel.getAllPropertiesVerify(this));
+
+ for (AvatarRDRequirementReference ref: references) {
+ myPanel = (AvatarRDPanel)(ref.getTDiagramPanel());
+ props.addAll(myPanel.getAllPropertiesVerify(ref));
+ }
+ return props;
}
public String getStringOfAllPropertiesVerified() {
@@ -1007,8 +1025,15 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
}
public ArrayList<AvatarRDElementReference> getAllElementsSatisfied() {
+ ArrayList<AvatarRDElementReference> satis = new ArrayList<>();
AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
- return myPanel.getAllElementsSatified(this);
+ satis.addAll(myPanel.getAllElementsSatified(this));
+
+ for (AvatarRDRequirementReference ref: references) {
+ myPanel = (AvatarRDPanel)(ref.getTDiagramPanel());
+ satis.addAll(myPanel.getAllElementsSatified(ref));
+ }
+ return satis;
}
public String getStringOfAllElementsSatisfied() {
@@ -1021,9 +1046,20 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
return s;
}
+ public ArrayList<AvatarRDRequirementReference> getAllReferences() {
+ return references;
+ }
+
public ArrayList<AvatarRDRequirement> getAllImmediateSons() {
+ ArrayList<AvatarRDRequirement> sons = new ArrayList<>();
AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
- return myPanel.getAllImmediateSons(this);
+ sons.addAll(myPanel.getAllImmediateSons(this));
+
+ /*for (AvatarRDRequirementReference ref: references) {
+ myPanel = (AvatarRDPanel)(ref.getTDiagramPanel());
+ sons.addAll(myPanel.getAllImmediateSons(ref));
+ }*/
+ return sons;
}
public String getStringOfAllImmediateSons() {
@@ -1037,8 +1073,17 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
}
public ArrayList<AvatarRDRequirement> getAllSons() {
+ ArrayList<AvatarRDRequirement> sons = new ArrayList<>();
AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
- return myPanel.getAllSons(this);
+ sons.addAll(myPanel.getAllSons(this));
+
+ /*for (AvatarRDRequirementReference ref: references) {
+ if (ref.getReference() != null) {
+ myPanel = (AvatarRDPanel) (ref.getTDiagramPanel());
+ sons.addAll(myPanel.getAllSons(ref.getReference()));
+ }
+ }*/
+ return sons;
}
public String getStringOfAllSons() {
@@ -1052,8 +1097,17 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
}
public ArrayList<AvatarRDRequirement> getAllImmediateFathers() {
+
+ ArrayList<AvatarRDRequirement> fathers = new ArrayList<>();
AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
- return myPanel.getAllImmediateFathers(this);
+ fathers.addAll(myPanel.getAllImmediateFathers(this));
+
+ /*for (AvatarRDRequirementReference ref: references) {
+ myPanel = (AvatarRDPanel)(ref.getTDiagramPanel());
+ fathers.addAll(myPanel.getAllImmediateFathers(ref));
+ }*/
+ return fathers;
+
}
public String getStringOfAllImmediateFathers() {
@@ -1141,4 +1195,29 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
return s;
}
+
+ // For references
+ public Color getTopColor() {
+ return REQ_TYPE_COLOR.get(reqType);
+ }
+
+ public ArrayList<String> getExtraParamIDs() {
+ return extraParamIDs;
+ }
+
+ public ArrayList<String> getExtraParamValues() {
+ return extraParamValues;
+ }
+
+ public void addReference(AvatarRDRequirementReference ref) {
+ if (references.contains(ref)) {
+ return;
+ }
+ references.add(ref);
+ }
+
+ public void removeReference(AvatarRDRequirementReference ref) {
+ references.remove(ref);
+ }
+
}
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirementReference.java b/src/main/java/ui/avatarrd/AvatarRDRequirementReference.java
new file mode 100755
index 0000000000000000000000000000000000000000..097eb93f908b9eb4c86300654b94ace5f03278f2
--- /dev/null
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirementReference.java
@@ -0,0 +1,692 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package ui.avatarrd;
+
+
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.util.IconManager;
+import ui.window.JDialogChoiceSelection;
+import ui.window.JDialogIDAndStereotype;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+
+/**
+ * Class AvatarRDRequirementReference
+ * Avatar requirement reference: to be used in requirement diagram of AVATAR
+ * Creation: 13/07/2018
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 13/07/2018
+ */
+public class AvatarRDRequirementReference extends TGCScalableWithInternalComponent implements WithAttributes /*, TGAutoAdjust*/ {
+ public static int SIZE_LIMIT = 35;
+ public static String DEFAULT_REF = "UnsetReference";
+
+ public String oldValue;
+ protected int textX = 5;
+ protected int textY = 22;
+ protected int lineHeight = 30;
+ private double dlineHeight = 0.0;
+ //protected int reqType = 0;
+ // 0: normal, 1: formal, 2: security
+ //protected int startFontSize = 10;
+ protected Graphics graphics;
+ //protected int iconSize = 30;
+
+ private Font myFont, myFontB;
+ // private int maxFontSize = 30;
+ private int minFontSize = 4;
+ private int currentFontSize = -1;
+ private boolean displayText = true;
+
+ private AvatarRDRequirement reference;
+
+
+ // Icon
+ private int iconSize = 18;
+ // private boolean iconIsDrawn = false;
+
+ public AvatarRDRequirementReference(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ initScaling(200, 120);
+ oldScaleFactor = tdp.getZoom();
+ dlineHeight = lineHeight * oldScaleFactor;
+ lineHeight = (int) dlineHeight;
+ dlineHeight = dlineHeight - lineHeight;
+
+ minWidth = 1;
+ minHeight = lineHeight;
+
+ nbConnectingPoint = 40;
+ connectingPoint = new TGConnectingPoint[nbConnectingPoint];
+ connectingPoint[0] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.0, 0.25, TGConnectingPoint.WEST);
+ connectingPoint[1] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.0, 0.5, TGConnectingPoint.WEST);
+ connectingPoint[2] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.0, 0.75, TGConnectingPoint.WEST);
+ connectingPoint[3] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 1.0, 0.25, TGConnectingPoint.EAST);
+ connectingPoint[4] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 1.0, 0.5, TGConnectingPoint.EAST);
+ connectingPoint[5] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 1.0, 0.75, TGConnectingPoint.EAST);
+ connectingPoint[6] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.25, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[7] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[8] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.75, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[9] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.25, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[10] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[11] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.75, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[12] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.0, 0.25, TGConnectingPoint.WEST);
+ connectingPoint[13] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.0, 0.5, TGConnectingPoint.WEST);
+ connectingPoint[14] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.0, 0.75, TGConnectingPoint.WEST);
+ connectingPoint[15] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 1.0, 0.25, TGConnectingPoint.EAST);
+ connectingPoint[16] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 1.0, 0.5, TGConnectingPoint.EAST);
+ connectingPoint[17] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 1.0, 0.75, TGConnectingPoint.EAST);
+ connectingPoint[18] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.25, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[19] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.5, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[20] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.75, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[21] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.25, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[22] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.5, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[23] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.75, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[24] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[25] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[26] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[27] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+ int i = 28;
+ connectingPoint[0 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.0, 0.25);
+ connectingPoint[1 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.0, 0.5);
+ connectingPoint[2 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.0, 0.75);
+ connectingPoint[3 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 1.0, 0.25);
+ connectingPoint[4 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 1.0, 0.5);
+ connectingPoint[5 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 1.0, 0.75);
+ connectingPoint[6 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.25, 0.0);
+ connectingPoint[7 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.5, 0.0);
+ connectingPoint[8 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.75, 0.0);
+ connectingPoint[9 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.25, 1.0);
+ connectingPoint[10 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.5, 1.0);
+ connectingPoint[11 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.75, 1.0);
+
+ addTGConnectingPointsCommentTop();
+
+ nbInternalTGComponent = 0;
+ //tgcomponent = new TGComponent[nbInternalTGComponent];
+
+// int h = 1;
+ //TAttributeRequirement tgc0;
+ //tgc0 = new TAttributeRequirement(x, y+height+h, 0, 0, height + h, height+h, true, this, _tdp);
+ //tgcomponent[0] = tgc0;
+
+ moveable = true;
+ editable = true;
+ removable = true;
+ userResizable = true;
+ multieditable = true;
+
+ //reqType = 0;
+
+ value = DEFAULT_REF;
+
+ oldValue = value;
+
+ myImageIcon = IconManager.imgic5074;
+
+ }
+
+ public void internalDrawing(Graphics g) {
+ Font f = g.getFont();
+ // Font fold = f;
+ // int w, c;
+ int size;
+
+
+ if ((reference == null) && (value.compareTo(DEFAULT_REF) != 0)) {
+ updateReference();
+
+ }
+
+ if (!tdp.isScaled()) {
+ graphics = g;
+ }
+
+ if (((rescaled) && (!tdp.isScaled())) || myFont == null) {
+ currentFontSize = tdp.getFontSize();
+ //
+ myFont = f.deriveFont((float) currentFontSize);
+ myFontB = myFont.deriveFont(Font.BOLD);
+
+ if (rescaled) {
+ rescaled = false;
+ }
+ }
+
+ displayText = currentFontSize >= minFontSize;
+
+ // int h = g.getFontMetrics().getHeight();
+
+ g.drawRect(x, y, width, height);
+
+ g.drawLine(x, y + lineHeight, x + width, y + lineHeight);
+ Color topColor = null;
+ if (reference != null) {
+ topColor = reference.getTopColor();
+ }
+ if (topColor == null) {
+ //TraceManager.addDev("Swithing back to default Color for:" + REQ_TYPE_STR.get(reqType));
+ topColor = ColorManager.AVATAR_REQUIREMENT_TOP;
+ } else {
+ //TraceManager.addDev("Using color: " + topColor.getRGB() + "for " +REQ_TYPE_STR.get(reqType));
+ }
+ g.setColor(topColor);
+ g.fillRect(x + 1, y + 1, width - 1, lineHeight - 1);
+ g.setColor(ColorManager.AVATAR_REQUIREMENT_ATTRIBUTES);
+ g.fillRect(x + 1, y + 1 + lineHeight, width - 1, height - 1 - lineHeight);
+ ColorManager.setColor(g, getState(), 0);
+ if ((lineHeight > 23) && (width > 23)) {
+ g.drawImage(IconManager.img5100, x + width - iconSize + 1, y + 3, Color.yellow, null);
+ }
+
+ if (displayText) {
+ size = currentFontSize - 2;
+ g.setFont(myFont.deriveFont((float) (myFont.getSize() - 2)));
+
+ String req = "RefToRequirement";
+ /*if (reference != null) {
+ req = AvatarRDRequirement.REQ_TYPE_STR.get(reference.getRequirementType());
+ }*/
+ drawLimitedString(g, "<<" + req + ">>", x, y + size, width, 1);
+
+ size += currentFontSize;
+ g.setFont(myFontB);
+ // w = g.getFontMetrics().stringWidth(value);
+ drawLimitedString(g, value, x, y + size, width, 1);
+
+ }
+
+ if (reference != null) {
+ if (reference.isVerified()) {
+ if (reference.isSatisfied()) {
+ Color tmp = g.getColor();
+ GraphicLib.setMediumStroke(g);
+ g.setColor(Color.green);
+ g.drawLine(x + width - 2, y - 6 + lineHeight, x + width - 6, y - 2 + lineHeight);
+ g.drawLine(x + width - 6, y - 3 + lineHeight, x + width - 8, y - 6 + lineHeight);
+ g.setColor(tmp);
+ GraphicLib.setNormalStroke(g);
+ } else {
+ //g.drawString("acc", x + width - 10, y+height-10);
+ Color tmp = g.getColor();
+ GraphicLib.setMediumStroke(g);
+ g.setColor(Color.red);
+ g.drawLine(x + width - 2, y - 2 + lineHeight, x + width - 8, y - 8 + lineHeight);
+ g.drawLine(x + width - 8, y - 2 + lineHeight, x + width - 2, y - 8 + lineHeight);
+ g.setColor(tmp);
+ GraphicLib.setNormalStroke(g);
+ }
+ }
+
+ g.setFont(myFont);
+ String texti = "Text";
+ String s;
+ int i;
+ size = lineHeight + currentFontSize;
+
+ //ID
+ if (size < (height - 2)) {
+ drawLimitedString(g, "ID=" + reference.getID(), x + textX, y + size, width, 0);
+ }
+ size += currentFontSize;
+
+ //text
+ for (i = 0; i < reference.getTexts().length; i++) {
+ if (size < (height - 2)) {
+ s = reference.getTexts()[i];
+ if (i == 0) {
+ s = texti + "=\"" + s;
+ }
+ if (i == (reference.getTexts().length - 1)) {
+ s = s + "\"";
+ }
+ drawLimitedString(g, s, x + textX, y + size, width, 0);
+ }
+ size += currentFontSize;
+
+ }
+ // Type and risk
+ if (size < (height - 2)) {
+ drawLimitedString(g, "Kind=\"" + reference.getKind() + "\"", x + textX, y + size, width, 0);
+ size += currentFontSize;
+ if (size < (height - 2)) {
+ drawLimitedString(g, "Risk=\"" + reference.getCriticality() + "\"", x + textX, y + size, width, 0);
+ size += currentFontSize;
+ if (size < (height - 2)) {
+
+ drawLimitedString(g, "Reference elements=\"" + reference.getReferenceElements() + "\"", x + textX, y + size, width, 0);
+ size += currentFontSize;
+
+ if (size < (height - 2)) {
+
+ if (reference.getRequirementType() == AvatarRDRequirement.SECURITY_REQ) {
+ drawLimitedString(g, "Targeted attacks=\"" + reference.getAttackTreeNode() + "\"", x + textX, y + size, width, 0);
+ size += currentFontSize;
+ }
+
+ if (reference.getRequirementType() == AvatarRDRequirement.SAFETY_REQ) {
+ drawLimitedString(g, "State violating req.=\"" + reference.getViolatedAction() + "\"", x + textX, y + size, width, 0);
+ size += currentFontSize;
+ }
+ }
+ }
+ }
+ }
+
+ // Extra attributes
+ for (i = 0; i < reference.getExtraParamIDs().size(); i++) {
+ if (size < (height - 2)) {
+ s = reference.getExtraParamIDs().get(i) + ":" + reference.getExtraParamValues().get(i);
+ drawLimitedString(g, s, x + textX, y + size, width, 0);
+ }
+ size += currentFontSize;
+
+ }
+ }
+
+ g.setFont(f);
+ }
+
+ public boolean editOndoubleClick(JFrame frame, int _x, int _y) {
+ ArrayList<TGComponent> comps = tdp.getMainGUI().getAllRequirements();
+ ArrayList<String> allRequirements = new ArrayList<>(comps.size());
+ ArrayList<AvatarRDRequirement> realComps = new ArrayList<>(comps.size());
+ allRequirements.add(DEFAULT_REF);
+ realComps.add(null);
+ int currentIndex = 0;
+ for(TGComponent tgc: comps) {
+ if (tgc instanceof AvatarRDRequirement) {
+ AvatarRDRequirement req = (AvatarRDRequirement)tgc;
+ realComps.add(req);
+ String name = tgc.getTDiagramPanel().getName() + "::" + req.getRequirementName();
+ if (name.compareTo(value) == 0) {
+ currentIndex = allRequirements.size();
+ }
+ allRequirements.add(name);
+
+ }
+ }
+ String[] tabAllRequirements = allRequirements.toArray(new String[0]);
+ JDialogChoiceSelection jdcs = new JDialogChoiceSelection(tdp.getGUI().getFrame(), "Setting Reference to a Requirement ",
+ tabAllRequirements, currentIndex);
+ // jdr.setSize(750, 400);
+ GraphicLib.centerOnParent(jdcs, 500, 150);
+ jdcs.setVisible(true);
+
+ if (jdcs.hasBeenCancelled()) {
+ return false;
+ }
+
+ currentIndex = jdcs.getIndexOfSelectedElement();
+ value = tabAllRequirements[currentIndex];
+ if (reference != null) {
+ reference.removeReference(this);
+ }
+ reference = realComps.get(currentIndex);
+
+ return true;
+
+
+ }
+
+
+
+ public void rescale(double scaleFactor) {
+ dlineHeight = (lineHeight + dlineHeight) / oldScaleFactor * scaleFactor;
+ lineHeight = (int) (dlineHeight);
+ dlineHeight = dlineHeight - lineHeight;
+
+ minHeight = lineHeight;
+
+ super.rescale(scaleFactor);
+ }
+
+
+ public TGComponent isOnOnlyMe(int x1, int y1) {
+ if (GraphicLib.isInRectangle(x1, y1, x, y, width, height)) {
+ return this;
+ }
+ return null;
+ }
+
+ public void updateReference() {
+ ArrayList<TGComponent> comps = tdp.getMainGUI().getAllRequirements();
+ String tdpName = getTDPName();
+ String reqName = getRequirementName();
+ for(TGComponent tgc: comps) {
+ if (tgc instanceof AvatarRDRequirement) {
+ AvatarRDRequirement req = (AvatarRDRequirement) tgc;
+ if (req.getTDiagramPanel().getName().compareTo(tdpName) == 0) {
+ if (req.getRequirementName().compareTo(reqName) == 0) {
+ reference = req;
+ req.addReference(this);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ public String getRequirementReference() {
+ return value;
+ }
+
+
+
+ public String getAttributes() {
+ if (reference == null) {
+ return "";
+ }
+ String attr = "ID=" + reference.getID() + "\n";
+ attr += "Text= " + reference.getText() + "\n";
+ attr += "Kind= " + reference.getKind() + "\n";
+ attr += "Risk= " + reference.getCriticality() + "\n";
+ attr += "References= " + reference.getReferenceElements() + "\n";
+ if (reference.getRequirementType() == AvatarRDRequirement.SAFETY_REQ) {
+ attr += "Violated action= " + reference.getViolatedAction() + "\n";
+ }
+ if (reference.getRequirementType() == AvatarRDRequirement.SECURITY_REQ) {
+ attr += "Attack tree node(s)= " + reference.getAttackTreeNode() + "\n";
+ }
+ for(int i=0; i<reference.getExtraParamIDs().size(); i++) {
+ attr += reference.getExtraParamIDs().get(i) + ": " + reference.getExtraParamValues().get(i) + "\n";
+ }
+
+ return attr;
+ }
+
+
+ public String getTDPName() {
+ int index = value.indexOf("::");
+ if (index == -1) {
+ return null;
+ }
+ return value.substring(0, index);
+ }
+
+ public String getRequirementName() {
+ int index = value.indexOf("::");
+ if (index == -1) {
+ return null;
+ }
+ return value.substring(index+2, value.length());
+ }
+
+ public AvatarRDRequirement getReference() {
+ return reference;
+ }
+
+ public int getType() {
+ return TGComponentManager.AVATARRD_REQUIREMENT_REFERENCE;
+ }
+
+
+ /*public void autoAdjust(int mode) {
+ //
+
+ if (graphics == null) {
+ return;
+ }
+
+ Font f = graphics.getFont();
+ Font f0 = f.deriveFont((float) currentFontSize);
+ Font f1 = f0.deriveFont(Font.BOLD);
+ Font f2 = f.deriveFont((float) (currentFontSize - 2));
+
+ // Must find for both modes which width is desirable
+ String s0, s1;
+ s0 = "<<" + REQ_TYPE_STR.get(reqType) + ">>";
+ s1 = "Text=";
+
+ graphics.setFont(f2);
+ int w0 = graphics.getFontMetrics().stringWidth(s0);
+ graphics.setFont(f1);
+ int w1 = graphics.getFontMetrics().stringWidth(value);
+ int w2 = Math.max(w0, w1) + (2 * iconSize);
+
+ graphics.setFont(f0);
+ int w3, w4 = w2;
+ int i;
+
+ if (texts.length == 1) {
+ w3 = graphics.getFontMetrics().stringWidth(s1 + "=\"" + texts[0] + "\"");
+ w4 = Math.max(w4, w3);
+ } else {
+ for (i = 0; i < texts.length; i++) {
+ if (i == 0) {
+ w3 = graphics.getFontMetrics().stringWidth(s1 + "=\"" + texts[i]);
+ } else if (i == (texts.length - 1)) {
+ w3 = graphics.getFontMetrics().stringWidth(texts[i] + "\"");
+ } else {
+ w3 = graphics.getFontMetrics().stringWidth(texts[i]);
+ }
+
+ w4 = Math.max(w4, w3 + 2);
+ }
+ }
+ w3 = graphics.getFontMetrics().stringWidth("Kind=\"" + kind + "\"") + 2;
+ w4 = Math.max(w4, w3);
+ w3 = graphics.getFontMetrics().stringWidth("Risk=\"" + criticality + "\"") + 2;
+ w4 = Math.max(w4, w3);
+ w3 = graphics.getFontMetrics().stringWidth("ID=\"" + id + "\"") + 2;
+ w4 = Math.max(w4, w3);
+
+ if (mode == 1) {
+ resize(w4, lineHeight);
+ return;
+ }
+
+ int h;
+ if (mode == 2) {
+ h = ((texts.length + 4) * currentFontSize) + lineHeight;
+ } else {
+ h = ((texts.length + 5) * currentFontSize) + lineHeight;
+ }
+
+ resize(w4, h);
+
+ }*/
+
+ /*public ArrayList<AvatarRDProperty> getAllPropertiesVerified() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllPropertiesVerify(this);
+ }
+
+ public String getStringOfAllPropertiesVerified() {
+ ArrayList<AvatarRDProperty> list = getAllPropertiesVerified();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDElementReference> getAllElementsSatisfied() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllElementsSatified(this);
+ }
+
+ public String getStringOfAllElementsSatisfied() {
+ ArrayList<AvatarRDElementReference> list = getAllElementsSatisfied();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllImmediateSons() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllImmediateSons(this);
+ }
+
+ public String getStringOfAllImmediateSons() {
+ ArrayList<AvatarRDRequirement> list = getAllImmediateSons();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllSons() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllSons(this);
+ }
+
+ public String getStringOfAllSons() {
+ ArrayList<AvatarRDRequirement> list = getAllSons();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllImmediateFathers() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllImmediateFathers(this);
+ }
+
+ public String getStringOfAllImmediateFathers() {
+ ArrayList<AvatarRDRequirement> list = getAllImmediateFathers();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllFathers() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllFathers(this);
+ }
+
+ public String getStringOfAllFathers() {
+ ArrayList<AvatarRDRequirement> list = getAllFathers();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllMeRefineOrigin() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllMeRefine(this, 0);
+ }
+
+ public String getStringAllMeRefineOrigin() {
+ ArrayList<AvatarRDRequirement> list = getAllMeRefineOrigin();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllMeRefineDestination() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllMeRefine(this, 1);
+ }
+
+ public String getStringAllMeRefineDestination() {
+ ArrayList<AvatarRDRequirement> list = getAllMeRefineDestination();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllMeDeriveOrigin() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllMeDerive(this, 0);
+ }
+
+ public String getStringAllMeDeriveOrigin() {
+ ArrayList<AvatarRDRequirement> list = getAllMeDeriveOrigin();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }
+
+ public ArrayList<AvatarRDRequirement> getAllMeDeriveDestination() {
+ AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+ return myPanel.getAllMeDerive(this, 1);
+ }
+
+ public String getStringAllMeDeriveDestination() {
+ ArrayList<AvatarRDRequirement> list = getAllMeDeriveDestination();
+ String s = "";
+ for(int i=0; i<list.size(); i++) {
+ if (i>0) s+= " / ";
+ s += list.get(i).getValue();
+ }
+ return s;
+ }*/
+
+}
diff --git a/src/main/java/ui/avatarrd/AvatarRDToolBar.java b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
index 6ad45236fb7f5c654b302274beb00cbfc2da6b04..54b56ab81854e51608eb774f1e8ba3127f98eef7 100755
--- a/src/main/java/ui/avatarrd/AvatarRDToolBar.java
+++ b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
@@ -74,6 +74,7 @@ public class AvatarRDToolBar extends TToolBar {
mgui.actions[TGUIAction.UML_NOTE].setEnabled(b);
mgui.actions[TGUIAction.CONNECTOR_COMMENT].setEnabled(b);
mgui.actions[TGUIAction.ARD_REQUIREMENT].setEnabled(b);
+ mgui.actions[TGUIAction.ARD_REQUIREMENT_REFERENCE].setEnabled(b);
mgui.actions[TGUIAction.ARD_PROPERTY].setEnabled(b);
mgui.actions[TGUIAction.ARD_ELEMENT_REFERENCE].setEnabled(b);
mgui.actions[TGUIAction.ARD_VERIFY_CONNECTOR].setEnabled(b);
@@ -110,6 +111,9 @@ public class AvatarRDToolBar extends TToolBar {
button = this.add(mgui.actions[TGUIAction.ARD_REQUIREMENT]);
button.addMouseListener(mgui.mouseHandler);
+ button = this.add(mgui.actions[TGUIAction.ARD_REQUIREMENT_REFERENCE]);
+ button.addMouseListener(mgui.mouseHandler);
+
button = this.add(mgui.actions[TGUIAction.ARD_PROPERTY]);
button.addMouseListener(mgui.mouseHandler);
diff --git a/src/main/java/ui/eln/ELNConnectingPoint.java b/src/main/java/ui/eln/ELNConnectingPoint.java
index 25c6551b90d18730641bb587cb91d54345ed359f..be3b97a1069ef524dae0b52835219e2c3a09b050 100644
--- a/src/main/java/ui/eln/ELNConnectingPoint.java
+++ b/src/main/java/ui/eln/ELNConnectingPoint.java
@@ -52,12 +52,23 @@ import ui.TGConnectingPointWidthHeight;
public class ELNConnectingPoint extends TGConnectingPointWidthHeight {
public boolean positionned;
+ private String name;
- public ELNConnectingPoint(CDElement _container, int _x, int _y, boolean _in, boolean _out, double _w, double _h) {
+ public ELNConnectingPoint(CDElement _container, int _x, int _y, boolean _in, boolean _out, double _w, double _h, String _name) {
super(_container, _x, _y, _in, _out, _w, _h);
+
+ name = _name;
}
public boolean isCompatibleWith(int type) {
return type == TGComponentManager.ELN_CONNECTOR;
}
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String _name) {
+ name = _name;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/ELNConnector.java b/src/main/java/ui/eln/ELNConnector.java
index e9a8b5cb69b8080732d64f30e2db39a704ad99dd..a37827b45e32aaeaed388f8e11bdf668f0d6cb3c 100644
--- a/src/main/java/ui/eln/ELNConnector.java
+++ b/src/main/java/ui/eln/ELNConnector.java
@@ -40,63 +40,87 @@ package ui.eln;
import ui.*;
import ui.util.IconManager;
-
+import ui.window.JDialogELNConnector;
import java.awt.*;
-import java.util.Vector;
+import java.util.*;
+import javax.swing.JFrame;
/**
- * Class ELNConnector
- * Connector used in ELN diagrams
+ * Class ELNConnector
+ * Connector used in ELN diagrams
* Creation: 11/06/2018
* @version 1.0 11/06/2018
* @author Irina Kit Yan LEE
*/
-public class ELNConnector extends TGConnector implements ScalableTGComponent {
-
+public class ELNConnector extends TGConnector implements ScalableTGComponent {
protected double oldScaleFactor;
- protected int c = 10; //square length
-
- public ELNConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
- super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
- myImageIcon = IconManager.imgic202;
- value = "Connector between ports";
- editable = false;
- oldScaleFactor = tdp.getZoom();
- p1 = _p1;
- p2 = _p2;
- }
-
- public TGConnectingPoint get_p1(){
- return p1;
+
+ public ELNConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
+ super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
+
+ myImageIcon = IconManager.imgic202;
+ value = "";
+ editable = true;
+ oldScaleFactor = tdp.getZoom();
+
+ p1 = _p1;
+ p2 = _p2;
}
- public TGConnectingPoint get_p2(){
- return p2;
+ public TGConnectingPoint get_p1() {
+ return p1;
}
- protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2) {
- g.drawLine(x1, y1, x2, y2);
- }
-
- public void rescale(double scaleFactor){
- int xx, yy;
-
- for(int i=0; i<nbInternalTGComponent; i++) {
- xx = tgcomponent[i].getX();
- yy = tgcomponent[i].getY();
- tgcomponent[i].dx = (tgcomponent[i].dx + xx) / oldScaleFactor * scaleFactor;
- tgcomponent[i].dy = (tgcomponent[i].dy + yy) / oldScaleFactor * scaleFactor;
- xx = (int)(tgcomponent[i].dx);
- tgcomponent[i].dx = tgcomponent[i].dx - xx;
- yy = (int)(tgcomponent[i].dy);
- tgcomponent[i].dy = tgcomponent[i].dy - yy;
- tgcomponent[i].setCd(xx, yy);
- }
- oldScaleFactor = scaleFactor;
- }
-
- public int getType() {
- return TGComponentManager.ELN_CONNECTOR;
- }
+ public TGConnectingPoint get_p2() {
+ return p2;
+ }
+
+ public boolean editOndoubleClick(JFrame frame) {
+ JDialogELNConnector jde = new JDialogELNConnector(this);
+ jde.setVisible(true);
+ return true;
+ }
+
+ protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2) {
+ int w = g.getFontMetrics().stringWidth(value);
+ Font fold = g.getFont();
+ Font f = fold.deriveFont(Font.ITALIC, (float) (tdp.getFontSize()));
+ g.setFont(f);
+ g.drawString(value, (x1 + x2 - w) / 2, (y1 + y2) / 2);
+ g.setFont(fold);
+
+ g.drawLine(x1, y1, x2, y2);
+ }
+
+ public void rescale(double scaleFactor) {
+ int xx, yy;
+
+ for (int i = 0; i < nbInternalTGComponent; i++) {
+ xx = tgcomponent[i].getX();
+ yy = tgcomponent[i].getY();
+ tgcomponent[i].dx = (tgcomponent[i].dx + xx) / oldScaleFactor * scaleFactor;
+ tgcomponent[i].dy = (tgcomponent[i].dy + yy) / oldScaleFactor * scaleFactor;
+ xx = (int) (tgcomponent[i].dx);
+ tgcomponent[i].dx = tgcomponent[i].dx - xx;
+ yy = (int) (tgcomponent[i].dy);
+ tgcomponent[i].dy = tgcomponent[i].dy - yy;
+ tgcomponent[i].setCd(xx, yy);
+ }
+ oldScaleFactor = scaleFactor;
+ }
+
+ public int getType() {
+ return TGComponentManager.ELN_CONNECTOR;
+ }
+
+ public java.util.List<ELNMidPortTerminal> getAllMidPortTerminal() {
+ java.util.List<ELNMidPortTerminal> list = new ArrayList<ELNMidPortTerminal>();
+ for (int i = 0; i < nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNMidPortTerminal) {
+ list.add((ELNMidPortTerminal) (tgcomponent[i]));
+ }
+ }
+ return list;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/ELNDiagramToolBar.java b/src/main/java/ui/eln/ELNDiagramToolBar.java
index e4654add8463c0afda3a2051aafa49056893ae2c..6494124d74dbaaa15c8c9555d389d441963e9f15 100644
--- a/src/main/java/ui/eln/ELNDiagramToolBar.java
+++ b/src/main/java/ui/eln/ELNDiagramToolBar.java
@@ -67,7 +67,6 @@ public class ELNDiagramToolBar extends TToolBar {
mgui.actions[TGUIAction.ELN_EDIT].setEnabled(b);
mgui.actions[TGUIAction.UML_NOTE].setEnabled(b);
- mgui.actions[TGUIAction.ELN_CONNECTOR].setEnabled(b);
mgui.actions[TGUIAction.ELN_RESISTOR].setEnabled(b);
mgui.actions[TGUIAction.ELN_CAPACITOR].setEnabled(b);
mgui.actions[TGUIAction.ELN_INDUCTOR].setEnabled(b);
@@ -81,6 +80,11 @@ public class ELNDiagramToolBar extends TToolBar {
mgui.actions[TGUIAction.ELN_TDF_VOLTAGE_SINK].setEnabled(b);
mgui.actions[TGUIAction.ELN_TDF_CURRENT_SINK].setEnabled(b);
mgui.actions[TGUIAction.ELN_MODULE].setEnabled(b);
+ mgui.actions[TGUIAction.ELN_MODULE_TERMINAL].setEnabled(b);
+ mgui.actions[TGUIAction.ELN_TOGGLE_ATTR].setEnabled(b);
+ mgui.actions[TGUIAction.ELN_TDF_VOLTAGE_SOURCE].setEnabled(b);
+ mgui.actions[TGUIAction.ELN_TDF_CURRENT_SOURCE].setEnabled(b);
+ mgui.actions[TGUIAction.ELN_CONNECTOR].setEnabled(b);
mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(b);
mgui.actions[TGUIAction.ACT_ONECLICK_LOTOS_RG].setEnabled(b);
@@ -101,8 +105,16 @@ public class ELNDiagramToolBar extends TToolBar {
this.addSeparator();
+ button = this.add(mgui.actions[TGUIAction.ELN_CONNECTOR]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
button = this.add(mgui.actions[TGUIAction.ELN_MODULE]);
button.addMouseListener(mgui.mouseHandler);
+
+ button = this.add(mgui.actions[TGUIAction.ELN_MODULE_TERMINAL]);
+ button.addMouseListener(mgui.mouseHandler);
this.addSeparator();
@@ -138,6 +150,12 @@ public class ELNDiagramToolBar extends TToolBar {
this.addSeparator();
+ button = this.add(mgui.actions[TGUIAction.ELN_TDF_VOLTAGE_SOURCE]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ button = this.add(mgui.actions[TGUIAction.ELN_TDF_CURRENT_SOURCE]);
+ button.addMouseListener(mgui.mouseHandler);
+
button = this.add(mgui.actions[TGUIAction.ELN_TDF_VOLTAGE_SINK]);
button.addMouseListener(mgui.mouseHandler);
@@ -146,7 +164,7 @@ public class ELNDiagramToolBar extends TToolBar {
this.addSeparator();
- button = this.add(mgui.actions[TGUIAction.ELN_CONNECTOR]);
+ button = this.add(mgui.actions[TGUIAction.ELN_TOGGLE_ATTR]);
button.addMouseListener(mgui.mouseHandler);
}
}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/ELNMidPortTerminal.java b/src/main/java/ui/eln/ELNMidPortTerminal.java
new file mode 100644
index 0000000000000000000000000000000000000000..fe2d2721240cb9c618d0d893731eed7fc20c5faa
--- /dev/null
+++ b/src/main/java/ui/eln/ELNMidPortTerminal.java
@@ -0,0 +1,112 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.eln;
+
+import myutil.GraphicLib;
+import ui.*;
+import java.awt.*;
+
+/**
+ * Class ELNMidPortTerminal
+ * Implements the intermediate points of connectors, when the connector is made of several lines.
+ * Creation: 19/07/2018
+ * @version 1.0 19/07/2018
+ * @author Irina Kit Yan LEE
+ */
+
+public class ELNMidPortTerminal extends ui.TGCPointOfConnector {
+ private int width = 10;
+ private int height = 10;
+ private int oldwidth, oldheight;
+
+ public ELNMidPortTerminal(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ initScaling(width, height);
+
+ initConnectingPoint(1);
+
+ nbInternalTGComponent = 0;
+
+ oldwidth = width;
+ oldheight = height;
+
+ moveable = true;
+ editable = false;
+ removable = true;
+ canBeCloned = false;
+ }
+
+ public void initConnectingPoint(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, -width/2, -height/2, true, true, 0.5, 0.5, "");
+ }
+
+ public void internalDrawing(Graphics g) {
+ width = (int) (oldwidth*tdp.getZoom());
+ height = (int) (oldheight*tdp.getZoom());
+ g.drawOval(x - width/2, y - height /2, width, height);
+ g.fillOval(x - width/2, y - height /2, width, height);
+ }
+
+ public TGComponent isOnMe(int _x, int _y) {
+ if (GraphicLib.isInRectangle(_x, _y, x - width/2, y - height/2, width, height)) {
+ return this;
+ }
+ return null;
+ }
+
+ public void myActionWhenRemoved() {
+ if (father != null) {
+ if (father instanceof TGConnector) {
+ TGConnector tg = (TGConnector)father;
+ tg.pointHasBeenRemoved(this);
+ }
+ }
+ }
+
+ public int getCurrentMaxX() {
+ return getX() + getWidth();
+ }
+
+ public int getCurrentMaxY() {
+ return getY() + getHeight();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/ELNModule.java b/src/main/java/ui/eln/ELNModule.java
index 72d7cd971c7033636459884c5250e074f69d0851..08f9c1895b3fb8a35a72170ce042fc5dd0491c15 100644
--- a/src/main/java/ui/eln/ELNModule.java
+++ b/src/main/java/ui/eln/ELNModule.java
@@ -1,26 +1,26 @@
/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
+ *
* ludovic.apvrille AT enst.fr
- *
+ *
* This software is a computer program whose purpose is to allow the
* edition of TURTLE analysis, design and deployment diagrams, to
* allow the generation of RT-LOTOS or Java code from this diagram,
* and at last to allow the analysis of formal validation traces
* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
* from INRIA Rhone-Alpes.
- *
+ *
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
- *
+ *
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
- *
+ *
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
@@ -31,7 +31,7 @@
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
- *
+ *
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
*/
@@ -40,44 +40,43 @@ package ui.eln;
import myutil.GraphicLib;
import ui.*;
-import ui.eln.sca_eln.ELNComponentNodeRef;
-import ui.syscams.SysCAMSComponentTaskDiagramPanel;
+import ui.eln.sca_eln.*;
+import ui.eln.sca_eln_sca_tdf.*;
import ui.util.IconManager;
-import ui.window.JDialogELNComponentCapacitor;
-import ui.window.JDialogELNModule;
-
+import ui.window.*;
import java.awt.*;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
+import java.util.*;
+import javax.swing.*;
/**
- * Class ELNModule
+ * Class ELNModule
* Module to be used in ELN diagrams
- * Creation: 12/06/2018
- * @version 1.0 12/06/2018
+ * Creation: 12/07/2018
+ * @version 1.0 12/07/2018
* @author Irina Kit Yan LEE
*/
-public class ELNModule extends TGCScalableWithInternalComponent implements SwallowTGComponent {
- protected Color myColor;
- protected int orientation;
+public class ELNModule extends TGCScalableWithInternalComponent implements SwallowTGComponent {
private int maxFontSize = 14;
private int minFontSize = 4;
private int currentFontSize = -1;
+ protected int orientation;
+ private Color myColor;
private int textX = 15;
private double dtextX = 0.0;
protected int decPoint = 3;
-
- public ELNModule(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+
+ public String oldValue;
+
+ public ELNModule(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- initScaling(250, 200);
-
+ initScaling(200, 150);
+
oldScaleFactor = tdp.getZoom();
dtextX = textX * oldScaleFactor;
- textX = (int) dtextX;
+ textX = (int)dtextX;
dtextX = dtextX - textX;
minWidth = 1;
@@ -90,73 +89,77 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
editable = true;
removable = true;
userResizable = true;
- value = tdp.findELNComponentName("Module_");
- }
- public Color getMyColor() {
- return myColor;
+ value = tdp.findELNComponentName("Module_");
}
public void internalDrawing(Graphics g) {
int w;
Font f = g.getFont();
Font fold = f;
-
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
+
if (myColor == null) {
myColor = Color.white;
}
-
+
if (this.rescaled && !this.tdp.isScaled()) {
- this.rescaled = false;
- int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
- f = f.deriveFont((float) maxCurrentFontSize);
-
- while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
- if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
- break;
- }
- maxCurrentFontSize--;
- f = f.deriveFont((float) maxCurrentFontSize);
- }
-
- if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
- maxCurrentFontSize++;
- f = f.deriveFont((float) maxCurrentFontSize);
- }
- g.setFont(f);
- this.currentFontSize = maxCurrentFontSize;
- } else {
- f = f.deriveFont(this.currentFontSize);
- }
-
- Color col = g.getColor();
+ this.rescaled = false;
+ int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
+ f = f.deriveFont((float) maxCurrentFontSize);
+
+ while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
+ if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
+ break;
+ }
+ maxCurrentFontSize--;
+ f = f.deriveFont((float) maxCurrentFontSize);
+ }
+
+ if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
+ maxCurrentFontSize++;
+ f = f.deriveFont((float) maxCurrentFontSize);
+ }
+ g.setFont(f);
+ this.currentFontSize = maxCurrentFontSize;
+ } else {
+ f = f.deriveFont(this.currentFontSize);
+ }
+
+ Color c = g.getColor();
g.drawRect(x, y, width, height);
if ((width > 2) && (height > 2)) {
g.setColor(myColor);
g.fillRect(x+1, y+1, width-1, height-1);
- g.setColor(col);
+ g.setColor(c);
}
-
- int attributeFontSize = this.currentFontSize * 5 / 6;
- g.setFont(f.deriveFont((float) attributeFontSize));
- g.setFont(f);
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
w = g.getFontMetrics().stringWidth(value);
- if (!(w < (width - 2 * textX))) {
- g.drawString(value, x + textX + 1, y + currentFontSize + textX);
+ if (w > (width - 2 * textX)) {
+ g.setFont(f.deriveFont(Font.BOLD));
+ if (mgui.getHidden() == false) {
+ g.drawString(value, x + textX + 1, y + currentFontSize + textX);
+ }
} else {
- g.drawString(value, x + (width - w)/2, y + currentFontSize + textX);
+ g.setFont(f.deriveFont(Font.BOLD));
+ if (mgui.getHidden() == false) {
+ g.drawString(value, x + (width - w)/2, y + currentFontSize + textX);
+ }
}
-
+
g.setFont(fold);
}
public void rescale(double scaleFactor){
dtextX = (textX + dtextX) / oldScaleFactor * scaleFactor;
textX = (int)(dtextX);
- dtextX = dtextX - textX;
+ dtextX = dtextX - textX;
super.rescale(scaleFactor);
}
-
+
public TGComponent isOnOnlyMe(int _x, int _y) {
if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
return this;
@@ -164,19 +167,15 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
return null;
}
- public int getType() {
- return TGComponentManager.ELN_MODULE;
- }
-
public boolean editOndoubleClick(JFrame frame, int _x, int _y) {
// On the name ?
if (_y <= (y + currentFontSize + textX)) {
+ oldValue = value;
String s = (String)JOptionPane.showInputDialog(frame, "Name:", "Setting component name",
JOptionPane.PLAIN_MESSAGE, IconManager.imgic100,
null,
getValue());
if ((s != null) && (s.length() > 0)) {
-
if (!TAttribute.isAValidId(s, false, false)) {
JOptionPane.showMessageDialog(frame,
"Could not change the name of the component: the new name is not a valid name",
@@ -193,15 +192,15 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
}
return false;
}
-
+
JDialogELNModule jde = new JDialogELNModule(this);
jde.setVisible(true);
rescaled = true;
return true;
}
- public int getDefaultConnector() {
- return TGComponentManager.ELN_CONNECTOR;
+ public int getType() {
+ return TGComponentManager.ELN_MODULE;
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
@@ -210,7 +209,10 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
}
if (tgc instanceof ELNComponentNodeRef) {
return true;
- }
+ }
+ if (tgc instanceof ELNModuleTerminal) {
+ return true;
+ }
return false;
}
@@ -229,6 +231,13 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
addInternalComponent(tgc, 0);
return true;
}
+ if (tgc instanceof ELNModuleTerminal) {
+ tgc.setFather(this);
+ tgc.setDrawingZone(true);
+ tgc.resizeWithFather();
+ addInternalComponent(tgc, 0);
+ return true;
+ }
return false;
}
@@ -238,10 +247,170 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
public void hasBeenResized() {
rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
+ for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof ELNComponent) {
tgcomponent[i].resizeWithFather();
}
+ if (tgcomponent[i] instanceof ELNComponentNodeRef) {
+ tgcomponent[i].resizeWithFather();
+ }
+ if (tgcomponent[i] instanceof ELNModuleTerminal) {
+ tgcomponent[i].resizeWithFather();
+ }
+ }
+ }
+
+ public int getCurrentFontSize() {
+ return currentFontSize;
+ }
+
+ public java.util.List<ELNComponentCapacitor> getAllComponentCapacitor() {
+ java.util.List<ELNComponentCapacitor> list = new ArrayList<ELNComponentCapacitor>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentCapacitor) {
+ list.add((ELNComponentCapacitor)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentCurrentSinkTDF> getAllComponentCurrentSinkTDF() {
+ java.util.List<ELNComponentCurrentSinkTDF> list = new ArrayList<ELNComponentCurrentSinkTDF>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentCurrentSinkTDF) {
+ list.add((ELNComponentCurrentSinkTDF)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentCurrentSourceTDF> getAllComponentCurrentSourceTDF() {
+ java.util.List<ELNComponentCurrentSourceTDF> list = new ArrayList<ELNComponentCurrentSourceTDF>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentCurrentSourceTDF) {
+ list.add((ELNComponentCurrentSourceTDF)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentIdealTransformer> getAllComponentIdealTransformer() {
+ java.util.List<ELNComponentIdealTransformer> list = new ArrayList<ELNComponentIdealTransformer>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentIdealTransformer) {
+ list.add((ELNComponentIdealTransformer)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentIndependentCurrentSource> getAllComponentIndependentCurrentSource() {
+ java.util.List<ELNComponentIndependentCurrentSource> list = new ArrayList<ELNComponentIndependentCurrentSource>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentIndependentCurrentSource) {
+ list.add((ELNComponentIndependentCurrentSource)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentIndependentVoltageSource> getAllComponentIndependentVoltageSource() {
+ java.util.List<ELNComponentIndependentVoltageSource> list = new ArrayList<ELNComponentIndependentVoltageSource>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentIndependentVoltageSource) {
+ list.add((ELNComponentIndependentVoltageSource)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentInductor> getAllComponentInductor() {
+ java.util.List<ELNComponentInductor> list = new ArrayList<ELNComponentInductor>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentInductor) {
+ list.add((ELNComponentInductor)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentNodeRef> getAllComponentNodeRef() {
+ java.util.List<ELNComponentNodeRef> list = new ArrayList<ELNComponentNodeRef>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentNodeRef) {
+ list.add((ELNComponentNodeRef)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentResistor> getAllComponentResistor() {
+ java.util.List<ELNComponentResistor> list = new ArrayList<ELNComponentResistor>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentResistor) {
+ list.add((ELNComponentResistor)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentTransmissionLine> getAllComponentTransmissionLine() {
+ java.util.List<ELNComponentTransmissionLine> list = new ArrayList<ELNComponentTransmissionLine>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentTransmissionLine) {
+ list.add((ELNComponentTransmissionLine)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentVoltageControlledCurrentSource> getAllComponentVoltageControlledCurrentSource() {
+ java.util.List<ELNComponentVoltageControlledCurrentSource> list = new ArrayList<ELNComponentVoltageControlledCurrentSource>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentVoltageControlledCurrentSource) {
+ list.add((ELNComponentVoltageControlledCurrentSource)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentVoltageControlledVoltageSource> getAllComponentVoltageControlledVoltageSource() {
+ java.util.List<ELNComponentVoltageControlledVoltageSource> list = new ArrayList<ELNComponentVoltageControlledVoltageSource>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentVoltageControlledVoltageSource) {
+ list.add((ELNComponentVoltageControlledVoltageSource)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentVoltageSinkTDF> getAllComponentVoltageSinkTDF() {
+ java.util.List<ELNComponentVoltageSinkTDF> list = new ArrayList<ELNComponentVoltageSinkTDF>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentVoltageSinkTDF) {
+ list.add((ELNComponentVoltageSinkTDF)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNComponentVoltageSourceTDF> getAllComponentVoltageSourceTDF() {
+ java.util.List<ELNComponentVoltageSourceTDF> list = new ArrayList<ELNComponentVoltageSourceTDF>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNComponentVoltageSourceTDF) {
+ list.add((ELNComponentVoltageSourceTDF)(tgcomponent[i]));
+ }
+ }
+ return list;
+ }
+
+ public java.util.List<ELNModuleTerminal> getAllModuleTerminal() {
+ java.util.List<ELNModuleTerminal> list = new ArrayList<ELNModuleTerminal>();
+ for(int i=0; i<nbInternalTGComponent; i++) {
+ if (tgcomponent[i] instanceof ELNModuleTerminal) {
+ list.add((ELNModuleTerminal)(tgcomponent[i]));
+ }
}
+ return list;
}
}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/ELNPortTerminal.java b/src/main/java/ui/eln/ELNModuleTerminal.java
similarity index 60%
rename from src/main/java/ui/eln/ELNPortTerminal.java
rename to src/main/java/ui/eln/ELNModuleTerminal.java
index 1b45a1ed8cc03532313b1a1525fd63e061005785..ad23bb2497a888a6566d4c2ed6fd5d8e89688128 100644
--- a/src/main/java/ui/eln/ELNPortTerminal.java
+++ b/src/main/java/ui/eln/ELNModuleTerminal.java
@@ -43,32 +43,32 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ui.*;
-import ui.eln.ELNConnectingPoint;
-import ui.window.JDialogELNPortTerminal;
+import ui.window.*;
import javax.swing.*;
import java.awt.*;
/**
- * Class ELNPortTerminal
- * Port terminal to be used in ELN diagrams
- * Creation: 06/07/2018
- * @version 1.0 06/07/2018
+ * Class ELNModuleTerminal
+ * Primitive port. To be used in ELN diagrams
+ * Creation: 13/07/2018
+ * @version 1.0 13/07/2018
* @author Irina Kit Yan LEE
*/
-public class ELNPortTerminal extends TGCScalableWithInternalComponent implements SwallowedTGComponent {
+public class ELNModuleTerminal extends TGCScalableWithInternalComponent implements SwallowedTGComponent, LinkedReference {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
private int minFontSize = 4;
private int currentFontSize = -1;
protected int oldx, oldy;
+ protected int currentOrientation = GraphicLib.NORTH;
private int textX = 15;
private double dtextX = 0.0;
protected int decPoint = 3;
- public ELNPortTerminal(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ public ELNModuleTerminal(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
initScaling(10, 10);
@@ -80,22 +80,25 @@ public class ELNPortTerminal extends TGCScalableWithInternalComponent implements
minWidth = 1;
minHeight = 1;
- initConnectingPoint(1);
+ initConnectingPoint(2);
addTGConnectingPointsComment();
- moveable = false;
+ nbInternalTGComponent = 0;
+
+ moveable = true;
editable = true;
- removable = false;
+ removable = true;
userResizable = false;
- setValue("");
+ value = "";
}
public void initConnectingPoint(int nb) {
nbConnectingPoint = nb;
connectingPoint = new TGConnectingPoint[nb];
- connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.5, 0.5);
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.5, 1.0, "");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.5, 0.0, "");
}
public Color getMyColor() {
@@ -106,6 +109,33 @@ public class ELNPortTerminal extends TGCScalableWithInternalComponent implements
Font f = g.getFont();
Font fold = f;
+ if ((x != oldx) | (oldy != y)) {
+ manageMove(g, f);
+ oldx = x;
+ oldy = y;
+ } else {
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int w = g.getFontMetrics().stringWidth(value);
+ int h = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.PLAIN));
+ switch (currentOrientation) {
+ case GraphicLib.NORTH:
+ g.drawString(value, x + width + width / 2, y);
+ break;
+ case GraphicLib.WEST:
+ g.drawString(value, x - w, y + height + height / 2 + h);
+ break;
+ case GraphicLib.SOUTH:
+ g.drawString(value, x + width + width / 2, y + height + h);
+ break;
+ case GraphicLib.EAST:
+ default:
+ g.drawString(value, x + width, y + height + height / 2 + h);
+ }
+ }
+
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
@@ -130,12 +160,91 @@ public class ELNPortTerminal extends TGCScalableWithInternalComponent implements
}
Color c = g.getColor();
- g.drawRect(x, y, width, height);
- g.fillRect(x, y, width, height);
+ g.drawOval(x, y, width, height);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width, height);
g.setColor(c);
g.setFont(fold);
}
+ public void manageMove(Graphics g, Font f) {
+ if (father != null) {
+ Point p = GraphicLib.putPointOnRectangle(x + (width / 2), y + (height / 2), father.getX(), father.getY(),
+ father.getWidth(), father.getHeight());
+
+ x = p.x - width / 2;
+ y = p.y - height / 2;
+
+ setMoveCd(x, y);
+
+ int orientation = GraphicLib.getCloserOrientation(x + (width / 2), y + (height / 2), father.getX(),
+ father.getY(), father.getWidth(), father.getHeight());
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int w = g.getFontMetrics().stringWidth(value);
+ int h = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ switch (orientation) {
+ case GraphicLib.NORTH:
+ g.drawString(value, x + width + width / 2, y);
+ break;
+ case GraphicLib.WEST:
+ g.drawString(value, x - w, y + height + height / 2 + h);
+ break;
+ case GraphicLib.SOUTH:
+ g.drawString(value, x + width + width / 2, y + height + h);
+ break;
+ case GraphicLib.EAST:
+ default:
+ g.drawString(value, x + width, y + height + height / 2 + h);
+ }
+
+ if (orientation != currentOrientation) {
+ setOrientation(orientation);
+ }
+ }
+ }
+
+ public void setOrientation(int orientation) {
+ currentOrientation = orientation;
+ double w0, h0, w1, h1;
+
+ switch (orientation) {
+ case GraphicLib.NORTH:
+ w0 = 0.5;
+ h0 = 1.0;
+ w1 = 0.5;
+ h1 = 0.0;
+ break;
+ case GraphicLib.WEST:
+ w0 = 1.0;
+ h0 = 0.5;
+ w1 = 0.0;
+ h1 = 0.5;
+ break;
+ case GraphicLib.SOUTH:
+ w0 = 0.5;
+ h0 = 0.0;
+ w1 = 0.5;
+ h1 = 1.0;
+ break;
+ case GraphicLib.EAST:
+ default:
+ w0 = 0.0;
+ h0 = 0.5;
+ w1 = 1.0;
+ h1 = 0.5;
+ }
+
+ ((ELNConnectingPoint) connectingPoint[0]).setW(w0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(h0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(w1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(h1);
+ }
+
public TGComponent isOnOnlyMe(int _x, int _y) {
if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
return this;
@@ -144,11 +253,32 @@ public class ELNPortTerminal extends TGCScalableWithInternalComponent implements
}
public int getType() {
- return TGComponentManager.ELN_PORT_TERMINAL;
+ return TGComponentManager.ELN_MODULE_TERMINAL;
+ }
+
+ public void wasSwallowed() {
+ myColor = null;
+ }
+
+ public void wasUnswallowed() {
+ myColor = null;
+ setFather(null);
+ TDiagramPanel tdp = getTDiagramPanel();
+ setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
+ }
+
+ public void resizeWithFather() {
+ if ((father != null) && (father instanceof ELNModule)) {
+ setCdRectangle(0 - getWidth() / 2, father.getWidth() - (getWidth() / 2), 0 - getHeight() / 2,
+ father.getHeight() - (getHeight() / 2));
+ setMoveCd(x, y);
+ oldx = -1;
+ oldy = -1;
+ }
}
public boolean editOndoubleClick(JFrame frame) {
- JDialogELNPortTerminal jde = new JDialogELNPortTerminal(this);
+ JDialogELNModuleTerminal jde = new JDialogELNModuleTerminal(this);
jde.setVisible(true);
return true;
}
@@ -193,25 +323,4 @@ public class ELNPortTerminal extends TGCScalableWithInternalComponent implements
public int getDefaultConnector() {
return TGComponentManager.ELN_CONNECTOR;
}
-
- public void wasSwallowed() {
- myColor = null;
- }
-
- public void wasUnswallowed() {
- myColor = null;
- setFather(null);
- TDiagramPanel tdp = getTDiagramPanel();
- setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
- }
-
- public void resizeWithFather() {
- if ((father != null) && (father instanceof ELNComponent)) {
- setCdRectangle(0 - getWidth() / 2, father.getWidth() - (getWidth() / 2), 0 - getHeight() / 2,
- father.getHeight() - (getHeight() / 2));
- setMoveCd(x, y);
- oldx = -1;
- oldy = -1;
- }
- }
}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
index 53ca1775606ed6895937bd9bced10bb60ef704c7..641b3b0a09720a8d8209e910366b269aa1163d75 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentCapacitor extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentCapacitor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -75,10 +75,7 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
+ private boolean first;
public ELNComponentCapacitor(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -92,6 +89,8 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
minWidth = 1;
minHeight = 1;
+ initPortTerminal(2);
+
addTGConnectingPointsComment();
moveable = true;
@@ -104,6 +103,17 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
setQ0(0.0);
setUnit0("F");
setUnit1("C");
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
}
public Color getMyColor() {
@@ -111,23 +121,9 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y + height / 2 - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("p");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 8, true, false);
- term1 = new ELNPortTerminal(x + width - height / 4, y + height / 2 - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("n");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - height / 4, y + height / 2 - height / 8, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -169,10 +165,10 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 2);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -180,53 +176,61 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x, y + height / 2 - height / 8, true);
- term1.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term1.setMoveCd(x, y + height / 2 - height / 8, true);
- term0.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term0.setMoveCd(x, y + height / 2 - height / 8, true);
- term1.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x, y + height / 2 - height / 8, true);
- term0.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -241,64 +245,68 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 2, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x + width / 2 - width / 8, y, true);
- term1.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term1.setMoveCd(x + width / 2 - width / 8, y, true);
- term0.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term0.setMoveCd(x + width / 2 - width / 8, y, true);
- term1.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x + width / 2 - width / 8, y, true);
- term0.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -315,10 +323,10 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 2);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -326,53 +334,61 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x, y + height / 2 - height / 8, true);
- term0.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term0.setMoveCd(x, y + height / 2 - height / 8, true);
- term1.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term1.setMoveCd(x, y + height / 2 - height / 8, true);
- term0.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x, y + height / 2 - height / 8, true);
- term1.setMoveCd(x + width - height / 4, y + height / 2 - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -387,64 +403,68 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 2, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x + width / 2 - width / 8, y, true);
- term0.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term0.setMoveCd(x + width / 2 - width / 8, y, true);
- term1.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term1.setMoveCd(x + width / 2 - width / 8, y, true);
- term0.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x + width / 2 - width / 8, y, true);
- term1.setMoveCd(x + width / 2 - width / 8, y + height - width / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
}
g.setColor(c);
@@ -452,21 +472,39 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
}
private void rotateTopBottom(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5 };
int[] pty0 = { y + height / 2, y + height / 2, y, y + height, y + height / 2 };
g.drawPolygon(ptx0, pty0, 5);
int[] ptx1 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5 };
int[] pty1 = { y + height / 2, y + height / 2, y, y + height, y + height / 2 };
g.drawPolygon(ptx1, pty1, 5);
+ g.drawOval(x, y + height / 2 - height / 8, width / 10, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 8, width / 10, height / 4);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height / 2 - height / 8, width / 10, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height / 2 - height / 8, width / 10, height / 4);
+ g.setColor(c);
}
private void rotateRightLeft(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 2, x + width / 2, x, x + width, x + width / 2 };
int[] pty0 = { y, y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5 };
g.drawPolygon(ptx0, pty0, 5);
int[] ptx1 = { x + width / 2, x + width / 2, x, x + width, x + width / 2 };
int[] pty1 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5 };
g.drawPolygon(ptx1, pty1, 5);
+ g.drawOval(x + width / 2 - width / 8, y, width / 4, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y, width / 4, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 8, y + height - height / 10, width / 4, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y + height - height / 10, width / 4, height / 10);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -512,8 +550,6 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
sb.append("\" unit1=\"");
sb.append(encode(unit1));
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -532,7 +568,7 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
double value, q0;
String unit0, unit1;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -549,8 +585,6 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
unit0 = elt.getAttribute("unit0");
unit1 = elt.getAttribute("unit1");
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -561,8 +595,6 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
setUnit0(unit0);
setUnit1(unit1);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -729,38 +761,6 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -769,7 +769,7 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent impl
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
index 90e765b3cf786c9423b68cd4f60eac63faff32dd..f33d289222175de0e731c0c22798716ca27a21f3 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
@@ -49,6 +49,7 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
/**
* Class ELNComponentIdealTransformer
@@ -58,7 +59,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentIdealTransformer extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentIdealTransformer extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -74,12 +75,7 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
- private ELNPortTerminal term2;
- private ELNPortTerminal term3;
+ private boolean first;
public ELNComponentIdealTransformer(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -93,6 +89,8 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
minWidth = 1;
minHeight = 1;
+ initPortTerminal(4);
+
addTGConnectingPointsComment();
moveable = true;
@@ -102,6 +100,19 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
value = tdp.findELNComponentName("IdealTransformer");
setRatio(1.0);
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p1");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p2");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n1");
+ connectingPoint[3] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n2");
}
public Color getMyColor() {
@@ -109,34 +120,9 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("p1");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
-
- term1 = new ELNPortTerminal(x + width - width / 10, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("p2");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - width / 10, y, true, false);
-
- term2 = new ELNPortTerminal(x, y + height - height / 10, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term2.setValue("n1");
- getTDiagramPanel().getComponentList().add(term2);
- term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 10, true, false);
-
- term3 = new ELNPortTerminal(x + width - width / 10, y + height - height / 10, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term3.setValue("n2");
- getTDiagramPanel().getComponentList().add(term3);
- term3.getTDiagramPanel().addComponent(term3, x + width - width / 10, y + height - height / 10, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -180,11 +166,11 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("n2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -192,88 +178,88 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 10, y, true);
- term2.setMoveCd(x, y + height - height / 10, true);
- term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 20 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 20 + sh3);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTop(g);
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 10, y, true);
- term3.setMoveCd(x, y + height - height / 10, true);
- term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 20 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottom(g);
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 10, y, true);
- term0.setMoveCd(x, y + height - height / 10, true);
- term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 10, y, true);
- term1.setMoveCd(x, y + height - height / 10, true);
- term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -292,11 +278,11 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("n2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -304,88 +290,88 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 10, y, true);
- term3.setMoveCd(x, y + height - height / 10, true);
- term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 20 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 20 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRight(g);
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 10, y, true);
- term2.setMoveCd(x, y + height - height / 10, true);
- term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 20 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 20 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeft(g);
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 10, y, true);
- term1.setMoveCd(x, y + height - height / 10, true);
- term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 20,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 10, y, true);
- term0.setMoveCd(x, y + height - height / 10, true);
- term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 20,
+ y + height + sh2);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -404,11 +390,11 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("n2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -416,88 +402,88 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 10, y, true);
- term1.setMoveCd(x, y + height - height / 10, true);
- term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottom(g);
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 10, y, true);
- term0.setMoveCd(x, y + height - height / 10, true);
- term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTop(g);
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 10, y, true);
- term3.setMoveCd(x, y + height - height / 10, true);
- term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 20 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 10, y, true);
- term2.setMoveCd(x, y + height - height / 10, true);
- term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(19.0 / 20.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 20 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 20 + sh3);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -516,11 +502,11 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("n2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -528,88 +514,88 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 10, y, true);
- term0.setMoveCd(x, y + height - height / 10, true);
- term2.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 20,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeft(g);
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 10, y, true);
- term1.setMoveCd(x, y + height - height / 10, true);
- term3.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 20,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRight(g);
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 10, y, true);
- term2.setMoveCd(x, y + height - height / 10, true);
- term0.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 20 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 20 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 10, y, true);
- term3.setMoveCd(x, y + height - height / 10, true);
- term1.setMoveCd(x + width - width / 10, y + height - height / 10, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 20 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 20 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ }
}
}
g.setColor(c);
@@ -617,6 +603,7 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
}
private void rotateTop(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width / 5, x + width / 5, x + width / 5 };
int[] pty0 = { y + height / 20, y + height / 20, y + height / 5, y + height / 20 };
g.drawPolygon(ptx0, pty0, 4);
@@ -654,13 +641,38 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
y + 4 * height / 5 + height / 10 };
g.drawPolygon(ptx5, pty5, 3);
g.fillPolygon(ptx5, pty5, 3);
-
+
int w = g.getFontMetrics().stringWidth(Double.toString(ratio));
int h = g.getFontMetrics().getAscent();
g.drawString(Double.toString(ratio), x + (width - w) / 2, y + height + height / 10 + h);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, width - width / 10, height + height / 10,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width / 5, x + width / 5, x + width / 5 };
int[] pty0 = { y + height / 20, y + height / 20, y + height / 5, y + height / 20 };
g.drawPolygon(ptx0, pty0, 4);
@@ -698,12 +710,37 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
y + height / 5 - height / 10 };
g.drawPolygon(ptx5, pty5, 3);
g.fillPolygon(ptx5, pty5, 3);
-
+
int w = g.getFontMetrics().stringWidth(Double.toString(ratio));
- g.drawString(Double.toString(ratio), x + (width - w) / 2, y - height / 20);
+ g.drawString(Double.toString(ratio), x + (width - w) / 2, y - height / 10);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, width - width / 10, height + height / 10,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 20, x + width / 20, x + width / 5, x + width / 20 };
int[] pty0 = { y, y + height / 5, y + height / 5, y + height / 5 };
g.drawPolygon(ptx0, pty0, 4);
@@ -739,13 +776,38 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
y + height / 5 + height / 10 + 2 * height / 5 - height / 10 };
g.drawPolygon(ptx5, pty5, 3);
g.fillPolygon(ptx5, pty5, 3);
-
+
int w = g.getFontMetrics().stringWidth(Double.toString(ratio));
int h = g.getFontMetrics().getAscent();
g.drawString(Double.toString(ratio), x - width / 10 - w, y + height / 2 + h / 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10, height - height / 10,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 20, x + width / 20, x + width / 5, x + width / 20 };
int[] pty0 = { y, y + height / 5, y + height / 5, y + height / 5 };
g.drawPolygon(ptx0, pty0, 4);
@@ -781,9 +843,33 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
y + height / 5 + height / 10 + 2 * height / 5 - height / 10 };
g.drawPolygon(ptx5, pty5, 3);
g.fillPolygon(ptx5, pty5, 3);
-
+
int h = g.getFontMetrics().getAscent();
g.drawString(Double.toString(ratio), x + width + width / 10, y + height / 2 + h / 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10, height - height / 10,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -807,8 +893,6 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
StringBuffer sb = new StringBuffer("<extraparam>\n");
sb.append("<attributes ratio=\"" + ratio);
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -826,7 +910,7 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
Element elt;
double ratio;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -840,8 +924,6 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
if (elt.getTagName().equals("attributes")) {
ratio = Double.parseDouble(elt.getAttribute("ratio"));
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -849,8 +931,6 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
first = Boolean.parseBoolean(elt.getAttribute("first"));
setRatio(ratio);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -993,38 +1073,6 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -1033,7 +1081,7 @@ public class ELNComponentIdealTransformer extends TGCScalableWithInternalCompone
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
index 76aaf261915526331a5442f431147048629f9169..59965eb0b56291f5a04bf7d9e3702c381126b361 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentIndependentCurrentSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentIndependentCurrentSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -76,12 +76,9 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
+ private boolean first;
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
-
- public ELNComponentIndependentCurrentSource(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ public ELNComponentIndependentCurrentSource(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
initScaling(60, 80);
@@ -93,6 +90,8 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
minWidth = 1;
minHeight = 1;
+ initPortTerminal(2);
+
addTGConnectingPointsComment();
moveable = true;
@@ -111,6 +110,17 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
setAcAmplitude(0.0);
setAcPhase(0.0);
setAcNoiseAmplitude(0.0);
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
}
public Color getMyColor() {
@@ -118,23 +128,9 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("p");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
- term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("n");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -172,11 +168,11 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 3, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -184,56 +180,60 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x + width / 3 - width / 12, y, true);
- term1.setMoveCd(x + width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 3 + width / 6, y);
- g.drawString(term1.getValue(), x + width / 3 + width / 6, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 3 + width / 6,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottomFlip(g);
- term0.setMoveCd(x + 2 * width / 3 - width / 12, y, true);
- term1.setMoveCd(x + 2 * width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + 2 * width / 3 + width / 6, y);
- g.drawString(term1.getValue(), x + 2 * width / 3 + width / 6, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + 2 * width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + 2 * width / 3 + width / 6,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTopFlip(g);
- term1.setMoveCd(x + width / 3 - width / 12, y, true);
- term0.setMoveCd(x + width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 3 + width / 6, y);
- g.drawString(term0.getValue(), x + width / 3 + width / 6, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 3 + width / 6,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term1.setMoveCd(x + 2 * width / 3 - width / 12, y, true);
- term0.setMoveCd(x + 2 * width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + 2 * width / 3 + width / 6, y);
- g.drawString(term0.getValue(), x + 2 * width / 3 + width / 6, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + 2 * width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + 2 * width / 3 + width / 6,
+ y + height + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -248,10 +248,10 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 3);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -260,56 +260,64 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term1.setMoveCd(x, y + height / 3 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 3 + height / 6 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 3 + height / 6 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 3 + height / 6 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 3 + height / 6 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRightFlip(g);
- term1.setMoveCd(x, y + 2 * height / 3 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + 2 * height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + 2 * height / 3 + height / 6 + sh1);
- g.drawString(term0.getValue(), x + width, y + 2 * height / 3 + height / 6 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(2.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + 2 * height / 3 + height / 6 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + 2 * height / 3 + height / 6 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y + height / 3 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 3 + height / 6 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 3 + height / 6 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 3 + height / 6 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 3 + height / 6 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term0.setMoveCd(x, y + 2 * height / 3 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + 2 * height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + 2 * height / 3 + height / 6 + sh0);
- g.drawString(term1.getValue(), x + width, y + 2 * height / 3 + height / 6 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(2.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + 2 * height / 3 + height / 6 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + 2 * height / 3 + height / 6 + sh1);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -322,11 +330,11 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 3, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -334,56 +342,60 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term1.setMoveCd(x + 2 * width / 3 - width / 12, y, true);
- term0.setMoveCd(x + 2 * width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + 2 * width / 3 + width / 6, y);
- g.drawString(term0.getValue(), x + 2 * width / 3 + width / 6, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + 2 * width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + 2 * width / 3 + width / 6,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTopFlip(g);
- term1.setMoveCd(x + width / 3 - width / 12, y, true);
- term0.setMoveCd(x + width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 3 + width / 6, y);
- g.drawString(term0.getValue(), x + width / 3 + width / 6, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 3 + width / 6,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottomFlip(g);
- term0.setMoveCd(x + 2 * width / 3 - width / 12, y, true);
- term1.setMoveCd(x + 2 * width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + 2 * width / 3 + width / 6, y);
- g.drawString(term1.getValue(), x + 2 * width / 3 + width / 6, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + 2 * width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + 2 * width / 3 + width / 6,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x + width / 3 - width / 12, y, true);
- term1.setMoveCd(x + width / 3 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 3 + width / 6, y);
- g.drawString(term1.getValue(), x + width / 3 + width / 6, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 3 + width / 6, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 3 + width / 6,
+ y + height + sh1);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -398,10 +410,10 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 3);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -410,56 +422,64 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term0.setMoveCd(x, y + 2 * height / 3 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + 2 * height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + 2 * height / 3 + height / 6 + sh0);
- g.drawString(term1.getValue(), x + width, y + 2 * height / 3 + height / 6 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(2.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + 2 * height / 3 + height / 6 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + 2 * height / 3 + height / 6 + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y + height / 3 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 3 + height / 6 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 3 + height / 6 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 3 + height / 6 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 3 + height / 6 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRightFlip(g);
- term1.setMoveCd(x, y + 2 * height / 3 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + 2 * height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + 2 * height / 3 + height / 6 + sh1);
- g.drawString(term0.getValue(), x + width, y + 2 * height / 3 + height / 6 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(2.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(2.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + 2 * height / 3 + height / 6 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + 2 * height / 3 + height / 6 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term1.setMoveCd(x, y + height / 3 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height / 3 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 3 + height / 6 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 3 + height / 6 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 3.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 3.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 3 + height / 6 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 3 + height / 6 + sh0);
+ }
}
}
g.setColor(c);
@@ -467,6 +487,7 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
}
private void rotateTop(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 3, x + width / 3 };
int[] pty0 = { y, y + height / 4 };
g.drawPolygon(ptx0, pty0, 2);
@@ -484,9 +505,18 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x + width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(c);
}
private void rotateTopFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 3, x + width / 3 };
int[] pty0 = { y, y + height / 4 };
g.drawPolygon(ptx0, pty0, 2);
@@ -504,9 +534,18 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + height / 4 + height / 8, y + height / 4 + height / 8 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x + width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + 2 * width / 3, x + 2 * width / 3 };
int[] pty0 = { y, y + height / 4 };
g.drawPolygon(ptx0, pty0, 2);
@@ -523,9 +562,18 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + height / 4 + height / 8, y + height / 4 + height / 8 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x + 2 * width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + 2 * width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(c);
+ g.drawOval(x + 2 * width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + 2 * width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(c);
}
private void rotateBottomFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + 2 * width / 3, x + 2 * width / 3 };
int[] pty0 = { y, y + height / 4 };
g.drawPolygon(ptx0, pty0, 2);
@@ -542,9 +590,18 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x + 2 * width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + 2 * width / 3 - width / 12, y, width / 6, height / 8);
+ g.setColor(c);
+ g.drawOval(x + 2 * width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + 2 * width / 3 - width / 12, y + height - height / 8, width / 6, height / 8);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width / 4 };
int[] pty0 = { y + height / 3, y + height / 3 };
g.drawPolygon(ptx0, pty0, 2);
@@ -562,9 +619,18 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + 2 * height / 3 + height / 6 + height / 12, y + 2 * height / 3 + height / 6 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
}
private void rotateRightFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width / 4 };
int[] pty0 = { y + 2 * height / 3, y + 2 * height / 3 };
g.drawPolygon(ptx0, pty0, 2);
@@ -582,9 +648,18 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + height / 3 - height / 6 + height / 12, y + height / 3 - height / 6 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width / 4 };
int[] pty0 = { y + 2 * height / 3, y + 2 * height / 3 };
g.drawPolygon(ptx0, pty0, 2);
@@ -602,9 +677,18 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + height / 3 - height / 6 + height / 12, y + height / 3 - height / 6 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + 2 * height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
}
private void rotateLeftFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width / 4 };
int[] pty0 = { y + height / 3, y + height / 3 };
g.drawPolygon(ptx0, pty0, 2);
@@ -622,6 +706,14 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
y + 2 * height / 3 + height / 6 + height / 12, y + 2 * height / 3 + height / 6 };
g.drawPolygon(ptx3, pty3, 6);
g.fillPolygon(ptx3, pty3, 6);
+ g.drawOval(x, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height / 3 - height / 12, width / 8, height / 6);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -671,8 +763,6 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
sb.append("\" ac_phase=\"" + acPhase);
sb.append("\" ac_noise_amplitude=\"" + acNoiseAmplitude);
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -692,7 +782,7 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
double initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmplitude;
String delay;
String unit0;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -715,8 +805,6 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
acPhase = Double.parseDouble(elt.getAttribute("ac_phase"));
acNoiseAmplitude = Double.parseDouble(elt.getAttribute("ac_noise_amplitude"));
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -733,8 +821,6 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
setAcPhase(acPhase);
setAcNoiseAmplitude(acNoiseAmplitude);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -949,38 +1035,6 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -989,7 +1043,7 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
index 07c764496d9bbddd7d6b64b35e9e541893a93a91..bf75e2fb38688d2e261219166edccf5b0b45ab9f 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentIndependentVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentIndependentVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -76,10 +76,7 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
+ private boolean first;
public ELNComponentIndependentVoltageSource(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -93,6 +90,8 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
minWidth = 1;
minHeight = 1;
+ initPortTerminal(2);
+
addTGConnectingPointsComment();
moveable = true;
@@ -111,6 +110,17 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
setAcAmplitude(0.0);
setAcPhase(0.0);
setAcNoiseAmplitude(0.0);
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
}
public Color getMyColor() {
@@ -118,23 +128,9 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("p");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
- term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("n");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -172,11 +168,11 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 2, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -184,56 +180,60 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x + width / 2 - width / 12, y, true);
- term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottomFlip(g);
- term0.setMoveCd(x + width / 2 - width / 12, y, true);
- term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTopFlip(g);
- term1.setMoveCd(x + width / 2 - width / 12, y, true);
- term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term1.setMoveCd(x + width / 2 - width / 12, y, true);
- term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -248,10 +248,10 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 2);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -260,56 +260,64 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term1.setMoveCd(x, y + height / 2 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRightFlip(g);
- term1.setMoveCd(x, y + height / 2 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y + height / 2 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term0.setMoveCd(x, y + height / 2 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -322,11 +330,11 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 2, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -334,56 +342,60 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term1.setMoveCd(x + width / 2 - width / 12, y, true);
- term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTopFlip(g);
- term1.setMoveCd(x + width / 2 - width / 12, y, true);
- term0.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottomFlip(g);
- term0.setMoveCd(x + width / 2 - width / 12, y, true);
- term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x + width / 2 - width / 12, y, true);
- term1.setMoveCd(x + width / 2 - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 4, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 4,
+ y + height + sh1);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -398,10 +410,10 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 2);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -410,56 +422,64 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term0.setMoveCd(x, y + height / 2 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y + height / 2 - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw1, y + height / 2 + height / 4 + sh1);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 4 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw1,
+ y + height / 2 + height / 4 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 4 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRightFlip(g);
- term1.setMoveCd(x, y + height / 2 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term1.setMoveCd(x, y + height / 2 - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height / 2 - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw0, y + height / 2 + height / 4 + sh0);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 4 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw0,
+ y + height / 2 + height / 4 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 4 + sh1);
+ }
}
}
g.setColor(c);
@@ -467,6 +487,7 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
}
private void rotateTop(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 2, x + width / 2 };
int[] pty0 = { y, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -481,9 +502,18 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + 3 * height / 4 + height / 8, y + 3 * height / 4 + height / 8 };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x, y + height / 4, width, height / 2);
+ g.drawOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(c);
}
private void rotateTopFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 2, x + width / 2 };
int[] pty0 = { y, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -498,9 +528,18 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + height / 8, y + height / 8 };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x, y + height / 4, width, height / 2);
+ g.drawOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 2, x + width / 2 };
int[] pty0 = { y, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -515,9 +554,18 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + height / 4 - height / 8, y + height / 4 - height / 8 };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x, y + height / 4, width, height / 2);
+ g.drawOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(c);
}
private void rotateBottomFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 2, x + width / 2 };
int[] pty0 = { y, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -531,9 +579,18 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + 3 * height / 4 + height / 8, y + 3 * height / 4 + height / 8 };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x, y + height / 4, width, height / 2);
+ g.drawOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y, width / 4, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 8, y + height - height / 8, width / 4, height / 8);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width };
int[] pty0 = { y + height / 2, y + height / 2 };
g.drawPolygon(ptx0, pty0, 2);
@@ -547,9 +604,18 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + height / 2 + height / 4, y + height };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x + width / 4, y, width / 2, height);
+ g.drawOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
}
private void rotateRightFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width };
int[] pty0 = { y + height / 2, y + height / 2 };
g.drawPolygon(ptx0, pty0, 2);
@@ -562,9 +628,18 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + height / 4, y };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x + width / 4, y, width / 2, height);
+ g.drawOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width };
int[] pty0 = { y + height / 2, y + height / 2 };
g.drawPolygon(ptx0, pty0, 2);
@@ -578,9 +653,18 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + height / 2 - height / 4, y };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x + width / 4, y, width / 2, height);
+ g.drawOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
}
private void rotateLeftFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + width };
int[] pty0 = { y + height / 2, y + height / 2 };
g.drawPolygon(ptx0, pty0, 2);
@@ -594,6 +678,14 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
int[] pty2 = { y + height / 2 + height / 4, y + height };
g.drawPolygon(ptx2, pty2, 2);
g.drawOval(x + width / 4, y, width / 2, height);
+ g.drawOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height / 2 - height / 8, width / 8, height / 4);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -921,38 +1013,6 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -961,7 +1021,7 @@ public class ELNComponentIndependentVoltageSource extends TGCScalableWithInterna
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
index f7358f3cb8aa06b0b0c6b1daa5581e65eee2b03b..1b45f4c8bf1fff7fce5b9b6346674a7be8f81fc9 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
@@ -59,7 +59,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentInductor extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentInductor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -76,10 +76,7 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
+ private boolean first;
public ELNComponentInductor(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -93,6 +90,8 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
minWidth = 1;
minHeight = 1;
+ initPortTerminal(2);
+
addTGConnectingPointsComment();
moveable = true;
@@ -105,6 +104,17 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
setPhi0(0.0);
setUnit0("H");
setUnit1("Wb");
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
}
public Color getMyColor() {
@@ -112,23 +122,9 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("p");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
- term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("n");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -168,10 +164,10 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -180,56 +176,64 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTop(g);
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottom(g);
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -242,11 +246,11 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + 2 * width, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -254,56 +258,60 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRight(g);
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeft(g);
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -318,10 +326,10 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -330,56 +338,64 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottom(g);
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTop(g);
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -392,11 +408,11 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + 2 * width, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -404,42 +420,45 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeft(g);
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRight(g);
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -447,14 +466,15 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
}
g.setColor(c);
@@ -462,35 +482,71 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
}
private void rotateTop(Graphics g) {
+ Color c = g.getColor();
g.drawLine(x, y + height / 2, x + width / 5, y + height / 2);
g.drawLine(x + 4 * width / 5, y + height / 2, x + width, y + height / 2);
g.drawArc(x + width / 5, y, width / 5, height, 0, 180);
g.drawArc(x + 2 * width / 5, y, width / 5, height, 0, 180);
g.drawArc(x + 3 * width / 5, y, width / 5, height, 0, 180);
+ g.drawOval(x, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
g.drawLine(x, y + height / 2, x + width / 5, y + height / 2);
g.drawLine(x + 4 * width / 5, y + height / 2, x + width, y + height / 2);
g.drawArc(x + width / 5, y, width / 5, height, 180, 180);
g.drawArc(x + 2 * width / 5, y, width / 5, height, 180, 180);
g.drawArc(x + 3 * width / 5, y, width / 5, height, 180, 180);
+ g.drawOval(x, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
+ Color c = g.getColor();
g.drawLine(x + width / 2, y, x + width / 2, y + height / 5);
g.drawLine(x + width / 2, y + 4 * height / 5, x + width / 2, y + height);
g.drawArc(x, y + height / 5, width, height / 5, 270, 180);
g.drawArc(x, y + 2 * height / 5, width, height / 5, 270, 180);
g.drawArc(x, y + 3 * height / 5, width, height / 5, 270, 180);
+ g.drawOval(x + width / 2 - width / 4, y, width / 2, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 4, y, width / 2, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 4, y + height - height / 10, width / 2, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 4, y + height - height / 10, width / 2, height / 10);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
g.drawLine(x + width / 2, y, x + width / 2, y + height / 5);
g.drawLine(x + width / 2, y + 4 * height / 5, x + width / 2, y + height);
g.drawArc(x, y + height / 5, width, height / 5, 90, 180);
g.drawArc(x, y + 2 * height / 5, width, height / 5, 90, 180);
g.drawArc(x, y + 3 * height / 5, width, height / 5, 90, 180);
+ g.drawOval(x + width / 2 - width / 4, y, width / 2, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 4, y, width / 2, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 4, y + height - height / 10, width / 2, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 4, y + height - height / 10, width / 2, height / 10);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -536,8 +592,6 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
sb.append("\" unit1=\"");
sb.append(encode(unit1));
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -556,7 +610,7 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
double value, phi0;
String unit0, unit1;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -573,8 +627,6 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
unit0 = elt.getAttribute("unit0");
unit1 = elt.getAttribute("unit1");
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -585,8 +637,6 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
setUnit0(unit0);
setUnit1(unit1);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -753,38 +803,6 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -793,7 +811,7 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentNodeRef.java b/src/main/java/ui/eln/sca_eln/ELNComponentNodeRef.java
index fb868d0ba48fd9cc20066f61f550df2dd33803b4..95d0b86b798ef2e746dc8eb085dd07680e8d5e0e 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentNodeRef.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentNodeRef.java
@@ -60,7 +60,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implements SwallowedTGComponent, ActionListener {
+public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -106,7 +106,7 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
public void initConnectingPoint(int nb) {
nbConnectingPoint = nb;
connectingPoint = new TGConnectingPoint[nb];
- connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.5, 0.0);
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "");
}
public Color getMyColor() {
@@ -151,12 +151,11 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
}
int attributeFontSize = this.currentFontSize * 5 / 6;
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 2);
- g.setFont(f.deriveFont(Font.PLAIN));
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 2, y + (height + h) / 2);
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -199,12 +198,11 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
}
int attributeFontSize = this.currentFontSize * 5 / 6;
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 2);
- g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -248,12 +246,12 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
}
int attributeFontSize = this.currentFontSize * 5 / 6;
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 2);
- g.setFont(f.deriveFont(Font.PLAIN));
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 2, y + (height + h) / 2);
+
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -296,12 +294,11 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
}
int attributeFontSize = this.currentFontSize * 5 / 6;
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height / 2);
- g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -389,8 +386,6 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
protected String translateExtraParam() {
StringBuffer sb = new StringBuffer("<extraparam>\n");
sb.append("<attributes position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -407,7 +402,7 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
Node n1, n2;
Element elt;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -420,16 +415,12 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
elt = (Element) n2;
if (elt.getTagName().equals("attributes")) {
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
first = Boolean.parseBoolean(elt.getAttribute("first"));
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -563,7 +554,7 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
public void setFirst(boolean _first) {
first = _first;
}
-
+
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -572,7 +563,7 @@ public class ELNComponentNodeRef extends TGCScalableWithInternalComponent implem
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
index 31e9712b3eab2da7bc9b5f074439f3f610089a4f..8efcb5bf946c2f2db10ead5ce58e94525a5be887 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentResistor extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentResistor extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -75,10 +75,7 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
+ private boolean first;
public ELNComponentResistor(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -92,6 +89,8 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
minWidth = 1;
minHeight = 1;
+ initPortTerminal(2);
+
addTGConnectingPointsComment();
moveable = true;
@@ -102,6 +101,17 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
setVal(1.0);
setUnit("\u03A9");
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
}
public Color getMyColor() {
@@ -109,23 +119,9 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("p");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y + height / 2 - height / 4, true, false);
- term1 = new ELNPortTerminal(x + width - height / 2, y + height / 2 - height / 4, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("n");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - height / 2, y + height / 2 - height / 4, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -167,10 +163,10 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -178,53 +174,61 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -239,64 +243,68 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + 2 * width, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
} else if (position == 2) {
@@ -314,10 +322,10 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
g.drawString(value, x + (width - w) / 2, y - height);
g.setFont(f.deriveFont(Font.PLAIN));
@@ -325,53 +333,61 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term1.setMoveCd(x, y + height / 2 - height / 4, true);
- term0.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - sw1, y + height / 2 + height / 2 + sh1);
- g.drawString(term0.getValue(), x + width, y + height / 2 + height / 2 + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height / 2 + height / 2 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height / 2 + height / 2 + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x, y + height / 2 - height / 4, true);
- term1.setMoveCd(x + width - height / 2, y + height / 2 - height / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - sw0, y + height / 2 + height / 2 + sh0);
- g.drawString(term1.getValue(), x + width, y + height / 2 + height / 2 + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height / 2 + height / 2 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height / 2 + height / 2 + sh1);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -386,64 +402,68 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
int attributeFontSize = this.currentFontSize * 5 / 6;
int sh0 = g.getFontMetrics().getAscent();
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 5);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + 2 * width, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term1.setMoveCd(x + width / 2 - width / 4, y, true);
- term0.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.0);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x + width / 2 - width / 4, y, true);
- term1.setMoveCd(x + width / 2 - width / 4, y + height - width / 4, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(1.0);
- g.drawString(term0.getValue(), x + width / 2 + width / 2, y);
- g.drawString(term1.getValue(), x + width / 2 + width / 2, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width / 2 + width / 2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width / 2 + width / 2,
+ y + height + sh1);
+ }
}
}
g.setColor(c);
@@ -451,19 +471,37 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
}
private void rotateTopBottom(Graphics g) {
+ Color c = g.getColor();
int[] ptx = { x, x + width / 5, x + width / 5, x + 4 * width / 5, x + 4 * width / 5, x + width,
x + 4 * width / 5, x + 4 * width / 5, x + width / 5, x + width / 5 };
int[] pty = { y + height / 2, y + height / 2, y, y, y + height / 2, y + height / 2, y + height / 2, y + height,
y + height, y + height / 2 };
g.drawPolygon(ptx, pty, 10);
+ g.drawOval(x, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height / 2 - height / 4, width / 10, height / 2);
+ g.setColor(c);
}
private void rotateRightLeft(Graphics g) {
+ Color c = g.getColor();
int[] ptx = { x + width / 2, x + width / 2, x, x, x + width / 2, x + width / 2, x + width / 2, x + width,
x + width, x + width / 2 };
int[] pty = { y, y + height / 5, y + height / 5, y + 4 * height / 5, y + 4 * height / 5, y + height,
y + 4 * height / 5, y + 4 * height / 5, y + height / 5, y + height / 5 };
g.drawPolygon(ptx, pty, 10);
+ g.drawOval(x + width / 2 - width / 4, y, width / 2, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 4, y, width / 2, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width / 2 - width / 4, y + height - height / 10, width / 2, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width / 2 - width / 4, y + height - height / 10, width / 2, height / 10);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -509,8 +547,6 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
sb.append("\" unit=\"");
sb.append(encode(unit));
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -529,7 +565,7 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
double value;
String unit;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -544,8 +580,6 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
value = Double.parseDouble(elt.getAttribute("value"));
unit = elt.getAttribute("unit");
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -554,8 +588,6 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
setVal(value);
setUnit(unit);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -706,38 +738,6 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -746,7 +746,7 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
index 3b3551de6d08fa16bee4fba272f7ae3970afeed7..133d724f9e51984dfd853efd2dc0eb7d3d0802fd 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
@@ -49,6 +49,7 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
/**
* Class ELNComponentTransmissionLine
@@ -58,7 +59,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentTransmissionLine extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentTransmissionLine extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -76,12 +77,7 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
- private ELNPortTerminal term2;
- private ELNPortTerminal term3;
+ private boolean first;
public ELNComponentTransmissionLine(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -95,6 +91,8 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
minWidth = 1;
minHeight = 1;
+ initPortTerminal(4);
+
addTGConnectingPointsComment();
moveable = true;
@@ -108,6 +106,19 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
setDelay("sc_core::SC_ZERO_TIME");
setDelta0(0.0);
setUnit2("Hz");
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "a1");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "a2");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "b1");
+ connectingPoint[3] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "b2");
}
public Color getMyColor() {
@@ -115,34 +126,9 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("a1");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
-
- term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("a2");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - width / 12, y, true, false);
-
- term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term2.setValue("b1");
- getTDiagramPanel().getComponentList().add(term2);
- term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 8, true, false);
-
- term3 = new ELNPortTerminal(x + width - width / 12, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term3.setValue("b2");
- getTDiagramPanel().getComponentList().add(term3);
- term3.getTDiagramPanel().addComponent(term3, x + width - width / 12, y + height - height / 8, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -188,96 +174,96 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("b2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 4 - height / 16);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 12, y, true);
- term2.setMoveCd(x, y + height - height / 8, true);
- term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 16 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 16 + sh3);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 12, y, true);
- term3.setMoveCd(x, y + height - height / 8, true);
- term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 16 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 16 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 12, y, true);
- term0.setMoveCd(x, y + height - height / 8, true);
- term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 16 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 16 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 12, y, true);
- term1.setMoveCd(x, y + height - height / 8, true);
- term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 16 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 16 + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -298,96 +284,96 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("b2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 4 + width / 16, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 8, y, true);
- term3.setMoveCd(x, y + height - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 8, y, true);
- term2.setMoveCd(x, y + height - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 8, y, true);
- term1.setMoveCd(x, y + height - height / 12, true);
- term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 8, y, true);
- term0.setMoveCd(x, y + height - height / 12, true);
- term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16,
+ y + height + sh2);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -408,96 +394,96 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("b2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 4 - height / 16);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 12, y, true);
- term1.setMoveCd(x, y + height - height / 8, true);
- term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 16 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 16 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 12, y, true);
- term0.setMoveCd(x, y + height - height / 8, true);
- term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 16 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 16 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 12, y, true);
- term3.setMoveCd(x, y + height - height / 8, true);
- term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 16 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 16 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 12, y, true);
- term2.setMoveCd(x, y + height - height / 8, true);
- term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 16 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 16 + sh3);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -518,96 +504,96 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("b2");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 4 + width / 16, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 8, y, true);
- term0.setMoveCd(x, y + height - height / 12, true);
- term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 8, y, true);
- term1.setMoveCd(x, y + height - height / 12, true);
- term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 8, y, true);
- term2.setMoveCd(x, y + height - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 8, y, true);
- term3.setMoveCd(x, y + height - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16,
+ y + height + sh1);
+ }
}
}
g.setColor(c);
@@ -615,25 +601,79 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
}
private void rotateTopBottom(Graphics g) {
- int[] ptx0 = { x, x + width / 6, x + 5 * width / 6, x + width, x + 5 * width / 6, x + width / 6 };
- int[] pty0 = { y, y + height / 2 - height / 8, y + height / 2 - height / 8, y, y + height / 2 - height / 8,
- y + height / 2 - height / 8 };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 24, x + width / 6, x + 5 * width / 6, x + width - width / 24, x + 5 * width / 6,
+ x + width / 6 };
+ int[] pty0 = { y + height / 16, y + height / 2 - height / 8, y + height / 2 - height / 8, y + height / 16,
+ y + height / 2 - height / 8, y + height / 2 - height / 8 };
g.drawPolygon(ptx0, pty0, 6);
- int[] ptx1 = { x, x + width / 6, x + 5 * width / 6, x + width, x + 5 * width / 6, x + width / 6 };
- int[] pty1 = { y + height, y + height / 2 + height / 8, y + height / 2 + height / 8, y + height,
- y + height / 2 + height / 8, y + height / 2 + height / 8 };
+ int[] ptx1 = { x + width / 24, x + width / 6, x + 5 * width / 6, x + width - width / 24, x + 5 * width / 6,
+ x + width / 6 };
+ int[] pty1 = { y + height - height / 16, y + height / 2 + height / 8, y + height / 2 + height / 8,
+ y + height - height / 16, y + height / 2 + height / 8, y + height / 2 + height / 8 };
g.drawPolygon(ptx1, pty1, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateRightLeft(Graphics g) {
- int[] ptx0 = { x, x + width / 2 - width / 8, x + width / 2 - width / 8, x, x + width / 2 - width / 8,
- x + width / 2 - width / 8 };
- int[] pty0 = { y, y + height / 6, y + 5 * height / 6, y + height, y + 5 * height / 6, y + height / 6 };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 16, x + width / 2 - width / 8, x + width / 2 - width / 8, x + width / 16,
+ x + width / 2 - width / 8, x + width / 2 - width / 8 };
+ int[] pty0 = { y + height / 24, y + height / 6, y + 5 * height / 6, y + height - height / 24,
+ y + 5 * height / 6, y + height / 6 };
g.drawPolygon(ptx0, pty0, 6);
- int[] ptx1 = { x + width, x + width / 2 + width / 8, x + width / 2 + width / 8, x + width,
- x + width / 2 + width / 8, x + width / 2 + width / 8 };
- int[] pty1 = { y, y + height / 6, y + 5 * height / 6, y + height, y + 5 * height / 6, y + height / 6 };
+ int[] ptx1 = { x + width - width / 16, x + width / 2 + width / 8, x + width / 2 + width / 8,
+ x + width - width / 16, x + width / 2 + width / 8, x + width / 2 + width / 8 };
+ int[] pty1 = { y + height / 24, y + height / 6, y + 5 * height / 6, y + height - height / 24,
+ y + 5 * height / 6, y + height / 6 };
g.drawPolygon(ptx1, pty1, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -681,8 +721,6 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
sb.append("\" delta0=\"" + delta0);
sb.append("\" unit2=\"" + encode(unit2));
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -702,7 +740,7 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
double z0, delta0;
String delay;
String unit0, unit2;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -720,8 +758,6 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
delta0 = Double.parseDouble(elt.getAttribute("delta0"));
unit2 = elt.getAttribute("unit2");
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -733,8 +769,6 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
setDelta0(delta0);
setUnit2(unit2);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -909,38 +943,6 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -949,7 +951,7 @@ public class ELNComponentTransmissionLine extends TGCScalableWithInternalCompone
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
index da6a4575575b4022c295eb09c5635d706d9f8718..41c26fc60596f890b07d1f026c7e5974944fd62e 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
@@ -49,6 +49,7 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
/**
* Class ELNComponentVoltageControlledCurrentSource
@@ -58,7 +59,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -75,12 +76,7 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
- private ELNPortTerminal term2;
- private ELNPortTerminal term3;
+ private boolean first;
public ELNComponentVoltageControlledCurrentSource(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -94,6 +90,8 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
minWidth = 1;
minHeight = 1;
+ initPortTerminal(4);
+
addTGConnectingPointsComment();
moveable = true;
@@ -104,6 +102,19 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
setVal(1.0);
setUnit("S");
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "ncp");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "np");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "ncn");
+ connectingPoint[3] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "nn");
}
public Color getMyColor() {
@@ -111,34 +122,9 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("ncp");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
-
- term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("np");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - width / 12, y, true, false);
-
- term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term2.setValue("ncn");
- getTDiagramPanel().getComponentList().add(term2);
- term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 8, true, false);
-
- term3 = new ELNPortTerminal(x + width - width / 12, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term3.setValue("nn");
- getTDiagramPanel().getComponentList().add(term3);
- term3.getTDiagramPanel().addComponent(term3, x + width - width / 12, y + height - height / 8, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -182,11 +168,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 4 - height / 16);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -194,88 +180,88 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 12, y, true);
- term2.setMoveCd(x, y + height - height / 8, true);
- term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 16 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 16 + sh3);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottomFlip(g);
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 12, y, true);
- term3.setMoveCd(x, y + height - height / 8, true);
- term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 16 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 16 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTopFlip(g);
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 12, y, true);
- term0.setMoveCd(x, y + height - height / 8, true);
- term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 16 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 16 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 12, y, true);
- term1.setMoveCd(x, y + height - height / 8, true);
- term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 16 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 16 + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -294,11 +280,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 4 + width / 16, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -306,88 +292,88 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 8, y, true);
- term3.setMoveCd(x, y + height - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRightFlip(g);
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 8, y, true);
- term2.setMoveCd(x, y + height - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 8, y, true);
- term1.setMoveCd(x, y + height - height / 12, true);
- term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 8, y, true);
- term0.setMoveCd(x, y + height - height / 12, true);
- term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16,
+ y + height + sh2);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -406,11 +392,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 4 - height / 16);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -418,88 +404,88 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 12, y, true);
- term1.setMoveCd(x, y + height - height / 8, true);
- term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 16 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 16 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTopFlip(g);
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 12, y, true);
- term0.setMoveCd(x, y + height - height / 8, true);
- term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 16 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 16 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottomFlip(g);
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 12, y, true);
- term3.setMoveCd(x, y + height - height / 8, true);
- term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 16 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 16 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 12, y, true);
- term2.setMoveCd(x, y + height - height / 8, true);
- term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 16 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 16 + sh3);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -518,11 +504,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 4 + width / 16, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -530,88 +516,88 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 8, y, true);
- term0.setMoveCd(x, y + height - height / 12, true);
- term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 8, y, true);
- term1.setMoveCd(x, y + height - height / 12, true);
- term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRightFlip(g);
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 8, y, true);
- term2.setMoveCd(x, y + height - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 8, y, true);
- term3.setMoveCd(x, y + height - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16,
+ y + height + sh1);
+ }
}
}
g.setColor(c);
@@ -619,6 +605,7 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
}
private void rotateTop(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + 2 * width / 6 };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -648,9 +635,34 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateTopFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + 2 * width / 6 };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -680,9 +692,34 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + height / 4 + height / 8, y + height / 4 + height / 8 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + 4 * width / 6, x + width };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -712,9 +749,34 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + height / 4 + height / 8, y + height / 4 + height / 8 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateBottomFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + 4 * width / 6, x + width };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -744,9 +806,34 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y, y + 2 * height / 6 };
g.drawPolygon(ptx0, pty0, 2);
@@ -776,9 +863,34 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
private void rotateRightFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y + 4 * height / 6, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -808,9 +920,34 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + height / 6 - height / 12 - height / 24 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y + 4 * height / 6, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -840,9 +977,34 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + height / 6 - height / 12 - height / 24 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
private void rotateLeftFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y, y + 2 * height / 6 };
g.drawPolygon(ptx0, pty0, 2);
@@ -872,6 +1034,30 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx5, pty5, 6);
g.fillPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -914,8 +1100,6 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
sb.append("<attributes value=\"" + val);
sb.append("\" unit=\"" + encode(unit));
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -934,7 +1118,7 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
double value;
String unit;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -949,8 +1133,6 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
value = Double.parseDouble(elt.getAttribute("value"));
unit = elt.getAttribute("unit");
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -959,8 +1141,6 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
setVal(value);
setUnit(unit);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -1111,38 +1291,6 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -1151,7 +1299,7 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
index 4d3793de72fd6e90762df90d21100bfd9afadc18..faf41fe67e315f5df08f42af010db7d6c98f5269 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
@@ -49,6 +49,7 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
/**
* Class ELNComponentVoltageControlledVoltageSource
@@ -58,7 +59,7 @@ import java.awt.event.ActionListener;
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowTGComponent, SwallowedTGComponent, ELNComponent {
+public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -74,12 +75,7 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
private int position = 0;
private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
private int old;
- private boolean first, f = true;
-
- private ELNPortTerminal term0;
- private ELNPortTerminal term1;
- private ELNPortTerminal term2;
- private ELNPortTerminal term3;
+ private boolean first;
public ELNComponentVoltageControlledVoltageSource(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -93,6 +89,8 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
minWidth = 1;
minHeight = 1;
+ initPortTerminal(4);
+
addTGConnectingPointsComment();
moveable = true;
@@ -102,6 +100,19 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
value = tdp.findELNComponentName("VCVS");
setVal(1.0);
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "ncp");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "np");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "ncn");
+ connectingPoint[3] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "nn");
}
public Color getMyColor() {
@@ -109,34 +120,9 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
}
public void internalDrawing(Graphics g) {
- if (f == true) {
- term0 = new ELNPortTerminal(x, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term0.setValue("ncp");
- getTDiagramPanel().getComponentList().add(term0);
- term0.getTDiagramPanel().addComponent(term0, x, y, true, false);
-
- term1 = new ELNPortTerminal(x + width - width / 12, y, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term1.setValue("np");
- getTDiagramPanel().getComponentList().add(term1);
- term1.getTDiagramPanel().addComponent(term1, x + width - width / 12, y, true, false);
-
- term2 = new ELNPortTerminal(x, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term2.setValue("ncn");
- getTDiagramPanel().getComponentList().add(term2);
- term2.getTDiagramPanel().addComponent(term2, x, y + height - height / 8, true, false);
-
- term3 = new ELNPortTerminal(x + width - width / 12, y + height - height / 8, this.minX, this.maxX, this.minY, this.maxY, false, this.father, this.tdp);
- term3.setValue("nn");
- getTDiagramPanel().getComponentList().add(term3);
- term3.getTDiagramPanel().addComponent(term3, x + width - width / 12, y + height - height / 8, true, false);
- old = width;
- width = height;
- height = old;
- f = false;
- }
-
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -180,11 +166,11 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 4 - height / 16);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -192,88 +178,88 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 12, y, true);
- term2.setMoveCd(x, y + height - height / 8, true);
- term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 16 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 16 + sh3);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottomFlip(g);
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 12, y, true);
- term3.setMoveCd(x, y + height - height / 8, true);
- term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 16 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 16 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTopFlip(g);
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 12, y, true);
- term0.setMoveCd(x, y + height - height / 8, true);
- term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 16 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 16 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 12, y, true);
- term1.setMoveCd(x, y + height - height / 8, true);
- term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 16 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 16 + sh0);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -292,11 +278,11 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 4 + width / 16, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -304,88 +290,88 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 8, y, true);
- term3.setMoveCd(x, y + height - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16,
+ y + height + sh1);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRightFlip(g);
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 8, y, true);
- term2.setMoveCd(x, y + height - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 8, y, true);
- term1.setMoveCd(x, y + height - height / 12, true);
- term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 8, y, true);
- term0.setMoveCd(x, y + height - height / 12, true);
- term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16,
+ y + height + sh2);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -404,11 +390,11 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 4 - height / 16);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -416,88 +402,88 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- term3.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 12, y, true);
- term1.setMoveCd(x, y + height - height / 8, true);
- term0.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y);
- g.drawString(term2.getValue(), x + width + height / 8, y);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y + height + sh1);
- g.drawString(term0.getValue(), x + width + height / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 16 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 16 + sh0);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTopFlip(g);
- term2.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 12, y, true);
- term0.setMoveCd(x, y + height - height / 8, true);
- term1.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y);
- g.drawString(term3.getValue(), x + width + height / 8, y);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y + height + sh0);
- g.drawString(term1.getValue(), x + width + height / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 16 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 16 + sh1);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottomFlip(g);
- term1.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 12, y, true);
- term3.setMoveCd(x, y + height - height / 8, true);
- term2.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - height / 8 - sw1, y);
- g.drawString(term0.getValue(), x + width + height / 8, y);
- g.drawString(term3.getValue(), x - height / 8 - sw3, y + height + sh3);
- g.drawString(term2.getValue(), x + width + height / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - sw3,
+ y + height + height / 16 + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height + height / 16 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
- term0.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 12, y, true);
- term2.setMoveCd(x, y + height - height / 8, true);
- term3.setMoveCd(x + width - width / 12, y + height - height / 8, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - height / 8 - sw0, y);
- g.drawString(term1.getValue(), x + width + height / 8, y);
- g.drawString(term2.getValue(), x - height / 8 - sw2, y + height + sh2);
- g.drawString(term3.getValue(), x + width + height / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(15.0 / 16.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 16);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height + height / 16 + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width,
+ y + height + height / 16 + sh3);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -516,11 +502,11 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int sh2 = g.getFontMetrics().getAscent();
int sw3 = g.getFontMetrics().stringWidth("nn");
int sh3 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 4 + width / 16, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -528,88 +514,88 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- term1.setMoveCd(x, y, true);
- term3.setMoveCd(x + width - width / 8, y, true);
- term0.setMoveCd(x, y + height - height / 12, true);
- term2.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y);
- g.drawString(term3.getValue(), x + width + width / 8, y);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y + height + sh0);
- g.drawString(term2.getValue(), x + width + width / 8, y + height + sh2);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeftFlip(g);
- term0.setMoveCd(x, y, true);
- term2.setMoveCd(x + width - width / 8, y, true);
- term1.setMoveCd(x, y + height - height / 12, true);
- term3.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term0.getValue(), x - width / 8 - sw0, y);
- g.drawString(term2.getValue(), x + width + width / 8, y);
- g.drawString(term1.getValue(), x - width / 8 - sw1, y + height + sh1);
- g.drawString(term3.getValue(), x + width + width / 8, y + height + sh3);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 16 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x + width + width / 16,
+ y + height + sh3);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRightFlip(g);
- term3.setMoveCd(x, y, true);
- term1.setMoveCd(x + width - width / 8, y, true);
- term2.setMoveCd(x, y + height - height / 12, true);
- term0.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y);
- g.drawString(term1.getValue(), x + width + width / 8, y);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y + height + sh2);
- g.drawString(term0.getValue(), x + width + width / 8, y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2,
+ y + height + sh2);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- term2.setMoveCd(x, y, true);
- term0.setMoveCd(x + width - width / 8, y, true);
- term3.setMoveCd(x, y + height - height / 12, true);
- term1.setMoveCd(x + width - width / 8, y + height - height / 12, true);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term2.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term0.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setW(0.0);
- ((ELNConnectingPoint) (term3.getTGConnectingPointAtIndex(0))).setH(0.5);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setW(1.0);
- ((ELNConnectingPoint) (term1.getTGConnectingPointAtIndex(0))).setH(0.5);
- g.drawString(term2.getValue(), x - width / 8 - sw2, y);
- g.drawString(term0.getValue(), x + width + width / 8, y);
- g.drawString(term3.getValue(), x - width / 8 - sw3, y + height + sh3);
- g.drawString(term1.getValue(), x + width + width / 8, y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setW(1.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[3]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(15.0 / 16.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - width / 16 - sw2, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[3]).getName(), x - width / 16 - sw3,
+ y + height + sh3);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 16,
+ y + height + sh1);
+ }
}
}
g.setColor(c);
@@ -617,6 +603,7 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
}
private void rotateTop(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + 2 * width / 6 };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -648,9 +635,34 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
int[] pty6 = { y + height - height / 4, y + height - height / 4 };
g.drawPolygon(ptx6, pty6, 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateTopFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x, x + 2 * width / 6 };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -682,9 +694,34 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
int[] pty6 = { y + height / 4, y + height / 4 };
g.drawPolygon(ptx6, pty6, 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + 4 * width / 6, x + width };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -715,9 +752,34 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
int[] pty6 = { y + height / 4, y + height / 4 };
g.drawPolygon(ptx6, pty6, 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateBottomFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + 4 * width / 6, x + width };
int[] pty0 = { y + height / 16, y + height / 16 };
g.drawPolygon(ptx0, pty0, 2);
@@ -748,9 +810,34 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
int[] pty6 = { y + height - height / 4, y + height - height / 4 };
g.drawPolygon(ptx6, pty6, 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 24, y - height / 16, width - width / 12, height + height / 8,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
+ g.drawOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 12, y + height - height / 8, width / 12, height / 8);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y, y + 2 * height / 6 };
g.drawPolygon(ptx0, pty0, 2);
@@ -782,9 +869,34 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx6 = { x + width / 4, x + width / 4 };
int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx6, pty6, 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
private void rotateRightFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y + 4 * height / 6, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -813,12 +925,37 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx5, pty5, 6);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
int[] ptx6 = { x + width / 4, x + width / 4 };
int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx6, pty6, 2);
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y + 4 * height / 6, y + height };
g.drawPolygon(ptx0, pty0, 2);
@@ -850,9 +987,34 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx6 = { x + width - width / 4, x + width - width / 4 };
int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx6, pty6, 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
private void rotateLeftFlip(Graphics g) {
+ Color c = g.getColor();
int[] ptx0 = { x + width / 16, x + width / 16 };
int[] pty0 = { y, y + 2 * height / 6 };
g.drawPolygon(ptx0, pty0, 2);
@@ -884,6 +1046,30 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx6 = { x + width - width / 4, x + width - width / 4 };
int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx6, pty6, 2);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 16, y + height / 24, width + width / 8, height - height / 12,
+ 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
+ g.drawOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 8, y + height - height / 12, width / 8, height / 12);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -908,8 +1094,6 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
StringBuffer sb = new StringBuffer("<extraparam>\n");
sb.append("<attributes value=\"" + val);
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -927,7 +1111,7 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
Element elt;
double value;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -941,8 +1125,6 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
if (elt.getTagName().equals("attributes")) {
value = Double.parseDouble(elt.getAttribute("value"));
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -950,8 +1132,6 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
first = Boolean.parseBoolean(elt.getAttribute("first"));
setVal(value);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -1094,38 +1274,6 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
first = _first;
}
- public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- return tgc instanceof ELNPortTerminal;
- }
-
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
- if (tgc instanceof ELNPortTerminal) {
- tgc.setFather(this);
- tgc.setDrawingZone(true);
- tgc.resizeWithFather();
- addInternalComponent(tgc, 0);
- return true;
- }
- return false;
- }
-
- public void removeSwallowedTGComponent(TGComponent tgc) {
- removeInternalComponent(tgc);
- }
-
- public void hasBeenResized() {
- rescaled = true;
- for (int i = 0; i < nbInternalTGComponent; i++) {
- if (tgcomponent[i] instanceof ELNPortTerminal) {
- tgcomponent[i].resizeWithFather();
- }
- }
-
- if (getFather() != null) {
- resizeWithFather();
- }
- }
-
public void resizeWithFather() {
if ((father != null) && (father instanceof ELNModule)) {
resizeToFatherSize();
@@ -1134,7 +1282,7 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
setMoveCd(x, y);
}
}
-
+
public void wasSwallowed() {
myColor = null;
}
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java
index 31dc1ef2aefe2fcb2c6e842805cfa86fba8dc637..e566d185ece415eed6d127b69155ff66a5cc59db 100644
--- a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSinkTDF.java
@@ -39,29 +39,27 @@
package ui.eln.sca_eln_sca_tdf;
import myutil.GraphicLib;
-
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ui.*;
-import ui.eln.ELNConnectingPoint;
+import ui.eln.*;
import ui.window.JDialogELNComponentCurrentSinkTDF;
-import ui.window.JDialogELNComponentVoltageSinkTDF;
-
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
/**
* Class ELNComponentCurrentSinkTDF
* Converts current to a TDF output signal to be used in ELN diagrams
- * Creation: 29/06/2018
- * @version 1.0 29/06/2018
+ * Creation: 17/07/2018
+ * @version 1.0 17/07/2018
* @author Irina Kit Yan LEE
*/
-public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent implements ActionListener {
+public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -79,11 +77,10 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
private int old;
private boolean first;
- public ELNComponentCurrentSinkTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY,
- boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ public ELNComponentCurrentSinkTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- initScaling(80, 80);
+ initScaling(100, 100);
dtextX = textX * oldScaleFactor;
textX = (int) dtextX;
@@ -92,6 +89,8 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
minWidth = 1;
minHeight = 1;
+ initPortTerminal(3);
+
addTGConnectingPointsComment();
moveable = true;
@@ -107,12 +106,13 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
height = old;
}
-// public void initConnectingPoint(int nb) {
-// nbConnectingPoint = nb;
-// connectingPoint = new TGConnectingPoint[nb];
-// connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
-// connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 1.0, "n");
-// }
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "outp");
+ }
public Color getMyColor() {
return myColor;
@@ -121,6 +121,7 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
public void internalDrawing(Graphics g) {
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -160,11 +161,13 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sw2 = g.getFontMetrics().stringWidth("outp");
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -173,12 +176,18 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -186,38 +195,56 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottomFlip(g);
((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTopFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -232,11 +259,12 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -244,52 +272,74 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRightFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1,
- y + height + sh1);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeftFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0,
- y + height + sh0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -304,11 +354,13 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sw2 = g.getFontMetrics().stringWidth("outp");
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -316,26 +368,38 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTopFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -343,12 +407,18 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottomFlip(g);
((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -356,12 +426,18 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -376,11 +452,12 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -388,52 +465,74 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0,
- y + height + sh0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeftFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRightFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1,
- y + height + sh1);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
}
g.setColor(c);
@@ -441,203 +540,239 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
}
private void rotateTop(Graphics g) {
- int[] ptx0 = { x, x + 2 * width / 6 };
- int[] pty0 = { y, y };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x, x + 2 * width / 6 };
- int[] pty1 = { y + height, y + height };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height / 8, y + height / 8, y + height / 16, y + height / 8 + height / 16, y + height / 8,
- y + height / 8 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height - height / 8, y + height - height / 8 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 6, x + 5 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8,
- y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5, x + 2 * width / 5, x, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + 2 * width / 5 - width / 20, x + 2 * width / 5, x + 2 * width / 5 + width / 20 };
+ int[] pty1 = { y + height / 2, y + height / 2 + height / 20, y + height / 2 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateTopFlip(Graphics g) {
- int[] ptx0 = { x, x + 2 * width / 6 };
- int[] pty0 = { y, y };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x, x + 2 * width / 6 };
- int[] pty1 = { y + height, y + height };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height - height / 8, y + height - height / 8, y + height - height / 16,
- y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 8 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height / 8, y + height / 8 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 6, x + 5 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8, y + height / 4 + height / 8, y + height / 4,
- y + height / 4 + height / 8, y + height / 4 + height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5, x + 2 * width / 5, x, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + 2 * width / 5 - width / 20, x + 2 * width / 5, x + 2 * width / 5 + width / 20 };
+ int[] pty1 = { y + height / 2, y + height / 2 - height / 20, y + height / 2 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
- int[] ptx0 = { x + 4 * width / 6, x + width };
- int[] pty0 = { y, y };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + 4 * width / 6, x + width };
- int[] pty1 = { y + height, y + height };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty3 = { y + height - height / 8, y + height - height / 8, y + height - height / 16,
- y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 8 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty4 = { y + height / 8, y + height / 8 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
- x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
- x + width / 6 - width / 12 - width / 24 };
- int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8, y + height / 4 + height / 8, y + height / 4,
- y + height / 4 + height / 8, y + height / 4 + height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + width, x + 3 * width / 5,
+ x + 3 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + 3 * width / 5 - width / 20, x + 3 * width / 5, x + 3 * width / 5 + width / 20 };
+ int[] pty1 = { y + height / 2, y + height / 2 - height / 20, y + height / 2 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateBottomFlip(Graphics g) {
- int[] ptx0 = { x + 4 * width / 6, x + width };
- int[] pty0 = { y, y };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + 4 * width / 6, x + width };
- int[] pty1 = { y + height, y + height };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty3 = { y + height / 8, y + height / 8, y + height / 16, y + height / 8 + height / 16, y + height / 8,
- y + height / 8 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty4 = { y + height - height / 8, y + height - height / 8 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
- x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
- x + width / 6 - width / 12 - width / 24 };
- int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8,
- y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + width, x + 3 * width / 5,
+ x + 3 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + 3 * width / 5 - width / 20, x + 3 * width / 5, x + 3 * width / 5 + width / 20 };
+ int[] pty1 = { y + height / 2, y + height / 2 + height / 20, y + height / 2 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y, y + 2 * height / 6 };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y, y + 2 * height / 6 };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width - width / 8, x + width - width / 8, x + width - width / 16,
- x + width - width / 8 - width / 16, x + width - width / 8, x + width - width / 8 };
- int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 24 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 8, x + width / 8 };
- int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
- x + width / 4 + width / 8, x + width / 4 + width / 8 };
- int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 12, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5, y + 2 * height / 5, y, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + width / 2, x + width / 2 - width / 20, x + width / 2 };
+ int[] pty1 = { y + 2 * height / 5 - height / 20, y + 2 * height / 5, y + 2 * height / 5 + height / 20 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateRightFlip(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y + 4 * height / 6, y + height };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y + 4 * height / 6, y + height };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width - width / 8, x + width - width / 8, x + width - width / 16,
- x + width - width / 8 - width / 16, x + width - width / 8, x + width - width / 8 };
- int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 8, x + width / 8 };
- int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
- x + width / 4 + width / 8, x + width / 4 + width / 8 };
- int[] pty5 = { y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 12 - height / 24,
- y + height / 6 - height / 12, y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 6,
- y + height / 6 - height / 12 - height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + height, y + 3 * height / 5,
+ y + 3 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + width / 2, x + width / 2 - width / 20, x + width / 2 };
+ int[] pty1 = { y + 3 * height / 5 - height / 20, y + 3 * height / 5, y + 3 * height / 5 + height / 20 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y + 4 * height / 6, y + height };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y + 4 * height / 6, y + height };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width / 8, x + width / 8, x + width / 16, x + width / 8 + width / 16, x + width / 8,
- x + width / 8 };
- int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 8, x + width - width / 8 };
- int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
- x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8 };
- int[] pty5 = { y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 12 - height / 24,
- y + height / 6 - height / 12, y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 6,
- y + height / 6 - height / 12 - height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + height, y + 3 * height / 5,
+ y + 3 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + width / 2, x + width / 2 + width / 20, x + width / 2 };
+ int[] pty1 = { y + 3 * height / 5 - height / 20, y + 3 * height / 5, y + 3 * height / 5 + height / 20 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateLeftFlip(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y, y + 2 * height / 6 };
- g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y, y + 2 * height / 6 };
- g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width / 8, x + width / 8, x + width / 16, x + width / 8 + width / 16, x + width / 8,
- x + width / 8 };
- int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 24 };
- g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 8, x + width - width / 8 };
- int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
- g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
- x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8 };
- int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 12, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5, y + 2 * height / 5, y, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ int[] ptx1 = { x + width / 2, x + width / 2 + width / 20, x + width / 2 };
+ int[] pty1 = { y + 2 * height / 5 - height / 20, y + 2 * height / 5, y + 2 * height / 5 + height / 20 };
+ g.drawPolygon(ptx1, pty1, 3);
+ g.fillPolygon(ptx1, pty1, 3);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -661,8 +796,6 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
StringBuffer sb = new StringBuffer("<extraparam>\n");
sb.append("<attributes scale=\"" + scale);
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -680,7 +813,7 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
Element elt;
double scale;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -694,8 +827,6 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
if (elt.getTagName().equals("attributes")) {
scale = Double.parseDouble(elt.getAttribute("scale"));
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -703,8 +834,6 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
first = Boolean.parseBoolean(elt.getAttribute("first"));
setScale(scale);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -723,11 +852,11 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
componentMenu.addSeparator();
- JMenuItem rotateright = new JMenuItem("Rotate right 90°");
+ JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
rotateright.addActionListener(this);
componentMenu.add(rotateright);
- JMenuItem rotateleft = new JMenuItem("Rotate left 90°");
+ JMenuItem rotateleft = new JMenuItem("Rotate left 90\u00b0");
rotateleft.addActionListener(this);
componentMenu.add(rotateleft);
@@ -743,12 +872,12 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
}
public void actionPerformed(ActionEvent e) {
- if (e.getActionCommand().equals("Rotate right 90°")) {
+ if (e.getActionCommand().equals("Rotate right 90\u00b0")) {
position++;
position %= 4;
first = false;
}
- if (e.getActionCommand().equals("Rotate left 90°")) {
+ if (e.getActionCommand().equals("Rotate left 90\u00b0")) {
position = position + 3;
position %= 4;
first = false;
@@ -803,47 +932,67 @@ public class ELNComponentCurrentSinkTDF extends TGCScalableWithInternalComponent
return position;
}
- public void setPosition(int position) {
- this.position = position;
+ public void setPosition(int _position) {
+ position = _position;
}
public boolean isFv_0_2() {
return fv_0_2;
}
- public void setFv_0_2(boolean fv_0_2) {
- this.fv_0_2 = fv_0_2;
+ public void setFv_0_2(boolean _fv_0_2) {
+ fv_0_2 = _fv_0_2;
}
public boolean isFv_1_3() {
return fv_1_3;
}
- public void setFv_1_3(boolean fv_1_3) {
- this.fv_1_3 = fv_1_3;
+ public void setFv_1_3(boolean _fv_1_3) {
+ fv_1_3 = _fv_1_3;
}
public boolean isFh_0_2() {
return fh_0_2;
}
- public void setFh_0_2(boolean fh_0_2) {
- this.fh_0_2 = fh_0_2;
+ public void setFh_0_2(boolean _fh_0_2) {
+ fh_0_2 = _fh_0_2;
}
public boolean isFh_1_3() {
return fh_1_3;
}
- public void setFh_1_3(boolean fh_1_3) {
- this.fh_1_3 = fh_1_3;
+ public void setFh_1_3(boolean _fh_1_3) {
+ fh_1_3 = _fh_1_3;
}
public boolean isFirst() {
return first;
}
- public void setFirst(boolean first) {
- this.first = first;
+ public void setFirst(boolean _first) {
+ first = _first;
+ }
+
+ public void resizeWithFather() {
+ if ((father != null) && (father instanceof ELNModule)) {
+ resizeToFatherSize();
+
+ setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
+ setMoveCd(x, y);
+ }
+ }
+
+ public void wasSwallowed() {
+ myColor = null;
+ }
+
+ public void wasUnswallowed() {
+ myColor = null;
+ setFather(null);
+ TDiagramPanel tdp = getTDiagramPanel();
+ setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSourceTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSourceTDF.java
new file mode 100644
index 0000000000000000000000000000000000000000..8e17ecc461f16aaa6b62b41e7c3668ffbec24125
--- /dev/null
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentCurrentSourceTDF.java
@@ -0,0 +1,1031 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.eln.sca_eln_sca_tdf;
+
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.eln.*;
+import ui.window.JDialogELNComponentCurrentSourceTDF;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
+
+/**
+ * Class ELNComponentCurrentSourceTDF
+ * Current source driven by a TDF input signal signal to be used in ELN diagrams
+ * Creation: 19/07/2018
+ * @version 1.0 19/07/2018
+ * @author Irina Kit Yan LEE
+ */
+
+public class ELNComponentCurrentSourceTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+ protected Color myColor;
+ protected int orientation;
+ private int maxFontSize = 14;
+ private int minFontSize = 4;
+ private int currentFontSize = -1;
+
+ private int textX = 15;
+ private double dtextX = 0.0;
+ protected int decPoint = 3;
+
+ private double scale;
+
+ private int position = 0;
+ private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
+ private int old;
+ private boolean first;
+
+ public ELNComponentCurrentSourceTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ initScaling(100, 100);
+
+ dtextX = textX * oldScaleFactor;
+ textX = (int) dtextX;
+ dtextX = dtextX - textX;
+
+ minWidth = 1;
+ minHeight = 1;
+
+ initPortTerminal(3);
+
+ addTGConnectingPointsComment();
+
+ moveable = true;
+ editable = true;
+ removable = true;
+ userResizable = false;
+ value = tdp.findELNComponentName("TDF_ISource");
+
+ setScale(1.0);
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "inp");
+ }
+
+ public Color getMyColor() {
+ return myColor;
+ }
+
+ public void internalDrawing(Graphics g) {
+ Font f = g.getFont();
+ Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
+
+ if (this.rescaled && !this.tdp.isScaled()) {
+ this.rescaled = false;
+ int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
+ f = f.deriveFont((float) maxCurrentFontSize);
+
+ while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
+ if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
+ break;
+ }
+ maxCurrentFontSize--;
+ f = f.deriveFont((float) maxCurrentFontSize);
+ }
+
+ if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
+ maxCurrentFontSize++;
+ f = f.deriveFont((float) maxCurrentFontSize);
+ }
+ g.setFont(f);
+ this.currentFontSize = maxCurrentFontSize;
+ } else {
+ f = f.deriveFont(this.currentFontSize);
+ }
+
+ Color c = g.getColor();
+
+ if (position == 0) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sw2 = g.getFontMetrics().stringWidth("inp");
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateTop(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateBottomFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateTopFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateBottom(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ } else if (position == 1) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateRight(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateRightFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateLeftFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateLeft(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ } else if (position == 2) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sw2 = g.getFontMetrics().stringWidth("inp");
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateBottom(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateTopFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateBottomFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateTop(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ } else if (position == 3) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateLeft(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateLeftFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateRightFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateRight(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ }
+ g.setColor(c);
+ g.setFont(fold);
+ }
+
+ private void rotateTop(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height / 5 + height / 10, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5 - height / 10,
+ y + height - height / 20 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + 2 * width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + 2 * width / 5, y + height / 2, x + 4 * width / 5, y + height / 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5 + width / 10, y + height / 5 + height / 10,
+ x + 4 * width / 5 + width / 10, y + 4 * height / 5 - height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 5, y + height / 2, x + 2 * width / 5, y + height / 2, true);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateTopFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height / 5 + height / 10, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5 - height / 10,
+ y + height - height / 20 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + 2 * width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + 2 * width / 5, y + height / 2, x + 4 * width / 5, y + height / 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5 + width / 10, y + 4 * height / 5 - height / 10,
+ x + 4 * width / 5 + width / 10, y + height / 5 + height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 5, y + height / 2, x + 2 * width / 5, y + height / 2, true);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height / 5 + height / 10, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x, x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5 - height / 10,
+ y + height - height / 20 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + width / 5, y + height / 2, x + 3 * width / 5, y + height / 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 10, y + 4 * height / 5 - height / 10, x + width / 10,
+ y + height / 5 + height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5, y + height / 2, x + 3 * width / 5, y + height / 2,
+ true);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateBottomFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height / 5 + height / 10, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x, x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20, y + 4 * height / 5 - height / 10,
+ y + height - height / 20 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + width / 5, y + height / 2, x + 3 * width / 5, y + height / 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 10, y + height / 5 + height / 10, x + width / 10,
+ y + 4 * height / 5 - height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5, y + height / 2, x + 3 * width / 5, y + height / 2,
+ true);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateRight(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + height / 5 + height / 10, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5 - width / 10,
+ x + width - width / 20 };
+ int[] pty1 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + width / 2 - width / 5, y + 2 * height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + width / 2, y + 2 * height / 5, x + width / 2, y + 4 * height / 5);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5 - width / 10, y + 4 * height / 5 + height / 10,
+ x + width / 5 + width / 10, y + 4 * height / 5 + height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + height / 5, x + width / 2, y + 2 * height / 5, true);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateRightFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + height / 5 + height / 10, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5 - width / 10,
+ x + width - width / 20 };
+ int[] pty1 = { y, y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + width / 2 - width / 5, y + height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + width / 2, y + height / 5, x + width / 2, y + 3 * height / 5);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5 - width / 10, y + height / 10,
+ x + width / 5 + width / 10, y + height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + 4 * height / 5, x + width / 2, y + 3 * height / 5,
+ true);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + height / 5 + height / 10, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5 - width / 10,
+ x + width - width / 20 };
+ int[] pty1 = { y, y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + width / 2 - width / 5, y + height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + width / 2, y + height / 5, x + width / 2, y + 3 * height / 5);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 5 + width / 10, y + height / 10,
+ x + 4 * width / 5 - width / 10, y + height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + 4 * height / 5, x + width / 2, y + 3 * height / 5,
+ true);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateLeftFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + height / 5 + height / 10, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 4);
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20, x + 4 * width / 5 - width / 10,
+ x + width - width / 20 };
+ int[] pty1 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5 };
+ g.drawPolygon(ptx1, pty1, 4);
+ g.drawOval(x + width / 2 - width / 5, y + 2 * height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ g.drawLine(x + width / 2, y + 2 * height / 5, x + width / 2, y + 4 * height / 5);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 5 + width / 10, y + 4 * height / 5 + height / 10,
+ x + 4 * width / 5 - width / 10, y + 4 * height / 5 + height / 10, true);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + height / 5, x + width / 2, y + 2 * height / 5, true);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ public TGComponent isOnOnlyMe(int _x, int _y) {
+ if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
+ return this;
+ }
+ return null;
+ }
+
+ public int getType() {
+ return TGComponentManager.ELN_TDF_CURRENT_SOURCE;
+ }
+
+ public boolean editOndoubleClick(JFrame frame) {
+ JDialogELNComponentCurrentSourceTDF jde = new JDialogELNComponentCurrentSourceTDF(this);
+ jde.setVisible(true);
+ return true;
+ }
+
+ protected String translateExtraParam() {
+ StringBuffer sb = new StringBuffer("<extraparam>\n");
+ sb.append("<attributes scale=\"" + scale);
+ sb.append("\" position=\"" + position);
+ sb.append("\" fv_0_2=\"" + fv_0_2);
+ sb.append("\" fv_1_3=\"" + fv_1_3);
+ sb.append("\" fh_0_2=\"" + fh_0_2);
+ sb.append("\" fh_1_3=\"" + fh_1_3);
+ sb.append("\" first=\"" + first + "\"");
+ sb.append("/>\n");
+ sb.append("</extraparam>\n");
+ return new String(sb);
+ }
+
+ public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException {
+ try {
+ NodeList nli;
+ Node n1, n2;
+ Element elt;
+
+ double scale;
+ int position;
+ boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
+
+ for (int i = 0; i < nl.getLength(); i++) {
+ n1 = nl.item(i);
+ if (n1.getNodeType() == Node.ELEMENT_NODE) {
+ nli = n1.getChildNodes();
+ for (int j = 0; j < nli.getLength(); j++) {
+ n2 = nli.item(j);
+ if (n2.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element) n2;
+ if (elt.getTagName().equals("attributes")) {
+ scale = Double.parseDouble(elt.getAttribute("scale"));
+ position = Integer.parseInt(elt.getAttribute("position"));
+ fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
+ fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
+ fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
+ fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
+ first = Boolean.parseBoolean(elt.getAttribute("first"));
+ setScale(scale);
+ setPosition(position);
+ setFv_0_2(fv_0_2);
+ setFv_1_3(fv_1_3);
+ setFh_0_2(fh_0_2);
+ setFh_1_3(fh_1_3);
+ setFirst(first);
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ throw new MalformedModelingException();
+ }
+ }
+
+ public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
+ componentMenu.addSeparator();
+
+ JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
+ rotateright.addActionListener(this);
+ componentMenu.add(rotateright);
+
+ JMenuItem rotateleft = new JMenuItem("Rotate left 90\u00b0");
+ rotateleft.addActionListener(this);
+ componentMenu.add(rotateleft);
+
+ componentMenu.addSeparator();
+
+ JMenuItem rotatevertically = new JMenuItem("Flip vertically");
+ rotatevertically.addActionListener(this);
+ componentMenu.add(rotatevertically);
+
+ JMenuItem rotatehorizontally = new JMenuItem("Flip horizontally");
+ rotatehorizontally.addActionListener(this);
+ componentMenu.add(rotatehorizontally);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if (e.getActionCommand().equals("Rotate right 90\u00b0")) {
+ position++;
+ position %= 4;
+ first = false;
+ }
+ if (e.getActionCommand().equals("Rotate left 90\u00b0")) {
+ position = position + 3;
+ position %= 4;
+ first = false;
+ }
+ if (e.getActionCommand().equals("Flip vertically")) {
+ if (position == 0 || position == 2) {
+ if (fv_0_2 == false) {
+ fv_0_2 = true;
+ } else {
+ fv_0_2 = false;
+ }
+ }
+ if (position == 1 || position == 3) {
+ if (fv_1_3 == false) {
+ fv_1_3 = true;
+ } else {
+ fv_1_3 = false;
+ }
+ }
+ }
+ if (e.getActionCommand().equals("Flip horizontally")) {
+ if (position == 0 || position == 2) {
+ if (fh_0_2 == false) {
+ fh_0_2 = true;
+ } else {
+ fh_0_2 = false;
+ }
+ }
+ if (position == 1 || position == 3) {
+ if (fh_1_3 == false) {
+ fh_1_3 = true;
+ } else {
+ fh_1_3 = false;
+ }
+ }
+ }
+ }
+
+ public int getDefaultConnector() {
+ return TGComponentManager.ELN_CONNECTOR;
+ }
+
+ public double getScale() {
+ return scale;
+ }
+
+ public void setScale(double _scale) {
+ scale = _scale;
+ }
+
+ public int getPosition() {
+ return position;
+ }
+
+ public void setPosition(int _position) {
+ position = _position;
+ }
+
+ public boolean isFv_0_2() {
+ return fv_0_2;
+ }
+
+ public void setFv_0_2(boolean _fv_0_2) {
+ fv_0_2 = _fv_0_2;
+ }
+
+ public boolean isFv_1_3() {
+ return fv_1_3;
+ }
+
+ public void setFv_1_3(boolean _fv_1_3) {
+ fv_1_3 = _fv_1_3;
+ }
+
+ public boolean isFh_0_2() {
+ return fh_0_2;
+ }
+
+ public void setFh_0_2(boolean _fh_0_2) {
+ fh_0_2 = _fh_0_2;
+ }
+
+ public boolean isFh_1_3() {
+ return fh_1_3;
+ }
+
+ public void setFh_1_3(boolean _fh_1_3) {
+ fh_1_3 = _fh_1_3;
+ }
+
+ public boolean isFirst() {
+ return first;
+ }
+
+ public void setFirst(boolean _first) {
+ first = _first;
+ }
+
+ public void resizeWithFather() {
+ if ((father != null) && (father instanceof ELNModule)) {
+ resizeToFatherSize();
+
+ setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
+ setMoveCd(x, y);
+ }
+ }
+
+ public void wasSwallowed() {
+ myColor = null;
+ }
+
+ public void wasUnswallowed() {
+ myColor = null;
+ setFather(null);
+ TDiagramPanel tdp = getTDiagramPanel();
+ setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java
index 0e6f725396fbeab98d8909199edbe5ea948acb16..a44f8b982b0ead4d196a17f82e639b1e6f78b5cb 100644
--- a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSinkTDF.java
@@ -39,28 +39,28 @@
package ui.eln.sca_eln_sca_tdf;
import myutil.GraphicLib;
-
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ui.*;
-import ui.eln.ELNConnectingPoint;
+import ui.eln.*;
import ui.window.JDialogELNComponentVoltageSinkTDF;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
/**
* Class ELNComponentVoltageSinkTDF
* Converts voltage to a TDF output signal to be used in ELN diagrams
- * Creation: 29/06/2018
- * @version 1.0 29/06/2018
+ * Creation: 17/07/2018
+ * @version 1.0 17/07/2018
* @author Irina Kit Yan LEE
*/
-public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent implements ActionListener {
+public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
protected Color myColor;
protected int orientation;
private int maxFontSize = 14;
@@ -78,11 +78,10 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
private int old;
private boolean first;
- public ELNComponentVoltageSinkTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY,
- boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ public ELNComponentVoltageSinkTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- initScaling(80, 80);
+ initScaling(100, 100);
dtextX = textX * oldScaleFactor;
textX = (int) dtextX;
@@ -91,6 +90,8 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
minWidth = 1;
minHeight = 1;
+ initPortTerminal(3);
+
addTGConnectingPointsComment();
moveable = true;
@@ -106,12 +107,13 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
height = old;
}
-// public void initConnectingPoint(int nb) {
-// nbConnectingPoint = nb;
-// connectingPoint = new TGConnectingPoint[nb];
-// connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
-// connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 1.0, "n");
-// }
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "outp");
+ }
public Color getMyColor() {
return myColor;
@@ -120,6 +122,7 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
public void internalDrawing(Graphics g) {
Font f = g.getFont();
Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
if (this.rescaled && !this.tdp.isScaled()) {
this.rescaled = false;
@@ -159,11 +162,13 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sw2 = g.getFontMetrics().stringWidth("outp");
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -172,12 +177,18 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
@@ -185,38 +196,56 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateBottomFlip(g);
((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateTopFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
} else if (position == 1) {
if (first == false) {
@@ -231,11 +260,12 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -243,52 +273,74 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateRightFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1,
- y + height + sh1);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateLeftFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0,
- y + height + sh0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
} else if (position == 2) {
if (first == false) {
@@ -303,11 +355,13 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sw2 = g.getFontMetrics().stringWidth("outp");
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 4);
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -315,26 +369,38 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateBottom(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateTopFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
@@ -342,12 +408,18 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateBottomFlip(g);
((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + height / 8, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + height / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
@@ -355,12 +427,18 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateTop(g);
((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - height / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - height / 8 - sw1,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
}
} else if (position == 3) {
if (first == false) {
@@ -375,11 +453,12 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
int sh0 = g.getFontMetrics().getAscent();
int sw1 = g.getFontMetrics().stringWidth("n");
int sh1 = g.getFontMetrics().getAscent();
- int w = g.getFontMetrics().stringWidth(value);
+ int sh2 = g.getFontMetrics().getAscent();
g.setFont(f.deriveFont((float) attributeFontSize));
g.setFont(f);
g.setFont(f.deriveFont(Font.BOLD));
- g.drawString(value, x + (width - w) / 2, y - height / 6);
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
g.setFont(f.deriveFont(Font.PLAIN));
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
@@ -387,52 +466,74 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
rotateLeft(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0,
- y + height + sh0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8,
- y + height + sh1);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
rotateLeftFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 8 - sw0, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
rotateRightFlip(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1,
- y + height + sh1);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8,
- y + height + sh0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
}
if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
|| (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
|| (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
rotateRight(g);
- ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
- ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
- ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
- g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 8 - sw1, y);
- g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 8, y);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
}
}
g.setColor(c);
@@ -440,203 +541,331 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
}
private void rotateTop(Graphics g) {
- int[] ptx0 = { x, x + 2 * width / 6 };
- int[] pty0 = { y, y };
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5 - width / 10 };
+ int[] pty0 = { y + height / 20, y + height / 20 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x, x + 2 * width / 6 };
- int[] pty1 = { y + height, y + height };
+ int[] ptx1 = { x, x + 2 * width / 5 - width / 10 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height / 8, y + height / 8, y + height / 16, y + height / 8 + height / 16, y + height / 8,
- y + height / 8 };
+ int[] ptx3 = { x + width / 5 - width / 20, x + width / 5, x + width / 5, x + width / 5, x + width / 5,
+ x + width / 5 + width / 20 };
+ int[] pty3 = { y + height / 10 + height / 20, y + height / 10 + height / 20, y + height / 10, y + height / 5,
+ y + height / 10 + height / 20, y + height / 10 + height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height - height / 8, y + height - height / 8 };
+ int[] ptx4 = { x + width / 5 - width / 20, x + width / 5 + width / 20 };
+ int[] pty4 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 6, x + 5 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8,
- y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5 - width / 20,
+ x + 2 * width / 5 + width / 20, x + 2 * width / 5 };
+ int[] pty5 = { y + height / 20, y + height - height / 20, y + height - height / 10, y + height - height / 10,
+ y + height - height / 20 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateTopFlip(Graphics g) {
- int[] ptx0 = { x, x + 2 * width / 6 };
- int[] pty0 = { y, y };
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5 - width / 10 };
+ int[] pty0 = { y + height / 20, y + height / 20 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x, x + 2 * width / 6 };
- int[] pty1 = { y + height, y + height };
+ int[] ptx1 = { x, x + 2 * width / 5 - width / 10 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
- x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height - height / 8, y + height - height / 8, y + height - height / 16,
- y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 8 };
+ int[] ptx3 = { x + width / 5 - width / 20, x + width / 5, x + width / 5, x + width / 5, x + width / 5,
+ x + width / 5 + width / 20 };
+ int[] pty3 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20,
+ y + height - 2 * height / 10, y + height - height / 10, y + height - height / 10 - height / 20,
+ y + height - height / 10 - height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height / 8, y + height / 8 };
+ int[] ptx4 = { x + width / 5 - width / 20, x + width / 5 + width / 20 };
+ int[] pty4 = { y + height / 10 + height / 20, y + height / 10 + height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
- x + 5 * width / 6 + width / 6, x + 5 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8, y + height / 4 + height / 8, y + height / 4,
- y + height / 4 + height / 8, y + height / 4 + height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + 2 * width / 5, x + 2 * width / 5, x + 2 * width / 5 - width / 20,
+ x + 2 * width / 5 + width / 20, x + 2 * width / 5 };
+ int[] pty5 = { y + height - height / 20, y + height / 20, y + height / 10, y + height / 10, y + height / 20 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateBottom(Graphics g) {
- int[] ptx0 = { x + 4 * width / 6, x + width };
- int[] pty0 = { y, y };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5 + width / 10 };
+ int[] pty0 = { y + height / 20, y + height / 20 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + 4 * width / 6, x + width };
- int[] pty1 = { y + height, y + height };
+ int[] ptx1 = { x + height, x + 3 * width / 5 + width / 10 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty3 = { y + height - height / 8, y + height - height / 8, y + height - height / 16,
- y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 8 };
+ int[] ptx3 = { x + 4 * width / 5 - width / 20, x + 4 * width / 5, x + 4 * width / 5, x + 4 * width / 5,
+ x + 4 * width / 5, x + 4 * width / 5 + width / 20 };
+ int[] pty3 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20,
+ y + height - 2 * height / 10, y + height - height / 10, y + height - height / 10 - height / 20,
+ y + height - height / 10 - height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty4 = { y + height / 8, y + height / 8 };
+ int[] ptx4 = { x + 4 * width / 5 - width / 20, x + 4 * width / 5 + width / 20 };
+ int[] pty4 = { y + height / 10 + height / 20, y + height / 10 + height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
- x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
- x + width / 6 - width / 12 - width / 24 };
- int[] pty5 = { y + 3 * height / 4, y + height / 4 + height / 8, y + height / 4 + height / 8, y + height / 4,
- y + height / 4 + height / 8, y + height / 4 + height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5 + width / 20,
+ x + 3 * width / 5 - width / 20, x + 3 * width / 5 };
+ int[] pty5 = { y + height - height / 20, y + height / 20, y + height / 10, y + height / 10, y + height / 20 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateBottomFlip(Graphics g) {
- int[] ptx0 = { x + 4 * width / 6, x + width };
- int[] pty0 = { y, y };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5 + width / 10 };
+ int[] pty0 = { y + height / 20, y + height / 20 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + 4 * width / 6, x + width };
- int[] pty1 = { y + height, y + height };
+ int[] ptx1 = { x + height, x + 3 * width / 5 + width / 10 };
+ int[] pty1 = { y + height - height / 20, y + height - height / 20 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
- x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty3 = { y + height / 8, y + height / 8, y + height / 16, y + height / 8 + height / 16, y + height / 8,
- y + height / 8 };
+ int[] ptx3 = { x + 4 * width / 5 - width / 20, x + 4 * width / 5, x + 4 * width / 5, x + 4 * width / 5,
+ x + 4 * width / 5, x + 4 * width / 5 + width / 20 };
+ int[] pty3 = { y + height / 10 + height / 20, y + height / 10 + height / 20, y + height / 10, y + height / 5,
+ y + height / 10 + height / 20, y + height / 10 + height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty4 = { y + height - height / 8, y + height - height / 8 };
+ int[] ptx4 = { x + 4 * width / 5 - width / 20, x + 4 * width / 5 + width / 20 };
+ int[] pty4 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
- x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
- x + width / 6 - width / 12 - width / 24 };
- int[] pty5 = { y + height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8,
- y + 3 * height / 4, y + 3 * height / 4 - height / 8, y + 3 * height / 4 - height / 8 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + 3 * width / 5, x + 3 * width / 5, x + 3 * width / 5 + width / 20,
+ x + 3 * width / 5 - width / 20, x + 3 * width / 5 };
+ int[] pty5 = { y + height / 20, y + height - height / 20, y + height - height / 10, y + height - height / 10,
+ y + height - height / 20 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateRight(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y, y + 2 * height / 6 };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5 - height / 10 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y, y + 2 * height / 6 };
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20 };
+ int[] pty1 = { y, y + 2 * height / 5 - height / 10 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width - width / 8, x + width - width / 8, x + width - width / 16,
- x + width - width / 8 - width / 16, x + width - width / 8, x + width - width / 8 };
- int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 24 };
+ int[] ptx3 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 10, x + width - width / 10, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 20 };
+ int[] pty3 = { y + height / 5 - height / 20, y + height / 5, y + height / 5, y + height / 5, y + height / 5,
+ y + height / 5 + height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 8, x + width / 8 };
- int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
+ int[] ptx4 = { x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty4 = { y + height / 5 - height / 20, y + height / 5 + height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
- x + width / 4 + width / 8, x + width / 4 + width / 8 };
- int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 12, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + width - width / 20, x + width / 20, x + width / 10, x + width / 10, x + width / 20 };
+ int[] pty5 = { y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5 - height / 20,
+ y + 2 * height / 5 + height / 20, y + 2 * height / 5 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateRightFlip(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y + 4 * height / 6, y + height };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5 + height / 10 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y + 4 * height / 6, y + height };
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20 };
+ int[] pty1 = { y + height, y + 3 * height / 5 + height / 10 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width - width / 8, x + width - width / 8, x + width - width / 16,
- x + width - width / 8 - width / 16, x + width - width / 8, x + width - width / 8 };
- int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12 + height / 24 };
+ int[] ptx3 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 10, x + width - width / 10, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 20 };
+ int[] pty3 = { y + 4 * height / 5 - height / 20, y + 4 * height / 5, y + 4 * height / 5, y + 4 * height / 5,
+ y + 4 * height / 5, y + 4 * height / 5 + height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 8, x + width / 8 };
- int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
+ int[] ptx4 = { x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty4 = { y + 4 * height / 5 - height / 20, y + 4 * height / 5 + height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
- x + width / 4 + width / 8, x + width / 4 + width / 8 };
- int[] pty5 = { y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 12 - height / 24,
- y + height / 6 - height / 12, y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 6,
- y + height / 6 - height / 12 - height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + width - width / 20, x + width / 20, x + width / 10, x + width / 10, x + width / 20 };
+ int[] pty5 = { y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5 + height / 20,
+ y + 3 * height / 5 - height / 20, y + 3 * height / 5 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateLeft(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y + 4 * height / 6, y + height };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5 + height / 10 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y + 4 * height / 6, y + height };
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20 };
+ int[] pty1 = { y + height, y + 3 * height / 5 + height / 10 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width / 8, x + width / 8, x + width / 16, x + width / 8 + width / 16, x + width / 8,
- x + width / 8 };
- int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
- y + 4 * height / 6 + height / 12 + height / 24 };
+ int[] ptx3 = { x + width / 10 + width / 20, x + width / 10 + width / 20, x + width / 10, x + width / 5,
+ x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty3 = { y + 4 * height / 5 - height / 20, y + 4 * height / 5, y + 4 * height / 5, y + 4 * height / 5,
+ y + 4 * height / 5, y + 4 * height / 5 + height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 8, x + width - width / 8 };
- int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
+ int[] ptx4 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20 };
+ int[] pty4 = { y + 4 * height / 5 - height / 20, y + 4 * height / 5 + height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
- x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8 };
- int[] pty5 = { y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 12 - height / 24,
- y + height / 6 - height / 12, y + height / 6 - height / 12 - height / 24, y + height / 6 - height / 6,
- y + height / 6 - height / 12 - height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + width / 20, x + width - width / 20, x + width - width / 10, x + width - width / 10,
+ x + width - width / 20 };
+ int[] pty5 = { y + 3 * height / 5, y + 3 * height / 5, y + 3 * height / 5 + height / 20,
+ y + 3 * height / 5 - height / 20, y + 3 * height / 5 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
}
private void rotateLeftFlip(Graphics g) {
- int[] ptx0 = { x, x };
- int[] pty0 = { y, y + 2 * height / 6 };
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5 - height / 10 };
g.drawPolygon(ptx0, pty0, 2);
- int[] ptx1 = { x + width, x + width };
- int[] pty1 = { y, y + 2 * height / 6 };
+ int[] ptx1 = { x + width - width / 20, x + width - width / 20 };
+ int[] pty1 = { y, y + 2 * height / 5 - height / 10 };
g.drawPolygon(ptx1, pty1, 2);
- int[] ptx3 = { x + width / 8, x + width / 8, x + width / 16, x + width / 8 + width / 16, x + width / 8,
- x + width / 8 };
- int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
- y + 2 * height / 6 - height / 24 };
+ int[] ptx3 = { x + width / 10 + width / 20, x + width / 10 + width / 20, x + width / 10, x + width / 5,
+ x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty3 = { y + height / 5 - height / 20, y + height / 5, y + height / 5, y + height / 5, y + height / 5,
+ y + height / 5 + height / 20 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 8, x + width - width / 8 };
- int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
+ int[] ptx4 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20 };
+ int[] pty4 = { y + height / 5 - height / 20, y + height / 5 + height / 20 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
- x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8 };
- int[] pty5 = { y + 5 * height / 6 + height / 12 + height / 24, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 12, y + 5 * height / 6 + height / 12 + height / 24,
- y + 5 * height / 6 + height / 6, y + 5 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx5, pty5, 6);
- g.fillPolygon(ptx5, pty5, 6);
+ int[] ptx5 = { x + width / 20, x + width - width / 20, x + width - width / 10, x + width - width / 10,
+ x + width - width / 20 };
+ int[] pty5 = { y + 2 * height / 5, y + 2 * height / 5, y + 2 * height / 5 - height / 20,
+ y + 2 * height / 5 + height / 20, y + 2 * height / 5 };
+ g.drawPolygon(ptx5, pty5, 5);
+ g.fillPolygon(ptx5, pty5, 5);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
}
public TGComponent isOnOnlyMe(int _x, int _y) {
@@ -660,8 +889,6 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
StringBuffer sb = new StringBuffer("<extraparam>\n");
sb.append("<attributes scale=\"" + scale);
sb.append("\" position=\"" + position);
- sb.append("\" width=\"" + width);
- sb.append("\" height=\"" + height);
sb.append("\" fv_0_2=\"" + fv_0_2);
sb.append("\" fv_1_3=\"" + fv_1_3);
sb.append("\" fh_0_2=\"" + fh_0_2);
@@ -679,7 +906,7 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
Element elt;
double scale;
- int position, width, height;
+ int position;
boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
for (int i = 0; i < nl.getLength(); i++) {
@@ -693,8 +920,6 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
if (elt.getTagName().equals("attributes")) {
scale = Double.parseDouble(elt.getAttribute("scale"));
position = Integer.parseInt(elt.getAttribute("position"));
- width = Integer.parseInt(elt.getAttribute("width"));
- height = Integer.parseInt(elt.getAttribute("height"));
fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
@@ -702,8 +927,6 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
first = Boolean.parseBoolean(elt.getAttribute("first"));
setScale(scale);
setPosition(position);
- this.width = width;
- this.height = height;
setFv_0_2(fv_0_2);
setFv_1_3(fv_1_3);
setFh_0_2(fh_0_2);
@@ -722,11 +945,11 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
componentMenu.addSeparator();
- JMenuItem rotateright = new JMenuItem("Rotate right 90°");
+ JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
rotateright.addActionListener(this);
componentMenu.add(rotateright);
- JMenuItem rotateleft = new JMenuItem("Rotate left 90°");
+ JMenuItem rotateleft = new JMenuItem("Rotate left 90\u00b0");
rotateleft.addActionListener(this);
componentMenu.add(rotateleft);
@@ -742,12 +965,12 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
}
public void actionPerformed(ActionEvent e) {
- if (e.getActionCommand().equals("Rotate right 90°")) {
+ if (e.getActionCommand().equals("Rotate right 90\u00b0")) {
position++;
position %= 4;
first = false;
}
- if (e.getActionCommand().equals("Rotate left 90°")) {
+ if (e.getActionCommand().equals("Rotate left 90\u00b0")) {
position = position + 3;
position %= 4;
first = false;
@@ -802,47 +1025,67 @@ public class ELNComponentVoltageSinkTDF extends TGCScalableWithInternalComponent
return position;
}
- public void setPosition(int position) {
- this.position = position;
+ public void setPosition(int _position) {
+ position = _position;
}
public boolean isFv_0_2() {
return fv_0_2;
}
- public void setFv_0_2(boolean fv_0_2) {
- this.fv_0_2 = fv_0_2;
+ public void setFv_0_2(boolean _fv_0_2) {
+ fv_0_2 = _fv_0_2;
}
public boolean isFv_1_3() {
return fv_1_3;
}
- public void setFv_1_3(boolean fv_1_3) {
- this.fv_1_3 = fv_1_3;
+ public void setFv_1_3(boolean _fv_1_3) {
+ fv_1_3 = _fv_1_3;
}
public boolean isFh_0_2() {
return fh_0_2;
}
- public void setFh_0_2(boolean fh_0_2) {
- this.fh_0_2 = fh_0_2;
+ public void setFh_0_2(boolean _fh_0_2) {
+ fh_0_2 = _fh_0_2;
}
public boolean isFh_1_3() {
return fh_1_3;
}
- public void setFh_1_3(boolean fh_1_3) {
- this.fh_1_3 = fh_1_3;
+ public void setFh_1_3(boolean _fh_1_3) {
+ fh_1_3 = _fh_1_3;
}
public boolean isFirst() {
return first;
}
- public void setFirst(boolean first) {
- this.first = first;
+ public void setFirst(boolean _first) {
+ first = _first;
+ }
+
+ public void resizeWithFather() {
+ if ((father != null) && (father instanceof ELNModule)) {
+ resizeToFatherSize();
+
+ setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
+ setMoveCd(x, y);
+ }
+ }
+
+ public void wasSwallowed() {
+ myColor = null;
+ }
+
+ public void wasUnswallowed() {
+ myColor = null;
+ setFather(null);
+ TDiagramPanel tdp = getTDiagramPanel();
+ setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSourceTDF.java b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSourceTDF.java
new file mode 100644
index 0000000000000000000000000000000000000000..080c27f897dea9df94fc7aa7cd050ff20406356a
--- /dev/null
+++ b/src/main/java/ui/eln/sca_eln_sca_tdf/ELNComponentVoltageSourceTDF.java
@@ -0,0 +1,1063 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.eln.sca_eln_sca_tdf;
+
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.eln.*;
+import ui.window.JDialogELNComponentVoltageSourceTDF;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.RoundRectangle2D;
+
+/**
+ * Class ELNComponentVoltageSourceTDF
+ * Voltage source driven by a TDF input signal to be used in ELN diagrams
+ * Creation: 19/07/2018
+ * @version 1.0 19/07/2018
+ * @author Irina Kit Yan LEE
+ */
+
+public class ELNComponentVoltageSourceTDF extends TGCScalableWithInternalComponent implements ActionListener, SwallowedTGComponent, ELNComponent {
+ protected Color myColor;
+ protected int orientation;
+ private int maxFontSize = 14;
+ private int minFontSize = 4;
+ private int currentFontSize = -1;
+
+ private int textX = 15;
+ private double dtextX = 0.0;
+ protected int decPoint = 3;
+
+ private double scale;
+
+ private int position = 0;
+ private boolean fv_0_2 = false, fv_1_3 = false, fh_0_2 = false, fh_1_3 = false;
+ private int old;
+ private boolean first;
+
+ public ELNComponentVoltageSourceTDF(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+ initScaling(100, 100);
+
+ dtextX = textX * oldScaleFactor;
+ textX = (int) dtextX;
+ dtextX = dtextX - textX;
+
+ minWidth = 1;
+ minHeight = 1;
+
+ initPortTerminal(3);
+
+ addTGConnectingPointsComment();
+
+ moveable = true;
+ editable = true;
+ removable = true;
+ userResizable = false;
+ value = tdp.findELNComponentName("TDF_VSource");
+
+ setScale(1.0);
+
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ public void initPortTerminal(int nb) {
+ nbConnectingPoint = nb;
+ connectingPoint = new TGConnectingPoint[nb];
+ connectingPoint[0] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "p");
+ connectingPoint[1] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "n");
+ connectingPoint[2] = new ELNConnectingPoint(this, 0, 0, true, true, 0.0, 0.0, "inp");
+ }
+
+ public Color getMyColor() {
+ return myColor;
+ }
+
+ public void internalDrawing(Graphics g) {
+ Font f = g.getFont();
+ Font fold = f;
+ MainGUI mgui = getTDiagramPanel().getMainGUI();
+
+ if (this.rescaled && !this.tdp.isScaled()) {
+ this.rescaled = false;
+ int maxCurrentFontSize = Math.max(0, Math.min(this.height, (int) (this.maxFontSize * this.tdp.getZoom())));
+ f = f.deriveFont((float) maxCurrentFontSize);
+
+ while (maxCurrentFontSize > (this.minFontSize * this.tdp.getZoom() - 1)) {
+ if (g.getFontMetrics().stringWidth(value) < (width - (2 * textX))) {
+ break;
+ }
+ maxCurrentFontSize--;
+ f = f.deriveFont((float) maxCurrentFontSize);
+ }
+
+ if (this.currentFontSize < this.minFontSize * this.tdp.getZoom()) {
+ maxCurrentFontSize++;
+ f = f.deriveFont((float) maxCurrentFontSize);
+ }
+ g.setFont(f);
+ this.currentFontSize = maxCurrentFontSize;
+ } else {
+ f = f.deriveFont(this.currentFontSize);
+ }
+
+ Color c = g.getColor();
+
+ if (position == 0) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sw2 = g.getFontMetrics().stringWidth("inp");
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateTop(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateBottomFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateTopFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateBottom(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ } else if (position == 1) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateRight(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateRightFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateLeftFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateLeft(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ } else if (position == 2) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sw2 = g.getFontMetrics().stringWidth("inp");
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int w = g.getFontMetrics().stringWidth(value);
+ g.drawString(value, x + (width - w) / 2, y - height / 5 - height / 20);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateBottom(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateTopFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width,
+ y + height + height / 20 + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateBottomFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - sw0, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - sw1,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateTop(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.5);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width, y - height / 20);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width,
+ y + height + height / 20 + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x - sw2,
+ y + height / 2 + height / 10 + height / 20 + sh2);
+ }
+ }
+ } else if (position == 3) {
+ if (first == false) {
+ first = true;
+ old = width;
+ width = height;
+ height = old;
+ }
+
+ int attributeFontSize = this.currentFontSize * 5 / 6;
+ int sw0 = g.getFontMetrics().stringWidth("p");
+ int sh0 = g.getFontMetrics().getAscent();
+ int sw1 = g.getFontMetrics().stringWidth("n");
+ int sh1 = g.getFontMetrics().getAscent();
+ int sh2 = g.getFontMetrics().getAscent();
+ g.setFont(f.deriveFont((float) attributeFontSize));
+ g.setFont(f);
+ g.setFont(f.deriveFont(Font.BOLD));
+ int h = g.getFontMetrics().getAscent();
+ g.drawString(value, x + width + width / 5 + width / 20, y + (height + h) / 2);
+ g.setFont(f.deriveFont(Font.PLAIN));
+
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)) {
+ rotateLeft(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ if ((fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)) {
+ rotateLeftFlip(g);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x - width / 20 - sw0,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x + width + width / 20,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == true && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == true && fh_1_3 == false)) {
+ rotateRightFlip(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(0.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(1.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 20 - sw1, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 20, y);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20,
+ y + height + sh2);
+ }
+ }
+ if ((fv_0_2 == true && fv_1_3 == false && fh_0_2 == true && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == true && fh_0_2 == false && fh_1_3 == true)
+ || (fv_0_2 == true && fv_1_3 == true && fh_0_2 == false && fh_1_3 == false)
+ || (fv_0_2 == false && fv_1_3 == false && fh_0_2 == true && fh_1_3 == true)) {
+ rotateRight(g);
+ ((ELNConnectingPoint) connectingPoint[1]).setW(1.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[1]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setW(19.0 / 20.0);
+ ((ELNConnectingPoint) connectingPoint[0]).setH(1.0);
+ ((ELNConnectingPoint) connectingPoint[2]).setW(0.5);
+ ((ELNConnectingPoint) connectingPoint[2]).setH(0.0);
+ if (mgui.getHidden() == false) {
+ g.drawString(((ELNConnectingPoint) connectingPoint[1]).getName(), x - width / 16 - sw1,
+ y + height + sh1);
+ g.drawString(((ELNConnectingPoint) connectingPoint[0]).getName(), x + width + width / 16,
+ y + height + sh0);
+ g.drawString(((ELNConnectingPoint) connectingPoint[2]).getName(), x + width / 2 + width / 10 + width / 20, y);
+ }
+ }
+ }
+ g.setColor(c);
+ g.setFont(fold);
+ }
+
+ private void rotateTop(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + width, x + 3 * width / 5,
+ x + 3 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + 2 * width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx1 = { x + 3 * width / 5 + width / 20, x + 3 * width / 5 + width / 10, x + 3 * width / 5 + width / 10,
+ x + 3 * width / 5 + width / 10, x + 3 * width / 5 + width / 10,
+ x + 3 * width / 5 + width / 10 + width / 20 };
+ int[] pty1 = { y + height / 10 + height / 20, y + height / 10 + height / 20, y + height / 10,
+ y + height / 10 + height / 10, y + height / 10 + height / 20, y + height / 10 + height / 20 };
+ g.drawPolygon(ptx1, pty1, 6);
+ int[] ptx2 = { x + 3 * width / 5 + width / 20, x + 3 * width / 5 + width / 10 + width / 20 };
+ int[] pty2 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20 };
+ g.drawPolygon(ptx2, pty2, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 5, y + height / 2, x + 2 * width / 5, y + height / 2, true);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateTopFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width, x + 3 * width / 5, x + 3 * width / 5, x + width, x + 3 * width / 5,
+ x + 3 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + 2 * width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx1 = { x + 3 * width / 5 + width / 20, x + 3 * width / 5 + width / 10, x + 3 * width / 5 + width / 10,
+ x + 3 * width / 5 + width / 10, x + 3 * width / 5 + width / 10,
+ x + 3 * width / 5 + width / 10 + width / 20 };
+ int[] pty1 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20,
+ y + height - 2 * height / 10, y + height - height / 10, y + height - height / 10 - height / 20,
+ y + height - height / 10 - height / 20 };
+ g.drawPolygon(ptx1, pty1, 6);
+ int[] ptx2 = { x + 3 * width / 5 + width / 20, x + 3 * width / 5 + width / 10 + width / 20 };
+ int[] pty2 = { y + height / 10 + height / 20, y + height / 10 + height / 20 };
+ g.drawPolygon(ptx2, pty2, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 5, y + height / 2, x + 2 * width / 5, y + height / 2, true);
+ g.fillRect(x, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 10, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateBottom(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5, x + 2 * width / 5, x, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx3 = { x + 2 * width / 5 - width / 10 - width / 20, x + 2 * width / 5 - width / 10,
+ x + 2 * width / 5 - width / 10, x + 2 * width / 5 - width / 10, x + 2 * width / 5 - width / 10,
+ x + 2 * width / 5 - width / 20 };
+ int[] pty3 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20,
+ y + height - 2 * height / 10, y + height - height / 10, y + height - height / 10 - height / 20,
+ y + height - height / 10 - height / 20 };
+ g.drawPolygon(ptx3, pty3, 6);
+ int[] ptx4 = { x + 2 * width / 5 - width / 10 - width / 20, x + 2 * width / 5 - width / 20 };
+ int[] pty4 = { y + height / 10 + height / 20, y + height / 10 + height / 20 };
+ g.drawPolygon(ptx4, pty4, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5, y + height / 2, x + 3 * width / 5, y + height / 2,
+ true);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateBottomFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x, x + 2 * width / 5, x + 2 * width / 5, x, x + 2 * width / 5, x + 2 * width / 5 };
+ int[] pty0 = { y + height / 20, y + height / 20, y + height - height / 20, y + height - height / 20,
+ y + height - height / 20, y + height / 20 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + width / 5, y + height / 2 - height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx3 = { x + 2 * width / 5 - width / 10 - width / 20, x + 2 * width / 5 - width / 10,
+ x + 2 * width / 5 - width / 10, x + 2 * width / 5 - width / 10, x + 2 * width / 5 - width / 10,
+ x + 2 * width / 5 - width / 20 };
+ int[] pty3 = { y + height / 10 + height / 20, y + height / 10 + height / 20, y + height / 10, y + height / 5,
+ y + height / 10 + height / 20, y + height / 10 + height / 20 };
+ g.drawPolygon(ptx3, pty3, 6);
+ int[] ptx4 = { x + 2 * width / 5 - width / 10 - width / 20, x + 2 * width / 5 - width / 20 };
+ int[] pty4 = { y + height - height / 10 - height / 20, y + height - height / 10 - height / 20 };
+ g.drawPolygon(ptx4, pty4, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + 4 * width / 5, y + height / 2, x + 3 * width / 5, y + height / 2,
+ true);
+ g.fillRect(x + 4 * width / 5, y + 2 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x + width / 20, y - height / 20, 4 * width / 5 + width / 10 - width / 20,
+ height + height / 10, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateRight(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + height, y + 3 * height / 5,
+ y + 3 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + width / 2 - width / 5, y + 2 * height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx3 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 10, x + width - width / 10, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 20 };
+ int[] pty3 = { y + 3 * height / 5 + height / 20, y + 3 * height / 5 + height / 10,
+ y + 3 * height / 5 + height / 10, y + 3 * height / 5 + height / 10, y + 3 * height / 5 + height / 10,
+ y + 3 * height / 5 + height / 10 + height / 20 };
+ g.drawPolygon(ptx3, pty3, 6);
+ int[] ptx4 = { x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty4 = { y + 3 * height / 5 + height / 20, y + 3 * height / 5 + height / 10 + height / 20 };
+ g.drawPolygon(ptx4, pty4, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + height / 5, x + width / 2, y + 2 * height / 5, true);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateRightFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5, y + 2 * height / 5, y, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + width / 2 - width / 5, y + height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx3 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 10, x + width - width / 10, x + width - width / 10 - width / 20,
+ x + width - width / 10 - width / 20 };
+ int[] pty3 = { y + 2 * height / 5 - height / 10 - height / 20, y + 2 * height / 5 - height / 10,
+ y + 2 * height / 5 - height / 10, y + 2 * height / 5 - height / 10, y + 2 * height / 5 - height / 10,
+ y + 2 * height / 5 - height / 20 };
+ g.drawPolygon(ptx3, pty3, 6);
+ int[] ptx4 = { x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty4 = { y + 2 * height / 5 - height / 20, y + 2 * height / 5 - height / 10 - height / 20 };
+ g.drawPolygon(ptx4, pty4, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + 4 * height / 5, x + width / 2, y + 3 * height / 5,
+ true);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateLeft(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y, y + 2 * height / 5, y + 2 * height / 5, y, y + 2 * height / 5, y + 2 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + width / 2 - width / 5, y + height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx3 = { x + width / 10 + width / 20, x + width / 10 + width / 20, x + width / 10,
+ x + width / 10 + width / 10, x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty3 = { y + 2 * height / 5 - height / 10 - height / 20, y + 2 * height / 5 - height / 10,
+ y + 2 * height / 5 - height / 10, y + 2 * height / 5 - height / 10, y + 2 * height / 5 - height / 10,
+ y + 2 * height / 5 - height / 20 };
+ g.drawPolygon(ptx3, pty3, 6);
+ int[] ptx4 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20 };
+ int[] pty4 = { y + 2 * height / 5 - height / 20, y + 2 * height / 5 - height / 10 - height / 20 };
+ g.drawPolygon(ptx4, pty4, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + 4 * height / 5, x + width / 2, y + 3 * height / 5,
+ true);
+ g.fillRect(x + 2 * width / 5, y + 4 * height / 5, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 20, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ private void rotateLeftFlip(Graphics g) {
+ Color c = g.getColor();
+ int[] ptx0 = { x + width / 20, x + width / 20, x + width - width / 20, x + width - width / 20,
+ x + width - width / 20, x + width / 20 };
+ int[] pty0 = { y + height, y + 3 * height / 5, y + 3 * height / 5, y + height, y + 3 * height / 5,
+ y + 3 * height / 5 };
+ g.drawPolygon(ptx0, pty0, 6);
+ g.drawOval(x + width / 2 - width / 5, y + 2 * height / 5, width / 5 + width / 5, height / 5 + height / 5);
+ int[] ptx3 = { x + width / 10 + width / 20, x + width / 10 + width / 20, x + width / 10,
+ x + width / 10 + width / 10, x + width / 10 + width / 20, x + width / 10 + width / 20 };
+ int[] pty3 = { y + 3 * height / 5 + height / 20, y + 3 * height / 5 + height / 10,
+ y + 3 * height / 5 + height / 10, y + 3 * height / 5 + height / 10, y + 3 * height / 5 + height / 10,
+ y + 3 * height / 5 + height / 10 + height / 20 };
+ g.drawPolygon(ptx3, pty3, 6);
+ int[] ptx4 = { x + width - width / 10 - width / 20, x + width - width / 10 - width / 20 };
+ int[] pty4 = { y + 3 * height / 5 + height / 20, y + 3 * height / 5 + height / 10 + height / 20 };
+ g.drawPolygon(ptx4, pty4, 2);
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x + width / 2, y + height / 5, x + width / 2, y + 2 * height / 5, true);
+ g.fillRect(x + 2 * width / 5, y, width / 5, height / 5);
+
+ Graphics2D g2d = (Graphics2D) g.create();
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g2d.setStroke(dashed);
+ g2d.draw(new RoundRectangle2D.Double(x - width / 20, y + height / 10, width + width / 10,
+ 4 * height / 5 + height / 10 - height / 20, 10, 10));
+ g2d.dispose();
+
+ g.drawOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ g.drawOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(Color.WHITE);
+ g.fillOval(x + width - width / 10, y + height - height / 10, width / 10, height / 10);
+ g.setColor(c);
+ }
+
+ public TGComponent isOnOnlyMe(int _x, int _y) {
+ if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
+ return this;
+ }
+ return null;
+ }
+
+ public int getType() {
+ return TGComponentManager.ELN_TDF_VOLTAGE_SOURCE;
+ }
+
+ public boolean editOndoubleClick(JFrame frame) {
+ JDialogELNComponentVoltageSourceTDF jde = new JDialogELNComponentVoltageSourceTDF(this);
+ jde.setVisible(true);
+ return true;
+ }
+
+ protected String translateExtraParam() {
+ StringBuffer sb = new StringBuffer("<extraparam>\n");
+ sb.append("<attributes scale=\"" + scale);
+ sb.append("\" position=\"" + position);
+ sb.append("\" fv_0_2=\"" + fv_0_2);
+ sb.append("\" fv_1_3=\"" + fv_1_3);
+ sb.append("\" fh_0_2=\"" + fh_0_2);
+ sb.append("\" fh_1_3=\"" + fh_1_3);
+ sb.append("\" first=\"" + first + "\"");
+ sb.append("/>\n");
+ sb.append("</extraparam>\n");
+ return new String(sb);
+ }
+
+ public void loadExtraParam(NodeList nl, int decX, int decY, int decId) throws MalformedModelingException {
+ try {
+ NodeList nli;
+ Node n1, n2;
+ Element elt;
+
+ double scale;
+ int position;
+ boolean fv_0_2, fv_1_3, fh_0_2, fh_1_3, first;
+
+ for (int i = 0; i < nl.getLength(); i++) {
+ n1 = nl.item(i);
+ if (n1.getNodeType() == Node.ELEMENT_NODE) {
+ nli = n1.getChildNodes();
+ for (int j = 0; j < nli.getLength(); j++) {
+ n2 = nli.item(j);
+ if (n2.getNodeType() == Node.ELEMENT_NODE) {
+ elt = (Element) n2;
+ if (elt.getTagName().equals("attributes")) {
+ scale = Double.parseDouble(elt.getAttribute("scale"));
+ position = Integer.parseInt(elt.getAttribute("position"));
+ fv_0_2 = Boolean.parseBoolean(elt.getAttribute("fv_0_2"));
+ fv_1_3 = Boolean.parseBoolean(elt.getAttribute("fv_1_3"));
+ fh_0_2 = Boolean.parseBoolean(elt.getAttribute("fh_0_2"));
+ fh_1_3 = Boolean.parseBoolean(elt.getAttribute("fh_1_3"));
+ first = Boolean.parseBoolean(elt.getAttribute("first"));
+ setScale(scale);
+ setPosition(position);
+ setFv_0_2(fv_0_2);
+ setFv_1_3(fv_1_3);
+ setFh_0_2(fh_0_2);
+ setFh_1_3(fh_1_3);
+ setFirst(first);
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ throw new MalformedModelingException();
+ }
+ }
+
+ public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
+ componentMenu.addSeparator();
+
+ JMenuItem rotateright = new JMenuItem("Rotate right 90\u00b0");
+ rotateright.addActionListener(this);
+ componentMenu.add(rotateright);
+
+ JMenuItem rotateleft = new JMenuItem("Rotate left 90\u00b0");
+ rotateleft.addActionListener(this);
+ componentMenu.add(rotateleft);
+
+ componentMenu.addSeparator();
+
+ JMenuItem rotatevertically = new JMenuItem("Flip vertically");
+ rotatevertically.addActionListener(this);
+ componentMenu.add(rotatevertically);
+
+ JMenuItem rotatehorizontally = new JMenuItem("Flip horizontally");
+ rotatehorizontally.addActionListener(this);
+ componentMenu.add(rotatehorizontally);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if (e.getActionCommand().equals("Rotate right 90\u00b0")) {
+ position++;
+ position %= 4;
+ first = false;
+ }
+ if (e.getActionCommand().equals("Rotate left 90\u00b0")) {
+ position = position + 3;
+ position %= 4;
+ first = false;
+ }
+ if (e.getActionCommand().equals("Flip vertically")) {
+ if (position == 0 || position == 2) {
+ if (fv_0_2 == false) {
+ fv_0_2 = true;
+ } else {
+ fv_0_2 = false;
+ }
+ }
+ if (position == 1 || position == 3) {
+ if (fv_1_3 == false) {
+ fv_1_3 = true;
+ } else {
+ fv_1_3 = false;
+ }
+ }
+ }
+ if (e.getActionCommand().equals("Flip horizontally")) {
+ if (position == 0 || position == 2) {
+ if (fh_0_2 == false) {
+ fh_0_2 = true;
+ } else {
+ fh_0_2 = false;
+ }
+ }
+ if (position == 1 || position == 3) {
+ if (fh_1_3 == false) {
+ fh_1_3 = true;
+ } else {
+ fh_1_3 = false;
+ }
+ }
+ }
+ }
+
+ public int getDefaultConnector() {
+ return TGComponentManager.ELN_CONNECTOR;
+ }
+
+ public double getScale() {
+ return scale;
+ }
+
+ public void setScale(double _scale) {
+ scale = _scale;
+ }
+
+ public int getPosition() {
+ return position;
+ }
+
+ public void setPosition(int _position) {
+ position = _position;
+ }
+
+ public boolean isFv_0_2() {
+ return fv_0_2;
+ }
+
+ public void setFv_0_2(boolean _fv_0_2) {
+ fv_0_2 = _fv_0_2;
+ }
+
+ public boolean isFv_1_3() {
+ return fv_1_3;
+ }
+
+ public void setFv_1_3(boolean _fv_1_3) {
+ fv_1_3 = _fv_1_3;
+ }
+
+ public boolean isFh_0_2() {
+ return fh_0_2;
+ }
+
+ public void setFh_0_2(boolean _fh_0_2) {
+ fh_0_2 = _fh_0_2;
+ }
+
+ public boolean isFh_1_3() {
+ return fh_1_3;
+ }
+
+ public void setFh_1_3(boolean _fh_1_3) {
+ fh_1_3 = _fh_1_3;
+ }
+
+ public boolean isFirst() {
+ return first;
+ }
+
+ public void setFirst(boolean _first) {
+ first = _first;
+ }
+
+ public void resizeWithFather() {
+ if ((father != null) && (father instanceof ELNModule)) {
+ resizeToFatherSize();
+
+ setCdRectangle(0, father.getWidth() - getWidth(), 0, father.getHeight() - getHeight());
+ setMoveCd(x, y);
+ }
+ }
+
+ public void wasSwallowed() {
+ myColor = null;
+ }
+
+ public void wasUnswallowed() {
+ myColor = null;
+ setFather(null);
+ TDiagramPanel tdp = getTDiagramPanel();
+ setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/interactivesimulation/InteractiveSimulationActions.java b/src/main/java/ui/interactivesimulation/InteractiveSimulationActions.java
index c15a6a0364ec72304a16643ff6eccbbebaf054e5..63ab392022ab44a05e4c4bd000890f852601f3e0 100755
--- a/src/main/java/ui/interactivesimulation/InteractiveSimulationActions.java
+++ b/src/main/java/ui/interactivesimulation/InteractiveSimulationActions.java
@@ -109,8 +109,8 @@ public class InteractiveSimulationActions extends AbstractAction {
public static final int ACT_QUIT_SD_WINDOW = 37;
public static final int ACT_SAVE_SD_SVG = 38;
-
- public static final int NB_ACTION = 39;
+ public static final int ACT_SAVE_SD_PNG = 39;
+ public static final int NB_ACTION = 40;
private static final TAction [] actions = new TAction[NB_ACTION];
@@ -198,7 +198,7 @@ public class InteractiveSimulationActions extends AbstractAction {
actions[ACT_QUIT_SD_WINDOW] = new TAction("close-sdpanel", "Close Window", IconManager.imgic27, IconManager.imgic27, "Close window", "Close this window", 'Q');
actions[ACT_SAVE_SD_SVG] = new TAction("svg-sdpanel", "Save in SVG Format", IconManager.imgic1310, IconManager.imgic1310, "Save in SVG Format", "Save as SVG file", 'S');
-
+ actions[ACT_SAVE_SD_PNG] = new TAction("png-sdpanel", "Save in PNG Format", IconManager.imgic1310, IconManager.imgic1310, "Save in PNG Format", "Save as PNG file", 'S');
}
diff --git a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 6137d19b9ee92637a9def3303f57d5cea0a92d99..ec11c83c40cd2a3873e75760254448a477274438 100755
--- a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -146,10 +146,17 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
protected JTextField stateFileName;
protected JTextField benchmarkFileName;
protected JComboBox<String> cpus, busses, mems, tasks, chans;
- private Map<String, List<Integer>> channelIDMap= new HashMap<String, List<Integer>>();
+ private Map<String, List<Integer>> origChannelIDMap= new HashMap<String, List<Integer>>();
+ private Map<String, List<Integer>> destChannelIDMap= new HashMap<String, List<Integer>>();
private String[] cpuIDs, busIDs, memIDs, taskIDs, chanIDs;
private List<String> simtraces= new ArrayList<String>();
+
+ //Find matching channels
+ public Map<String, List<Integer>> channelMsgIdMap = new HashMap<String, List<Integer>>();
+ public Map<Integer, String> msgIdStartTimeMap = new HashMap<Integer, String>();
+ public Map<Integer, String> msgIdEndTimeMap = new HashMap<Integer, String>();
+
// Status elements
private JLabel status, time, info;
@@ -932,7 +939,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
GridBagLayout gridbag0 = new GridBagLayout();
GridBagConstraints c0 = new GridBagConstraints();
latencyPanel.setLayout(gridbag0);
- infoTab.addTab("Latency", null, latencyPanel, "Latency Measurements");
+ infoTab.addTab("Latency", null, new JScrollPane(latencyPanel), "Latency Measurements");
c0.gridwidth = GridBagConstraints.REMAINDER;
latencyPanel.add(new JLabel("Latencies shown in number of cycles relative to the main clock"), c0);
@@ -1383,7 +1390,11 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
public void resetSimTrace(){
msgTimes.clear();
chanId=0;
- channelIDMap.clear();
+ channelMsgIdMap.clear();
+ msgIdStartTimeMap.clear();
+ msgIdEndTimeMap.clear();
+ origChannelIDMap.clear();
+ destChannelIDMap.clear();
simtraces.clear();
simIndex=0;
}
@@ -1563,21 +1574,31 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
msgTimes.put(tran.channelName, new ArrayList<String>());
}
if (!msgTimes.get(tran.channelName).contains(tran.endTime)){
- if (channelIDMap.containsKey(tran.channelName) && channelIDMap.get(tran.channelName).size()>0){
- msgId=channelIDMap.get(tran.channelName).remove(0);
- }
- else {
- if (!channelIDMap.containsKey(tran.channelName)){
- channelIDMap.put(tran.channelName, new ArrayList<Integer>());
- }
- channelIDMap.get(tran.channelName).add(msgId);
- chanId++;
- }
String trace="";
if (command.equals("Write")){
+ if (destChannelIDMap.containsKey(tran.channelName) && destChannelIDMap.get(tran.channelName).size()>0){
+ msgId=destChannelIDMap.get(tran.channelName).remove(0);
+ }
+ else {
+ if (!origChannelIDMap.containsKey(tran.channelName)){
+ origChannelIDMap.put(tran.channelName, new ArrayList<Integer>());
+ }
+ origChannelIDMap.get(tran.channelName).add(msgId);
+ chanId++;
+ }
trace = "time=" + tran.endTime+ " block="+ originTask.getName() + " type="+asynchType+ " blockdestination="+ destTask.getName() + " channel="+tran.channelName+" msgid="+ msgId + " params=\"" +chan.getSize()+"\"";
}
else {
+ if (origChannelIDMap.containsKey(tran.channelName) && origChannelIDMap.get(tran.channelName).size()>0){
+ msgId=origChannelIDMap.get(tran.channelName).remove(0);
+ }
+ else {
+ if (!destChannelIDMap.containsKey(tran.channelName)){
+ destChannelIDMap.put(tran.channelName, new ArrayList<Integer>());
+ }
+ destChannelIDMap.get(tran.channelName).add(msgId);
+ chanId++;
+ }
trace = "time=" + tran.endTime+ " block="+ destTask.getName() + " type="+asynchType+ " blockdestination="+ destTask.getName() + " channel="+tran.channelName+" msgid="+ msgId + " params=\"" +chan.getSize()+"\"";
}
//
@@ -1611,21 +1632,31 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
msgTimes.put(tran.channelName, new ArrayList<String>());
}
if (!msgTimes.get(tran.channelName).contains(tran.endTime)){
- if (channelIDMap.containsKey(tran.channelName) && channelIDMap.get(tran.channelName).size()>0){
- msgId=channelIDMap.get(tran.channelName).remove(0);
- }
- else {
- if (!channelIDMap.containsKey(tran.channelName)){
- channelIDMap.put(tran.channelName, new ArrayList<Integer>());
- }
- channelIDMap.get(tran.channelName).add(msgId);
- chanId++;
- }
String trace="";
if (command.equals("Send")){
+ if (destChannelIDMap.containsKey(tran.channelName) && destChannelIDMap.get(tran.channelName).size()>0){
+ msgId=destChannelIDMap.get(tran.channelName).remove(0);
+ }
+ else {
+ if (!origChannelIDMap.containsKey(tran.channelName)){
+ origChannelIDMap.put(tran.channelName, new ArrayList<Integer>());
+ }
+ origChannelIDMap.get(tran.channelName).add(msgId);
+ chanId++;
+ }
trace = "time=" + tran.endTime+ " block="+ originTask.getName() + " type="+asynchType+ " blockdestination="+ destTask.getName() + " channel="+tran.channelName+" msgid="+ msgId + " params=\"";
}
else {
+ if (origChannelIDMap.containsKey(tran.channelName) && origChannelIDMap.get(tran.channelName).size()>0){
+ msgId=origChannelIDMap.get(tran.channelName).remove(0);
+ }
+ else {
+ if (!destChannelIDMap.containsKey(tran.channelName)){
+ destChannelIDMap.put(tran.channelName, new ArrayList<Integer>());
+ }
+ destChannelIDMap.get(tran.channelName).add(msgId);
+ chanId++;
+ }
trace = "time=" + tran.endTime+ " block="+ destTask.getName() + " type="+asynchType+ " blockdestination="+ destTask.getName() + " channel="+tran.channelName+" msgid="+ msgId + " params=\"";
}
//
@@ -1666,25 +1697,47 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
int msgId=chanId;
if (!msgTimes.containsKey(tran.channelName)){
msgTimes.put(tran.channelName, new ArrayList<String>());
+ }
+ if (!channelMsgIdMap.containsKey(tran.channelName)){
+ channelMsgIdMap.put(tran.channelName, new ArrayList<Integer>());
}
+
+
+
if (!msgTimes.get(tran.channelName).contains(tran.endTime)){
- if (channelIDMap.containsKey(tran.channelName) && channelIDMap.get(tran.channelName).size()>0){
- msgId=channelIDMap.get(tran.channelName).remove(0);
- }
- else {
- if (!channelIDMap.containsKey(tran.channelName)){
- channelIDMap.put(tran.channelName, new ArrayList<Integer>());
- }
- channelIDMap.get(tran.channelName).add(msgId);
- chanId++;
- }
+
+
String trace="";
if (command.equals("Request")){
+ if (destChannelIDMap.containsKey(tran.channelName) && destChannelIDMap.get(tran.channelName).size()>0){
+ msgId=destChannelIDMap.get(tran.channelName).remove(0);
+ }
+ else {
+ if (!origChannelIDMap.containsKey(tran.channelName)){
+ origChannelIDMap.put(tran.channelName, new ArrayList<Integer>());
+ }
+ origChannelIDMap.get(tran.channelName).add(msgId);
+ chanId++;
+ }
trace = "time=" + tran.endTime+ " block="+ tran.taskName + " type="+asynchType+ " blockdestination="+ destTask.getName() + " channel="+tran.channelName+" msgid="+ msgId + " params=\"";
+ msgIdStartTimeMap.put(msgId, tran.endTime);
}
else {
+ if (origChannelIDMap.containsKey(tran.channelName) && origChannelIDMap.get(tran.channelName).size()>0){
+ msgId=origChannelIDMap.get(tran.channelName).remove(0);
+ }
+ else {
+ if (!destChannelIDMap.containsKey(tran.channelName)){
+ destChannelIDMap.put(tran.channelName, new ArrayList<Integer>());
+ }
+ destChannelIDMap.get(tran.channelName).add(msgId);
+ chanId++;
+ }
trace = "time=" + tran.endTime+ " block="+ destTask.getName() + " type="+asynchType+ " blockdestination="+ destTask.getName() + " channel="+tran.channelName+" msgid="+ msgId + " params=\"";
+ msgIdEndTimeMap.put(msgId, tran.endTime);
}
+
+ channelMsgIdMap.get(tran.channelName).add(msgId);
//
if (!simtraces.contains(trace)){
simtraces.add(trace);
@@ -1727,6 +1780,73 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
}
}
+ public void calculateCorrespondingTimes(){
+ for (String channel: channelMsgIdMap.keySet()){
+ List<Integer> minTimes = new ArrayList<Integer>();
+ for (int msgId: channelMsgIdMap.get(channel)){
+ String startTime = msgIdStartTimeMap.get(msgId);
+ String endTime = msgIdEndTimeMap.get(msgId);
+ if (startTime!=null && endTime !=null){
+ int diff = Integer.valueOf(endTime) - Integer.valueOf(startTime);
+ minTimes.add(diff);
+ }
+ }
+ SimulationLatency sl = new SimulationLatency();
+ sl.setTransaction1("Send Req: " + channel);
+ sl.setTransaction2("Corresponding Wait Req " + channel);
+
+
+
+
+ sl.setMinTime("??");
+ sl.setMaxTime("??");
+ sl.setAverageTime("??");
+ sl.setStDev("??");
+ boolean found=false;
+ for (Object o:latencies){
+ SimulationLatency s = (SimulationLatency) o;
+ if (s.getTransaction1().equals(sl.getTransaction1()) && s.getTransaction2().equals(sl.getTransaction2())){
+ sl = s;
+ found=true;
+ }
+ }
+ if (!found){
+ latencies.add(sl);
+ }
+ if (minTimes.size()>0){
+ int sum=0;
+ sl.setMinTime(Integer.toString(Collections.min(minTimes)));
+ sl.setMaxTime(Integer.toString(Collections.max(minTimes)));
+ for (int time: minTimes){
+ sum+=time;
+ }
+ double average = (double) sum/ (double) minTimes.size();
+ double stdev =0.0;
+ for (int time:minTimes){
+ stdev +=(time - average)*(time-average);
+ }
+ stdev= stdev/minTimes.size();
+ stdev = Math.sqrt(stdev);
+ sl.setAverageTime(String.format("%.1f",average));
+ sl.setStDev(String.format("%.1f",stdev));
+ }
+
+
+ //updateLatency();
+ // if (latm !=null && latencies.size()>0){
+ // latm.setData(latencies);
+ // }
+
+
+ }
+
+
+
+ //System.out.println(channelMsgIdMap);
+ //System.out.println(msgIdStartTimeMap);
+ //System.out.println(msgIdEndTimeMap);
+ }
+
protected void addStatusToNode(String status, String task){
mgui.addStatus(task,status);
}
@@ -1875,6 +1995,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
// for (int i=0; i<elt.getAttributes().getLength(); i++){
//
// }
+ // System.out.println("element " + elt);
id = null;
name = null;
command = null;
@@ -1994,7 +2115,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
}
if (elt.getTagName().compareTo(SIMULATION_TRANS) == 0) {
-
+ //System.out.println("EL " + elt.getAttribute("messageid"));
SimulationTransaction st = new SimulationTransaction();
st.nodeType = elt.getAttribute("deviceid");
@@ -2680,10 +2801,12 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
//calcuate response + checkpoint 1 id + checkpoint 2 id
List<String> id1List = nameIdMap.get(sl.getTransaction1());
List<String> id2List = nameIdMap.get(sl.getTransaction2());
- for (String id1: id1List){
- for (String id2: id2List){
- sendCommand("cl " + id1 + " " + id2);
- }
+ if (id1List!=null && id2List!=null){
+ for (String id1: id1List){
+ for (String id2: id2List){
+ sendCommand("cl " + id1 + " " + id2);
+ }
+ }
}
}
}
@@ -2703,21 +2826,23 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
List<String> ids2 = nameIdMap.get(sl.getTransaction2());
List<Integer> times1 = new ArrayList<Integer>();
List<Integer> times2 = new ArrayList<Integer>();
- for (String id1: ids1){
- if (transTimes.containsKey(id1)){
- for(String time1: transTimes.get(id1)){
- times1.add(Integer.valueOf(time1));
- }
+ if (ids1!=null && ids2!=null){
+ for (String id1: ids1){
+ if (transTimes.containsKey(id1)){
+ for(String time1: transTimes.get(id1)){
+ times1.add(Integer.valueOf(time1));
+ }
+ }
}
- }
- for (String id2: ids2){
- if (transTimes.containsKey(id2)){
- ArrayList<Integer> minTimes = new ArrayList<Integer>();
- for (String time2: transTimes.get(id2)){
- times2.add(Integer.valueOf(time2));
- }
- }
- }
+ for (String id2: ids2){
+ if (transTimes.containsKey(id2)){
+ ArrayList<Integer> minTimes = new ArrayList<Integer>();
+ for (String time2: transTimes.get(id2)){
+ times2.add(Integer.valueOf(time2));
+ }
+ }
+ }
+ }
//
//
List<Integer> minTimes = new ArrayList<Integer>();
@@ -2755,6 +2880,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
}
}
}
+ calculateCorrespondingTimes();
if (latm!=null && latencies.size()>0){
latm.setData(latencies);
}
@@ -3448,7 +3574,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
checkedTransactions.add(compName+" (ID: " + tgc.getDIPLOID() + ")");
if (!nameIdMap.containsKey(compName)){
nameIdMap.put(compName,new ArrayList<String>());
- checkedTransactions.add(compName);
+ checkedTransactions.add(compName + " (all instances)");
}
nameIdMap.get(compName).add(Integer.toString(tgc.getDIPLOID()));
nameIdMap.put(compName+" (ID: " + tgc.getDIPLOID() + ")",new ArrayList<String>());
diff --git a/src/main/java/ui/interactivesimulation/JFrameTMLSimulationPanel.java b/src/main/java/ui/interactivesimulation/JFrameTMLSimulationPanel.java
index d20126925f3c039a5e11a2621e9be1bb2bfcb398..ff8e2a9772e0d785006c06fbadfc4f45d7d54eff 100644
--- a/src/main/java/ui/interactivesimulation/JFrameTMLSimulationPanel.java
+++ b/src/main/java/ui/interactivesimulation/JFrameTMLSimulationPanel.java
@@ -56,7 +56,7 @@ import java.awt.event.ComponentEvent;
import java.io.BufferedReader;
import java.io.File;
-
+import java.awt.image.BufferedImage;
/**
* Class JFrameSimulationSDPanel
* Creation: 26/05/2011
@@ -113,6 +113,8 @@ public class JFrameTMLSimulationPanel extends JFrame implements ActionListener {
topPanel.add(buttonClose);
JButton buttonSVG = new JButton(actions[InteractiveSimulationActions.ACT_SAVE_SD_SVG]);
topPanel.add(buttonSVG);
+ JButton buttonPNG = new JButton(actions[InteractiveSimulationActions.ACT_SAVE_SD_PNG]);
+ topPanel.add(buttonPNG);
/*topPanel.add(new JLabel(" time unit:"));
units = new JComboBox<>(unitTab);
units.setSelectedIndex(1);
@@ -187,6 +189,32 @@ public class JFrameTMLSimulationPanel extends JFrame implements ActionListener {
gen.saveInSVG(sdpanel, file.getAbsolutePath());
//newSVGSave(fileName);
}
+
+ private void savePNG() {
+ TraceManager.addDev("Saving in png format");
+ File file = mgui.selectFileForCapture();
+
+ BufferedImage bi;
+ bi = sdpanel.performCapture();
+ boolean ok = true;
+
+ try {
+ ok = FileUtils.checkFileForSave(file);
+ } catch (Exception e) {
+ ok = false;
+ }
+
+ if (!ok) {
+ JOptionPane.showMessageDialog(this,
+ "The capture could not be performed: the specified file is not valid",
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
+ return;
+ }
+
+ mgui.writeImageCapture(bi, file, true);
+ //newSVGSave(fileName);
+ }
public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
@@ -196,6 +224,8 @@ public class JFrameTMLSimulationPanel extends JFrame implements ActionListener {
close();
} else if (command.equals(actions[InteractiveSimulationActions.ACT_SAVE_SD_SVG].getActionCommand())) {
saveSVG();
+ } else if (command.equals(actions[InteractiveSimulationActions.ACT_SAVE_SD_PNG].getActionCommand())) {
+ savePNG();
}
}
diff --git a/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramToolBar.java b/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramToolBar.java
index 27d8481ad52df9b47eaddac8170e978b9b810433..0bf3942cfd5132a20109695b8ec1ad277976ec69 100644
--- a/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramToolBar.java
+++ b/src/main/java/ui/syscams/SysCAMSComponentTaskDiagramToolBar.java
@@ -38,10 +38,7 @@
package ui.syscams;
-import ui.MainGUI;
-import ui.TGUIAction;
-import ui.TToolBar;
-
+import ui.*;
import javax.swing.*;
/**
@@ -67,7 +64,6 @@ public class SysCAMSComponentTaskDiagramToolBar extends TToolBar {
mgui.actions[TGUIAction.CAMS_EDIT].setEnabled(b);
mgui.actions[TGUIAction.UML_NOTE].setEnabled(b);
- mgui.actions[TGUIAction.CAMS_CONNECTOR].setEnabled(b);
mgui.actions[TGUIAction.CAMS_BLOCK_TDF].setEnabled(b);
mgui.actions[TGUIAction.CAMS_BLOCK_DE].setEnabled(b);
mgui.actions[TGUIAction.CAMS_PORT_TDF].setEnabled(b);
@@ -76,6 +72,7 @@ public class SysCAMSComponentTaskDiagramToolBar extends TToolBar {
mgui.actions[TGUIAction.CAMS_CLUSTER].setEnabled(b);
mgui.actions[TGUIAction.CAMS_GENCODE].setEnabled(b);
mgui.actions[TGUIAction.CAMS_BLOCK_GPIO2VCI].setEnabled(b);
+ mgui.actions[TGUIAction.CAMS_CONNECTOR].setEnabled(b);
mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(b);
mgui.actions[TGUIAction.ACT_ONECLICK_LOTOS_RG].setEnabled(b);
@@ -94,6 +91,11 @@ public class SysCAMSComponentTaskDiagramToolBar extends TToolBar {
button = this.add(mgui.actions[TGUIAction.UML_NOTE]);
button.addMouseListener(mgui.mouseHandler);
+ this.addSeparator();
+
+ button = this.add(mgui.actions[TGUIAction.CAMS_CONNECTOR]);
+ button.addMouseListener(mgui.mouseHandler);
+
this.addSeparator();
button = this.add(mgui.actions[TGUIAction.CAMS_CLUSTER]);
@@ -123,11 +125,6 @@ public class SysCAMSComponentTaskDiagramToolBar extends TToolBar {
this.addSeparator();
- button = this.add(mgui.actions[TGUIAction.CAMS_CONNECTOR]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
-
button = this.add(mgui.actions[TGUIAction.CAMS_GENCODE]);
button.addMouseListener(mgui.mouseHandler);
}
diff --git a/src/main/java/ui/syscams/SysCAMSPortConnectingPoint.java b/src/main/java/ui/syscams/SysCAMSPortConnectingPoint.java
index 333341f49e0058d1d7b1ff520a2e7e91c866df4a..9246b51a02718c232eeea18a018452ffa3eb9cf9 100644
--- a/src/main/java/ui/syscams/SysCAMSPortConnectingPoint.java
+++ b/src/main/java/ui/syscams/SysCAMSPortConnectingPoint.java
@@ -50,7 +50,7 @@ import ui.TGConnectingPointWidthHeight;
* @author Irina Kit Yan LEE
*/
-public class SysCAMSPortConnectingPoint extends TGConnectingPointWidthHeight{
+public class SysCAMSPortConnectingPoint extends TGConnectingPointWidthHeight {
public SysCAMSPrimitivePort port;
public boolean positionned;
diff --git a/src/main/java/ui/syscams/SysCAMSPortConnector.java b/src/main/java/ui/syscams/SysCAMSPortConnector.java
index b29d7867c5efdc417745a1445f6232c3ec598a9d..b57a640757e437934c0dbf88b1f1b78c11f701d7 100644
--- a/src/main/java/ui/syscams/SysCAMSPortConnector.java
+++ b/src/main/java/ui/syscams/SysCAMSPortConnector.java
@@ -45,6 +45,9 @@ import java.awt.*;
import java.awt.geom.Point2D;
import java.util.Vector;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+
import myutil.GraphicLib;
/**
@@ -97,23 +100,25 @@ public class SysCAMSPortConnector extends TGConnector implements ScalableTGCompo
}
}
if ((pt1.port != null) && (pt2.port != null)) {
- if ((pt1.port.getFather() instanceof SysCAMSBlockTDF) && (pt2.port.getFather() instanceof SysCAMSBlockGPIO2VCI)
- || (pt2.port.getFather() instanceof SysCAMSBlockTDF) && (pt1.port.getFather() instanceof SysCAMSBlockGPIO2VCI)) {
- if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
- Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
- g.setStroke(dashed);
- g.drawLine(x1, y1, x2, y2);
+ if ((pt1.port instanceof SysCAMSPortConverter) && (pt2.port instanceof SysCAMSPortDE)) {
+ if (pt2.port.getFather().getFather() instanceof SysCAMSCompositeComponent) {
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
} else {
Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
g.setStroke(dashed);
GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
}
- } else {
- if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
- g.drawLine(x1, y1, x2, y2);
+ } else if ((pt2.port instanceof SysCAMSPortConverter) && (pt1.port instanceof SysCAMSPortDE)) {
+ if (pt1.port.getFather().getFather() instanceof SysCAMSCompositeComponent) {
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
} else {
+ Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
+ g.setStroke(dashed);
GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
}
+ } else if ((pt1.port instanceof SysCAMSPortTDF) && (pt2.port instanceof SysCAMSPortTDF)
+ || (pt2.port instanceof SysCAMSPortTDF) && (pt1.port instanceof SysCAMSPortTDF)) {
+ GraphicLib.arrowWithLine(g, 1, 0, 10, x1, y1, x2, y2, true);
}
}
return;
diff --git a/src/main/java/ui/syscams/SysCAMSPrimitivePort.java b/src/main/java/ui/syscams/SysCAMSPrimitivePort.java
index 5e0274655221a4df9c49991290b7fb5d4fd5ba91..9b5b5bffb497041d88b350ca3d5e3eb950ca7277 100644
--- a/src/main/java/ui/syscams/SysCAMSPrimitivePort.java
+++ b/src/main/java/ui/syscams/SysCAMSPrimitivePort.java
@@ -122,12 +122,14 @@ public class SysCAMSPrimitivePort extends TGCScalableWithInternalComponent imple
((SysCAMSPortTDF) this).setRate(-1);
((SysCAMSPortTDF) this).setDelay(-1);
((SysCAMSPortTDF) this).setTDFType("int");
+ ((SysCAMSPortTDF) this).setOrigin(0);
} else if (this instanceof SysCAMSPortDE) {
// ((SysCAMSPortDE) this).setPeriod(-1);
// ((SysCAMSPortDE) this).setTime("");
// ((SysCAMSPortDE) this).setRate(-1);
// ((SysCAMSPortDE) this).setDelay(-1);
((SysCAMSPortDE) this).setDEType("int");
+ ((SysCAMSPortDE) this).setOrigin(0);
((SysCAMSPortDE) this).setSensitive(false);
((SysCAMSPortDE) this).setSensitiveMethod("");
} else if (this instanceof SysCAMSPortConverter) {
@@ -136,6 +138,7 @@ public class SysCAMSPrimitivePort extends TGCScalableWithInternalComponent imple
((SysCAMSPortConverter) this).setDelay(-1);
((SysCAMSPortConverter) this).setRate(-1);
((SysCAMSPortConverter) this).setConvType("int");
+ ((SysCAMSPortConverter) this).setOrigin(0);
}
}
@@ -376,6 +379,38 @@ public class SysCAMSPrimitivePort extends TGCScalableWithInternalComponent imple
((SysCAMSComponentTaskDiagramPanel)tdp).updatePorts();
return true;
}
+
+ public StringBuffer encode(String data) {
+ StringBuffer databuf = new StringBuffer(data);
+ StringBuffer buffer = new StringBuffer("");
+ for(int pos = 0; pos != data.length(); pos++) {
+ char c = databuf.charAt(pos);
+ switch(c) {
+ case '&' :
+ buffer.append("&");
+ break;
+ case '\"' :
+ buffer.append(""");
+ break;
+ case '\'' :
+ buffer.append("'");
+ break;
+ case '<' :
+ buffer.append("<");
+ break;
+ case '>' :
+ buffer.append(">");
+ break;
+ case '\u03BC':
+ buffer.append("μ");
+ break;
+ default :
+ buffer.append(databuf.charAt(pos));
+ break;
+ }
+ }
+ return buffer;
+ }
protected String translateExtraParam() {
StringBuffer sb = new StringBuffer("<extraparam>\n");
@@ -390,14 +425,14 @@ public class SysCAMSPrimitivePort extends TGCScalableWithInternalComponent imple
sb.append("\" time=\"" + ((SysCAMSPortTDF) this).getTime());
sb.append("\" rate=\"" + ((SysCAMSPortTDF) this).getRate());
sb.append("\" delay=\"" + ((SysCAMSPortTDF) this).getDelay());
- sb.append("\" type=\"" + ((SysCAMSPortTDF) this).getTDFType());
+ sb.append("\" type=\"" + encode(((SysCAMSPortTDF) this).getTDFType()));
}
if (this instanceof SysCAMSPortDE) {
// sb.append("\" period=\"" + ((SysCAMSPortDE) this).getPeriod());
// sb.append("\" time=\"" + ((SysCAMSPortDE) this).getTime());
// sb.append("\" rate=\"" + ((SysCAMSPortDE) this).getRate());
// sb.append("\" delay=\"" + ((SysCAMSPortDE) this).getDelay());
- sb.append("\" type=\"" + ((SysCAMSPortDE) this).getDEType());
+ sb.append("\" type=\"" + encode(((SysCAMSPortDE) this).getDEType()));
sb.append("\" sensitive=\"" + ((SysCAMSPortDE) this).getSensitive());
sb.append("\" sensitive_method=\"" + ((SysCAMSPortDE) this).getSensitiveMethod());
}
@@ -406,7 +441,7 @@ public class SysCAMSPrimitivePort extends TGCScalableWithInternalComponent imple
sb.append("\" time=\"" + ((SysCAMSPortConverter) this).getTime());
sb.append("\" rate=\"" + ((SysCAMSPortConverter) this).getRate());
sb.append("\" delay=\"" + ((SysCAMSPortConverter) this).getDelay());
- sb.append("\" type=\"" + ((SysCAMSPortConverter) this).getConvType());
+ sb.append("\" type=\"" + encode(((SysCAMSPortConverter) this).getConvType()));
}
sb.append("\" />\n");
sb.append("</extraparam>\n");
diff --git a/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java b/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
index 7bff1cfa0260d5d3c89d1259edb2d8510daaa483..087baf4e4fecd75916702bb8aa6381149c1136ea 100755
--- a/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
+++ b/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
@@ -59,6 +59,18 @@ import ui.tmlad.TMLADNotifiedEvent;
import ui.tmldd.TMLArchiCPNode;
import ui.tmldd.TMLArchiPortArtifact;
+import proverifspec.ProVerifResultTrace;
+import proverifspec.ProVerifResultTraceStep;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import ui.interactivesimulation.JFrameSimulationSDPanel;
+
import javax.swing.*;
import java.awt.*;
import java.util.Vector;
@@ -108,14 +120,22 @@ public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent
public static int TOCHECK = 1;
public static int CHECKED_CONF = 2;
public static int CHECKED_UNCONF = 3;
+
+ //ProVerifTrace
+ String pragma;
+ ProVerifResultTrace resTrace;
+
public String mappingName="???";
protected int decPoint = 3;
+
protected boolean conflict = false;
protected String conflictMessage;
protected String dataFlowType = "VOID";
protected String associatedEvent = "VOID";
+
+
public int verification;
@@ -454,6 +474,8 @@ public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent
g.drawRect(x-lockwidth*3/2, y+lockheight/2+yoffset, lockwidth, lockheight);
}
}
+
+
public void manageMove() {
//
@@ -624,8 +646,43 @@ public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent
((TMLComponentTaskDiagramPanel)tdp).updatePorts();
+
return true;
}
+
+ public void showTrace(){
+ //Show Result trace
+ PipedOutputStream pos = new PipedOutputStream();
+ try {
+ PipedInputStream pis = new PipedInputStream(pos, 4096);
+ BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(pos));
+
+ JFrameSimulationSDPanel jfssdp = new JFrameSimulationSDPanel(null, tdp.getMGUI(), pragma);
+ jfssdp.setIconImage(IconManager.img8);
+ GraphicLib.centerOnParent(jfssdp, 600, 600);
+ jfssdp.setFileReference(new BufferedReader(new InputStreamReader(pis)));
+ jfssdp.setVisible(true);
+ //jfssdp.setModalExclusionType(ModalExclusionType
+ // .APPLICATION_EXCLUDE);
+ jfssdp.toFront();
+
+ // TraceManager.addDev("\n--- Trace ---");
+ int i = 0;
+ for (ProVerifResultTraceStep step : resTrace.getTrace()) {
+ step.describeAsTMLSDTransaction(bw, i);
+ i++;
+ }
+ bw.close();
+ } catch (IOException e) {
+ TraceManager.addDev("Error when writing trace step SD transaction");
+ } finally {
+ try {
+ pos.close();
+ } catch (IOException ignored) {
+ }
+ }
+
+ }
protected String translateExtraParam() {
TType a;
@@ -966,6 +1023,14 @@ public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent
}
return true;
}
+
+ public void setResultTrace(ProVerifResultTrace trace){
+ resTrace = trace;
+ }
+
+ public void setPragmaString(String str){
+ pragma=str;
+ }
public void setPortName(String s) {
for (TURTLEPanel tp : tdp.getMainGUI().tabs) {
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index 9208bc9c45827454e90c447a58be8acd42d84418..ca6785b0a23c9f45212c3f2903e5d5f9dff58346 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -50,8 +50,8 @@ package ui.util;
*/
public class DefaultText {
- public static String BUILD = "12692";
- public static String DATE = "2018/07/11 02:01:55 CET";
+ public static String BUILD = "12707";
+ public static String DATE = "2018/07/23 16:51:06 CET";
public static StringBuffer sbAbout = makeAbout();
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index bfa8e5c11194e66b03271e0633fa1648dd6549c3..b54bb121219ad0ed343b1f21a3ccd9a7f951c15d 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -61,7 +61,7 @@ public class IconManager {
//Added by Solange
public static Image img0, img1;
- public static ImageIcon imgic13, imgic14, imgic15, imgic16, imgic17, imgic18, imgic19;
+ public static ImageIcon imgic13, imgic14, imgic15, imgic16, imgic16_1, imgic17, imgic18, imgic19;
public static ImageIcon imgic20, imgic21, imgic22, imgic23, imgic24, imgic25, imgic26, imgic27, imgic28, imgic29;
public static ImageIcon imgic20_proj, imgic21_proj, imgic22_proj, imgic23_proj, imgic22_net, imgic23_net;
@@ -157,7 +157,7 @@ public class IconManager {
public static ImageIcon imgic5040, imgic5042, imgic5044, imgic5046, imgic5048;
public static ImageIcon imgic5050, imgic5052, imgic5054, imgic5056, imgic5058;
public static ImageIcon imgic5060, imgic5062, imgic5064, imgic5066, imgic5068;
- public static ImageIcon imgic5070, imgic5072;
+ public static ImageIcon imgic5070, imgic5072, imgic5074;
public static ImageIcon imgic5100, imgic5102, imgic5104, imgic5106, imgic5108;
public static ImageIcon imgic5110, imgic5112, imgic5113, imgic5114;
@@ -187,7 +187,7 @@ public class IconManager {
// ELN
public static ImageIcon imgic8020, imgic8021, imgic8022, imgic8023, imgic8024, imgic8025, imgic8026, imgic8027, imgic8028, imgic8029,
- imgic8030, imgic8031;
+ imgic8030, imgic8031, imgic8032, imgic8033, imgic8034;
//private static String icon7 = "turtle_large.gif";
private static String ttoolStringIcon = "starting_logo.gif";
@@ -212,6 +212,7 @@ public class IconManager {
private static String icon15 = "activitydiagram.gif";
private static String icon16 = "toolbarButtonGraphics/general/Refresh16.gif";
+ private static String icon16_1 = "toolbarButtonGraphics/general/Refresh24.gif";
private static String icon17 = "iod.gif";
private static String icon18 = "sd.gif";
@@ -624,6 +625,7 @@ public class IconManager {
private static String icon5068 = "avatarrdref.gif";
private static String icon5070 = "avatarlibfunction.gif";
private static String icon5072 = "scissors.png";
+ private static String icon5074 = "avatarrdreqref.gif";
private static String icon5100 = "avatarhead16.gif";
private static String icon5102 = "avatarhead32.gif";
@@ -689,6 +691,9 @@ public class IconManager {
private static String icon8029 = "elnground.gif";
private static String icon8030 = "elntdfvsink.gif";
private static String icon8031 = "elntdfisink.gif";
+ private static String icon8032 = "elnportterminal.gif";
+ private static String icon8033 = "elntdfvsource.gif";
+ private static String icon8034 = "elntdfisource.gif";
public IconManager() {
@@ -749,6 +754,7 @@ public class IconManager {
imgic14 = getIcon(icon14);
imgic15 = getIcon(icon15);
imgic16 = getIcon(icon16);
+ imgic16_1 = getIcon(icon16_1);
imgic17 = getIcon(icon17);
imgic18 = getIcon(icon18);
imgic19 = getIcon(icon19);
@@ -1135,6 +1141,7 @@ public class IconManager {
if (imgic5072 != null) {
img5072 = imgic5072.getImage();
}
+ imgic5074 = getIcon(icon5074);
imgic5100 = getIcon(icon5100);
imgic5102 = getIcon(icon5102);
@@ -1200,6 +1207,9 @@ public class IconManager {
imgic8029 = getIcon(icon8029);
imgic8030 = getIcon(icon8030);
imgic8031 = getIcon(icon8031);
+ imgic8032 = getIcon(icon8032);
+ imgic8033 = getIcon(icon8033);
+ imgic8034 = getIcon(icon8034);
}
} // Class
diff --git a/src/main/java/ui/window/JDialogADDCPUNode.java b/src/main/java/ui/window/JDialogADDCPUNode.java
index 8536888e6f8c56188388ff805fe51517211caadc..d640923aa58f549fdf13801a3ad518a64ac9e3b2 100644
--- a/src/main/java/ui/window/JDialogADDCPUNode.java
+++ b/src/main/java/ui/window/JDialogADDCPUNode.java
@@ -79,6 +79,7 @@ public class JDialogADDCPUNode extends JDialogBase implements ActionListener {
// Panel2
protected JTextField nbOfIrq, iCacheWays, iCacheSets, iCacheWords, dCacheWays, dCacheSets, dCacheWords;
protected JTextField index;
+ protected JTextField cluster_index;
protected JTextField monitored;
/** Creates new form */
@@ -177,11 +178,17 @@ public class JDialogADDCPUNode extends JDialogBase implements ActionListener {
panel2.add(dCacheWords, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Index:"), c2);
+ panel2.add(new JLabel("Index:"), c2);//DG 2.7.
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
index = new JTextField(""+node.getIndex(), 15);
panel2.add(index, c2);
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Cluster Index:"), c2);//DG 2.7.
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cluster_index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(cluster_index, c2);
+
c2.gridwidth = 1;
panel2.add(new JLabel("Monitored:"), c2);
//c2.gridwidth = GridBagConstraints.REMAINDER; //end row
diff --git a/src/main/java/ui/window/JDialogADDMemoryNode.java b/src/main/java/ui/window/JDialogADDMemoryNode.java
index 28108c461f7417fa464ae672260728270c9388dc..d8c7aaaece5c8878e7bf0b357d14e3b1fbc2f7e9 100644
--- a/src/main/java/ui/window/JDialogADDMemoryNode.java
+++ b/src/main/java/ui/window/JDialogADDMemoryNode.java
@@ -76,6 +76,7 @@ public class JDialogADDMemoryNode extends JDialogBase implements ActionListener
// Panel2
protected JTextField index;
+ protected JTextField cluster_index;
protected JTextField dataSize;
protected JTextField monitored;
@@ -221,7 +222,14 @@ public class JDialogADDMemoryNode extends JDialogBase implements ActionListener
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
index = new JTextField(""+node.getIndex(), 15);
panel2.add(index, c2);
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Cluster Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cluster_index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(cluster_index, c2);
+
c2.gridwidth = 1;
panel2.add(new JLabel("Data size (in byte):"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
@@ -328,6 +336,10 @@ public class JDialogADDMemoryNode extends JDialogBase implements ActionListener
public String getIndex() {
return index.getText();
}
+
+ public String getClusterIndex() {
+ return cluster_index.getText();
+ }
public String getDataSize() {
return dataSize.getText();
diff --git a/src/main/java/ui/window/JDialogADDMemoryNode.java-new b/src/main/java/ui/window/JDialogADDMemoryNode.java-new
new file mode 100644
index 0000000000000000000000000000000000000000..d8c7aaaece5c8878e7bf0b357d14e3b1fbc2f7e9
--- /dev/null
+++ b/src/main/java/ui/window/JDialogADDMemoryNode.java-new
@@ -0,0 +1,353 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.window;
+
+import ui.util.IconManager;
+import ui.avatardd.ADDMemoryNode;
+import ui.avatardd.ADDRAMNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Class JDialogADDMemoryNode
+ * Dialog for managing attributes of Memory nodes
+ * Creation: 21/08/2014
+ * @version 1.0 21/08/2014
+ * @author Ludovic APVRILLE
+ */
+
+public class JDialogADDMemoryNode extends JDialogBase implements ActionListener {
+
+ //private static String[] tracemodeTab = {"vcd trace", "VCI logger", "VCI stats"};
+ private static String[] tracemodeTab = {"VCI logger","VCI stats"};
+ private boolean regularClose;
+
+ private JPanel panel2, panel3;
+ private JTabbedPane tabbedPane;
+ private JTextArea processCodeTextArea;
+ private String finalString;
+ private Frame frame;
+ private ADDMemoryNode node;
+
+ protected JComboBox<String> tracemode;
+ private static int selectedTracemode = 0;
+
+ // Panel1
+ protected JTextField nodeName;
+
+ // Panel2
+ protected JTextField index;
+ protected JTextField cluster_index;
+ protected JTextField dataSize;
+ protected JTextField monitored;
+
+ private String memoryName;
+
+ /** Creates new form */
+ public JDialogADDMemoryNode(Frame _frame, String _title, ADDMemoryNode _node) {
+ super(_frame, _title, true);
+ frame = _frame;
+ node = _node;
+ memoryName = _title.split(" ")[1];
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+ private void myInitComponents() {}
+
+ public StringBuffer encode(String data) {
+ StringBuffer databuf = new StringBuffer(data);
+ StringBuffer buffer = new StringBuffer("");
+ int endline = 0;
+ int nb_arobase = 0;
+ int condition = 0;
+
+ for(int pos = 0; pos != data.length(); pos++) {
+ char c = databuf.charAt(pos);
+ switch(c) {
+ case '\n' :
+ break;
+ case '\t' :
+ break;
+ case '{' :
+ buffer.append("{\n");
+ endline = 1;
+ nb_arobase++;
+ break;
+ case '}' :
+ if (nb_arobase == 1) {
+ buffer.append("}\n");
+ endline = 0;
+ } else {
+ int i = nb_arobase;
+ while (i >= 1) {
+ buffer.append("\t");
+ i--;
+ }
+ buffer.append("}\n");
+ endline = 1;
+ }
+ nb_arobase--;
+ break;
+ case ';' :
+ if (condition == 1) {
+ buffer.append(";");
+ } else {
+ buffer.append(";\n");
+ endline = 1;
+ }
+ break;
+ case ' ' :
+ if (endline == 0) {
+ buffer.append(databuf.charAt(pos));
+ }
+ break;
+ case '(' :
+ buffer.append("(");
+ condition = 1;
+ break;
+ case ')' :
+ buffer.append(")");
+ condition = 0;
+ break;
+ default :
+ if (endline == 1) {
+ endline = 0;
+ int i = nb_arobase;
+ while (i >= 1) {
+ buffer.append("\t");
+ i--;
+ }
+ }
+ buffer.append(databuf.charAt(pos));
+ break;
+ }
+ }
+ return buffer;
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(gridbag0);
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+ if (memoryName.equals("RAM")) {
+ panel3 = new JPanel();
+ panel3.setLayout(new BorderLayout());
+ panel3.setBorder(new javax.swing.border.TitledBorder("C Code"));
+ panel3.setPreferredSize(new Dimension(400, 200));
+ }
+
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("Memory attributes"));
+ panel2.setPreferredSize(new Dimension(400, 200));
+
+ if (memoryName.equals("RAM")) {
+ tabbedPane = new JTabbedPane();
+ tabbedPane.add("Attributes", panel2);
+ tabbedPane.add("C Code", panel3);
+ }
+
+ c1.gridwidth = 1;
+ c1.gridheight = 1;
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("Memory name:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ nodeName = new JTextField(node.getNodeName(), 30);
+ nodeName.setEditable(true);
+ nodeName.setFont(new Font("times", Font.PLAIN, 12));
+ panel2.add(nodeName, c1);
+
+ c2.gridwidth = 1;
+ c2.gridheight = 1;
+ c2.weighty = 1.0;
+ c2.weightx = 1.0;
+ c2.fill = GridBagConstraints.HORIZONTAL;
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(index, c2);
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Cluster Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cluster_index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(cluster_index, c2);
+
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Data size (in byte):"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ dataSize = new JTextField(""+node.getDataSize(), 15);
+ panel2.add(dataSize, c2);
+
+ /*c2.gridwidth = 1;
+ panel2.add(new JLabel("Monitored:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ monitored = new JTextField(""+node.getMonitored(), 15);
+ panel2.add(monitored, c2);*/
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Monitored:"), c2);
+ //c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ //monitored = new JTextField(""+node.getMonitored(), 15);//DG 19.04.
+ tracemode = new JComboBox<>(tracemodeTab);
+ tracemode.setSelectedIndex(selectedTracemode);
+ tracemode.addActionListener(this);
+ panel2.add(tracemode, c2);
+
+ if (memoryName.equals("RAM")) {
+ panel3.add(new JLabel("Behavior function of RAM : "), BorderLayout.NORTH);
+ StringBuffer stringbuf = encode(node.getProcessCode());
+ String beginString = stringbuf.toString();
+ finalString = beginString.replaceAll("\t}", "}");
+
+ processCodeTextArea = new JTextArea(finalString);
+ processCodeTextArea.setSize(100, 100);
+ processCodeTextArea.setTabSize(2);
+
+ processCodeTextArea.setFont(new Font("Arial", Font.PLAIN, 16));
+ processCodeTextArea.setLineWrap(true);
+ processCodeTextArea.setWrapStyleWord(true);
+
+ JScrollPane processScrollPane = new JScrollPane(processCodeTextArea);
+ processScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+ processScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+ processScrollPane.setPreferredSize(new Dimension(200, 150));
+
+ panel3.add(processScrollPane, BorderLayout.SOUTH);
+ }
+
+ // main panel;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+ if (memoryName.equals("RAM")) {
+ c.add(tabbedPane, c0);
+ } else {
+ c.add(panel2, c0);
+ }
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+
+ initButtons(c0, c, this);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ /*if (evt.getSource() == typeBox) {
+ boolean b = ((Boolean)(initValues.elementAt(typeBox.getSelectedIndex()))).booleanValue();
+ initialValue.setEnabled(b);
+ return;
+ }*/
+ if (evt.getSource() == tracemode) {
+ selectedTracemode = tracemode.getSelectedIndex();
+ }
+
+ String command = evt.getActionCommand();
+
+ if (memoryName.equals("RAM")) {
+ node.setProcessCode(processCodeTextArea.getText());
+ }
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public void closeDialog() {
+ regularClose = true;
+ dispose();
+ }
+
+ public void cancelDialog() {
+ dispose();
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public String getNodeName() {
+ return nodeName.getText();
+ }
+
+ public String getIndex() {
+ return index.getText();
+ }
+
+ public String getClusterIndex() {
+ return cluster_index.getText();
+ }
+
+ public String getDataSize() {
+ return dataSize.getText();
+ }
+
+ public int getMonitored() {
+ //return tracemodeTab[tracemode.getSelectedIndex()];
+ return tracemode.getSelectedIndex();
+ //return monitored.getText();
+ }
+}
diff --git a/src/main/java/ui/window/JDialogADDTTYNode.java b/src/main/java/ui/window/JDialogADDTTYNode.java
index ff8b91e8b0ad6d247f321f828a088b9e3dd260e0..60b30f07beaa9bec9c494282b7a98f9740ea7f22 100644
--- a/src/main/java/ui/window/JDialogADDTTYNode.java
+++ b/src/main/java/ui/window/JDialogADDTTYNode.java
@@ -74,6 +74,7 @@ public class JDialogADDTTYNode extends JDialogBase implements ActionListener {
// Panel2
protected JTextField index;
+ protected JTextField cluster_index;
/** Creates new form */
public JDialogADDTTYNode(Frame _frame, String _title, ADDTTYNode _node) {
@@ -135,7 +136,13 @@ public class JDialogADDTTYNode extends JDialogBase implements ActionListener {
index = new JTextField(""+node.getIndex(), 15);
panel2.add(index, c2);
-
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Cluster Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cluster_index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(cluster_index, c2);
+
+
// main panel;
c0.gridheight = 10;
c0.weighty = 1.0;
@@ -189,5 +196,7 @@ public class JDialogADDTTYNode extends JDialogBase implements ActionListener {
return index.getText();
}
-
+ public String getClusterIndex() {
+ return cluster_index.getText();
+ }
}
diff --git a/src/main/java/ui/window/JDialogADDTTYNode.java-new b/src/main/java/ui/window/JDialogADDTTYNode.java-new
new file mode 100644
index 0000000000000000000000000000000000000000..60b30f07beaa9bec9c494282b7a98f9740ea7f22
--- /dev/null
+++ b/src/main/java/ui/window/JDialogADDTTYNode.java-new
@@ -0,0 +1,202 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+
+
+package ui.window;
+
+import ui.util.IconManager;
+import ui.avatardd.ADDTTYNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+//import javax.swing.event.*;
+//import java.util.*;
+
+
+/**
+ * Class JDialogADDTTYNode
+ * Dialog for managing attributes of TTY nodes
+ * Creation: 21/08/2014
+ * @version 1.0 21/08/2014
+ * @author Ludovic APVRILLE
+ */
+public class JDialogADDTTYNode extends JDialogBase implements ActionListener {
+
+ private boolean regularClose;
+
+ private JPanel panel2;
+ private Frame frame;
+ private ADDTTYNode node;
+
+
+ // Panel1
+ protected JTextField nodeName;
+
+ // Panel2
+ protected JTextField index;
+ protected JTextField cluster_index;
+
+ /** Creates new form */
+ public JDialogADDTTYNode(Frame _frame, String _title, ADDTTYNode _node) {
+ super(_frame, _title, true);
+ frame = _frame;
+ node = _node;
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+ private void myInitComponents() {
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(gridbag0);
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("TTY attributes"));
+ panel2.setPreferredSize(new Dimension(400, 200));
+
+ c1.gridwidth = 1;
+ c1.gridheight = 1;
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(new JLabel("TTY name:"), c2);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ nodeName = new JTextField(node.getNodeName(), 30);
+ nodeName.setEditable(true);
+ nodeName.setFont(new Font("times", Font.PLAIN, 12));
+ panel2.add(nodeName, c1);
+
+
+ c2.gridwidth = 1;
+ c2.gridheight = 1;
+ c2.weighty = 1.0;
+ c2.weightx = 1.0;
+ c2.fill = GridBagConstraints.HORIZONTAL;
+
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(index, c2);
+
+ c2.gridwidth = 1;
+ panel2.add(new JLabel("Cluster Index:"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cluster_index = new JTextField(""+node.getIndex(), 15);
+ panel2.add(cluster_index, c2);
+
+
+ // main panel;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c.add(panel2, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+
+ initButtons(c0, c, this);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ /* if (evt.getSource() == typeBox) {
+ boolean b = ((Boolean)(initValues.elementAt(typeBox.getSelectedIndex()))).booleanValue();
+ initialValue.setEnabled(b);
+ return;
+ }*/
+
+
+ String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public void closeDialog() {
+ regularClose = true;
+ dispose();
+ }
+
+ public void cancelDialog() {
+ dispose();
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public String getNodeName() {
+ return nodeName.getText();
+ }
+
+ public String getIndex() {
+ return index.getText();
+ }
+
+ public String getClusterIndex() {
+ return cluster_index.getText();
+ }
+}
diff --git a/src/main/java/ui/window/JDialogAvatarddExecutableCodeGeneration.java b/src/main/java/ui/window/JDialogAvatarddExecutableCodeGeneration.java
index 89185af9639dbd0a83fa9ca6efe38df090dc51a6..37a7fb481923c720475bdcbeb11ee6917f65818f 100644
--- a/src/main/java/ui/window/JDialogAvatarddExecutableCodeGeneration.java
+++ b/src/main/java/ui/window/JDialogAvatarddExecutableCodeGeneration.java
@@ -538,7 +538,7 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
if (avddspec == null) {
jta.append("Error: No AVATAR Deployemnt specification\n");
} else {
- System.err.println("**AVATAR TOPCELL found");
+ TraceManager.addDev("**AVATAR TOPCELL found");
TopCellGenerator topCellGenerator = new TopCellGenerator(avddspec, tracemode.isSelected(), avspec);
testGo();
@@ -546,16 +546,16 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
try {
jta.append("Saving MPSoC code in files\n");
- System.err.println("Saving MPSoC code in files\n");
+ TraceManager.addDev("Saving MPSoC code in files\n");
pathCode = code2.getText();
- System.err.println("AVATAR TOPCELL saved in " + code2.getText());
+ TraceManager.addDev("AVATAR TOPCELL saved in " + code2.getText());
topCellGenerator.saveFile(pathCode);
jta.append("Code saved\n");
} catch (Exception e) {
jta.append("Could not generate files\n");
- System.err.println("Could not generate MPSoC files\n");
+ TraceManager.addDev("Could not generate MPSoC files\n");
e.printStackTrace();
}
}
@@ -613,7 +613,7 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
if (avddspec == null) {
jta.append("Error: No AVATAR Deployment specification\n");
} else {
- System.err.println("AVATAR TOPCELL found");
+ TraceManager.addDev("AVATAR TOPCELL found");
}
TopCellGenerator topCellGenerator = new TopCellGenerator(avddspec, tracemode.isSelected(), avspec);
diff --git a/src/main/java/ui/window/JDialogChoiceSelection.java b/src/main/java/ui/window/JDialogChoiceSelection.java
new file mode 100644
index 0000000000000000000000000000000000000000..6bc3586b5146296cad6ad113dfbc97e87d93a61a
--- /dev/null
+++ b/src/main/java/ui/window/JDialogChoiceSelection.java
@@ -0,0 +1,170 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.window;
+
+import ui.AvatarSignal;
+import ui.ColorManager;
+import ui.util.IconManager;
+import ui.TGComponent;
+import myutil.TraceManager;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
+
+/**
+ * Class JDialogChoiceSelection
+ * Dialog for managing several names and stereotype
+ * Creation: 13/07/2018
+ * @version 1.0 13/07/2018
+ * @author Ludovic APVRILLE
+ */
+public class JDialogChoiceSelection extends JDialogBase implements ActionListener {
+
+ private String[] availableElements;
+ private int indexOfInitialElement;
+
+
+
+ private JPanel panel1;
+
+ // Panel1
+ private JComboBox<String> listOfElements;
+
+ private boolean cancelled;
+
+ /** Creates new form */
+ public JDialogChoiceSelection(Frame _f, String _title,
+ String[] _availableElements, int _indexOfCurrentElements) {
+
+ super(_f, _title, true);
+
+ availableElements = _availableElements;
+ indexOfInitialElement = _indexOfCurrentElements;
+
+ initComponents();
+ myInitComponents();
+
+ pack();
+ }
+
+
+
+ private void myInitComponents() {
+ }
+
+
+ private void initComponents() {
+ Container c = getContentPane();
+ //GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ //GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(new BorderLayout());
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+ panel1 = new JPanel();
+ panel1.setLayout(gridbag1);
+
+ panel1.setBorder(new javax.swing.border.TitledBorder("Requirement"));
+
+ //panel1.setPreferredSize(new Dimension(500, 250));
+
+ // first line panel1
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.gridheight = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel(" "), c1);
+
+ // Combo box
+ listOfElements = new JComboBox<String>(availableElements);
+ listOfElements.setSelectedIndex(indexOfInitialElement);
+ panel1.add(listOfElements, c1);
+
+
+
+
+ c.add(panel1, BorderLayout.CENTER);
+
+ JPanel buttons = initBasicButtons(this);
+ c.add(buttons, BorderLayout.SOUTH);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ //String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (evt.getSource() == closeButton) {
+ closeDialog();
+ } else if (evt.getSource() == cancelButton) {
+ cancelDialog();
+ }
+ }
+
+ public void closeDialog() {
+ cancelled = false;
+ dispose();
+ }
+
+ public int getIndexOfSelectedElement() {
+ return listOfElements.getSelectedIndex();
+ }
+
+
+ public boolean hasBeenCancelled() {
+ return cancelled;
+ }
+
+ public void cancelDialog() {
+ cancelled = true;
+ dispose();
+ }
+}
diff --git a/src/main/java/ui/window/JDialogELNComponentCurrentControlledVoltageSource.java b/src/main/java/ui/window/JDialogELNComponentCurrentControlledVoltageSource.java
deleted file mode 100644
index 8c22a22071d2b55c527d3d9ce173d5df361b130c..0000000000000000000000000000000000000000
--- a/src/main/java/ui/window/JDialogELNComponentCurrentControlledVoltageSource.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
- * ludovic.apvrille AT enst.fr
- *
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-
-package ui.window;
-
-import ui.eln.sca_eln.ELNComponentCurrentControlledVoltageSource;
-import ui.util.IconManager;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-
-/**
- * Class JDialogELNComponentCurrentControlledVoltageSource
- * Dialog for managing of ELN current controlled voltage source
- * Creation: 13/06/2018
- * @version 1.0 13/06/2018
- * @author Irina Kit Yan LEE
-*/
-
-@SuppressWarnings("serial")
-
-public class JDialogELNComponentCurrentControlledVoltageSource extends JDialog implements ActionListener {
-
- /** Access to ActionPerformed **/
- private JTextField nameTextField;
- private JTextField valueTextField;
- private String valueListString[];
- private JComboBox<String> valueComboBoxString;
-
- /** Parameters **/
- private ELNComponentCurrentControlledVoltageSource ccvs;
-
- /** Constructor **/
- public JDialogELNComponentCurrentControlledVoltageSource(ELNComponentCurrentControlledVoltageSource _ccvs) {
- /** Set JDialog **/
- setTitle("Setting the current controlled voltage source");
- setLocationRelativeTo(null);
- setVisible(true);
- setAlwaysOnTop(true);
- setResizable(false);
-
- /** Parameters **/
- ccvs = _ccvs;
-
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
- getRootPane().getActionMap().put("close", new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- dispose();
- }
- });
-
- dialog();
- }
-
- public void dialog() {
- /** JPanel **/
- JPanel mainPanel = new JPanel(new BorderLayout());
- this.add(mainPanel);
-
- JPanel attributesMainPanel = new JPanel(new GridLayout());
- mainPanel.add(attributesMainPanel, BorderLayout.NORTH);
-
- // Left Side
- Box box = Box.createVerticalBox();
- box.setBorder(BorderFactory.createTitledBorder("Setting current controlled voltage source attributes"));
-
- GridBagLayout gridBag = new GridBagLayout();
- GridBagConstraints constraints = new GridBagConstraints();
- JPanel boxPanel = new JPanel();
- boxPanel.setFont(new Font("Helvetica", Font.PLAIN, 14));
- boxPanel.setLayout(gridBag);
-
- JLabel labelName = new JLabel("nm : ");
- constraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(labelName, constraints);
- boxPanel.add(labelName);
-
- nameTextField = new JTextField(ccvs.getValue().toString(), 10); // name not empty
- constraints = new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(nameTextField, constraints);
- boxPanel.add(nameTextField);
-
- JLabel valueLabel = new JLabel("value : ");
- constraints = new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(valueLabel, constraints);
- boxPanel.add(valueLabel);
-
- valueTextField = new JTextField("" + ccvs.getVal(), 10); // name not empty
- constraints = new GridBagConstraints(1, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(valueTextField, constraints);
- boxPanel.add(valueTextField);
-
- valueListString = new String[9];
- valueListString[0] = "G\u03A9";
- valueListString[1] = "M\u03A9";
- valueListString[2] = "k\u03A9";
- valueListString[3] = "\u03A9";
- valueListString[4] = "m\u03A9";
- valueListString[5] = "\u03BC\u03A9";
- valueListString[6] = "n\u03A9";
- valueListString[7] = "p\u03A9";
- valueListString[8] = "f\u03A9";
- valueComboBoxString = new JComboBox<String>(valueListString);
- if (ccvs.getUnit().equals("G\u03A9")) {
- valueComboBoxString.setSelectedIndex(0);
- } else if (ccvs.getUnit().equals("M\u03A9")) {
- valueComboBoxString.setSelectedIndex(1);
- } else if (ccvs.getUnit().equals("k\u03A9")) {
- valueComboBoxString.setSelectedIndex(2);
- } else if (ccvs.getUnit().equals("\u03A9")) {
- valueComboBoxString.setSelectedIndex(3);
- } else if (ccvs.getUnit().equals("m\u03A9")) {
- valueComboBoxString.setSelectedIndex(4);
- } else if (ccvs.getUnit().equals("\u03BC\u03A9")) {
- valueComboBoxString.setSelectedIndex(5);
- } else if (ccvs.getUnit().equals("n\u03A9")) {
- valueComboBoxString.setSelectedIndex(6);
- } else if (ccvs.getUnit().equals("p\u03A9")) {
- valueComboBoxString.setSelectedIndex(7);
- } else if (ccvs.getUnit().equals("f\u03A9")) {
- valueComboBoxString.setSelectedIndex(8);
- }
- valueComboBoxString.addActionListener(this);
- constraints = new GridBagConstraints(2, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(valueComboBoxString, constraints);
- boxPanel.add(valueComboBoxString);
-
- box.add(boxPanel); // add border to box
- attributesMainPanel.add(box); // add grid to grid
-
- // Down Side
- JPanel downPanel = new JPanel(new FlowLayout());
-
- JButton saveCloseButton = new JButton("Save and close");
- saveCloseButton.setIcon(IconManager.imgic25);
- saveCloseButton.setActionCommand("Save_Close");
- saveCloseButton.addActionListener(this);
- saveCloseButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(saveCloseButton);
-
- JButton cancelButton = new JButton("Cancel");
- cancelButton.setIcon(IconManager.imgic27);
- cancelButton.setActionCommand("Cancel");
- cancelButton.addActionListener(this);
- cancelButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(cancelButton);
-
- mainPanel.add(downPanel, BorderLayout.CENTER);
- pack();
- this.getRootPane().setDefaultButton(saveCloseButton);
- }
-
- public void actionPerformed(ActionEvent e) {
- if ("Save_Close".equals(e.getActionCommand())) {
- ccvs.setValue(new String(nameTextField.getText()));
-
- if (!(valueTextField.getText().isEmpty())) {
- Boolean valValueDouble = false;
- try {
- Double.parseDouble(valueTextField.getText());
- } catch (NumberFormatException e1) {
- JDialog msg = new JDialog(this);
- msg.setLocationRelativeTo(null);
- JOptionPane.showMessageDialog(msg, "The scale coefficient of the control current is not a Double", "Warning !",
- JOptionPane.WARNING_MESSAGE);
- valValueDouble = true;
- }
- if (valValueDouble == false) {
- ccvs.setVal(Double.parseDouble(valueTextField.getText()));
- }
- } else {
- ccvs.setVal(1.0);
- }
- ccvs.setUnit((String) valueComboBoxString.getSelectedItem());
-
- this.dispose();
- }
-
- if ("Cancel".equals(e.getActionCommand())) {
- this.dispose();
- }
- }
-}
diff --git a/src/main/java/ui/window/JDialogELNComponentCurrentControlledCurrentSource.java b/src/main/java/ui/window/JDialogELNComponentCurrentSourceTDF.java
similarity index 78%
rename from src/main/java/ui/window/JDialogELNComponentCurrentControlledCurrentSource.java
rename to src/main/java/ui/window/JDialogELNComponentCurrentSourceTDF.java
index e8c8cb6df453cb58d253356dc5b7e95f01a392a9..4c2c8c814e7091675422fbf8dea54692faf2a5d4 100644
--- a/src/main/java/ui/window/JDialogELNComponentCurrentControlledCurrentSource.java
+++ b/src/main/java/ui/window/JDialogELNComponentCurrentSourceTDF.java
@@ -1,212 +1,203 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
- * ludovic.apvrille AT enst.fr
- *
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-
-package ui.window;
-
-import ui.eln.sca_eln.ELNComponentCurrentControlledCurrentSource;
-import ui.util.IconManager;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-
-/**
- * Class JDialogELNComponentCurrentControlledCurrentSource
- * Dialog for managing of ELN current controlled current source
- * Creation: 13/06/2018
- * @version 1.0 13/06/2018
- * @author Irina Kit Yan LEE
-*/
-
-@SuppressWarnings("serial")
-
-public class JDialogELNComponentCurrentControlledCurrentSource extends JDialog implements ActionListener {
-
- /** Access to ActionPerformed **/
- private JTextField nameTextField;
- private JTextField valueTextField;
-
- /** Parameters **/
- private ELNComponentCurrentControlledCurrentSource cccs;
-
- /** Constructor **/
- public JDialogELNComponentCurrentControlledCurrentSource(ELNComponentCurrentControlledCurrentSource _cccs) {
- /** Set JDialog **/
- setTitle("Setting the current controlled current source");
- setLocationRelativeTo(null);
- setVisible(true);
- setAlwaysOnTop(true);
- setResizable(false);
-
- /** Parameters **/
- cccs = _cccs;
-
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
- getRootPane().getActionMap().put("close", new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- dispose();
- }
- });
-
- dialog();
- }
-
- public void dialog() {
- /** JPanel **/
- JPanel mainPanel = new JPanel(new BorderLayout());
- this.add(mainPanel);
-
- JPanel attributesMainPanel = new JPanel(new GridLayout());
- mainPanel.add(attributesMainPanel, BorderLayout.NORTH);
-
- // Left Side
- Box box = Box.createVerticalBox();
- box.setBorder(BorderFactory.createTitledBorder("Setting current controlled current source attributes"));
-
- GridBagLayout gridBag = new GridBagLayout();
- GridBagConstraints constraints = new GridBagConstraints();
- JPanel boxPanel = new JPanel();
- boxPanel.setFont(new Font("Helvetica", Font.PLAIN, 14));
- boxPanel.setLayout(gridBag);
-
- JLabel labelName = new JLabel("nm : ");
- constraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(labelName, constraints);
- boxPanel.add(labelName);
-
- nameTextField = new JTextField(cccs.getValue().toString(), 10); // name not empty
- constraints = new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(nameTextField, constraints);
- boxPanel.add(nameTextField);
-
- JLabel ratioLabel = new JLabel("value : ");
- constraints = new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(ratioLabel, constraints);
- boxPanel.add(ratioLabel);
-
- valueTextField = new JTextField("" + cccs.getVal(), 10); // name not empty
- constraints = new GridBagConstraints(1, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(valueTextField, constraints);
- boxPanel.add(valueTextField);
-
- box.add(boxPanel); // add border to box
- attributesMainPanel.add(box); // add grid to grid
-
- // Down Side
- JPanel downPanel = new JPanel(new FlowLayout());
-
- JButton saveCloseButton = new JButton("Save and close");
- saveCloseButton.setIcon(IconManager.imgic25);
- saveCloseButton.setActionCommand("Save_Close");
- saveCloseButton.addActionListener(this);
- saveCloseButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(saveCloseButton);
-
- JButton cancelButton = new JButton("Cancel");
- cancelButton.setIcon(IconManager.imgic27);
- cancelButton.setActionCommand("Cancel");
- cancelButton.addActionListener(this);
- cancelButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(cancelButton);
-
- mainPanel.add(downPanel, BorderLayout.CENTER);
- pack();
- this.getRootPane().setDefaultButton(saveCloseButton);
- }
-
- public void actionPerformed(ActionEvent e) {
- if ("Save_Close".equals(e.getActionCommand())) {
- cccs.setValue(new String(nameTextField.getText()));
-
- if (!(valueTextField.getText().isEmpty())) {
- Boolean valValueDouble = false;
- try {
- Double.parseDouble(valueTextField.getText());
- } catch (NumberFormatException e1) {
- JDialog msg = new JDialog(this);
- msg.setLocationRelativeTo(null);
- JOptionPane.showMessageDialog(msg, "The scale coefficient of the control current is not a Double", "Warning !",
- JOptionPane.WARNING_MESSAGE);
- valValueDouble = true;
- }
- if (valValueDouble == false) {
- cccs.setVal(Double.parseDouble(valueTextField.getText()));
- }
- } else {
- cccs.setVal(1.0);
- }
-
- this.dispose();
- }
-
- if ("Cancel".equals(e.getActionCommand())) {
- this.dispose();
- }
- }
-}
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.window;
+
+import ui.eln.sca_eln_sca_tdf.ELNComponentCurrentSourceTDF;
+import ui.util.IconManager;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+
+/**
+ * Class JDialogELNComponentCurrentSourceTDF
+ * Dialog for managing the ELN current driven by a TDF input signal
+ * Creation: 19/07/2018
+ * @version 1.0 19/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+@SuppressWarnings("serial")
+
+public class JDialogELNComponentCurrentSourceTDF extends JDialog implements ActionListener {
+ private JTextField nameTextField;
+ private JTextField valueTextField;
+
+ private ELNComponentCurrentSourceTDF isource;
+
+ public JDialogELNComponentCurrentSourceTDF(ELNComponentCurrentSourceTDF _isource) {
+ setTitle("Setting the current driven by a TDF output signal");
+ setLocationRelativeTo(null);
+ setVisible(true);
+ setAlwaysOnTop(true);
+ setResizable(false);
+
+ isource = _isource;
+
+ getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
+ getRootPane().getActionMap().put("close", new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+ });
+
+ dialog();
+ }
+
+ public void dialog() {
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ this.add(mainPanel);
+
+ JPanel attributesMainPanel = new JPanel(new GridLayout());
+ mainPanel.add(attributesMainPanel, BorderLayout.NORTH);
+
+ Box box = Box.createVerticalBox();
+ box.setBorder(BorderFactory.createTitledBorder("Setting eln_tdf_isource attributes"));
+
+ GridBagLayout gridBag = new GridBagLayout();
+ GridBagConstraints constraints = new GridBagConstraints();
+ JPanel boxPanel = new JPanel();
+ boxPanel.setFont(new Font("Helvetica", Font.PLAIN, 14));
+ boxPanel.setLayout(gridBag);
+
+ JLabel labelName = new JLabel("nm : ");
+ constraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(labelName, constraints);
+ boxPanel.add(labelName);
+
+ nameTextField = new JTextField(isource.getValue().toString(), 10);
+ constraints = new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(nameTextField, constraints);
+ boxPanel.add(nameTextField);
+
+ JLabel valueLabel = new JLabel("scale : ");
+ constraints = new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(valueLabel, constraints);
+ boxPanel.add(valueLabel);
+
+ valueTextField = new JTextField("" + isource.getScale(), 10);
+ constraints = new GridBagConstraints(1, 1, 1, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(valueTextField, constraints);
+ boxPanel.add(valueTextField);
+
+ box.add(boxPanel);
+ attributesMainPanel.add(box);
+
+ JPanel downPanel = new JPanel(new FlowLayout());
+
+ JButton saveCloseButton = new JButton("Save and close");
+ saveCloseButton.setIcon(IconManager.imgic25);
+ saveCloseButton.setActionCommand("Save_Close");
+ saveCloseButton.addActionListener(this);
+ saveCloseButton.setPreferredSize(new Dimension(200, 30));
+ downPanel.add(saveCloseButton);
+
+ JButton cancelButton = new JButton("Cancel");
+ cancelButton.setIcon(IconManager.imgic27);
+ cancelButton.setActionCommand("Cancel");
+ cancelButton.addActionListener(this);
+ cancelButton.setPreferredSize(new Dimension(200, 30));
+ downPanel.add(cancelButton);
+
+ mainPanel.add(downPanel, BorderLayout.CENTER);
+ pack();
+ this.getRootPane().setDefaultButton(saveCloseButton);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if ("Save_Close".equals(e.getActionCommand())) {
+ isource.setValue(new String(nameTextField.getText()));
+
+ if (!(valueTextField.getText().isEmpty())) {
+ Boolean valValueDouble = false;
+ try {
+ Double.parseDouble(valueTextField.getText());
+ } catch (NumberFormatException e1) {
+ JDialog msg = new JDialog(this);
+ msg.setLocationRelativeTo(null);
+ JOptionPane.showMessageDialog(msg, "The scale coefficient is not a Double", "Warning !",
+ JOptionPane.WARNING_MESSAGE);
+ valValueDouble = true;
+ }
+ if (valValueDouble == false) {
+ isource.setScale(Double.parseDouble(valueTextField.getText()));
+ }
+ } else {
+ isource.setScale(1.0);
+ }
+
+ this.dispose();
+ }
+
+ if ("Cancel".equals(e.getActionCommand())) {
+ this.dispose();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/window/JDialogELNComponentGyrator.java b/src/main/java/ui/window/JDialogELNComponentGyrator.java
deleted file mode 100644
index 5a34c734e2a055fb24f34da842d0f8c039f55fec..0000000000000000000000000000000000000000
--- a/src/main/java/ui/window/JDialogELNComponentGyrator.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
- * ludovic.apvrille AT enst.fr
- *
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-
-package ui.window;
-
-import ui.eln.sca_eln.ELNComponentGyrator;
-import ui.util.IconManager;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-
-/**
- * Class JDialogELNComponentGyrator
- * Dialog for managing of ELN gyrator
- * Creation: 14/06/2018
- * @version 1.0 14/06/2018
- * @author Irina Kit Yan LEE
-*/
-
-@SuppressWarnings("serial")
-
-public class JDialogELNComponentGyrator extends JDialog implements ActionListener {
-
- /** Access to ActionPerformed **/
- private JTextField nameTextField;
- private JTextField gyra1TextField;
- private String gyra1ListString[];
- private JComboBox<String> gyra1ComboBoxString;
- private JTextField gyra2TextField;
- private String gyra2ListString[];
- private JComboBox<String> gyra2ComboBoxString;
-
- /** Parameters **/
- private ELNComponentGyrator gyrator;
-
- /** Constructor **/
- public JDialogELNComponentGyrator(ELNComponentGyrator _gyrator) {
- /** Set JDialog **/
- setTitle("Setting the gyrator");
- setLocationRelativeTo(null);
- setVisible(true);
- setAlwaysOnTop(true);
- setResizable(false);
-
- /** Parameters **/
- gyrator = _gyrator;
-
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
- getRootPane().getActionMap().put("close", new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- dispose();
- }
- });
-
- dialog();
- }
-
- public void dialog() {
- /** JPanel **/
- JPanel mainPanel = new JPanel(new BorderLayout());
- this.add(mainPanel);
-
- JPanel attributesMainPanel = new JPanel(new GridLayout());
- mainPanel.add(attributesMainPanel, BorderLayout.NORTH);
-
- // Left Side
- Box box = Box.createVerticalBox();
- box.setBorder(BorderFactory.createTitledBorder("Setting gyrator attributes"));
-
- GridBagLayout gridBag = new GridBagLayout();
- GridBagConstraints constraints = new GridBagConstraints();
- JPanel boxPanel = new JPanel();
- boxPanel.setFont(new Font("Helvetica", Font.PLAIN, 14));
- boxPanel.setLayout(gridBag);
-
- JLabel labelName = new JLabel("nm : ");
- constraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(labelName, constraints);
- boxPanel.add(labelName);
-
- nameTextField = new JTextField(gyrator.getValue().toString(), 10);
- constraints = new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(nameTextField, constraints);
- boxPanel.add(nameTextField);
-
- JLabel gyra1Label = new JLabel("g1 : ");
- constraints = new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(gyra1Label, constraints);
- boxPanel.add(gyra1Label);
-
- gyra1TextField = new JTextField("" + gyrator.getG1(), 10);
- constraints = new GridBagConstraints(1, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(gyra1TextField, constraints);
- boxPanel.add(gyra1TextField);
-
- gyra1ListString = new String[9];
- gyra1ListString[0] = "GS";
- gyra1ListString[1] = "MS";
- gyra1ListString[2] = "kS";
- gyra1ListString[3] = "S";
- gyra1ListString[4] = "mS";
- gyra1ListString[5] = "\u03BCS";
- gyra1ListString[6] = "nS";
- gyra1ListString[7] = "pS";
- gyra1ListString[8] = "fS";
- gyra1ComboBoxString = new JComboBox<String>(gyra1ListString);
- if (gyrator.getUnit1().equals("GS")) {
- gyra1ComboBoxString.setSelectedIndex(0);
- } else if (gyrator.getUnit1().equals("MS")) {
- gyra1ComboBoxString.setSelectedIndex(1);
- } else if (gyrator.getUnit1().equals("kS")) {
- gyra1ComboBoxString.setSelectedIndex(2);
- } else if (gyrator.getUnit1().equals("S")) {
- gyra1ComboBoxString.setSelectedIndex(3);
- } else if (gyrator.getUnit1().equals("mS")) {
- gyra1ComboBoxString.setSelectedIndex(4);
- } else if (gyrator.getUnit1().equals("\u03BCS")) {
- gyra1ComboBoxString.setSelectedIndex(5);
- } else if (gyrator.getUnit1().equals("nS")) {
- gyra1ComboBoxString.setSelectedIndex(6);
- } else if (gyrator.getUnit1().equals("pS")) {
- gyra1ComboBoxString.setSelectedIndex(7);
- } else if (gyrator.getUnit1().equals("fS")) {
- gyra1ComboBoxString.setSelectedIndex(8);
- }
- gyra1ComboBoxString.addActionListener(this);
- constraints = new GridBagConstraints(2, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(gyra1ComboBoxString, constraints);
- boxPanel.add(gyra1ComboBoxString);
-
- JLabel gyra2Label = new JLabel("g2 : ");
- constraints = new GridBagConstraints(0, 2, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(gyra2Label, constraints);
- boxPanel.add(gyra2Label);
-
- gyra2TextField = new JTextField("" + gyrator.getG2(), 10); // name not empty
- constraints = new GridBagConstraints(1, 2, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(gyra2TextField, constraints);
- boxPanel.add(gyra2TextField);
-
- gyra2ListString = new String[9];
- gyra2ListString[0] = "GS";
- gyra2ListString[1] = "MS";
- gyra2ListString[2] = "kS";
- gyra2ListString[3] = "S";
- gyra2ListString[4] = "mS";
- gyra2ListString[5] = "\u03BCS";
- gyra2ListString[6] = "nS";
- gyra2ListString[7] = "pS";
- gyra2ListString[8] = "fS";
- gyra2ComboBoxString = new JComboBox<String>(gyra2ListString);
- if (gyrator.getUnit2().equals("GS")) {
- gyra2ComboBoxString.setSelectedIndex(0);
- } else if (gyrator.getUnit2().equals("MS")) {
- gyra2ComboBoxString.setSelectedIndex(1);
- } else if (gyrator.getUnit2().equals("kS")) {
- gyra2ComboBoxString.setSelectedIndex(2);
- } else if (gyrator.getUnit2().equals("S")) {
- gyra2ComboBoxString.setSelectedIndex(3);
- } else if (gyrator.getUnit2().equals("mS")) {
- gyra2ComboBoxString.setSelectedIndex(4);
- } else if (gyrator.getUnit2().equals("\u03BCS")) {
- gyra2ComboBoxString.setSelectedIndex(5);
- } else if (gyrator.getUnit2().equals("nS")) {
- gyra2ComboBoxString.setSelectedIndex(6);
- } else if (gyrator.getUnit2().equals("pS")) {
- gyra2ComboBoxString.setSelectedIndex(7);
- } else if (gyrator.getUnit2().equals("fS")) {
- gyra2ComboBoxString.setSelectedIndex(8);
- }
- gyra2ComboBoxString.addActionListener(this);
- constraints = new GridBagConstraints(2, 2, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(gyra2ComboBoxString, constraints);
- boxPanel.add(gyra2ComboBoxString);
-
- box.add(boxPanel); // add border to box
- attributesMainPanel.add(box); // add grid to grid
-
- // Down Side
- JPanel downPanel = new JPanel(new FlowLayout());
-
- JButton saveCloseButton = new JButton("Save and close");
- saveCloseButton.setIcon(IconManager.imgic25);
- saveCloseButton.setActionCommand("Save_Close");
- saveCloseButton.addActionListener(this);
- saveCloseButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(saveCloseButton);
-
- JButton cancelButton = new JButton("Cancel");
- cancelButton.setIcon(IconManager.imgic27);
- cancelButton.setActionCommand("Cancel");
- cancelButton.addActionListener(this);
- cancelButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(cancelButton);
-
- mainPanel.add(downPanel, BorderLayout.CENTER);
- pack();
- this.getRootPane().setDefaultButton(saveCloseButton);
- }
-
- public void actionPerformed(ActionEvent e) {
- if ("Save_Close".equals(e.getActionCommand())) {
- gyrator.setValue(new String(nameTextField.getText()));
-
- if (!(gyra1TextField.getText().isEmpty())) {
- Boolean valValueDouble = false;
- try {
- Double.parseDouble(gyra1TextField.getText());
- } catch (NumberFormatException e1) {
- JDialog msg = new JDialog(this);
- msg.setLocationRelativeTo(null);
- JOptionPane.showMessageDialog(msg, "The gyration conductance is not a Double", "Warning !",
- JOptionPane.WARNING_MESSAGE);
- valValueDouble = true;
- }
- if (valValueDouble == false) {
- gyrator.setG1(Double.parseDouble(gyra1TextField.getText()));
- }
- } else {
- gyrator.setG1(1.0);
- }
- gyrator.setUnit1((String) gyra1ComboBoxString.getSelectedItem());
-
- if (!(gyra2TextField.getText().isEmpty())) {
- Boolean valValueDouble = false;
- try {
- Double.parseDouble(gyra2TextField.getText());
- } catch (NumberFormatException e1) {
- JDialog msg = new JDialog(this);
- msg.setLocationRelativeTo(null);
- JOptionPane.showMessageDialog(msg, "The gyration conductance is not a Double", "Warning !",
- JOptionPane.WARNING_MESSAGE);
- valValueDouble = true;
- }
- if (valValueDouble == false) {
- gyrator.setG2(Double.parseDouble(gyra2TextField.getText()));
- }
- } else {
- gyrator.setG2(1.0);
- }
- gyrator.setUnit2((String) gyra2ComboBoxString.getSelectedItem());
-
- this.dispose();
- }
-
- if ("Cancel".equals(e.getActionCommand())) {
- this.dispose();
- }
- }
-}
diff --git a/src/main/java/ui/window/JDialogELNComponentNullor.java b/src/main/java/ui/window/JDialogELNComponentVoltageSourceTDF.java
similarity index 70%
rename from src/main/java/ui/window/JDialogELNComponentNullor.java
rename to src/main/java/ui/window/JDialogELNComponentVoltageSourceTDF.java
index c64b3ab9a5c25398553cb1e6e621971910a22354..0e86355231187fada793fe8fb03feec16843b86d 100644
--- a/src/main/java/ui/window/JDialogELNComponentNullor.java
+++ b/src/main/java/ui/window/JDialogELNComponentVoltageSourceTDF.java
@@ -1,176 +1,203 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
- * ludovic.apvrille AT enst.fr
- *
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-
-package ui.window;
-
-import ui.eln.sca_eln.ELNComponentNullor;
-import ui.util.IconManager;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-
-/**
- * Class JDialogELNComponentNullor
- * Dialog for managing of ELN nullor
- * Creation: 13/06/2018
- * @version 1.0 13/06/2018
- * @author Irina Kit Yan LEE
-*/
-
-@SuppressWarnings("serial")
-
-public class JDialogELNComponentNullor extends JDialog implements ActionListener {
-
- /** Access to ActionPerformed **/
- private JTextField nameTextField;
-
- /** Parameters **/
- private ELNComponentNullor nullor;
-
- /** Constructor **/
- public JDialogELNComponentNullor(ELNComponentNullor _nullor) {
- /** Set JDialog **/
- setTitle("Setting the nullor");
- setLocationRelativeTo(null);
- setVisible(true);
- setAlwaysOnTop(true);
- setResizable(false);
-
- /** Parameters **/
- nullor = _nullor;
-
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
- getRootPane().getActionMap().put("close", new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- dispose();
- }
- });
-
- dialog();
- }
-
- public void dialog() {
- /** JPanel **/
- JPanel mainPanel = new JPanel(new BorderLayout());
- this.add(mainPanel);
-
- JPanel attributesMainPanel = new JPanel(new GridLayout());
- mainPanel.add(attributesMainPanel, BorderLayout.NORTH);
-
- // Left Side
- Box box = Box.createVerticalBox();
- box.setBorder(BorderFactory.createTitledBorder("Setting nullor attributes"));
-
- GridBagLayout gridBag = new GridBagLayout();
- GridBagConstraints constraints = new GridBagConstraints();
- JPanel boxPanel = new JPanel();
- boxPanel.setFont(new Font("Helvetica", Font.PLAIN, 14));
- boxPanel.setLayout(gridBag);
-
- JLabel labelName = new JLabel("nm : ");
- constraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(labelName, constraints);
- boxPanel.add(labelName);
-
- nameTextField = new JTextField(nullor.getValue().toString(), 10); // name not empty
- constraints = new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(5, 10, 5, 10), 0, 0);
- gridBag.setConstraints(nameTextField, constraints);
- boxPanel.add(nameTextField);
-
- box.add(boxPanel); // add border to box
- attributesMainPanel.add(box); // add grid to grid
-
- // Down Side
- JPanel downPanel = new JPanel(new FlowLayout());
-
- JButton saveCloseButton = new JButton("Save and close");
- saveCloseButton.setIcon(IconManager.imgic25);
- saveCloseButton.setActionCommand("Save_Close");
- saveCloseButton.addActionListener(this);
- saveCloseButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(saveCloseButton);
-
- JButton cancelButton = new JButton("Cancel");
- cancelButton.setIcon(IconManager.imgic27);
- cancelButton.setActionCommand("Cancel");
- cancelButton.addActionListener(this);
- cancelButton.setPreferredSize(new Dimension(200, 30));
- downPanel.add(cancelButton);
-
- mainPanel.add(downPanel, BorderLayout.CENTER);
- pack();
- this.getRootPane().setDefaultButton(saveCloseButton);
- }
-
- public void actionPerformed(ActionEvent e) {
- if ("Save_Close".equals(e.getActionCommand())) {
- nullor.setValue(new String(nameTextField.getText()));
-
- this.dispose();
- }
-
- if ("Cancel".equals(e.getActionCommand())) {
- this.dispose();
- }
- }
-}
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.window;
+
+import ui.eln.sca_eln_sca_tdf.ELNComponentVoltageSourceTDF;
+import ui.util.IconManager;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+
+/**
+ * Class JDialogELNComponentVoltageSourceTDF
+ * Dialog for managing the ELN voltage driven by a TDF input signal
+ * Creation: 19/07/2018
+ * @version 1.0 19/07/2018
+ * @author Irina Kit Yan LEE
+*/
+
+@SuppressWarnings("serial")
+
+public class JDialogELNComponentVoltageSourceTDF extends JDialog implements ActionListener {
+ private JTextField nameTextField;
+ private JTextField valueTextField;
+
+ private ELNComponentVoltageSourceTDF vsource;
+
+ public JDialogELNComponentVoltageSourceTDF(ELNComponentVoltageSourceTDF _vsource) {
+ setTitle("Setting the voltage driven by a TDF output signal");
+ setLocationRelativeTo(null);
+ setVisible(true);
+ setAlwaysOnTop(true);
+ setResizable(false);
+
+ vsource = _vsource;
+
+ getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
+ getRootPane().getActionMap().put("close", new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+ });
+
+ dialog();
+ }
+
+ public void dialog() {
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ this.add(mainPanel);
+
+ JPanel attributesMainPanel = new JPanel(new GridLayout());
+ mainPanel.add(attributesMainPanel, BorderLayout.NORTH);
+
+ Box box = Box.createVerticalBox();
+ box.setBorder(BorderFactory.createTitledBorder("Setting eln_tdf_vsource attributes"));
+
+ GridBagLayout gridBag = new GridBagLayout();
+ GridBagConstraints constraints = new GridBagConstraints();
+ JPanel boxPanel = new JPanel();
+ boxPanel.setFont(new Font("Helvetica", Font.PLAIN, 14));
+ boxPanel.setLayout(gridBag);
+
+ JLabel labelName = new JLabel("nm : ");
+ constraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(labelName, constraints);
+ boxPanel.add(labelName);
+
+ nameTextField = new JTextField(vsource.getValue().toString(), 10);
+ constraints = new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(nameTextField, constraints);
+ boxPanel.add(nameTextField);
+
+ JLabel valueLabel = new JLabel("scale : ");
+ constraints = new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(valueLabel, constraints);
+ boxPanel.add(valueLabel);
+
+ valueTextField = new JTextField("" + vsource.getScale(), 10);
+ constraints = new GridBagConstraints(1, 1, 1, 1, 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(5, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(valueTextField, constraints);
+ boxPanel.add(valueTextField);
+
+ box.add(boxPanel);
+ attributesMainPanel.add(box);
+
+ JPanel downPanel = new JPanel(new FlowLayout());
+
+ JButton saveCloseButton = new JButton("Save and close");
+ saveCloseButton.setIcon(IconManager.imgic25);
+ saveCloseButton.setActionCommand("Save_Close");
+ saveCloseButton.addActionListener(this);
+ saveCloseButton.setPreferredSize(new Dimension(200, 30));
+ downPanel.add(saveCloseButton);
+
+ JButton cancelButton = new JButton("Cancel");
+ cancelButton.setIcon(IconManager.imgic27);
+ cancelButton.setActionCommand("Cancel");
+ cancelButton.addActionListener(this);
+ cancelButton.setPreferredSize(new Dimension(200, 30));
+ downPanel.add(cancelButton);
+
+ mainPanel.add(downPanel, BorderLayout.CENTER);
+ pack();
+ this.getRootPane().setDefaultButton(saveCloseButton);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if ("Save_Close".equals(e.getActionCommand())) {
+ vsource.setValue(new String(nameTextField.getText()));
+
+ if (!(valueTextField.getText().isEmpty())) {
+ Boolean valValueDouble = false;
+ try {
+ Double.parseDouble(valueTextField.getText());
+ } catch (NumberFormatException e1) {
+ JDialog msg = new JDialog(this);
+ msg.setLocationRelativeTo(null);
+ JOptionPane.showMessageDialog(msg, "The scale coefficient is not a Double", "Warning !",
+ JOptionPane.WARNING_MESSAGE);
+ valValueDouble = true;
+ }
+ if (valValueDouble == false) {
+ vsource.setScale(Double.parseDouble(valueTextField.getText()));
+ }
+ } else {
+ vsource.setScale(1.0);
+ }
+
+ this.dispose();
+ }
+
+ if ("Cancel".equals(e.getActionCommand())) {
+ this.dispose();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/window/JDialogELNConnector.java b/src/main/java/ui/window/JDialogELNConnector.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a71e3196d48b59b5c0d393e58ecd905e04772fd
--- /dev/null
+++ b/src/main/java/ui/window/JDialogELNConnector.java
@@ -0,0 +1,151 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.window;
+
+import ui.eln.ELNConnector;
+import ui.util.*;
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+
+/**
+ * Class JDialogELNConnector
+ * Dialog for managing of ELN connector
+ * Creation: 24/07/2018
+ * @version 1.0 24/07/2018
+ * @author Irina Kit Yan LEE
+ */
+
+@SuppressWarnings("serial")
+
+public class JDialogELNConnector extends JDialog implements ActionListener {
+
+ private JTextField nameTextField;
+
+ private ELNConnector con;
+
+ public JDialogELNConnector(ELNConnector con) {
+ this.setTitle("Setting Connector Attributes");
+ this.setLocationRelativeTo(null);
+ this.setVisible(true);
+ this.setAlwaysOnTop(true);
+ this.setResizable(false);
+
+ this.con = con;
+
+ getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
+ getRootPane().getActionMap().put("close", new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+ });
+
+ dialog();
+ }
+
+ public void dialog() {
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ this.add(mainPanel);
+
+ JPanel attributesMainPanel = new JPanel();
+ mainPanel.add(attributesMainPanel, BorderLayout.NORTH);
+
+ attributesMainPanel.setLayout(new BorderLayout());
+
+ Box attributesBox = Box.createVerticalBox();
+ attributesBox.setBorder(BorderFactory.createTitledBorder("Setting connector attributes"));
+
+ GridBagLayout gridBag = new GridBagLayout();
+ GridBagConstraints constraints = new GridBagConstraints();
+ JPanel attributesBoxPanel = new JPanel();
+ attributesBoxPanel.setFont(new Font("Helvetica", Font.PLAIN, 14));
+ attributesBoxPanel.setLayout(gridBag);
+
+ JLabel labelName = new JLabel("Name : ");
+ constraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+ new Insets(15, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(labelName, constraints);
+ attributesBoxPanel.add(labelName);
+
+ if (con.getValue().toString().equals("")) {
+ nameTextField = new JTextField(10);
+ } else {
+ nameTextField = new JTextField(con.getValue().toString(), 10);
+ }
+ constraints = new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+ new Insets(15, 10, 5, 10), 0, 0);
+ gridBag.setConstraints(nameTextField, constraints);
+ attributesBoxPanel.add(nameTextField);
+
+ attributesBox.add(attributesBoxPanel);
+
+ attributesMainPanel.add(attributesBox, BorderLayout.NORTH);
+
+ JPanel downPanel = new JPanel(new FlowLayout());
+
+ JButton saveCloseButton = new JButton("Save and close");
+ saveCloseButton.setIcon(IconManager.imgic25);
+ saveCloseButton.setActionCommand("Save_Close");
+ saveCloseButton.addActionListener(this);
+ saveCloseButton.setPreferredSize(new Dimension(200, 30));
+ downPanel.add(saveCloseButton);
+
+ JButton cancelButton = new JButton("Cancel");
+ cancelButton.setIcon(IconManager.imgic27);
+ cancelButton.setActionCommand("Cancel");
+ cancelButton.addActionListener(this);
+ cancelButton.setPreferredSize(new Dimension(200, 30));
+ downPanel.add(cancelButton);
+
+ mainPanel.add(downPanel, BorderLayout.CENTER);
+ pack();
+ this.getRootPane().setDefaultButton(saveCloseButton);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if ("Save_Close".equals(e.getActionCommand())) {
+ con.setValue(new String(nameTextField.getText()));
+ this.dispose();
+ }
+
+ if ("Cancel".equals(e.getActionCommand())) {
+ this.dispose();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/window/JDialogELNPortTerminal.java b/src/main/java/ui/window/JDialogELNModuleTerminal.java
similarity index 92%
rename from src/main/java/ui/window/JDialogELNPortTerminal.java
rename to src/main/java/ui/window/JDialogELNModuleTerminal.java
index 6f686dfb4c1bde08071461455c72416102ba17b5..d25cd2971f7b9e97f6253d0698ce4b3e8fa68813 100644
--- a/src/main/java/ui/window/JDialogELNPortTerminal.java
+++ b/src/main/java/ui/window/JDialogELNModuleTerminal.java
@@ -38,30 +38,30 @@
package ui.window;
-import ui.eln.ELNPortTerminal;
+import ui.eln.ELNModuleTerminal;
import ui.util.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
/**
- * Class JDialogELNPortTerminal
- * Dialog for managing of ELN port terminal
- * Creation: 06/07/2018
- * @version 1.0 06/07/2018
+ * Class JDialogELNModuleTerminal
+ * Dialog for managing of ELN module terminal
+ * Creation: 13/07/2018
+ * @version 1.0 13/07/2018
* @author Irina Kit Yan LEE
*/
@SuppressWarnings("serial")
-public class JDialogELNPortTerminal extends JDialog implements ActionListener {
+public class JDialogELNModuleTerminal extends JDialog implements ActionListener {
private JTextField nameTextField;
- private ELNPortTerminal term;
+ private ELNModuleTerminal term;
- public JDialogELNPortTerminal(ELNPortTerminal term) {
- this.setTitle("Setting Port Terminal Attributes");
+ public JDialogELNModuleTerminal(ELNModuleTerminal term) {
+ this.setTitle("Setting Module Terminal Attributes");
this.setLocationRelativeTo(null);
this.setVisible(true);
this.setAlwaysOnTop(true);
@@ -89,7 +89,7 @@ public class JDialogELNPortTerminal extends JDialog implements ActionListener {
attributesMainPanel.setLayout(new BorderLayout());
Box attributesBox = Box.createVerticalBox();
- attributesBox.setBorder(BorderFactory.createTitledBorder("Setting port terminal attributes"));
+ attributesBox.setBorder(BorderFactory.createTitledBorder("Setting module terminal attributes"));
GridBagLayout gridBag = new GridBagLayout();
GridBagConstraints constraints = new GridBagConstraints();
diff --git a/src/main/java/ui/window/JDialogFault.java b/src/main/java/ui/window/JDialogFault.java
index 5509dfae54dcbc4fccce6c6d9d7df3da8d8cee0f..ec44e9df0ead57c8306f08a0ae538c8d375cd1cb 100644
--- a/src/main/java/ui/window/JDialogFault.java
+++ b/src/main/java/ui/window/JDialogFault.java
@@ -141,6 +141,7 @@ public class JDialogFault extends JDialogBase implements ActionListener {
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c0.fill = GridBagConstraints.BOTH;
c.add(panel2, c0);
c0.gridwidth = 1;
diff --git a/src/main/java/ui/window/JDialogIDAndStereotype.java b/src/main/java/ui/window/JDialogIDAndStereotype.java
index c941478b4817ee855f3271151180806d10fb1bd2..af263031c2be3ce9f548c0031b056808ae7aa9ec 100644
--- a/src/main/java/ui/window/JDialogIDAndStereotype.java
+++ b/src/main/java/ui/window/JDialogIDAndStereotype.java
@@ -70,7 +70,7 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene
private Color defaultColor;
- private JPanel panel1;
+ private JPanel panel1, panel2;
// Panel1
private JComboBox<String> listStereotypes;
@@ -111,8 +111,10 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene
Container c = getContentPane();
//GridBagLayout gridbag0 = new GridBagLayout();
GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
//GridBagConstraints c0 = new GridBagConstraints();
GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
setFont(new Font("Helvetica", Font.PLAIN, 14));
c.setLayout(new BorderLayout());
@@ -121,8 +123,11 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene
panel1 = new JPanel();
panel1.setLayout(gridbag1);
+ panel1.setBorder(new javax.swing.border.TitledBorder("Stereotype"));
- panel1.setBorder(new javax.swing.border.TitledBorder("Requirement"));
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("Name"));
//panel1.setPreferredSize(new Dimension(500, 250));
@@ -166,13 +171,35 @@ public class JDialogIDAndStereotype extends JDialogBase implements ActionListene
//panel1.setEditable(true);
// ID
- c1.fill = GridBagConstraints.HORIZONTAL;
+
+
+ c2.weighty = 1.0;
+ c2.weightx = 1.0;
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c2.gridheight = 1;
+ c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.anchor = GridBagConstraints.CENTER;
name = new JTextField(currentName, 30);
- panel1.add(name, c1);
+ panel2.add(name, c2);
//panel1.setEditable(true);
-
- c.add(panel1, BorderLayout.CENTER);
+ JPanel mainPanel = new JPanel();
+ GridBagLayout gridbag = new GridBagLayout();
+ GridBagConstraints co = new GridBagConstraints();
+ mainPanel.setLayout(gridbag);
+ co.weighty = 1.0;
+ co.weightx = 1.0;
+ co.gridwidth = GridBagConstraints.REMAINDER; //end row
+ co.gridheight = 1;
+ co.fill = GridBagConstraints.HORIZONTAL;
+ co.anchor = GridBagConstraints.CENTER;
+ mainPanel.add(panel1, co);
+ mainPanel.add(panel2, co);
+
+ c.add(mainPanel, BorderLayout.CENTER);
+
+ //c.add(panel1, BorderLayout.NORTH);
+ //c.add(panel2, BorderLayout.CENTER);
JPanel buttons = initBasicButtons(this);
c.add(buttons, BorderLayout.SOUTH);
diff --git a/src/main/java/ui/window/JDialogInvariantAnalysis.java b/src/main/java/ui/window/JDialogInvariantAnalysis.java
index 240a9cb6efe6e762750f778296beefc3091e42fa..3164a12c6b96ed0041fb65777f5d05ca6958cf49 100644
--- a/src/main/java/ui/window/JDialogInvariantAnalysis.java
+++ b/src/main/java/ui/window/JDialogInvariantAnalysis.java
@@ -599,7 +599,7 @@ public class JDialogInvariantAnalysis extends JDialog implements ActionListener,
tmp = names[valLine];
elts[j] = tmp;
} catch (Exception e) {
- TraceManager.addDev("Line baldy formatted:" + tmp);
+ TraceManager.addDev("Line badly formatted:" + tmp);
}
@@ -752,7 +752,7 @@ public class JDialogInvariantAnalysis extends JDialog implements ActionListener,
// hasError = false;
- TraceManager.addDev("Thread started");
+ TraceManager.addDev("Invariants Thread started");
diff --git a/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java b/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java
index 82286b763bf2e173bbd907073539d00ca417ee07..b87a16a33582dd67bc8a589270813f55afd4706a 100644
--- a/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java
+++ b/src/main/java/ui/window/JDialogSysCAMSExecutableCodeGeneration.java
@@ -38,11 +38,13 @@
package ui.window;
+import syscamstranslator.toSysCAMS.MakefileCode;
import syscamstranslator.toSysCAMS.TopCellGenerator;
import launcher.LauncherException;
import launcher.RshClient;
import myutil.*;
import syscamstranslator.SysCAMSSpecification;
+import syscamstranslator.SysCAMSTCluster;
import ui.util.IconManager;
import ui.MainGUI;
import ui.SysCAMSPanelTranslator;
@@ -52,8 +54,11 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.io.FileWriter;
import java.io.StringWriter;
import java.io.Writer;
+import java.util.LinkedList;
+import java.util.Vector;
/**
* Class JDialogSysCAMSExecutableCodeGeneration
@@ -500,38 +505,56 @@ public class JDialogSysCAMSExecutableCodeGeneration extends javax.swing.JFrame i
if (jp1.getSelectedIndex() == 0) {
jta.append("Generating executable code (SystemC-AMS version)\n");
- SysCAMSComponentTaskDiagramPanel syscamsDiagramPanel = mgui.getFirstSysCAMSPanelFound();
- SysCAMSPanelTranslator syscamspaneltranslator = new SysCAMSPanelTranslator(syscamsDiagramPanel);
- SysCAMSSpecification syscalsspec = syscamspaneltranslator.getSysCAMSSpecification();
-
- // Generating code
- if (syscalsspec == null) {
- jta.append("Error: No SYSCAMS specification\n");
- } else {
- System.err.println("**SYSCAMS TOPCELL found");
-
- TopCellGenerator topCellGenerator = new TopCellGenerator(syscalsspec);
- testGo();
- jta.append("Generation of TopCell executable code: done\n");
-
- try {
- jta.append("Saving SysCAMS code in files\n");
- System.err.println("Saving SysCAMS code in files\n");
- pathCode = code2.getText();
-
- System.err.println("SYSCAMS TOPCELL saved in " + code2.getText());
- topCellGenerator.saveFile(pathCode);
-
- jta.append("Code saved\n");
- } catch (Exception e) {
- jta.append("Could not generate files\n");
- System.err.println("Could not generate SysCAMS files\n");
- e.printStackTrace();
- }
+ Vector<SysCAMSComponentTaskDiagramPanel> syscamsDiagramPanels = mgui.getListSysCAMSPanel();
+ LinkedList<SysCAMSTCluster> clusters = new LinkedList<SysCAMSTCluster>();
+ for (SysCAMSComponentTaskDiagramPanel syscamsDiagramPanel : syscamsDiagramPanels) {
+ SysCAMSPanelTranslator syscamspaneltranslator = new SysCAMSPanelTranslator(syscamsDiagramPanel);
+ SysCAMSSpecification syscalsspec = syscamspaneltranslator.getSysCAMSSpecification();
+ clusters.add(syscalsspec.getCluster());
}
-
+ for (SysCAMSComponentTaskDiagramPanel syscamsDiagramPanel : syscamsDiagramPanels) {
+ SysCAMSPanelTranslator syscamspaneltranslator = new SysCAMSPanelTranslator(syscamsDiagramPanel);
+ SysCAMSSpecification syscalsspec = syscamspaneltranslator.getSysCAMSSpecification();
+
+ // Generating code
+ if (syscalsspec == null) {
+ jta.append("Error: No SYSCAMS specification\n");
+ } else {
+ System.err.println("**SYSCAMS TOPCELL found");
+
+ TopCellGenerator topCellGenerator = new TopCellGenerator(syscalsspec);
+ testGo();
+ jta.append("Generation of TopCell \"" + syscalsspec.getCluster().getClusterName() + "\" executable code: done\n");
+
+ try {
+ jta.append("Saving SysCAMS code in files\n");
+ System.err.println("Saving SysCAMS code in files\n");
+ pathCode = code2.getText();
+
+ System.err.println("SYSCAMS TOPCELL : " + syscalsspec.getCluster().getClusterName() + "saved in " + code2.getText());
+ topCellGenerator.saveFile(pathCode);
+
+ jta.append("Code saved\n");
+ } catch (Exception e) {
+ jta.append("Could not generate files\n");
+ System.err.println("Could not generate SysCAMS files\n");
+ e.printStackTrace();
+ }
+ }
+ testGo();
+ }
+ try {
+ String makefile;
+ System.err.println(pathCode + "Makefile");
+ FileWriter fw = new FileWriter(pathCode + "/" + "Makefile");
+ makefile = MakefileCode.getMakefileCode(clusters);
+ fw.write(makefile);
+ fw.close();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
testGo();
-
+ }
// if (removeCFiles.isSelected()) {
//
// jta.append("Removing all .h files\n");
@@ -652,7 +675,7 @@ public class JDialogSysCAMSExecutableCodeGeneration extends javax.swing.JFrame i
// if ((hasError == false) && (jp1.getSelectedIndex() < 2)) {
// jp1.setSelectedIndex(jp1.getSelectedIndex() + 1);
// }
- }} catch (InterruptedException ie) {
+ } catch (InterruptedException ie) {
jta.append("Interrupted\n");
}
diff --git a/src/main/java/ui/window/JDialogSysCAMSPortConverter.java b/src/main/java/ui/window/JDialogSysCAMSPortConverter.java
index f97aad8c14411735f518fb6c0b506de489fa1369..1a985c62dd4b2219bd803e256f802511c0b61d61 100644
--- a/src/main/java/ui/window/JDialogSysCAMSPortConverter.java
+++ b/src/main/java/ui/window/JDialogSysCAMSPortConverter.java
@@ -144,17 +144,20 @@ public class JDialogSysCAMSPortConverter extends JDialog implements ActionListen
gridBag.setConstraints(periodTextField, constraints);
boxPanel.add(periodTextField);
- listPeriodString = new String[3];
- listPeriodString[0] = "us";
+ listPeriodString = new String[4];
+ listPeriodString[0] = "s";
listPeriodString[1] = "ms";
- listPeriodString[2] = "s";
+ listPeriodString[2] = "\u03BCs";
+ listPeriodString[3] = "ns";
periodComboBoxString = new JComboBox<String>(listPeriodString);
- if (port.getTime().equals("") || port.getTime().equals("us")) {
+ if (port.getTime().equals("") || port.getTime().equals("s")) {
periodComboBoxString.setSelectedIndex(0);
} else if (port.getTime().equals("ms")){
periodComboBoxString.setSelectedIndex(1);
- } else {
+ } else if (port.getTime().equals("\u03BCs")){
periodComboBoxString.setSelectedIndex(2);
+ } else if (port.getTime().equals("ns")){
+ periodComboBoxString.setSelectedIndex(3);
}
periodComboBoxString.setActionCommand("time");
periodComboBoxString.addActionListener(this);
diff --git a/src/main/java/ui/window/JDialogSysCAMSPortTDF.java b/src/main/java/ui/window/JDialogSysCAMSPortTDF.java
index 51362637cb1ef689adeaca671573d61e86073382..75702fa326c0b73de7877444b15747fade6bfba4 100644
--- a/src/main/java/ui/window/JDialogSysCAMSPortTDF.java
+++ b/src/main/java/ui/window/JDialogSysCAMSPortTDF.java
@@ -144,17 +144,20 @@ public class JDialogSysCAMSPortTDF extends JDialog implements ActionListener {
gridBag.setConstraints(periodTextField, constraints);
boxPanel.add(periodTextField);
- listPeriodString = new String[3];
- listPeriodString[0] = "us";
+ listPeriodString = new String[4];
+ listPeriodString[0] = "s";
listPeriodString[1] = "ms";
- listPeriodString[2] = "s";
+ listPeriodString[2] = "\u03BCs";
+ listPeriodString[3] = "ns";
periodComboBoxString = new JComboBox<String>(listPeriodString);
- if (port.getTime().equals("") || port.getTime().equals("us")) {
+ if (port.getTime().equals("") || port.getTime().equals("s")) {
periodComboBoxString.setSelectedIndex(0);
} else if (port.getTime().equals("ms")){
periodComboBoxString.setSelectedIndex(1);
- } else if (port.getTime().equals("s")){
+ } else if (port.getTime().equals("\u03BCs")){
periodComboBoxString.setSelectedIndex(2);
+ } else if (port.getTime().equals("ns")){
+ periodComboBoxString.setSelectedIndex(3);
}
periodComboBoxString.setActionCommand("time");
periodComboBoxString.addActionListener(this);
diff --git a/src/main/java/ui/window/JDialogSystemCGeneration.java b/src/main/java/ui/window/JDialogSystemCGeneration.java
index 64f3582be34ec515aa72032712d91eda56ce5d6e..2da61d2d75eb55da2c4fee5a5b206c6ae0bc5f1f 100644
--- a/src/main/java/ui/window/JDialogSystemCGeneration.java
+++ b/src/main/java/ui/window/JDialogSystemCGeneration.java
@@ -47,6 +47,7 @@ import req.ebrdd.EBRDD;
import tepe.TEPE;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
+import tmltranslator.tomappingsystemc2.Penalties;
import ui.AvatarRequirementPanelTranslator;
import ui.JTextAreaWriter;
import ui.MainGUI;
@@ -98,6 +99,7 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
protected static boolean interactiveSimulationSelected = true;
protected static boolean optimizeModeSelected = true;
+ protected static boolean activatePenaltiesSelected = true;
protected final static int NOT_STARTED = 1;
protected final static int STARTED = 2;
@@ -118,10 +120,10 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
protected JTextField code1, code2, unitcycle, compiler1, exe1, exe2, exe3, exe2int, exe2formal;
protected JTabbedPane tabbedPane;
protected JScrollPane jsp;
- protected JCheckBox removeCppFiles, removeXFiles, debugmode, optimizemode;
+ protected JCheckBox removeCppFiles, removeXFiles, debugmode, optimizemode, activatePenalties;
protected JComboBox<String> versionSimulator;
- //TEPED
+ //TEPE Diagram
private static Vector<AvatarPDPanel> validatedTepe, ignoredTepe;
private Vector<AvatarPDPanel> valTepe, ignTepe;
private JList<AvatarPDPanel> listIgnoredTepe;
@@ -137,6 +139,7 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
// private boolean hasError = false;
private int errorTabIndex = -1;
protected boolean startProcess = false;
+ private boolean mustRecompileAll;
private String simulatorHost;
@@ -309,6 +312,10 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
optimizemode.setSelected(optimizeModeSelected);
jp01.add(optimizemode, c01);
+ activatePenalties = new JCheckBox("Activate penalties");
+ activatePenalties.setSelected(activatePenaltiesSelected);
+ jp01.add(activatePenalties, c01);
+
jp01.add(new JLabel("Simulator used:"), c01);
versionSimulator = new JComboBox<String>(simus);
@@ -559,6 +566,7 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
updateStaticList();
optimizeModeSelected = optimizemode.isSelected();
+ activatePenaltiesSelected = activatePenalties.isSelected();
// wasClosed = true;
dispose();
}
@@ -725,7 +733,7 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
selectedItem = versionSimulator.getSelectedIndex();
- switch (selectedItem) { //Old SystemC generator
+ switch (selectedItem) {
case 0: { //Simulator without CPs (Daniel's version)
// Making EBRDDs
List<EBRDD> al = new ArrayList<EBRDD>();
@@ -785,10 +793,30 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
TraceManager.addError(message, th);
setError();
}
+ // Update the penalty file if necessary
+ // Must read the penalty file first
+
+ Penalties penalty = new Penalties(pathCode + File.separator + "src_simulator");
+ int changed = penalty.handlePenalties(activatePenalties.isSelected());
+
+ if (changed == -1) {
+ final String message = "Could not generate penalty code";
+ jta.append(System.lineSeparator() + message + System.lineSeparator());
+ setError();
+ }
+
+ if (changed == 1) {
+ mustRecompileAll = true;
+ } else {
+ mustRecompileAll = false;
+ }
break;
}
}
+
+
+
} //End of method generateCode()
private boolean validateData() {
@@ -818,6 +846,27 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
private void compileCode()
throws InterruptedException {
+
+ if (mustRecompileAll) {
+ jta.append("\"make clean\" must be performed\n");
+ rshc = new RshClient(simulatorHost);
+ String cmdClean = compiler1.getText() + " clean";
+ try {
+ if (!processCmd(cmdClean, jta, 0)) {
+ setError();
+ return;
+ }
+
+ jta.append("Make clean done.\n");
+ } catch (final Throwable th) {
+ jta.append("Error: " + th.getMessage() + ".\n");
+ TraceManager.addError(th);
+ setError();
+ return;
+ }
+ }
+
+
String cmd = compiler1.getText();
jta.append("Compiling simulator code with command: \n" + cmd + "\n");
@@ -922,7 +971,11 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
rshc.writeCommandMessages(textAreaWriter);
- return okReturnCode == null || okReturnCode.equals(rshc.getProcessReturnCode());
+ try {
+ return ((okReturnCode == null) || okReturnCode.equals(rshc.getProcessReturnCode()));
+ } catch (Exception e) {
+ return false;
+ }
}
//
// protected void checkMode() {
diff --git a/src/main/java/ui/window/JFrameRequirementTable.java b/src/main/java/ui/window/JFrameRequirementTable.java
index d859b328e02a4379b53099800a5d51dd906b1d8f..c5d8e5b9fc2c009d8b234c683a74d24e1b7c58d1 100644
--- a/src/main/java/ui/window/JFrameRequirementTable.java
+++ b/src/main/java/ui/window/JFrameRequirementTable.java
@@ -78,28 +78,14 @@ public class JFrameRequirementTable extends JFrame implements ActionListener /*,
private java.util.List<TableSorter> tss;
private java.util.List<String> titles;
- //private StatisticsTableModel tm;
-
- //private JStatisticsPanel jstat;
-
- //private java.util.List<JScrollPane> panes;
- private JButton buttonGenerate, buttonGenerateCSV;
-
- //private JTextField eq, sw, tr, li, pa;
+ private JButton refresh, buttonGenerate, buttonGenerateCSV;
+ private JTable jtableRTM;
// tab pane
- JTabbedPane mainTabbedPane;
-
- JTabbedPane main; // from MGUI
-
- Point[] pts; // storing column data, see JDialogRequirementTable
-
+ private JTabbedPane mainTabbedPane;
+ private JTabbedPane main; // from MGUI
+ private Point[] pts; // storing column data, see JDialogRequirementTable
- //shortest paths
- //JComboBox combo1, combo2, combo3, combo4;
- //JTextField combo1, combo2, combo3, combo4;
- //JTextField text1, text2;
- //JButton goPath, goPathL, savePath, savePathL;
public JFrameRequirementTable(String title, Vector<TURTLEPanel> _tabs, JTabbedPane _main, Point[] _pts) {
@@ -124,12 +110,15 @@ public class JFrameRequirementTable extends JFrame implements ActionListener /*,
JButton button1 = new JButton("Close", IconManager.imgic27);
button1.addActionListener(this);
+ JButton refresh = new JButton("Refresh", IconManager.imgic16_1);
+ refresh.addActionListener(this);
buttonGenerate = new JButton("Generate HTML doc.", IconManager.imgic29);
buttonGenerate.addActionListener(this);
buttonGenerateCSV = new JButton("Generate CSV doc.", IconManager.imgic29);
buttonGenerateCSV.addActionListener(this);
JPanel jp = new JPanel();
jp.add(button1);
+ jp.add(refresh);
jp.add(buttonGenerate);
jp.add(buttonGenerateCSV);
@@ -192,7 +181,7 @@ public class JFrameRequirementTable extends JFrame implements ActionListener /*,
private void makeJScrollPane(LinkedList<TGComponent> list, JTabbedPane tab, String title) {
RequirementsTableModel rtm = new RequirementsTableModel(list, pts);
TableSorter sorterRTM = new TableSorter(rtm);
- JTable jtableRTM = new JTable(sorterRTM);
+ jtableRTM = new JTable(sorterRTM);
sorterRTM.setTableHeader(jtableRTM.getTableHeader());
for (int i = 0; i < pts.length; i++) {
@@ -236,6 +225,9 @@ public class JFrameRequirementTable extends JFrame implements ActionListener /*,
if (command.equals("Close")) {
dispose();
return;
+ } else if (evt.getSource() == refresh) {
+ repaint();
+ jtableRTM.repaint();
} else if (evt.getSource() == buttonGenerate) {
// Compute path
diff --git a/src/main/resources/ui/util/avatarrdreq.gif b/src/main/resources/ui/util/avatarrdreq.gif
index 7903658d8255f406e0b447bb544c37f36305b1de..9cd64a5f08a1eb9eb86cc57068ba8f7b7aad049e 100755
Binary files a/src/main/resources/ui/util/avatarrdreq.gif and b/src/main/resources/ui/util/avatarrdreq.gif differ
diff --git a/src/main/resources/ui/util/avatarrdreqref.gif b/src/main/resources/ui/util/avatarrdreqref.gif
new file mode 100755
index 0000000000000000000000000000000000000000..1dc8e86ec539cd7718de7e2ec68a1143e883ab18
Binary files /dev/null and b/src/main/resources/ui/util/avatarrdreqref.gif differ
diff --git a/src/main/resources/ui/util/elnportterminal.gif b/src/main/resources/ui/util/elnportterminal.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cd4918e69c88c620c53e794faf778768493a2417
Binary files /dev/null and b/src/main/resources/ui/util/elnportterminal.gif differ
diff --git a/src/main/resources/ui/util/elntdfisource.gif b/src/main/resources/ui/util/elntdfisource.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a21f0ec320d9004845b7dce508cf43f15835dbae
Binary files /dev/null and b/src/main/resources/ui/util/elntdfisource.gif differ
diff --git a/src/main/resources/ui/util/elntdfvsource.gif b/src/main/resources/ui/util/elntdfvsource.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3d24958f33002f9c6e847c9e2064be07da2d2a0d
Binary files /dev/null and b/src/main/resources/ui/util/elntdfvsource.gif differ