diff --git a/modeling/modelsForTestingTTool/testdiplo.xml b/modeling/modelsForTestingTTool/testdiplo.xml
index f469dd28a8b4ccc36211e78f46202c535163e233..bfe0d7def72822cb7b3c9f381e0785a6e575cac8 100644
--- a/modeling/modelsForTestingTTool/testdiplo.xml
+++ b/modeling/modelsForTestingTTool/testdiplo.xml
@@ -8,8 +8,8 @@
<cdparam x="202" y="135" />
<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="202" y="135" id="95" />
-<P2 x="716" y="122" id="78" />
+<P1 x="202" y="135" id="89" />
+<P2 x="716" y="122" id="74" />
<Point x="494" y="61" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1" >
@@ -26,14 +26,14 @@
<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="1041" y="214" id="11" />
-<P2 x="279" y="167" id="89" />
+<P2 x="279" y="167" id="95" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4" >
<cdparam x="662" y="349" />
<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="875" y="362" id="59" />
+<P1 x="875" y="362" id="63" />
<P2 x="1019" y="214" id="12" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -41,7 +41,7 @@
<cdparam x="665" y="154" />
<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="878" y="145" id="74" />
+<P1 x="878" y="145" id="78" />
<P2 x="1024" y="205" id="14" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -57,7 +57,7 @@
<cdparam x="236" y="311" />
<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="236" y="285" id="91" />
+<P1 x="236" y="285" id="93" />
<P2 x="411" y="460" id="27" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -66,7 +66,7 @@
<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="424" y="229" id="48" />
-<P2 x="675" y="395" id="63" />
+<P2 x="675" y="395" id="59" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="9" >
@@ -81,7 +81,7 @@
<cdparam x="292" y="207" />
<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="279" y="218" id="93" />
+<P1 x="279" y="218" id="91" />
<P2 x="408" y="221" id="43" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -174,14 +174,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="60" >
<father id="73" num="0" />
-<cdparam x="862" y="362" />
+<cdparam x="662" 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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event jevt2" />
+<infoparam name="Primitive port" value="Event evt2" />
<TGConnectingPoint num="0" id="59" />
<extraparam>
-<Prop commName="jevt2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="evt2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" 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="" />
@@ -208,14 +208,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="64" >
<father id="73" num="2" />
-<cdparam x="662" y="395" />
+<cdparam x="862" 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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evt2" />
+<infoparam name="Primitive port" value="Event jevt2" />
<TGConnectingPoint num="0" id="63" />
<extraparam>
-<Prop commName="evt2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="jevt2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" 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="" />
@@ -244,15 +244,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="75" >
<father id="88" num="0" />
-<cdparam x="865" y="145" />
+<cdparam x="703" y="122" />
<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 jevt1" />
+<infoparam name="Primitive port" value="Event comm" />
<TGConnectingPoint num="0" id="74" />
<extraparam>
-<Prop commName="jevt1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<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="uint_16" 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="" />
@@ -278,15 +278,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="79" >
<father id="88" num="2" />
-<cdparam x="703" y="122" />
+<cdparam x="865" y="145" />
<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" />
+<infoparam name="Primitive port" value="Event jevt1" />
<TGConnectingPoint num="0" id="78" />
<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="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="jevt1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" 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="" />
@@ -314,15 +314,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="90" >
<father id="105" num="0" />
-<cdparam x="266" y="167" />
+<cdparam x="189" y="135" />
<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 jevt" />
+<infoparam name="Primitive port" value="Event testEvt" />
<TGConnectingPoint num="0" id="89" />
<extraparam>
-<Prop commName="jevt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="testEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" 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="" />
@@ -331,14 +331,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="92" >
<father id="105" num="1" />
-<cdparam x="223" y="285" />
+<cdparam x="266" 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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel ch1" />
+<infoparam name="Primitive port" value="Event evsrc" />
<TGConnectingPoint num="0" id="91" />
<extraparam>
-<Prop commName="ch1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="evsrc" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" 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="" />
@@ -348,14 +348,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="94" >
<father id="105" num="2" />
-<cdparam x="266" y="218" />
+<cdparam x="223" y="285" />
<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 evsrc" />
+<infoparam name="Primitive port" value="Channel ch1" />
<TGConnectingPoint num="0" id="93" />
<extraparam>
-<Prop commName="evsrc" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="ch1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" 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="" />
@@ -365,15 +365,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="96" >
<father id="105" num="3" />
-<cdparam x="189" y="135" />
+<cdparam x="266" 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="137" />
-<infoparam name="Primitive port" value="Event testEvt" />
+<infoparam name="Primitive port" value="Event jevt" />
<TGConnectingPoint num="0" id="95" />
<extraparam>
-<Prop commName="testEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="jevt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" 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="" />
@@ -655,7 +655,7 @@
<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="496" y="240" id="161" />
-<P2 x="579" y="395" id="194" />
+<P2 x="592" y="382" id="194" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="154" >
@@ -663,14 +663,14 @@
<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="496" y="223" id="159" />
-<P2 x="574" y="163" id="172" />
+<P2 x="587" y="150" id="172" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="155" >
<cdparam x="376" y="164" />
<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="376" y="164" id="183" />
+<P1 x="363" y="151" id="183" />
<P2 x="480" y="232" id="156" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -975,7 +975,7 @@
<cdparam x="579" 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="653" y="398" id="273" />
+<P1 x="666" y="385" id="273" />
<P2 x="487" y="255" id="240" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -983,7 +983,7 @@
<cdparam x="574" 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="656" y="163" id="251" />
+<P1 x="669" y="150" id="251" />
<P2 x="487" y="238" id="238" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -992,7 +992,7 @@
<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="504" y="247" id="235" />
-<P2 x="376" y="164" id="262" />
+<P2 x="363" y="151" id="262" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1208" id="250" >
@@ -1293,7 +1293,7 @@
<cdparam x="579" 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="653" y="398" id="352" />
+<P1 x="666" y="385" id="352" />
<P2 x="487" y="255" id="319" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1301,7 +1301,7 @@
<cdparam x="574" 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="656" y="163" id="330" />
+<P1 x="669" y="150" id="330" />
<P2 x="487" y="238" id="317" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1310,7 +1310,7 @@
<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="504" y="247" id="314" />
-<P2 x="376" y="164" id="341" />
+<P2 x="363" y="151" id="341" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1208" id="329" >
@@ -1647,11 +1647,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="398" >
<father id="441" num="0" />
-<cdparam x="413" y="213" />
+<cdparam x="445" y="269" />
<sizeparam width="109" 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="160" />
-<infoparam name="TGComponent" value="Design3::T1" />
+<infoparam name="TGComponent" value="Design3::T2" />
<TGConnectingPoint num="0" id="390" />
<TGConnectingPoint num="1" id="391" />
<TGConnectingPoint num="2" id="392" />
@@ -1661,7 +1661,7 @@
<TGConnectingPoint num="6" id="396" />
<TGConnectingPoint num="7" id="397" />
<extraparam>
-<info value="Design3::T1" taskName="T1" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
+<info value="Design3::T2" taskName="T2" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="407" >
@@ -1685,11 +1685,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="416" >
<father id="441" num="2" />
-<cdparam x="445" y="269" />
+<cdparam x="413" y="213" />
<sizeparam width="109" 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="160" />
-<infoparam name="TGComponent" value="Design3::T2" />
+<infoparam name="TGComponent" value="Design3::T1" />
<TGConnectingPoint num="0" id="408" />
<TGConnectingPoint num="1" id="409" />
<TGConnectingPoint num="2" id="410" />
@@ -1699,7 +1699,7 @@
<TGConnectingPoint num="6" id="414" />
<TGConnectingPoint num="7" id="415" />
<extraparam>
-<info value="Design3::T2" taskName="T2" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
+<info value="Design3::T1" taskName="T1" referenceTaskName="Design3" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -1713,55 +1713,28 @@
<Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
<DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="6003" id="483" >
+<COMPONENT type="6003" id="446" >
<cdparam x="50" y="150" />
<sizeparam width="200" height="120" minWidth="10" 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="Requirements" />
-<TGConnectingPoint num="0" id="487" />
-<TGConnectingPoint num="1" id="488" />
-<TGConnectingPoint num="2" id="489" />
-<TGConnectingPoint num="3" id="490" />
+<TGConnectingPoint num="0" id="442" />
+<TGConnectingPoint num="1" id="443" />
+<TGConnectingPoint num="2" id="444" />
+<TGConnectingPoint num="3" id="445" />
</COMPONENT>
-<CONNECTOR type="6004" id="481" >
-<cdparam x="950" y="220" />
-<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="482" />
-<P1 x="950" y="220" id="455" />
-<P2 x="758" y="298" id="464" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="6004" id="479" >
-<cdparam x="700" y="220" />
-<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="480" />
-<P1 x="700" y="220" id="473" />
-<P2 x="698" y="298" id="465" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="6004" id="477" >
-<cdparam x="450" y="220" />
-<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="478" />
-<P1 x="424" y="220" id="447" />
-<P2 x="637" y="298" id="463" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="6006" id="469" >
+<COMPONENT type="6006" id="451" >
<cdparam x="600" y="100" />
<sizeparam width="200" height="120" minWidth="10" 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="Com. Patterns" />
-<TGConnectingPoint num="0" id="473" />
-<TGConnectingPoint num="1" id="474" />
-<TGConnectingPoint num="2" id="475" />
-<TGConnectingPoint num="3" id="476" />
+<TGConnectingPoint num="0" id="447" />
+<TGConnectingPoint num="1" id="448" />
+<TGConnectingPoint num="2" id="449" />
+<TGConnectingPoint num="3" id="450" />
</COMPONENT>
<COMPONENT type="6002" id="459" >
@@ -1770,14 +1743,14 @@
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="463" />
-<TGConnectingPoint num="1" id="464" />
-<TGConnectingPoint num="2" id="465" />
-<TGConnectingPoint num="3" id="466" />
-<TGConnectingPoint num="4" id="467" />
-<TGConnectingPoint num="5" id="468" />
-</COMPONENT>
-<SUBCOMPONENT type="6005" id="492" >
+<TGConnectingPoint num="0" id="453" />
+<TGConnectingPoint num="1" id="454" />
+<TGConnectingPoint num="2" id="455" />
+<TGConnectingPoint num="3" id="456" />
+<TGConnectingPoint num="4" id="457" />
+<TGConnectingPoint num="5" id="458" />
+</COMPONENT>
+<SUBCOMPONENT type="6005" id="452" >
<father id="459" num="0" />
<cdparam x="551" y="338" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1786,31 +1759,31 @@
<infoparam name="value " value="Architecture" />
</SUBCOMPONENT>
-<COMPONENT type="6001" id="451" >
+<COMPONENT type="6001" id="464" >
<cdparam x="850" y="100" />
<sizeparam width="200" height="120" minWidth="10" 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="Architecture" />
-<TGConnectingPoint num="0" id="455" />
-<TGConnectingPoint num="1" id="456" />
-<TGConnectingPoint num="2" id="457" />
-<TGConnectingPoint num="3" id="458" />
+<TGConnectingPoint num="0" id="460" />
+<TGConnectingPoint num="1" id="461" />
+<TGConnectingPoint num="2" id="462" />
+<TGConnectingPoint num="3" id="463" />
</COMPONENT>
-<COMPONENT type="6000" id="443" >
+<COMPONENT type="6000" id="470" >
<cdparam x="298" y="103" />
<sizeparam width="252" height="117" minWidth="10" 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="Application" />
-<TGConnectingPoint num="0" id="447" />
-<TGConnectingPoint num="1" id="448" />
-<TGConnectingPoint num="2" id="449" />
-<TGConnectingPoint num="3" id="450" />
+<TGConnectingPoint num="0" id="466" />
+<TGConnectingPoint num="1" id="467" />
+<TGConnectingPoint num="2" id="468" />
+<TGConnectingPoint num="3" id="469" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="491" >
-<father id="443" num="0" />
+<SUBCOMPONENT type="6005" id="465" >
+<father id="470" num="0" />
<cdparam x="303" y="143" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1818,6 +1791,33 @@
<infoparam name="value " value="Design3" />
</SUBCOMPONENT>
+<CONNECTOR type="6004" id="472" >
+<cdparam x="950" y="220" />
+<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="471" />
+<P1 x="950" y="220" id="460" />
+<P2 x="758" y="298" id="454" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="6004" id="474" >
+<cdparam x="700" y="220" />
+<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="473" />
+<P1 x="700" y="220" id="447" />
+<P2 x="698" y="298" id="455" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="6004" id="476" >
+<cdparam x="450" y="220" />
+<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="475" />
+<P1 x="424" y="220" id="466" />
+<P2 x="637" y="298" id="453" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
</DiplodocusMethodologyDiagramPanel>
@@ -1828,39 +1828,39 @@
<Modeling type="TML Component Design" nameTab="Design5" >
<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="544" >
+<CONNECTOR type="126" id="477" >
<cdparam x="408" y="226" />
<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="408" y="226" id="522" />
-<P2 x="631" y="215" id="543" />
+<P1 x="408" y="226" id="489" />
+<P2 x="631" y="215" id="478" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="523" >
+<COMPONENT type="1202" id="488" >
<cdparam x="644" y="144" />
<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="524" />
-<TGConnectingPoint num="1" id="525" />
-<TGConnectingPoint num="2" id="526" />
-<TGConnectingPoint num="3" id="527" />
-<TGConnectingPoint num="4" id="528" />
-<TGConnectingPoint num="5" id="529" />
-<TGConnectingPoint num="6" id="530" />
-<TGConnectingPoint num="7" id="531" />
+<TGConnectingPoint num="0" id="480" />
+<TGConnectingPoint num="1" id="481" />
+<TGConnectingPoint num="2" id="482" />
+<TGConnectingPoint num="3" id="483" />
+<TGConnectingPoint num="4" id="484" />
+<TGConnectingPoint num="5" id="485" />
+<TGConnectingPoint num="6" id="486" />
+<TGConnectingPoint num="7" id="487" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="534" >
-<father id="523" num="0" />
+<SUBCOMPONENT type="1203" id="479" >
+<father id="488" num="0" />
<cdparam x="631" 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="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="543" />
+<TGConnectingPoint num="0" id="478" />
<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="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -1871,31 +1871,31 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="502" >
+<COMPONENT type="1202" id="499" >
<cdparam x="195" y="134" />
<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="503" />
-<TGConnectingPoint num="1" id="504" />
-<TGConnectingPoint num="2" id="505" />
-<TGConnectingPoint num="3" id="506" />
-<TGConnectingPoint num="4" id="507" />
-<TGConnectingPoint num="5" id="508" />
-<TGConnectingPoint num="6" id="509" />
-<TGConnectingPoint num="7" id="510" />
+<TGConnectingPoint num="0" id="491" />
+<TGConnectingPoint num="1" id="492" />
+<TGConnectingPoint num="2" id="493" />
+<TGConnectingPoint num="3" id="494" />
+<TGConnectingPoint num="4" id="495" />
+<TGConnectingPoint num="5" id="496" />
+<TGConnectingPoint num="6" id="497" />
+<TGConnectingPoint num="7" id="498" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="513" >
-<father id="502" num="0" />
+<SUBCOMPONENT type="1203" id="490" >
+<father id="499" num="0" />
<cdparam x="382" 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="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="522" />
+<TGConnectingPoint num="0" id="489" />
<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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -1909,103 +1909,103 @@
</TMLComponentTaskDiagramPanel>
-<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="549" >
-<cdparam x="423" y="193" />
+<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="501" >
+<cdparam x="410" y="154" />
<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="550" />
+<TGConnectingPoint num="0" id="500" />
</COMPONENT>
-<COMPONENT type="1006" id="545" >
-<cdparam x="402" y="119" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="504" >
+<cdparam x="380" y="100" />
+<sizeparam width="69" 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="comm(1)" />
-<TGConnectingPoint num="0" id="546" />
-<TGConnectingPoint num="1" id="547" />
+<infoparam name="read channel" value="comm(1) " />
+<TGConnectingPoint num="0" id="502" />
+<TGConnectingPoint num="1" id="503" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="511" >
+<COMPONENT type="1000" id="506" >
<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="512" />
+<TGConnectingPoint num="0" id="505" />
</COMPONENT>
-<CONNECTOR type="115" id="548" >
+<CONNECTOR type="115" id="507" >
<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="512" />
-<P2 x="434" y="114" id="546" />
+<P1 x="407" y="70" id="505" />
+<P2 x="414" y="95" id="502" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="551" >
-<cdparam x="434" y="144" />
+<CONNECTOR type="115" id="508" >
+<cdparam x="414" y="125" />
<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="144" id="547" />
-<P2 x="433" y="188" id="550" />
+<P1 x="414" y="125" id="503" />
+<P2 x="420" y="149" id="500" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="556" >
-<cdparam x="410" y="154" />
+<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="510" >
+<cdparam x="423" y="193" />
<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="557" />
+<TGConnectingPoint num="0" id="509" />
</COMPONENT>
-<COMPONENT type="1009" id="552" >
-<cdparam x="380" y="100" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="513" >
+<cdparam x="402" y="119" />
+<sizeparam width="65" 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="comm(1) " />
-<TGConnectingPoint num="0" id="553" />
-<TGConnectingPoint num="1" id="554" />
+<infoparam name="write channel" value="comm(1)" />
+<TGConnectingPoint num="0" id="511" />
+<TGConnectingPoint num="1" id="512" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="532" >
+<COMPONENT type="1000" id="515" >
<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="533" />
+<TGConnectingPoint num="0" id="514" />
</COMPONENT>
-<CONNECTOR type="115" id="555" >
+<CONNECTOR type="115" id="516" >
<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="533" />
-<P2 x="414" y="95" id="553" />
+<P1 x="407" y="70" id="514" />
+<P2 x="434" y="114" id="511" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="558" >
-<cdparam x="414" y="125" />
+<CONNECTOR type="115" id="517" >
+<cdparam x="434" y="144" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="125" id="554" />
-<P2 x="420" y="149" id="557" />
+<P1 x="434" y="144" id="512" />
+<P2 x="433" y="188" id="509" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -2016,4 +2016,20 @@
+<Modeling type="AVATAR Design" nameTab="Design" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+
+</AVATARBlockDiagramPanel>
+
+</Modeling>
+
+
+
+
</TURTLEGMODELING>
\ No newline at end of file
diff --git a/src/ui/JToolBarMainTurtle.java b/src/ui/JToolBarMainTurtle.java
index 187b9231794f23949eeb628ed44deafa0a9da7a9..e4e8bd9fee64a939a5fda14e890277ddd9d8cf34 100755
--- a/src/ui/JToolBarMainTurtle.java
+++ b/src/ui/JToolBarMainTurtle.java
@@ -398,6 +398,7 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
dse.setVisible(b);
avatarSimu.setVisible(!b);
avatarFVUPPAAL.setVisible(!b);
+ avatarFVStaticAnalysis.setVisible(!b);
if (avatarFVProVerif != null) {
avatarFVProVerif.setVisible(b);
}
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 1383111a2e840d97dad7db8a8201fbcea2fdda23..bd5ba37a9a54c64c76fe11ef0b7207b82b41f621 100644
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -3980,7 +3980,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TraceManager.addDev("Generate UPPAAL! showwindow=" + showWindow);
//gtm.mergeChoices(true);
if (gtm.getTURTLEModelingState() > 0) {
- TraceManager.addDev("4173");
+ //TraceManager.addDev("4173");
if (gtm.getTURTLEModelingState() == 3) {
//AVATAR
boolean result = gtm.generateUPPAALFromAVATAR(ConfigurationTTool.UPPAALCodeDirectory);