diff --git a/modeling/modelsForTestingTTool/testdiplo.xml b/modeling/modelsForTestingTTool/testdiplo.xml
index 55b4d5a458f48b4ef96bbb53e50d616282fdc9e8..e06de16246055383fcf45ad7cf8d6230f1a515e5 100644
--- a/modeling/modelsForTestingTTool/testdiplo.xml
+++ b/modeling/modelsForTestingTTool/testdiplo.xml
@@ -362,11 +362,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="88" >
<father id="131" num="0" />
-<cdparam x="514" y="332" />
+<cdparam x="393" y="238" />
<sizeparam width="162" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="318" minY="0" maxY="272" />
-<infoparam name="TGComponent" value="Design1::TMLComp_0" />
+<infoparam name="TGComponent" value="Design1::TMLComp_2" />
<TGConnectingPoint num="0" id="80" />
<TGConnectingPoint num="1" id="81" />
<TGConnectingPoint num="2" id="82" />
@@ -376,7 +376,7 @@
<TGConnectingPoint num="6" id="86" />
<TGConnectingPoint num="7" id="87" />
<extraparam>
-<info value="Design1::TMLComp_0" taskName="TMLComp_0" referenceTaskName="Design1" priority="0" operation="TMLComp_0" fatherComponentMECType="0" />
+<info value="Design1::TMLComp_2" taskName="TMLComp_2" referenceTaskName="Design1" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="97" >
@@ -400,11 +400,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="106" >
<father id="131" num="2" />
-<cdparam x="393" y="238" />
+<cdparam x="514" y="332" />
<sizeparam width="162" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="318" minY="0" maxY="272" />
-<infoparam name="TGComponent" value="Design1::TMLComp_2" />
+<infoparam name="TGComponent" value="Design1::TMLComp_0" />
<TGConnectingPoint num="0" id="98" />
<TGConnectingPoint num="1" id="99" />
<TGConnectingPoint num="2" id="100" />
@@ -414,7 +414,7 @@
<TGConnectingPoint num="6" id="104" />
<TGConnectingPoint num="7" id="105" />
<extraparam>
-<info value="Design1::TMLComp_2" taskName="TMLComp_2" referenceTaskName="Design1" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
+<info value="Design1::TMLComp_0" taskName="TMLComp_0" referenceTaskName="Design1" priority="0" operation="TMLComp_0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -433,7 +433,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="140" />
-<P2 x="579" y="395" id="173" />
+<P2 x="592" y="382" id="173" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="133" >
@@ -441,14 +441,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="138" />
-<P2 x="574" y="163" id="151" />
+<P2 x="587" y="150" id="151" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="134" >
<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="162" />
+<P1 x="363" y="151" id="162" />
<P2 x="480" y="232" id="135" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -756,7 +756,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="252" />
+<P1 x="666" y="385" id="252" />
<P2 x="487" y="255" id="219" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -764,7 +764,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="230" />
+<P1 x="669" y="150" id="230" />
<P2 x="487" y="238" id="217" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -773,7 +773,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="214" />
-<P2 x="259" y="225" id="241" />
+<P2 x="246" y="212" id="241" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1208" id="229" >
@@ -1077,7 +1077,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="331" />
+<P1 x="666" y="385" id="331" />
<P2 x="487" y="255" id="298" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1085,7 +1085,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="309" />
+<P1 x="669" y="150" id="309" />
<P2 x="487" y="238" id="296" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1094,7 +1094,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="293" />
-<P2 x="376" y="164" id="320" />
+<P2 x="363" y="151" id="320" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1208" id="308" >
@@ -1540,11 +1540,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="397" >
<father id="440" num="0" />
-<cdparam x="445" y="269" />
+<cdparam x="413" y="213" />
<sizeparam width="106" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="144" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design3::T2" />
+<infoparam name="TGComponent" value="Design3::T1" />
<TGConnectingPoint num="0" id="389" />
<TGConnectingPoint num="1" id="390" />
<TGConnectingPoint num="2" id="391" />
@@ -1554,7 +1554,7 @@
<TGConnectingPoint num="6" id="395" />
<TGConnectingPoint num="7" id="396" />
<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>
<SUBCOMPONENT type="1101" id="406" >
@@ -1578,11 +1578,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="415" >
<father id="440" num="2" />
-<cdparam x="413" y="213" />
+<cdparam x="445" y="269" />
<sizeparam width="106" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="144" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design3::T1" />
+<infoparam name="TGComponent" value="Design3::T2" />
<TGConnectingPoint num="0" id="407" />
<TGConnectingPoint num="1" id="408" />
<TGConnectingPoint num="2" id="409" />
@@ -1592,7 +1592,7 @@
<TGConnectingPoint num="6" id="413" />
<TGConnectingPoint num="7" id="414" />
<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>
@@ -1721,68 +1721,68 @@
<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="667" >
+<CONNECTOR type="126" id="476" >
<cdparam x="408" y="225" />
<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="225" id="540" />
-<P2 x="631" y="215" id="527" />
+<P1 x="395" y="212" id="493" />
+<P2 x="644" y="202" id="480" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="525" >
+<CONNECTOR type="126" id="477" >
<cdparam x="408" y="185" />
<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="183" id="542" />
-<P2 x="631" y="177" id="529" />
+<P1 x="395" y="170" id="491" />
+<P2 x="644" y="164" id="478" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="539" >
+<COMPONENT type="1202" id="490" >
<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="531" />
-<TGConnectingPoint num="1" id="532" />
-<TGConnectingPoint num="2" id="533" />
-<TGConnectingPoint num="3" id="534" />
-<TGConnectingPoint num="4" id="535" />
-<TGConnectingPoint num="5" id="536" />
-<TGConnectingPoint num="6" id="537" />
-<TGConnectingPoint num="7" id="538" />
+<TGConnectingPoint num="0" id="482" />
+<TGConnectingPoint num="1" id="483" />
+<TGConnectingPoint num="2" id="484" />
+<TGConnectingPoint num="3" id="485" />
+<TGConnectingPoint num="4" id="486" />
+<TGConnectingPoint num="5" id="487" />
+<TGConnectingPoint num="6" id="488" />
+<TGConnectingPoint num="7" id="489" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="528" >
-<father id="539" num="0" />
-<cdparam x="631" y="202" />
+<SUBCOMPONENT type="1203" id="479" >
+<father id="490" num="0" />
+<cdparam x="631" y="164" />
<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="527" />
+<infoparam name="Primitive port" value="Event evt" />
+<TGConnectingPoint num="0" id="478" />
<extraparam>
-<Prop commName="comm" commType="0" 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" referenceReq="" />
-<Type type="0" typeOther="" />
+<Prop commName="evt" 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" referenceReq="" />
+<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="530" >
-<father id="539" num="1" />
-<cdparam x="631" y="164" />
+<SUBCOMPONENT type="1203" id="481" >
+<father id="490" num="1" />
+<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="Event evt" />
-<TGConnectingPoint num="0" id="529" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="480" />
<extraparam>
-<Prop commName="evt" 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" referenceReq="" />
-<Type type="1" typeOther="" />
+<Prop commName="comm" commType="0" 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" referenceReq="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1790,52 +1790,52 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="552" >
+<COMPONENT type="1202" id="503" >
<cdparam x="195" y="133" />
<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="544" />
-<TGConnectingPoint num="1" id="545" />
-<TGConnectingPoint num="2" id="546" />
-<TGConnectingPoint num="3" id="547" />
-<TGConnectingPoint num="4" id="548" />
-<TGConnectingPoint num="5" id="549" />
-<TGConnectingPoint num="6" id="550" />
-<TGConnectingPoint num="7" id="551" />
+<TGConnectingPoint num="0" id="495" />
+<TGConnectingPoint num="1" id="496" />
+<TGConnectingPoint num="2" id="497" />
+<TGConnectingPoint num="3" id="498" />
+<TGConnectingPoint num="4" id="499" />
+<TGConnectingPoint num="5" id="500" />
+<TGConnectingPoint num="6" id="501" />
+<TGConnectingPoint num="7" id="502" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="541" >
-<father id="552" num="0" />
-<cdparam x="382" y="212" />
+<SUBCOMPONENT type="1203" id="492" >
+<father id="503" num="0" />
+<cdparam x="382" y="170" />
<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="540" />
+<infoparam name="Primitive port" value="Event evt" />
+<TGConnectingPoint num="0" id="491" />
<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="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
-<Type type="0" typeOther="" />
+<Prop commName="evt" 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" referenceReq="" />
+<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="543" >
-<father id="552" num="1" />
-<cdparam x="382" y="170" />
+<SUBCOMPONENT type="1203" id="494" >
+<father id="503" num="1" />
+<cdparam x="382" y="212" />
<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 evt" />
-<TGConnectingPoint num="0" id="542" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="493" />
<extraparam>
-<Prop commName="evt" 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" referenceReq="" />
-<Type type="1" typeOther="" />
+<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="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1847,102 +1847,102 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="554" >
+<COMPONENT type="1001" id="505" >
<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="553" />
+<TGConnectingPoint num="0" id="504" />
</COMPONENT>
-<COMPONENT type="1009" id="557" >
+<COMPONENT type="1009" id="508" >
<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="read channel" value="comm(1) " />
-<TGConnectingPoint num="0" id="555" />
-<TGConnectingPoint num="1" id="556" />
+<TGConnectingPoint num="0" id="506" />
+<TGConnectingPoint num="1" id="507" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="559" >
+<COMPONENT type="1000" id="510" >
<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="558" />
+<TGConnectingPoint num="0" id="509" />
</COMPONENT>
-<CONNECTOR type="115" id="560" >
+<CONNECTOR type="115" id="511" >
<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="558" />
-<P2 x="414" y="95" id="555" />
+<P1 x="407" y="70" id="509" />
+<P2 x="414" y="95" id="506" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="561" >
+<CONNECTOR type="115" id="512" >
<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="414" y="125" id="556" />
-<P2 x="420" y="149" id="553" />
+<P1 x="414" y="125" id="507" />
+<P2 x="420" y="149" id="504" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="563" >
+<COMPONENT type="1001" id="514" >
<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="562" />
+<TGConnectingPoint num="0" id="513" />
</COMPONENT>
-<COMPONENT type="1006" id="566" >
+<COMPONENT type="1006" id="517" >
<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="write channel" value="comm(1)" />
-<TGConnectingPoint num="0" id="564" />
-<TGConnectingPoint num="1" id="565" />
+<TGConnectingPoint num="0" id="515" />
+<TGConnectingPoint num="1" id="516" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="568" >
+<COMPONENT type="1000" id="519" >
<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="567" />
+<TGConnectingPoint num="0" id="518" />
</COMPONENT>
-<CONNECTOR type="115" id="569" >
+<CONNECTOR type="115" id="520" >
<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="567" />
-<P2 x="434" y="114" id="564" />
+<P1 x="407" y="70" id="518" />
+<P2 x="434" y="114" id="515" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="570" >
+<CONNECTOR type="115" id="521" >
<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="434" y="144" id="565" />
-<P2 x="433" y="188" id="562" />
+<P1 x="434" y="144" id="516" />
+<P2 x="433" y="188" id="513" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1955,152 +1955,191 @@
<Modeling type="TML Component Design" nameTab="Design5_cloned" >
<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="571" >
+<CONNECTOR type="126" id="522" >
+<cdparam x="610" 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="610" y="311" id="529" />
+<P2 x="778" y="307" id="591" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="126" id="523" >
+<cdparam x="555" y="265" />
+<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="604" y="302" id="531" />
+<P2 x="631" y="215" id="593" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="126" id="524" >
<cdparam x="676" y="408" />
<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="767" y="467" id="594" />
-<P2 x="631" y="215" id="624" />
+<P1 x="767" y="467" id="544" />
+<P2 x="588" y="311" id="528" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="572" >
+<CONNECTOR type="126" id="525" >
<cdparam x="426" 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="517" y="474" id="580" />
-<P2 x="741" y="467" id="599" />
+<P1 x="517" y="474" id="568" />
+<P2 x="741" y="467" id="549" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="573" >
+<CONNECTOR type="126" id="526" >
<cdparam x="408" y="185" />
<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="183" id="635" />
-<P2 x="631" y="177" id="622" />
+<P1 x="408" y="183" id="608" />
+<P2 x="631" y="177" id="595" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="574" >
+<CONNECTOR type="126" id="527" >
<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="225" id="637" />
-<P2 x="491" y="474" id="575" />
+<P1 x="408" y="225" id="606" />
+<P2 x="491" y="474" id="563" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1200" id="621" >
+<COMPONENT type="1207" id="543" >
+<cdparam x="588" y="300" />
+<sizeparam width="22" height="22" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Composite port" value="F" />
+<TGConnectingPoint num="0" id="528" />
+<TGConnectingPoint num="1" id="529" />
+<TGConnectingPoint num="2" id="530" />
+<TGConnectingPoint num="3" id="531" />
+<TGConnectingPoint num="4" id="532" />
+<TGConnectingPoint num="5" id="533" />
+<TGConnectingPoint num="6" id="534" />
+<TGConnectingPoint num="7" id="535" />
+<TGConnectingPoint num="8" id="536" />
+<TGConnectingPoint num="9" id="537" />
+<TGConnectingPoint num="10" id="538" />
+<TGConnectingPoint num="11" id="539" />
+<TGConnectingPoint num="12" id="540" />
+<TGConnectingPoint num="13" id="541" />
+<TGConnectingPoint num="14" id="542" />
+</COMPONENT>
+
+<COMPONENT type="1200" id="590" >
<cdparam x="504" y="395" />
<sizeparam width="250" height="200" 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" value="MyName" />
-<TGConnectingPoint num="0" id="613" />
-<TGConnectingPoint num="1" id="614" />
-<TGConnectingPoint num="2" id="615" />
-<TGConnectingPoint num="3" id="616" />
-<TGConnectingPoint num="4" id="617" />
-<TGConnectingPoint num="5" id="618" />
-<TGConnectingPoint num="6" id="619" />
-<TGConnectingPoint num="7" id="620" />
+<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" />
<extraparam>
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1201" id="593" >
-<father id="621" num="0" />
-<cdparam x="491" y="461" />
+<SUBCOMPONENT type="1201" id="562" >
+<father id="590" num="0" />
+<cdparam x="741" y="454" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="237" minY="-13" maxY="187" />
<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="575" />
-<TGConnectingPoint num="1" id="576" />
-<TGConnectingPoint num="2" id="577" />
-<TGConnectingPoint num="3" id="578" />
-<TGConnectingPoint num="4" id="579" />
-<TGConnectingPoint num="5" id="580" />
-<TGConnectingPoint num="6" id="581" />
-<TGConnectingPoint num="7" id="582" />
-<TGConnectingPoint num="8" id="583" />
-<TGConnectingPoint num="9" id="584" />
-<TGConnectingPoint num="10" id="585" />
-<TGConnectingPoint num="11" id="586" />
-<TGConnectingPoint num="12" id="587" />
-<TGConnectingPoint num="13" id="588" />
-<TGConnectingPoint num="14" id="589" />
-<TGConnectingPoint num="15" id="590" />
-<TGConnectingPoint num="16" id="591" />
-<TGConnectingPoint num="17" id="592" />
+<TGConnectingPoint num="0" id="544" />
+<TGConnectingPoint num="1" id="545" />
+<TGConnectingPoint num="2" id="546" />
+<TGConnectingPoint num="3" id="547" />
+<TGConnectingPoint num="4" id="548" />
+<TGConnectingPoint num="5" id="549" />
+<TGConnectingPoint num="6" id="550" />
+<TGConnectingPoint num="7" id="551" />
+<TGConnectingPoint num="8" id="552" />
+<TGConnectingPoint num="9" id="553" />
+<TGConnectingPoint num="10" id="554" />
+<TGConnectingPoint num="11" id="555" />
+<TGConnectingPoint num="12" id="556" />
+<TGConnectingPoint num="13" id="557" />
+<TGConnectingPoint num="14" id="558" />
+<TGConnectingPoint num="15" id="559" />
+<TGConnectingPoint num="16" id="560" />
+<TGConnectingPoint num="17" id="561" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="612" >
-<father id="621" num="1" />
-<cdparam x="741" y="454" />
+<SUBCOMPONENT type="1201" id="581" >
+<father id="590" num="1" />
+<cdparam x="491" y="461" />
<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="237" minY="-13" maxY="187" />
<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="594" />
-<TGConnectingPoint num="1" id="595" />
-<TGConnectingPoint num="2" id="596" />
-<TGConnectingPoint num="3" id="597" />
-<TGConnectingPoint num="4" id="598" />
-<TGConnectingPoint num="5" id="599" />
-<TGConnectingPoint num="6" id="600" />
-<TGConnectingPoint num="7" id="601" />
-<TGConnectingPoint num="8" id="602" />
-<TGConnectingPoint num="9" id="603" />
-<TGConnectingPoint num="10" id="604" />
-<TGConnectingPoint num="11" id="605" />
-<TGConnectingPoint num="12" id="606" />
-<TGConnectingPoint num="13" id="607" />
-<TGConnectingPoint num="14" id="608" />
-<TGConnectingPoint num="15" id="609" />
-<TGConnectingPoint num="16" id="610" />
-<TGConnectingPoint num="17" id="611" />
+<TGConnectingPoint num="0" id="563" />
+<TGConnectingPoint num="1" id="564" />
+<TGConnectingPoint num="2" id="565" />
+<TGConnectingPoint num="3" id="566" />
+<TGConnectingPoint num="4" id="567" />
+<TGConnectingPoint num="5" id="568" />
+<TGConnectingPoint num="6" id="569" />
+<TGConnectingPoint num="7" id="570" />
+<TGConnectingPoint num="8" id="571" />
+<TGConnectingPoint num="9" id="572" />
+<TGConnectingPoint num="10" id="573" />
+<TGConnectingPoint num="11" id="574" />
+<TGConnectingPoint num="12" id="575" />
+<TGConnectingPoint num="13" id="576" />
+<TGConnectingPoint num="14" id="577" />
+<TGConnectingPoint num="15" id="578" />
+<TGConnectingPoint num="16" id="579" />
+<TGConnectingPoint num="17" id="580" />
</SUBCOMPONENT>
-<COMPONENT type="1202" id="634" >
+<COMPONENT type="1202" id="605" >
<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="626" />
-<TGConnectingPoint num="1" id="627" />
-<TGConnectingPoint num="2" id="628" />
-<TGConnectingPoint num="3" id="629" />
-<TGConnectingPoint num="4" id="630" />
-<TGConnectingPoint num="5" id="631" />
-<TGConnectingPoint num="6" id="632" />
-<TGConnectingPoint num="7" id="633" />
+<TGConnectingPoint num="0" id="597" />
+<TGConnectingPoint num="1" id="598" />
+<TGConnectingPoint num="2" id="599" />
+<TGConnectingPoint num="3" id="600" />
+<TGConnectingPoint num="4" id="601" />
+<TGConnectingPoint num="5" id="602" />
+<TGConnectingPoint num="6" id="603" />
+<TGConnectingPoint num="7" id="604" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="623" >
-<father id="634" num="0" />
-<cdparam x="631" y="164" />
+<SUBCOMPONENT type="1203" id="592" >
+<father id="605" num="0" />
+<cdparam x="765" 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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evt" />
-<TGConnectingPoint num="0" id="622" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="591" />
<extraparam>
-<Prop commName="evt" 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" referenceReq="" />
-<Type type="1" typeOther="" />
+<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" referenceReq="null" />
+<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="625" >
-<father id="634" num="1" />
+<SUBCOMPONENT type="1203" id="594" >
+<father id="605" num="1" />
<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="624" />
+<TGConnectingPoint num="0" id="593" />
<extraparam>
<Prop commName="comm" commType="0" 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" referenceReq="" />
<Type type="0" typeOther="" />
@@ -2110,53 +2149,70 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="596" >
+<father id="605" num="2" />
+<cdparam x="631" y="164" />
+<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 evt" />
+<TGConnectingPoint num="0" id="595" />
+<extraparam>
+<Prop commName="evt" 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" referenceReq="" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
-<COMPONENT type="1202" id="647" >
+<COMPONENT type="1202" id="618" >
<cdparam x="195" y="133" />
<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="639" />
-<TGConnectingPoint num="1" id="640" />
-<TGConnectingPoint num="2" id="641" />
-<TGConnectingPoint num="3" id="642" />
-<TGConnectingPoint num="4" id="643" />
-<TGConnectingPoint num="5" id="644" />
-<TGConnectingPoint num="6" id="645" />
-<TGConnectingPoint num="7" id="646" />
+<TGConnectingPoint num="0" id="610" />
+<TGConnectingPoint num="1" id="611" />
+<TGConnectingPoint num="2" id="612" />
+<TGConnectingPoint num="3" id="613" />
+<TGConnectingPoint num="4" id="614" />
+<TGConnectingPoint num="5" id="615" />
+<TGConnectingPoint num="6" id="616" />
+<TGConnectingPoint num="7" id="617" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="636" >
-<father id="647" num="0" />
-<cdparam x="382" y="170" />
+<SUBCOMPONENT type="1203" id="607" >
+<father id="618" num="0" />
+<cdparam x="382" y="212" />
<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 evt" />
-<TGConnectingPoint num="0" id="635" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="606" />
<extraparam>
-<Prop commName="evt" 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" referenceReq="" />
-<Type type="1" typeOther="" />
+<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="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
+<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="638" >
-<father id="647" num="1" />
-<cdparam x="382" y="212" />
+<SUBCOMPONENT type="1203" id="609" >
+<father id="618" num="1" />
+<cdparam x="382" y="170" />
<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="637" />
+<infoparam name="Primitive port" value="Event evt" />
+<TGConnectingPoint num="0" id="608" />
<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="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
-<Type type="0" typeOther="" />
+<Prop commName="evt" 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" referenceReq="" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2168,102 +2224,102 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="TMLComp_1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="649" >
+<COMPONENT type="1001" id="620" >
<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="648" />
+<TGConnectingPoint num="0" id="619" />
</COMPONENT>
-<COMPONENT type="1009" id="652" >
+<COMPONENT type="1009" id="623" >
<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="read channel" value="comm(1) " />
-<TGConnectingPoint num="0" id="650" />
-<TGConnectingPoint num="1" id="651" />
+<TGConnectingPoint num="0" id="621" />
+<TGConnectingPoint num="1" id="622" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="654" >
+<COMPONENT type="1000" id="625" >
<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="653" />
+<TGConnectingPoint num="0" id="624" />
</COMPONENT>
-<CONNECTOR type="115" id="655" >
+<CONNECTOR type="115" id="626" >
<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="653" />
-<P2 x="414" y="95" id="650" />
+<P1 x="407" y="70" id="624" />
+<P2 x="414" y="95" id="621" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="656" >
+<CONNECTOR type="115" id="627" >
<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="414" y="125" id="651" />
-<P2 x="420" y="149" id="648" />
+<P1 x="414" y="125" id="622" />
+<P2 x="420" y="149" id="619" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="658" >
+<COMPONENT type="1001" id="629" >
<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="657" />
+<TGConnectingPoint num="0" id="628" />
</COMPONENT>
-<COMPONENT type="1006" id="661" >
+<COMPONENT type="1006" id="632" >
<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="write channel" value="comm(1)" />
-<TGConnectingPoint num="0" id="659" />
-<TGConnectingPoint num="1" id="660" />
+<TGConnectingPoint num="0" id="630" />
+<TGConnectingPoint num="1" id="631" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="663" >
+<COMPONENT type="1000" id="634" >
<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="662" />
+<TGConnectingPoint num="0" id="633" />
</COMPONENT>
-<CONNECTOR type="115" id="664" >
+<CONNECTOR type="115" id="635" >
<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="662" />
-<P2 x="434" y="114" id="659" />
+<P1 x="407" y="70" id="633" />
+<P2 x="434" y="114" id="630" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="665" >
+<CONNECTOR type="115" id="636" >
<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="434" y="144" id="660" />
-<P2 x="433" y="188" id="657" />
+<P1 x="434" y="144" id="631" />
+<P2 x="433" y="188" id="628" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -2276,77 +2332,77 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="668" >
+<COMPONENT type="1100" id="679" >
<cdparam x="307" y="109" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU0" value="name" />
-<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="0" id="655" />
+<TGConnectingPoint num="1" id="656" />
+<TGConnectingPoint num="2" id="657" />
+<TGConnectingPoint num="3" id="658" />
+<TGConnectingPoint num="4" id="659" />
+<TGConnectingPoint num="5" id="660" />
+<TGConnectingPoint num="6" id="661" />
+<TGConnectingPoint num="7" id="662" />
+<TGConnectingPoint num="8" id="663" />
+<TGConnectingPoint num="9" id="664" />
+<TGConnectingPoint num="10" id="665" />
+<TGConnectingPoint num="11" id="666" />
+<TGConnectingPoint num="12" id="667" />
+<TGConnectingPoint num="13" id="668" />
+<TGConnectingPoint num="14" id="669" />
+<TGConnectingPoint num="15" id="670" />
+<TGConnectingPoint num="16" id="671" />
+<TGConnectingPoint num="17" id="672" />
+<TGConnectingPoint num="18" id="673" />
+<TGConnectingPoint num="19" id="674" />
+<TGConnectingPoint num="20" id="675" />
+<TGConnectingPoint num="21" id="676" />
+<TGConnectingPoint num="22" id="677" />
+<TGConnectingPoint num="23" id="678" />
<extraparam>
<info stereotype="CPU" nodeName="CPU0" />
<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="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="702" >
-<father id="668" num="0" />
-<cdparam x="332" y="213" />
+<SUBCOMPONENT type="1101" id="645" >
+<father id="679" num="0" />
+<cdparam x="332" y="152" />
<sizeparam width="206" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="44" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design5_cloned::TMLComp_0" />
-<TGConnectingPoint num="0" id="703" />
-<TGConnectingPoint num="1" id="704" />
-<TGConnectingPoint num="2" id="705" />
-<TGConnectingPoint num="3" id="706" />
-<TGConnectingPoint num="4" id="707" />
-<TGConnectingPoint num="5" id="708" />
-<TGConnectingPoint num="6" id="709" />
-<TGConnectingPoint num="7" id="710" />
+<infoparam name="TGComponent" value="Design5_cloned::TMLComp_1" />
+<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" />
<extraparam>
-<info value="Design5_cloned::TMLComp_0" taskName="TMLComp_0" referenceTaskName="Design5_cloned" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
+<info value="Design5_cloned::TMLComp_1" taskName="TMLComp_1" referenceTaskName="Design5_cloned" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="693" >
-<father id="668" num="1" />
-<cdparam x="332" y="152" />
+<SUBCOMPONENT type="1101" id="654" >
+<father id="679" num="1" />
+<cdparam x="332" y="213" />
<sizeparam width="206" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="44" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Design5_cloned::TMLComp_1" />
-<TGConnectingPoint num="0" id="694" />
-<TGConnectingPoint num="1" id="695" />
-<TGConnectingPoint num="2" id="696" />
-<TGConnectingPoint num="3" id="697" />
-<TGConnectingPoint num="4" id="698" />
-<TGConnectingPoint num="5" id="699" />
-<TGConnectingPoint num="6" id="700" />
-<TGConnectingPoint num="7" id="701" />
+<infoparam name="TGComponent" value="Design5_cloned::TMLComp_0" />
+<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" />
<extraparam>
-<info value="Design5_cloned::TMLComp_1" taskName="TMLComp_1" referenceTaskName="Design5_cloned" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
+<info value="Design5_cloned::TMLComp_0" taskName="TMLComp_0" referenceTaskName="Design5_cloned" priority="0" operation="TMLComp_2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
diff --git a/src/main/java/ui/tmlcompd/TMLCPath.java b/src/main/java/ui/tmlcompd/TMLCPath.java
index e8a4d3ad095d6bc23a953e312c484f558c64c51e..c48b9962526f8039e1e4d4ec6a18344d61dc6951 100755
--- a/src/main/java/ui/tmlcompd/TMLCPath.java
+++ b/src/main/java/ui/tmlcompd/TMLCPath.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.
*/
@@ -47,11 +47,11 @@ import java.util.ArrayList;
import java.util.HashMap;
/**
- * Class TMLCPath
- * Notion of Path. To be used to analyze the correctness of paths in the model
- * Creation: 7/03/2014
- * @version 1.0 7/03/2014
- * @author Ludovic APVRILLE
+ * Class TMLCPath
+ * Notion of Path. To be used to analyze the correctness of paths in the model
+ * Creation: 7/03/2014
+ * @version 1.0 7/03/2014
+ * @author Ludovic APVRILLE
*/
public class TMLCPath {
@@ -81,8 +81,8 @@ public class TMLCPath {
"Events are not compatible with fork/join",
"Requests are not compatible with fork/join",
"Events/requests must all have the same parameters",
- "Channels and events can have only one input and one output"
- };
+ "Channels and events can have only one input and one output"
+ };
public TMLCPath() {
cports = new ArrayList<TMLCCompositePort>();
@@ -187,17 +187,17 @@ public class TMLCPath {
//rule1: Must have at least one producer
if (producerPorts.size() == 0) {
errorNumber = 1;
- if ((consumerPorts != null) && (consumerPorts.size() > 0)) {
- faultyComponent = consumerPorts.get(0);
- }
+ if ((consumerPorts != null) && (consumerPorts.size() > 0)) {
+ faultyComponent = consumerPorts.get(0);
+ }
}
//rule2: Must have at least one receiver
if (consumerPorts.size() == 0) {
errorNumber = 2;
- if ((producerPorts != null) && (producerPorts.size() > 0)) {
- faultyComponent = producerPorts.get(0);
- }
+ if ((producerPorts != null) && (producerPorts.size() > 0)) {
+ faultyComponent = producerPorts.get(0);
+ }
}
//rule3: If fork: must have only one producer
@@ -295,30 +295,28 @@ public class TMLCPath {
}
}
- // rule9: if no fork, no join, no request: one to one communication
- boolean foundReq = true;
- if ((forks.size() == 0) || (joins.size() == 0)) {
- if (producerPorts != null && producerPorts.size() > 0) {
+ // rule9: if no fork, no join, no request: one to one communication
+ boolean foundReq = true;
+ if ((forks.size() == 0) && (joins.size() == 0)) {
+ if (producerPorts != null && producerPorts.size() > 0) {
TMLCPrimitivePort referencePort = producerPorts.get(0);
if (referencePort != null) {
if (referencePort.getPortType() != 2) {
- foundReq = false;
- }
- }
- }
- }
- if (!foundReq) {
- if (producerPorts.size() > 1) {
- errorNumber = 9;
- faultyComponent = producerPorts.get(1);
- } else if (consumerPorts.size() > 1) {
- errorNumber = 9;
- faultyComponent = consumerPorts.get(1);
- }
-
- }
-
+ foundReq = false;
+ }
+ }
+ }
+ if (!foundReq) {
+ if (producerPorts.size() > 1) {
+ errorNumber = 9;
+ faultyComponent = producerPorts.get(1);
+ } else if (consumerPorts.size() > 1) {
+ errorNumber = 9;
+ faultyComponent = consumerPorts.get(1);
+ }
+ }
+ }
}