diff --git a/modeling/DIPLODOCUS/testDiplodocusPeriod.xml b/modeling/DIPLODOCUS/testDiplodocusPeriod.xml
index a5ba48bbf4ff1e4eecd2f9e7c1d523ae7f6315d6..39f0decfedba570e4cce8bcafe506bd55bee7168 100644
--- a/modeling/DIPLODOCUS/testDiplodocusPeriod.xml
+++ b/modeling/DIPLODOCUS/testDiplodocusPeriod.xml
@@ -718,7 +718,7 @@
<cdparam x="967" y="411" />
<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="933" y="385" id="259" />
+<P1 x="933" y="411" id="259" />
<P2 x="978" y="609" id="237" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -726,8 +726,8 @@
<cdparam x="559" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="566" y="302" id="248" />
-<P2 x="821" y="302" id="261" />
+<P1 x="579" y="315" id="248" />
+<P2 x="808" y="315" id="261" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="247" >
@@ -1417,56 +1417,56 @@
<Modeling type="TML Component Design" nameTab="FVWithEventFeedback" >
<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="692" >
+<CONNECTOR type="126" id="451" >
<cdparam x="808" y="364" />
<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="808" y="364" id="681" />
-<P2 x="579" y="370" id="691" />
+<P1 x="821" y="351" id="478" />
+<P2 x="566" y="357" id="465" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="451" >
+<CONNECTOR type="126" id="452" >
<cdparam x="967" y="411" />
<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="933" y="411" id="477" />
-<P2 x="978" y="609" id="453" />
+<P1 x="933" y="385" id="482" />
+<P2 x="978" y="609" id="454" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="452" >
+<CONNECTOR type="126" id="453" >
<cdparam x="559" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="579" y="315" id="464" />
-<P2 x="808" y="315" id="475" />
+<P1 x="566" y="302" id="467" />
+<P2 x="821" y="302" id="480" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="463" >
+<COMPONENT type="1202" id="464" >
<cdparam x="891" y="622" />
<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="AnotherTask" />
-<TGConnectingPoint num="0" id="455" />
-<TGConnectingPoint num="1" id="456" />
-<TGConnectingPoint num="2" id="457" />
-<TGConnectingPoint num="3" id="458" />
-<TGConnectingPoint num="4" id="459" />
-<TGConnectingPoint num="5" id="460" />
-<TGConnectingPoint num="6" id="461" />
-<TGConnectingPoint num="7" id="462" />
+<TGConnectingPoint num="0" id="456" />
+<TGConnectingPoint num="1" id="457" />
+<TGConnectingPoint num="2" id="458" />
+<TGConnectingPoint num="3" id="459" />
+<TGConnectingPoint num="4" id="460" />
+<TGConnectingPoint num="5" id="461" />
+<TGConnectingPoint num="6" id="462" />
+<TGConnectingPoint num="7" id="463" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="454" >
-<father id="463" num="0" />
+<SUBCOMPONENT type="1203" id="455" >
+<father id="464" num="0" />
<cdparam x="965" y="609" />
<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="453" />
+<TGConnectingPoint num="0" id="454" />
<extraparam>
<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="32" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -1477,36 +1477,36 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="474" >
+<COMPONENT type="1202" id="477" >
<cdparam x="366" y="244" />
<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="ManagerOfPeriodicTask" />
-<TGConnectingPoint num="0" id="466" />
-<TGConnectingPoint num="1" id="467" />
-<TGConnectingPoint num="2" id="468" />
-<TGConnectingPoint num="3" id="469" />
-<TGConnectingPoint num="4" id="470" />
-<TGConnectingPoint num="5" id="471" />
-<TGConnectingPoint num="6" id="472" />
-<TGConnectingPoint num="7" id="473" />
+<TGConnectingPoint num="0" id="469" />
+<TGConnectingPoint num="1" id="470" />
+<TGConnectingPoint num="2" id="471" />
+<TGConnectingPoint num="3" id="472" />
+<TGConnectingPoint num="4" id="473" />
+<TGConnectingPoint num="5" id="474" />
+<TGConnectingPoint num="6" id="475" />
+<TGConnectingPoint num="7" id="476" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="startTime" value="10" type="0" typeOther="" />
<Attribute access="2" id="period" value="5" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="682" >
-<father id="474" num="0" />
+<SUBCOMPONENT type="1203" id="466" >
+<father id="477" num="0" />
<cdparam x="553" y="357" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="691" />
+<infoparam name="Primitive port" value="Event end" />
+<TGConnectingPoint num="0" id="465" />
<extraparam>
-<Prop commName="end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1514,14 +1514,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="465" >
-<father id="474" num="1" />
+<SUBCOMPONENT type="1203" id="468" >
+<father id="477" num="1" />
<cdparam x="553" y="302" />
<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="464" />
+<TGConnectingPoint num="0" id="467" />
<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="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
@@ -1532,35 +1532,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="487" >
+<COMPONENT type="1202" id="492" >
<cdparam x="821" y="248" />
<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="PeriodicTask" />
-<TGConnectingPoint num="0" id="479" />
-<TGConnectingPoint num="1" id="480" />
-<TGConnectingPoint num="2" id="481" />
-<TGConnectingPoint num="3" id="482" />
-<TGConnectingPoint num="4" id="483" />
-<TGConnectingPoint num="5" id="484" />
-<TGConnectingPoint num="6" id="485" />
-<TGConnectingPoint num="7" id="486" />
+<TGConnectingPoint num="0" id="484" />
+<TGConnectingPoint num="1" id="485" />
+<TGConnectingPoint num="2" id="486" />
+<TGConnectingPoint num="3" id="487" />
+<TGConnectingPoint num="4" id="488" />
+<TGConnectingPoint num="5" id="489" />
+<TGConnectingPoint num="6" id="490" />
+<TGConnectingPoint num="7" id="491" />
<extraparam>
<Data isAttacker="No" />
<Attribute access="2" id="x" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="672" >
-<father id="487" num="0" />
+<SUBCOMPONENT type="1203" id="479" >
+<father id="492" num="0" />
<cdparam x="808" y="351" />
<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="681" />
+<infoparam name="Primitive port" value="Event end" />
+<TGConnectingPoint num="0" id="478" />
<extraparam>
-<Prop commName="end" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="end" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1568,14 +1568,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="476" >
-<father id="487" num="1" />
+<SUBCOMPONENT type="1203" id="481" >
+<father id="492" num="1" />
<cdparam x="808" y="302" />
<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="475" />
+<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="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="1" typeOther="" />
@@ -1585,14 +1585,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="478" >
-<father id="487" num="2" />
+<SUBCOMPONENT type="1203" id="483" >
+<father id="492" num="2" />
<cdparam x="920" y="385" />
<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 comm1" />
-<TGConnectingPoint num="0" id="477" />
+<TGConnectingPoint num="0" id="482" />
<extraparam>
<Prop commName="comm1" commType="0" origin="true" finite="false" blocking="false" maxSamples="200" widthSamples="32" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -1607,122 +1607,122 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="AnotherTask" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1000" id="489" >
+<COMPONENT type="1000" id="494" >
<cdparam x="603" y="105" />
<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="488" />
+<TGConnectingPoint num="0" id="493" />
</COMPONENT>
-<COMPONENT type="1030" id="492" >
+<COMPONENT type="1030" id="497" >
<cdparam x="569" y="150" />
<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="490" />
-<TGConnectingPoint num="1" id="491" />
+<TGConnectingPoint num="0" id="495" />
+<TGConnectingPoint num="1" id="496" />
</COMPONENT>
-<COMPONENT type="1001" id="494" >
+<COMPONENT type="1001" id="499" >
<cdparam x="670" y="320" />
<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="493" />
+<TGConnectingPoint num="0" id="498" />
</COMPONENT>
-<COMPONENT type="1009" id="497" >
+<COMPONENT type="1009" id="502" >
<cdparam x="633" y="257" />
<sizeparam width="85" 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(100) " />
-<TGConnectingPoint num="0" id="495" />
-<TGConnectingPoint num="1" id="496" />
+<TGConnectingPoint num="0" id="500" />
+<TGConnectingPoint num="1" id="501" />
<extraparam>
<Data channelName="comm" nbOfSamples="100" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="498" >
+<CONNECTOR type="115" id="503" >
<cdparam x="661" y="164" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="661" y="164" id="491" />
-<P2 x="675" y="252" id="495" />
+<P1 x="661" y="164" id="496" />
+<P2 x="675" y="252" id="500" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="499" >
+<CONNECTOR type="115" id="504" >
<cdparam x="675" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="675" y="282" id="496" />
-<P2 x="680" y="315" id="493" />
+<P1 x="675" y="282" id="501" />
+<P2 x="680" y="315" id="498" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="500" >
+<CONNECTOR type="115" id="505" >
<cdparam x="610" 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="610" y="125" id="488" />
-<P2 x="615" y="145" id="490" />
+<P1 x="610" y="125" id="493" />
+<P2 x="615" y="145" id="495" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="ManagerOfPeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1010" id="503" >
+<COMPONENT type="1010" id="508" >
<cdparam x="667" y="448" />
<sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="end() " />
-<TGConnectingPoint num="0" id="501" />
-<TGConnectingPoint num="1" id="502" />
+<TGConnectingPoint num="0" id="506" />
+<TGConnectingPoint num="1" id="507" />
<extraparam>
<Data eventName="end" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1008" id="506" >
+<COMPONENT type="1008" id="511" >
<cdparam x="643" y="336" />
<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="send event" value="evt(1)" />
-<TGConnectingPoint num="0" id="504" />
-<TGConnectingPoint num="1" id="505" />
+<TGConnectingPoint num="0" id="509" />
+<TGConnectingPoint num="1" id="510" />
<extraparam>
<Data eventName="evt" nbOfParams="5" />
<Param index="0" value="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="508" >
+<COMPONENT type="1001" id="513" >
<cdparam x="678" y="496" />
<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="507" />
+<TGConnectingPoint num="0" id="512" />
</COMPONENT>
-<COMPONENT type="1026" id="512" >
+<COMPONENT type="1026" id="517" >
<cdparam x="679" y="380" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="delay" value="null" />
-<TGConnectingPoint num="0" id="510" />
-<TGConnectingPoint num="1" id="511" />
+<TGConnectingPoint num="0" id="515" />
+<TGConnectingPoint num="1" id="516" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="509" >
-<father id="512" num="0" />
+<SUBCOMPONENT type="-1" id="514" >
+<father id="517" num="0" />
<cdparam x="694" y="400" />
<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1733,27 +1733,27 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1030" id="515" >
+<COMPONENT type="1030" id="520" >
<cdparam x="529" y="308" />
<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="513" />
-<TGConnectingPoint num="1" id="514" />
+<TGConnectingPoint num="0" id="518" />
+<TGConnectingPoint num="1" id="519" />
</COMPONENT>
-<COMPONENT type="1026" id="519" >
+<COMPONENT type="1026" id="524" >
<cdparam x="567" y="244" />
<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="delay" value="null" />
-<TGConnectingPoint num="0" id="517" />
-<TGConnectingPoint num="1" id="518" />
+<TGConnectingPoint num="0" id="522" />
+<TGConnectingPoint num="1" id="523" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="516" >
-<father id="519" num="0" />
+<SUBCOMPONENT type="-1" id="521" >
+<father id="524" num="0" />
<cdparam x="582" y="264" />
<sizeparam width="82" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1764,174 +1764,174 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1000" id="521" >
+<COMPONENT type="1000" id="526" >
<cdparam x="564" y="186" />
<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="520" />
+<TGConnectingPoint num="0" id="525" />
</COMPONENT>
-<CONNECTOR type="115" id="522" >
+<CONNECTOR type="115" id="527" >
<cdparam x="691" y="473" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="691" y="473" id="502" />
-<P2 x="688" y="491" id="507" />
+<P1 x="691" y="473" id="507" />
+<P2 x="688" y="491" id="512" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="523" >
+<CONNECTOR type="115" id="528" >
<cdparam x="571" y="206" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="571" y="206" id="520" />
-<P2 x="572" y="239" id="517" />
+<P1 x="571" y="206" id="525" />
+<P2 x="572" y="239" id="522" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="524" >
+<CONNECTOR type="115" id="529" >
<cdparam x="572" y="279" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="572" y="279" id="518" />
-<P2 x="575" y="303" id="513" />
+<P1 x="572" y="279" id="523" />
+<P2 x="575" y="303" id="518" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="525" >
+<CONNECTOR type="115" id="530" >
<cdparam x="684" y="415" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="684" y="415" id="511" />
-<P2 x="691" y="443" id="501" />
+<P1 x="684" y="415" id="516" />
+<P2 x="691" y="443" id="506" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="526" >
+<CONNECTOR type="115" id="531" >
<cdparam x="621" y="322" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="621" y="322" id="514" />
-<P2 x="666" y="331" id="504" />
+<P1 x="621" y="322" id="519" />
+<P2 x="666" y="331" id="509" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="527" >
+<CONNECTOR type="115" id="532" >
<cdparam x="666" y="361" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="666" y="361" id="505" />
-<P2 x="684" y="375" id="510" />
+<P1 x="666" y="361" id="510" />
+<P2 x="684" y="375" id="515" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1008" id="530" >
+<COMPONENT type="1008" id="535" >
<cdparam x="759" y="243" />
<sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="send event" value="end()" />
-<TGConnectingPoint num="0" id="528" />
-<TGConnectingPoint num="1" id="529" />
+<TGConnectingPoint num="0" id="533" />
+<TGConnectingPoint num="1" id="534" />
<extraparam>
<Data eventName="end" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1010" id="533" >
+<COMPONENT type="1010" id="538" >
<cdparam x="738" y="125" />
<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="evt(x) " />
-<TGConnectingPoint num="0" id="531" />
-<TGConnectingPoint num="1" id="532" />
+<TGConnectingPoint num="0" id="536" />
+<TGConnectingPoint num="1" id="537" />
<extraparam>
<Data eventName="evt" nbOfParams="5" />
<Param index="0" value="x" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1030" id="536" >
+<COMPONENT type="1030" id="541" >
<cdparam x="618" y="90" />
<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="534" />
-<TGConnectingPoint num="1" id="535" />
+<TGConnectingPoint num="0" id="539" />
+<TGConnectingPoint num="1" id="540" />
</COMPONENT>
-<COMPONENT type="1000" id="538" >
+<COMPONENT type="1000" id="543" >
<cdparam x="621" y="39" />
<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="537" />
+<TGConnectingPoint num="0" id="542" />
</COMPONENT>
-<COMPONENT type="1001" id="540" >
+<COMPONENT type="1001" id="545" >
<cdparam x="762" y="324" />
<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="539" />
+<TGConnectingPoint num="0" id="544" />
</COMPONENT>
-<COMPONENT type="1006" id="543" >
+<COMPONENT type="1006" id="548" >
<cdparam x="730" y="180" />
<sizeparam width="89" 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="comm1(100)" />
-<TGConnectingPoint num="0" id="541" />
-<TGConnectingPoint num="1" id="542" />
+<TGConnectingPoint num="0" id="546" />
+<TGConnectingPoint num="1" id="547" />
<breakpoint />
<extraparam>
<Data channelName="comm1" nbOfSamples="100" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="544" >
+<CONNECTOR type="115" id="549" >
<cdparam x="781" y="268" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="781" y="268" id="529" />
-<P2 x="772" y="319" id="539" />
+<P1 x="781" y="268" id="534" />
+<P2 x="772" y="319" id="544" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="545" >
+<CONNECTOR type="115" id="550" >
<cdparam x="802" y="205" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="774" y="205" id="542" />
-<P2 x="781" y="238" id="528" />
+<P1 x="774" y="205" id="547" />
+<P2 x="781" y="238" id="533" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="546" >
+<CONNECTOR type="115" id="551" >
<cdparam x="645" y="62" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="628" y="59" id="537" />
-<P2 x="664" y="85" id="534" />
+<P1 x="628" y="59" id="542" />
+<P2 x="664" y="85" id="539" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="547" >
+<CONNECTOR type="115" id="552" >
<cdparam x="710" y="104" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="710" y="104" id="535" />
-<P2 x="762" y="120" id="531" />
+<P1 x="710" y="104" id="540" />
+<P2 x="762" y="120" id="536" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="548" >
+<CONNECTOR type="115" id="553" >
<cdparam x="762" y="150" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="762" y="150" id="532" />
-<P2 x="774" y="175" id="541" />
+<P1 x="762" y="150" id="537" />
+<P2 x="774" y="175" id="546" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1944,227 +1944,227 @@
<Modeling type="TML Architecture" nameTab="ArchitectureWithEventFeedback" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="582" >
+<COMPONENT type="1105" id="587" >
<cdparam x="933" y="170" />
<sizeparam width="445" height="270" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="558" />
-<TGConnectingPoint num="1" id="559" />
-<TGConnectingPoint num="2" id="560" />
-<TGConnectingPoint num="3" id="561" />
-<TGConnectingPoint num="4" id="562" />
-<TGConnectingPoint num="5" id="563" />
-<TGConnectingPoint num="6" id="564" />
-<TGConnectingPoint num="7" id="565" />
-<TGConnectingPoint num="8" id="566" />
-<TGConnectingPoint num="9" id="567" />
-<TGConnectingPoint num="10" id="568" />
-<TGConnectingPoint num="11" id="569" />
-<TGConnectingPoint num="12" id="570" />
-<TGConnectingPoint num="13" id="571" />
-<TGConnectingPoint num="14" id="572" />
-<TGConnectingPoint num="15" id="573" />
-<TGConnectingPoint num="16" id="574" />
-<TGConnectingPoint num="17" id="575" />
-<TGConnectingPoint num="18" id="576" />
-<TGConnectingPoint num="19" id="577" />
-<TGConnectingPoint num="20" id="578" />
-<TGConnectingPoint num="21" id="579" />
-<TGConnectingPoint num="22" id="580" />
-<TGConnectingPoint num="23" id="581" />
+<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" />
+<TGConnectingPoint num="18" id="581" />
+<TGConnectingPoint num="19" id="582" />
+<TGConnectingPoint num="20" id="583" />
+<TGConnectingPoint num="21" id="584" />
+<TGConnectingPoint num="22" id="585" />
+<TGConnectingPoint num="23" id="586" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="557" >
-<father id="582" num="0" />
+<SUBCOMPONENT type="1103" id="562" >
+<father id="587" num="0" />
<cdparam x="979" y="238" />
<sizeparam width="275" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="170" minY="0" maxY="230" />
<infoparam name="TGComponent" value="FVWithEventFeedback::comm1__comm" />
-<TGConnectingPoint num="0" id="549" />
-<TGConnectingPoint num="1" id="550" />
-<TGConnectingPoint num="2" id="551" />
-<TGConnectingPoint num="3" id="552" />
-<TGConnectingPoint num="4" id="553" />
-<TGConnectingPoint num="5" id="554" />
-<TGConnectingPoint num="6" id="555" />
-<TGConnectingPoint num="7" id="556" />
+<TGConnectingPoint num="0" id="554" />
+<TGConnectingPoint num="1" id="555" />
+<TGConnectingPoint num="2" id="556" />
+<TGConnectingPoint num="3" id="557" />
+<TGConnectingPoint num="4" id="558" />
+<TGConnectingPoint num="5" id="559" />
+<TGConnectingPoint num="6" id="560" />
+<TGConnectingPoint num="7" id="561" />
<extraparam>
<info value="FVWithEventFeedback::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithEventFeedback" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="616" >
+<COMPONENT type="1102" id="621" >
<cdparam x="582" y="492" />
<sizeparam width="453" height="113" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="592" />
-<TGConnectingPoint num="1" id="593" />
-<TGConnectingPoint num="2" id="594" />
-<TGConnectingPoint num="3" id="595" />
-<TGConnectingPoint num="4" id="596" />
-<TGConnectingPoint num="5" id="597" />
-<TGConnectingPoint num="6" id="598" />
-<TGConnectingPoint num="7" id="599" />
-<TGConnectingPoint num="8" id="600" />
-<TGConnectingPoint num="9" id="601" />
-<TGConnectingPoint num="10" id="602" />
-<TGConnectingPoint num="11" id="603" />
-<TGConnectingPoint num="12" id="604" />
-<TGConnectingPoint num="13" id="605" />
-<TGConnectingPoint num="14" id="606" />
-<TGConnectingPoint num="15" id="607" />
-<TGConnectingPoint num="16" id="608" />
-<TGConnectingPoint num="17" id="609" />
-<TGConnectingPoint num="18" id="610" />
-<TGConnectingPoint num="19" id="611" />
-<TGConnectingPoint num="20" id="612" />
-<TGConnectingPoint num="21" id="613" />
-<TGConnectingPoint num="22" id="614" />
-<TGConnectingPoint num="23" id="615" />
+<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" />
+<TGConnectingPoint num="8" id="605" />
+<TGConnectingPoint num="9" id="606" />
+<TGConnectingPoint num="10" id="607" />
+<TGConnectingPoint num="11" id="608" />
+<TGConnectingPoint num="12" id="609" />
+<TGConnectingPoint num="13" id="610" />
+<TGConnectingPoint num="14" id="611" />
+<TGConnectingPoint num="15" id="612" />
+<TGConnectingPoint num="16" id="613" />
+<TGConnectingPoint num="17" id="614" />
+<TGConnectingPoint num="18" id="615" />
+<TGConnectingPoint num="19" id="616" />
+<TGConnectingPoint num="20" id="617" />
+<TGConnectingPoint num="21" id="618" />
+<TGConnectingPoint num="22" id="619" />
+<TGConnectingPoint num="23" id="620" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="591" >
-<father id="616" num="0" />
+<SUBCOMPONENT type="1103" id="596" >
+<father id="621" num="0" />
<cdparam x="662" y="551" />
<sizeparam width="275" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="178" minY="0" maxY="73" />
<infoparam name="TGComponent" value="FVWithEventFeedback::comm1__comm" />
-<TGConnectingPoint num="0" id="583" />
-<TGConnectingPoint num="1" id="584" />
-<TGConnectingPoint num="2" id="585" />
-<TGConnectingPoint num="3" id="586" />
-<TGConnectingPoint num="4" id="587" />
-<TGConnectingPoint num="5" id="588" />
-<TGConnectingPoint num="6" id="589" />
-<TGConnectingPoint num="7" id="590" />
+<TGConnectingPoint num="0" id="588" />
+<TGConnectingPoint num="1" id="589" />
+<TGConnectingPoint num="2" id="590" />
+<TGConnectingPoint num="3" id="591" />
+<TGConnectingPoint num="4" id="592" />
+<TGConnectingPoint num="5" id="593" />
+<TGConnectingPoint num="6" id="594" />
+<TGConnectingPoint num="7" id="595" />
<extraparam>
<info value="FVWithEventFeedback::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithEventFeedback" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="668" >
+<COMPONENT type="1100" id="673" >
<cdparam x="192" y="175" />
<sizeparam width="428" height="260" 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="644" />
-<TGConnectingPoint num="1" id="645" />
-<TGConnectingPoint num="2" id="646" />
-<TGConnectingPoint num="3" id="647" />
-<TGConnectingPoint num="4" id="648" />
-<TGConnectingPoint num="5" id="649" />
-<TGConnectingPoint num="6" id="650" />
-<TGConnectingPoint num="7" id="651" />
-<TGConnectingPoint num="8" id="652" />
-<TGConnectingPoint num="9" id="653" />
-<TGConnectingPoint num="10" id="654" />
-<TGConnectingPoint num="11" id="655" />
-<TGConnectingPoint num="12" id="656" />
-<TGConnectingPoint num="13" id="657" />
-<TGConnectingPoint num="14" id="658" />
-<TGConnectingPoint num="15" id="659" />
-<TGConnectingPoint num="16" id="660" />
-<TGConnectingPoint num="17" id="661" />
-<TGConnectingPoint num="18" id="662" />
-<TGConnectingPoint num="19" id="663" />
-<TGConnectingPoint num="20" id="664" />
-<TGConnectingPoint num="21" id="665" />
-<TGConnectingPoint num="22" id="666" />
-<TGConnectingPoint num="23" id="667" />
+<TGConnectingPoint num="0" id="649" />
+<TGConnectingPoint num="1" id="650" />
+<TGConnectingPoint num="2" id="651" />
+<TGConnectingPoint num="3" id="652" />
+<TGConnectingPoint num="4" id="653" />
+<TGConnectingPoint num="5" id="654" />
+<TGConnectingPoint num="6" id="655" />
+<TGConnectingPoint num="7" id="656" />
+<TGConnectingPoint num="8" id="657" />
+<TGConnectingPoint num="9" id="658" />
+<TGConnectingPoint num="10" id="659" />
+<TGConnectingPoint num="11" id="660" />
+<TGConnectingPoint num="12" id="661" />
+<TGConnectingPoint num="13" id="662" />
+<TGConnectingPoint num="14" id="663" />
+<TGConnectingPoint num="15" id="664" />
+<TGConnectingPoint num="16" id="665" />
+<TGConnectingPoint num="17" id="666" />
+<TGConnectingPoint num="18" id="667" />
+<TGConnectingPoint num="19" id="668" />
+<TGConnectingPoint num="20" id="669" />
+<TGConnectingPoint num="21" id="670" />
+<TGConnectingPoint num="22" id="671" />
+<TGConnectingPoint num="23" id="672" />
<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="625" >
-<father id="668" num="0" />
+<SUBCOMPONENT type="1101" id="630" >
+<father id="673" num="0" />
<cdparam x="295" y="331" />
<sizeparam width="260" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="168" minY="0" maxY="220" />
<infoparam name="TGComponent" value="FVWithEventFeedback::PeriodicTask" />
-<TGConnectingPoint num="0" id="617" />
-<TGConnectingPoint num="1" id="618" />
-<TGConnectingPoint num="2" id="619" />
-<TGConnectingPoint num="3" id="620" />
-<TGConnectingPoint num="4" id="621" />
-<TGConnectingPoint num="5" id="622" />
-<TGConnectingPoint num="6" id="623" />
-<TGConnectingPoint num="7" id="624" />
+<TGConnectingPoint num="0" id="622" />
+<TGConnectingPoint num="1" id="623" />
+<TGConnectingPoint num="2" id="624" />
+<TGConnectingPoint num="3" id="625" />
+<TGConnectingPoint num="4" id="626" />
+<TGConnectingPoint num="5" id="627" />
+<TGConnectingPoint num="6" id="628" />
+<TGConnectingPoint num="7" id="629" />
<extraparam>
<info value="FVWithEventFeedback::PeriodicTask" taskName="PeriodicTask" referenceTaskName="FVWithEventFeedback" priority="0" operation="PeriodicTask" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="634" >
-<father id="668" num="1" />
+<SUBCOMPONENT type="1101" id="639" >
+<father id="673" num="1" />
<cdparam x="266" y="268" />
<sizeparam width="328" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="100" minY="0" maxY="220" />
<infoparam name="TGComponent" value="FVWithEventFeedback::ManagerOfPeriodicTask" />
-<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="631" />
+<TGConnectingPoint num="1" id="632" />
+<TGConnectingPoint num="2" id="633" />
+<TGConnectingPoint num="3" id="634" />
+<TGConnectingPoint num="4" id="635" />
+<TGConnectingPoint num="5" id="636" />
+<TGConnectingPoint num="6" id="637" />
+<TGConnectingPoint num="7" id="638" />
<extraparam>
<info value="FVWithEventFeedback::ManagerOfPeriodicTask" taskName="ManagerOfPeriodicTask" referenceTaskName="FVWithEventFeedback" priority="0" operation="ManagerOfPeriodicTask" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="643" >
-<father id="668" num="2" />
+<SUBCOMPONENT type="1101" id="648" >
+<father id="673" num="2" />
<cdparam x="214" y="209" />
<sizeparam width="260" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="168" minY="0" maxY="220" />
<infoparam name="TGComponent" value="FVWithEventFeedback::AnotherTask" />
-<TGConnectingPoint num="0" id="635" />
-<TGConnectingPoint num="1" id="636" />
-<TGConnectingPoint num="2" id="637" />
-<TGConnectingPoint num="3" id="638" />
-<TGConnectingPoint num="4" id="639" />
-<TGConnectingPoint num="5" id="640" />
-<TGConnectingPoint num="6" id="641" />
-<TGConnectingPoint num="7" id="642" />
+<TGConnectingPoint num="0" id="640" />
+<TGConnectingPoint num="1" id="641" />
+<TGConnectingPoint num="2" id="642" />
+<TGConnectingPoint num="3" id="643" />
+<TGConnectingPoint num="4" id="644" />
+<TGConnectingPoint num="5" id="645" />
+<TGConnectingPoint num="6" id="646" />
+<TGConnectingPoint num="7" id="647" />
<extraparam>
<info value="FVWithEventFeedback::AnotherTask" taskName="AnotherTask" referenceTaskName="FVWithEventFeedback" priority="0" operation="AnotherTask" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="669" >
+<CONNECTOR type="125" id="674" >
<cdparam x="983" y="440" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="1044" y="440" id="572" />
-<P2 x="921" y="492" id="601" />
+<P1 x="1044" y="440" id="577" />
+<P2 x="921" y="492" id="606" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="670" >
+<CONNECTOR type="125" id="675" >
<cdparam x="620" y="385" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="620" y="370" id="657" />
-<P2 x="695" y="492" id="600" />
+<P1 x="620" y="370" id="662" />
+<P2 x="695" y="492" id="605" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
diff --git a/src/main/java/tmltranslator/TMLChannel.java b/src/main/java/tmltranslator/TMLChannel.java
index 8ddbfd1fe2849f0fb6b1b569a2c839bd6882c66c..e5f2b5e91012e6d5c0f012d7e673f82a1e0dd6ee 100755
--- a/src/main/java/tmltranslator/TMLChannel.java
+++ b/src/main/java/tmltranslator/TMLChannel.java
@@ -505,7 +505,13 @@ public class TMLChannel extends TMLCommunicationElement {
}
s += "destinationtask=\"" + destTask + "\" ";
s += "destinationport=\"" + destPort + "\" ";
- s += "dataFlowType=\"" + originPort.getDataFlowType() + "\" ";
+ if (originPort != null) {
+ s += "dataFlowType=\"" + originPort.getDataFlowType() + "\" ";
+ } else if ((originPorts != null) && (originPorts.size() > 0)){
+ TMLPort tmpP = originPorts.get(0);
+ s += "dataFlowType=\"" + tmpP.getDataFlowType() + "\" ";
+ }
+
}
if (isAJoinChannel()) {
s += "destinationtask=\"" + destinationTasks.get(0).getName() + "\" ";
diff --git a/src/main/java/ui/window/JDialogTMLCompositePort.java b/src/main/java/ui/window/JDialogTMLCompositePort.java
index daa87aeebc2b4bd3504e40dcd4687bc135888a59..717a0ef3b7cb597e58477da3addac0dee5419c3c 100755
--- a/src/main/java/ui/window/JDialogTMLCompositePort.java
+++ b/src/main/java/ui/window/JDialogTMLCompositePort.java
@@ -224,7 +224,7 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
- panel1.setBorder(new javax.swing.border.TitledBorder("Name and type "));
+ panel1.setBorder(new javax.swing.border.TitledBorder("Name, type and parameters"));
panel1.setPreferredSize(new Dimension(300, 150));
// First line panel1
@@ -272,49 +272,11 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
origin.addActionListener(this);
panel1.add(origin, c1);
-
- // parameters
- JPanel panel2 = new JPanel();
- panel2.setLayout(gridbag2);
- panel2.setBorder(new javax.swing.border.TitledBorder("Formal Verification & Simulation Parameters "));
- panel2.setPreferredSize(new Dimension(300, 300));
- c2.gridwidth = 1;
- c2.gridheight = 1;
- c2.weighty = 1.0;
- c2.weightx = 1.0;
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- c2.fill = GridBagConstraints.BOTH;
- c2.gridheight = 3;
- panel2.add(new JLabel(" "), c2);
-
- //Security Properties to check
- confCheckBox = new JCheckBox("Check Confidentiality");
- panel2.add(confCheckBox, c2);
- confCheckBox.addActionListener(this);
- confCheckBox.setSelected(checkConf);
- authCheckBox = new JCheckBox("Check Authenticity");
- authCheckBox.addActionListener(this);
- panel2.add(authCheckBox, c2);
- authCheckBox.setSelected(checkAuth);
-
-
- //If related to security requirement, allow reference to the requirement
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Reference Requirement"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- refReq = new JComboBox<>(refs);
- panel2.add(refReq, c2);
- if (reference != null) {
- refReq.setSelectedItem(reference);
- }
-
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Type #1"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel("Type #1"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
typeList1 = new JComboBox<>(types1);
//TraceManager.addDev("type1= " + type1);
if (type1.getType() < TType.OTHER) {
@@ -329,13 +291,13 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
}
}
}
- panel2.add(typeList1, c2);
+ panel1.add(typeList1, c1);
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Type #2"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel("Type #2"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
typeList2 = new JComboBox<>(types2);
if (type2.getType() < TType.OTHER) {
typeList2.setSelectedIndex(type2.getType());
@@ -349,13 +311,13 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
}
}
}
- panel2.add(typeList2, c2);
+ panel1.add(typeList2, c1);
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Type: #3"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel("Type: #3"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
typeList3 = new JComboBox<>(types3);
if (type3.getType() < TType.OTHER) {
typeList3.setSelectedIndex(type3.getType());
@@ -369,13 +331,13 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
}
}
}
- panel2.add(typeList3, c2);
+ panel1.add(typeList3, c1);
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Type: #4"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel("Type: #4"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
typeList4 = new JComboBox<>(types4);
if (type4.getType() < TType.OTHER) {
typeList4.setSelectedIndex(type4.getType());
@@ -389,14 +351,14 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
}
}
}
- panel2.add(typeList4, c2);
+ panel1.add(typeList4, c1);
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Type: #5"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel("Type: #5"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
typeList5 = new JComboBox<>(types5);
if (type5.getType() < TType.OTHER) {
typeList5.setSelectedIndex(type5.getType());
@@ -410,7 +372,91 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
}
}
}
- panel2.add(typeList5, c2);
+ panel1.add(typeList5, c1);
+
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel("Blocking?"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ blocking = new JComboBox<>(blockings);
+ if (isBlocking) {
+ blocking.setSelectedIndex(0);
+ } else {
+ blocking.setSelectedIndex(1);
+ }
+ blocking.addActionListener(this);
+ panel1.add(blocking, c1);
+
+ c1.gridwidth = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+ panel1.add(new JLabel("Finite?"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ finite = new JComboBox<>(finites);
+ if (isFinite) {
+ finite.setSelectedIndex(0);
+ } else {
+ finite.setSelectedIndex(1);
+ }
+ finite.addActionListener(this);
+ panel1.add(finite, c1);
+
+ c1.gridwidth = 1;
+ panel1.add(new JLabel("Width (in Byte)="), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ widthText = new JTextField(widthSamples);
+ panel1.add(widthText, c1);
+
+ c1.gridwidth = 1;
+ panel1.add(new JLabel("Capacity="), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ maxText = new JTextField(maxInFIFO);
+ panel1.add(maxText, c1);
+
+
+
+ JPanel panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("Properties and Verification "));
+ panel2.setPreferredSize(new Dimension(300, 300));
+
+ //If related to security requirement, allow reference to the requirement
+ c2.gridwidth = 1;
+ c2.fill = GridBagConstraints.HORIZONTAL;
+ c2.anchor = GridBagConstraints.CENTER;
+ panel2.add(new JLabel("Reference Requirement"), c2);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ refReq = new JComboBox<>(refs);
+ panel2.add(refReq, c2);
+ if (reference != null) {
+ refReq.setSelectedItem(reference);
+ }
+
+
+ c2.gridwidth = 1;
+ c2.gridheight = 1;
+ c2.weighty = 1.0;
+ c2.weightx = 1.0;
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c2.fill = GridBagConstraints.BOTH;
+ c2.gridheight = 3;
+ panel2.add(new JLabel(" "), c2);
+
+ //Security Properties to check
+ confCheckBox = new JCheckBox("Check Confidentiality");
+ panel2.add(confCheckBox, c2);
+ confCheckBox.addActionListener(this);
+ confCheckBox.setSelected(checkConf);
+ authCheckBox = new JCheckBox("Check Authenticity");
+ authCheckBox.addActionListener(this);
+ panel2.add(authCheckBox, c2);
+ authCheckBox.setSelected(checkAuth);
+
+
+
+
+
// Code generation
JPanel panel4 = new JPanel();
@@ -461,45 +507,7 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
isPostexCB.setSelected(isPostex);
panel4.add(isPostexCB, c4);
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Blocking?"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- blocking = new JComboBox<>(blockings);
- if (isBlocking) {
- blocking.setSelectedIndex(0);
- } else {
- blocking.setSelectedIndex(1);
- }
- blocking.addActionListener(this);
- panel2.add(blocking, c2);
-
- c2.gridwidth = 1;
- c2.fill = GridBagConstraints.HORIZONTAL;
- c2.anchor = GridBagConstraints.CENTER;
- panel2.add(new JLabel("Finite?"), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- finite = new JComboBox<>(finites);
- if (isFinite) {
- finite.setSelectedIndex(0);
- } else {
- finite.setSelectedIndex(1);
- }
- finite.addActionListener(this);
- panel2.add(finite, c2);
- c2.gridwidth = 1;
- panel2.add(new JLabel("Width (in Byte)="), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- widthText = new JTextField(widthSamples);
- panel2.add(widthText, c2);
-
- c2.gridwidth = 1;
- panel2.add(new JLabel("Capacity="), c2);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- maxText = new JTextField(maxInFIFO);
- panel2.add(maxText, c2);
/*c2.gridwidth = GridBagConstraints.REMAINDER; //end row
c2.fill = GridBagConstraints.HORIZONTAL;