From c1dd5de558afb36059b9112ad705b51fa5e17ba3 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Fri, 28 Jun 2019 13:02:35 +0200
Subject: [PATCH] Adding the notion of daemon task
---
modeling/DIPLODOCUS/simpleSDF.xml | 272 +++++++++---------
src/main/java/tmltranslator/TMLTask.java | 7 +
src/main/java/ui/GTMLModeling.java | 1 +
src/main/java/ui/TGCAttributeBox.java | 4 +-
src/main/java/ui/ebrdd/EBRDDAttributeBox.java | 3 +-
src/main/java/ui/procsd/ProCSDComponent.java | 2 +-
src/main/java/ui/tmlcd/TMLAttributeBox.java | 3 +-
.../ui/tmlcompd/TMLCPrimitiveComponent.java | 20 +-
.../java/ui/tmlcompd/TMLCRecordComponent.java | 3 +-
src/main/java/ui/window/JDialogAttribute.java | 34 ++-
10 files changed, 204 insertions(+), 145 deletions(-)
diff --git a/modeling/DIPLODOCUS/simpleSDF.xml b/modeling/DIPLODOCUS/simpleSDF.xml
index da365e453d..992df8b25d 100644
--- a/modeling/DIPLODOCUS/simpleSDF.xml
+++ b/modeling/DIPLODOCUS/simpleSDF.xml
@@ -8,15 +8,15 @@
<cdparam x="1345" y="398" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1332" y="385" id="119" />
-<P2 x="1796" y="319" id="151" />
+<P1 x="1332" y="385" id="113" />
+<P2 x="1796" y="319" id="147" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="2" >
<cdparam x="1560" y="174" />
<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="1547" y="161" id="98" />
+<P1 x="1547" y="161" id="100" />
<P2 x="1796" y="273" id="149" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -25,7 +25,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="983" y="264" id="21" />
-<P2 x="1126" y="161" id="85" />
+<P2 x="1126" y="161" id="79" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4" >
@@ -33,14 +33,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="989" y="273" id="19" />
-<P2 x="1182" y="396" id="117" />
+<P2 x="1182" y="396" id="115" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="5" >
<cdparam x="846" y="309" />
<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="833" y="237" id="168" />
+<P1 x="833" y="237" id="162" />
<P2 x="967" y="273" id="18" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -48,7 +48,7 @@
<cdparam x="1345" y="350" />
<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="1332" y="337" id="115" />
+<P1 x="1332" y="337" id="117" />
<P2 x="1660" y="178" id="39" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -57,14 +57,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="1677" y="170" id="34" />
-<P2 x="1796" y="223" id="147" />
+<P2 x="1796" y="223" id="151" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="8" >
<cdparam x="1560" y="110" />
<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="1547" y="97" id="100" />
+<P1 x="1547" y="97" id="98" />
<P2 x="1655" y="170" id="35" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -72,55 +72,55 @@
<cdparam x="1289" y="179" />
<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="1276" y="166" id="81" />
-<P2 x="1397" y="156" id="102" />
+<P1 x="1276" y="166" id="83" />
+<P2 x="1397" y="156" id="96" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="10" >
<cdparam x="1289" y="115" />
<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="1276" y="102" id="83" />
-<P2 x="1397" y="92" id="96" />
+<P1 x="1276" y="102" id="81" />
+<P2 x="1397" y="92" id="102" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="11" >
<cdparam x="335" y="300" />
<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="322" y="287" id="68" />
-<P2 x="427" y="287" id="132" />
+<P1 x="322" y="287" id="66" />
+<P2 x="427" y="287" id="134" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="12" >
<cdparam x="335" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="322" y="223" id="66" />
-<P2 x="427" y="223" id="130" />
+<P1 x="322" y="223" id="68" />
+<P2 x="427" y="223" id="136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="13" >
<cdparam x="590" y="305" />
<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="577" y="292" id="136" />
-<P2 x="683" y="289" id="164" />
+<P1 x="577" y="292" id="130" />
+<P2 x="683" y="289" id="166" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="14" >
<cdparam x="590" y="241" />
<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="577" y="228" id="134" />
-<P2 x="683" y="225" id="162" />
+<P1 x="577" y="228" id="132" />
+<P2 x="683" y="225" id="168" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="15" >
<cdparam x="846" 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="833" y="195" id="166" />
+<P1 x="833" y="195" id="164" />
<P2 x="996" y="175" id="50" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -129,7 +129,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="1012" y="166" id="53" />
-<P2 x="1126" y="97" id="79" />
+<P2 x="1126" y="97" id="85" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="17" >
@@ -137,7 +137,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="1012" y="183" id="55" />
-<P2 x="1182" y="332" id="113" />
+<P2 x="1182" y="332" id="119" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1207" id="33" >
@@ -230,15 +230,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="67" >
<father id="78" num="0" />
-<cdparam x="309" y="223" />
+<cdparam x="309" y="287" />
<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 chToT1" />
+<infoparam name="Primitive port" value="Event evtToT1" />
<TGConnectingPoint num="0" id="66" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT1" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -247,15 +247,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="69" >
<father id="78" num="1" />
-<cdparam x="309" y="287" />
+<cdparam x="309" y="223" />
<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 evtToT1" />
+<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="68" />
<extraparam>
-<Prop commName="evtToT1" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -284,15 +284,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="80" >
<father id="95" num="0" />
-<cdparam x="1113" y="97" />
+<cdparam x="1113" y="161" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT3" />
+<infoparam name="Primitive port" value="Event evtToT3" />
<TGConnectingPoint num="0" id="79" />
<extraparam>
-<Prop commName="chToT3" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT3" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -301,15 +301,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="82" >
<father id="95" num="1" />
-<cdparam x="1263" y="166" />
+<cdparam x="1263" y="102" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT4" />
+<infoparam name="Primitive port" value="Channel chToT4" />
<TGConnectingPoint num="0" id="81" />
<extraparam>
-<Prop commName="evtToT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -318,15 +318,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="84" >
<father id="95" num="2" />
-<cdparam x="1263" y="102" />
+<cdparam x="1263" y="166" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT4" />
+<infoparam name="Primitive port" value="Event evtToT4" />
<TGConnectingPoint num="0" id="83" />
<extraparam>
-<Prop commName="chToT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -335,15 +335,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="86" >
<father id="95" num="3" />
-<cdparam x="1113" y="161" />
+<cdparam x="1113" y="97" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT3" />
+<infoparam name="Primitive port" value="Channel chToT3" />
<TGConnectingPoint num="0" id="85" />
<extraparam>
-<Prop commName="evtToT3" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT3" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -372,15 +372,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="97" >
<father id="112" num="0" />
-<cdparam x="1384" y="92" />
+<cdparam x="1384" y="156" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT4" />
+<infoparam name="Primitive port" value="Event evtToT4" />
<TGConnectingPoint num="0" id="96" />
<extraparam>
-<Prop commName="chToT4" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT4" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -389,15 +389,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="99" >
<father id="112" num="1" />
-<cdparam x="1534" y="161" />
+<cdparam x="1534" y="97" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtFromT4" />
+<infoparam name="Primitive port" value="Channel chFromT4" />
<TGConnectingPoint num="0" id="98" />
<extraparam>
-<Prop commName="evtFromT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chFromT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -406,15 +406,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="101" >
<father id="112" num="2" />
-<cdparam x="1534" y="97" />
+<cdparam x="1534" y="161" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chFromT4" />
+<infoparam name="Primitive port" value="Event evtFromT4" />
<TGConnectingPoint num="0" id="100" />
<extraparam>
-<Prop commName="chFromT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -423,15 +423,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="103" >
<father id="112" num="3" />
-<cdparam x="1384" y="156" />
+<cdparam x="1384" y="92" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT4" />
+<infoparam name="Primitive port" value="Channel chToT4" />
<TGConnectingPoint num="0" id="102" />
<extraparam>
-<Prop commName="evtToT4" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT4" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -460,15 +460,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="114" >
<father id="129" num="0" />
-<cdparam x="1169" y="332" />
+<cdparam x="1319" 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="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT5" />
+<infoparam name="Primitive port" value="Event evtFromT5" />
<TGConnectingPoint num="0" id="113" />
<extraparam>
-<Prop commName="chToT5" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromT5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -477,15 +477,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="116" >
<father id="129" num="1" />
-<cdparam x="1319" y="337" />
+<cdparam x="1169" y="396" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chFromT5" />
+<infoparam name="Primitive port" value="Event evtToT5" />
<TGConnectingPoint num="0" id="115" />
<extraparam>
-<Prop commName="chFromT5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -494,15 +494,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="118" >
<father id="129" num="2" />
-<cdparam x="1169" y="396" />
+<cdparam x="1319" y="337" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT5" />
+<infoparam name="Primitive port" value="Channel chFromT5" />
<TGConnectingPoint num="0" id="117" />
<extraparam>
-<Prop commName="evtToT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chFromT5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -511,15 +511,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="120" >
<father id="129" num="3" />
-<cdparam x="1319" y="385" />
+<cdparam x="1169" y="332" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtFromT5" />
+<infoparam name="Primitive port" value="Channel chToT5" />
<TGConnectingPoint num="0" id="119" />
<extraparam>
-<Prop commName="evtFromT5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT5" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -548,15 +548,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="131" >
<father id="146" num="0" />
-<cdparam x="414" y="223" />
+<cdparam x="564" y="292" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT1" />
+<infoparam name="Primitive port" value="Event evtToT2" />
<TGConnectingPoint num="0" id="130" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT2" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -565,15 +565,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="133" >
<father id="146" num="1" />
-<cdparam x="414" y="287" />
+<cdparam x="564" y="228" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT1" />
+<infoparam name="Primitive port" value="Channel chToT2" />
<TGConnectingPoint num="0" id="132" />
<extraparam>
-<Prop commName="evtToT1" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -582,15 +582,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="135" >
<father id="146" num="2" />
-<cdparam x="564" y="228" />
+<cdparam x="414" y="287" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT2" />
+<infoparam name="Primitive port" value="Event evtToT1" />
<TGConnectingPoint num="0" id="134" />
<extraparam>
-<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT1" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -599,15 +599,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="137" >
<father id="146" num="3" />
-<cdparam x="564" y="292" />
+<cdparam x="414" y="223" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT2" />
+<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="136" />
<extraparam>
-<Prop commName="evtToT2" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -638,15 +638,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="148" >
<father id="161" num="0" />
-<cdparam x="1783" y="223" />
+<cdparam x="1783" y="319" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chtoDst" />
+<infoparam name="Primitive port" value="Event evtFromT5" />
<TGConnectingPoint num="0" id="147" />
<extraparam>
-<Prop commName="chtoDst" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -672,15 +672,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="152" >
<father id="161" num="2" />
-<cdparam x="1783" y="319" />
+<cdparam x="1783" y="223" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtFromT5" />
+<infoparam name="Primitive port" value="Channel chtoDst" />
<TGConnectingPoint num="0" id="151" />
<extraparam>
-<Prop commName="evtFromT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chtoDst" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -709,15 +709,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="163" >
<father id="178" num="0" />
-<cdparam x="670" y="225" />
+<cdparam x="820" y="237" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT2" />
+<infoparam name="Primitive port" value="Event evtToT3T5" />
<TGConnectingPoint num="0" id="162" />
<extraparam>
-<Prop commName="chToT2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT3T5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -726,15 +726,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="165" >
<father id="178" num="1" />
-<cdparam x="670" y="289" />
+<cdparam x="820" y="195" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT2" />
+<infoparam name="Primitive port" value="Channel chToT3T5" />
<TGConnectingPoint num="0" id="164" />
<extraparam>
-<Prop commName="evtToT2" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT3T5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -743,15 +743,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="167" >
<father id="178" num="2" />
-<cdparam x="820" y="195" />
+<cdparam x="670" y="289" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT3T5" />
+<infoparam name="Primitive port" value="Event evtToT2" />
<TGConnectingPoint num="0" id="166" />
<extraparam>
-<Prop commName="chToT3T5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" 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" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT2" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -760,15 +760,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="169" >
<father id="178" num="3" />
-<cdparam x="820" y="237" />
+<cdparam x="670" y="225" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT3T5" />
+<infoparam name="Primitive port" value="Channel chToT2" />
<TGConnectingPoint num="0" id="168" />
<extraparam>
-<Prop commName="evtToT3T5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" 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" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1777,11 +1777,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="356" >
<father id="399" num="0" />
-<cdparam x="332" y="523" />
+<cdparam x="411" y="615" />
<sizeparam width="127" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="123" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::T3" />
+<infoparam name="TGComponent" value="Application::T5" />
<TGConnectingPoint num="0" id="348" />
<TGConnectingPoint num="1" id="349" />
<TGConnectingPoint num="2" id="350" />
@@ -1791,7 +1791,7 @@
<TGConnectingPoint num="6" id="354" />
<TGConnectingPoint num="7" id="355" />
<extraparam>
-<info value="Application::T3" taskName="T3" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
+<info value="Application::T5" taskName="T5" referenceTaskName="Application" priority="0" operationMEC="T5" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="365" >
@@ -1815,11 +1815,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="374" >
<father id="399" num="2" />
-<cdparam x="411" y="615" />
+<cdparam x="332" y="523" />
<sizeparam width="127" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="123" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::T5" />
+<infoparam name="TGComponent" value="Application::T3" />
<TGConnectingPoint num="0" id="366" />
<TGConnectingPoint num="1" id="367" />
<TGConnectingPoint num="2" id="368" />
@@ -1829,7 +1829,7 @@
<TGConnectingPoint num="6" id="372" />
<TGConnectingPoint num="7" id="373" />
<extraparam>
-<info value="Application::T5" taskName="T5" referenceTaskName="Application" priority="0" operationMEC="T5" fatherComponentMECType="0" />
+<info value="Application::T3" taskName="T3" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -1978,11 +1978,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="483" >
<father id="526" num="0" />
-<cdparam x="539" y="82" />
-<sizeparam width="127" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="565" y="189" />
+<sizeparam width="133" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="123" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::T1" />
+<cdrectangleparam minX="0" maxX="117" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Application::Dst" />
<TGConnectingPoint num="0" id="475" />
<TGConnectingPoint num="1" id="476" />
<TGConnectingPoint num="2" id="477" />
@@ -1992,7 +1992,7 @@
<TGConnectingPoint num="6" id="481" />
<TGConnectingPoint num="7" id="482" />
<extraparam>
-<info value="Application::T1" taskName="T1" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
+<info value="Application::Dst" taskName="Dst" referenceTaskName="Application" priority="0" operationMEC="Dst" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="492" >
@@ -2016,11 +2016,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="501" >
<father id="526" num="2" />
-<cdparam x="565" y="189" />
-<sizeparam width="133" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="539" y="82" />
+<sizeparam width="127" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="117" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::Dst" />
+<cdrectangleparam minX="0" maxX="123" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Application::T1" />
<TGConnectingPoint num="0" id="493" />
<TGConnectingPoint num="1" id="494" />
<TGConnectingPoint num="2" id="495" />
@@ -2030,7 +2030,7 @@
<TGConnectingPoint num="6" id="499" />
<TGConnectingPoint num="7" id="500" />
<extraparam>
-<info value="Application::Dst" taskName="Dst" referenceTaskName="Application" priority="0" operationMEC="Dst" fatherComponentMECType="0" />
+<info value="Application::T1" taskName="T1" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
diff --git a/src/main/java/tmltranslator/TMLTask.java b/src/main/java/tmltranslator/TMLTask.java
index aed8f53460..c1be5b31ae 100755
--- a/src/main/java/tmltranslator/TMLTask.java
+++ b/src/main/java/tmltranslator/TMLTask.java
@@ -63,6 +63,7 @@ public class TMLTask extends TMLElement {
private Set<TMLEvent> eventsList;
private int operationType;
private String operation = "";
+ private boolean isDaemon;
private String operationMEC;
private boolean isAttacker;
@@ -81,6 +82,12 @@ public class TMLTask extends TMLElement {
isRequested = _b;
}
+ public void setDaemon(boolean _b) {
+ isDaemon = _b;
+ }
+
+ public boolean isDaemon() {return isDaemon;}
+
public void setPriority(int _priority) {
priority = _priority;
}
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index 46a17db895..99d9c7fa9f 100644
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -570,6 +570,7 @@ public class GTMLModeling {
}
tmlt = new TMLTask(makeName(tgc, tmlcpc.getValue()), tmlcpc, tmladp);
tmlt.addOperation(tmlcpc.getOperation());
+ tmlt.setDaemon(tmlcpc.isDaemon());
tmlt.setAttacker(tmlcpc.isAttacker());
//TraceManager.addDev("Task added:" + tmlt.getName() + " with tadp=" + tmladp + " major=" + tmladp.getMGUI().getMajorTitle(tmladp));
listE.addCor(tmlt, tgc);
diff --git a/src/main/java/ui/TGCAttributeBox.java b/src/main/java/ui/TGCAttributeBox.java
index adba2ecf78..dd719a94b7 100644
--- a/src/main/java/ui/TGCAttributeBox.java
+++ b/src/main/java/ui/TGCAttributeBox.java
@@ -196,7 +196,9 @@ public abstract class TGCAttributeBox extends TGCWithoutInternalComponent {
public boolean editOndoubleClick(JFrame frame) {
String oldValue = value;
- JDialogAttribute jda = new JDialogAttribute(myAttributes, forbiddenNames, frame, "Setting " + attributeText + "s of " + father.getValue(), attributeText, null);
+ JDialogAttribute jda = new JDialogAttribute(myAttributes, forbiddenNames, frame,
+ "Setting " + attributeText + "s of " + father.getValue(), attributeText,
+ null, false);
setJDialogOptions(jda);
// jda.setSize(650, 375);
GraphicLib.centerOnParent(jda, 650, 375);
diff --git a/src/main/java/ui/ebrdd/EBRDDAttributeBox.java b/src/main/java/ui/ebrdd/EBRDDAttributeBox.java
index c8627ccffe..4f4bc3ec75 100644
--- a/src/main/java/ui/ebrdd/EBRDDAttributeBox.java
+++ b/src/main/java/ui/ebrdd/EBRDDAttributeBox.java
@@ -211,7 +211,8 @@ public class EBRDDAttributeBox extends TGCWithoutInternalComponent {
public boolean editOndoubleClick(JFrame frame) {
String oldValue = value;
- JDialogAttribute jda = new JDialogAttribute(myAttributes, forbiddenNames, frame, "Setting variables", attributeText, null);
+ JDialogAttribute jda = new JDialogAttribute(myAttributes, forbiddenNames, frame,
+ "Setting variables", attributeText, null, false);
setJDialogOptions(jda);
// jda.setSize(650, 375);
GraphicLib.centerOnParent(jda, 650, 375);
diff --git a/src/main/java/ui/procsd/ProCSDComponent.java b/src/main/java/ui/procsd/ProCSDComponent.java
index ca3ff80655..afc8bc899b 100755
--- a/src/main/java/ui/procsd/ProCSDComponent.java
+++ b/src/main/java/ui/procsd/ProCSDComponent.java
@@ -516,7 +516,7 @@ public class ProCSDComponent extends TGCWithInternalComponent implements Swallow
if (e.getActionCommand().equals("edit attributes")) {
JDialogAttribute dialog = new JDialogAttribute(myAttributes,
new LinkedList<TAttribute> (), tdp.getGUI().getFrame(),
- "Setting attributes for this component", "Attribute", null);
+ "Setting attributes for this component", "Attribute", null, false);
dialog.addAccess("-");
dialog.addType("Natural");
// must see in GProactiveDesign for bool params
diff --git a/src/main/java/ui/tmlcd/TMLAttributeBox.java b/src/main/java/ui/tmlcd/TMLAttributeBox.java
index 0c77c26167..a2be761938 100755
--- a/src/main/java/ui/tmlcd/TMLAttributeBox.java
+++ b/src/main/java/ui/tmlcd/TMLAttributeBox.java
@@ -241,7 +241,8 @@ public class TMLAttributeBox extends TGCWithoutInternalComponent {
public boolean editOndoubleClick(JFrame frame) {
String oldValue = value;
- JDialogAttribute jda = new JDialogAttribute(myAttributes, forbiddenNames, frame, "Setting " + attributeText + "s of " + father.getValue(), attributeText, null);
+ JDialogAttribute jda = new JDialogAttribute(myAttributes, forbiddenNames, frame,
+ "Setting " + attributeText + "s of " + father.getValue(), attributeText, null, false);
setJDialogOptions(jda);
// jda.setSize(650, 375);
GraphicLib.centerOnParent(jda, 650, 375);
diff --git a/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java b/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
index 8aafa318e2..a182896313 100755
--- a/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
+++ b/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
@@ -71,6 +71,7 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
private Color myColor;
private boolean isAttacker = false;
+ private boolean isDaemon = false;
// Icon
private int iconSize = 15;
private boolean iconIsDrawn = false;
@@ -291,6 +292,10 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
return isAttacker;
}
+ public boolean isDaemon() {
+ return isDaemon;
+ }
+
public boolean editOndoubleClick(JFrame frame, int _x, int _y) {
// On the icon?
if (iconIsDrawn) {
@@ -343,7 +348,8 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
}
// And so -> attributes!
- JDialogAttribute jda = new JDialogAttribute(myAttributes, null, frame, "Setting attributes of " + value, "Attribute", operation);
+ JDialogAttribute jda = new JDialogAttribute(myAttributes, null, frame,
+ "Setting attributes of " + value, "Attribute", operation, isDaemon);
setJDialogOptions(jda);
// jda.setSize(650, 375);
GraphicLib.centerOnParent(jda, 750, 375);
@@ -353,6 +359,7 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
//return false;
//}
operation = jda.getOperation();
+ isDaemon = jda.isDaemon();
rescaled = true;
return true;
@@ -503,6 +510,8 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
StringBuffer sb = new StringBuffer("<extraparam>\n");
sb.append("<Data isAttacker=\"");
sb.append(isAttacker() ? "Yes" : "No");
+ sb.append("\" daemon=\"");
+ sb.append(isDaemon);
sb.append("\" Operation=\"");
sb.append(operation);
sb.append("\" />\n");
@@ -552,12 +561,21 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
elt = (Element) n2;
if (elt.getTagName().equals("Data")) {
isAttacker = elt.getAttribute("isAttacker").equals("Yes");
+
String tmpO = elt.getAttribute("Operation");
if (tmpO == null) {
operation = "";
} else {
operation = tmpO;
}
+
+
+ tmpO = elt.getAttribute("daemon");
+ if (tmpO == null) {
+ isDaemon = false;
+ } else {
+ isDaemon = tmpO.equals("true");
+ }
}
if (elt.getTagName().equals("Attribute")) {
//TraceManager.addDev("Analyzing attribute");
diff --git a/src/main/java/ui/tmlcompd/TMLCRecordComponent.java b/src/main/java/ui/tmlcompd/TMLCRecordComponent.java
index a7118b2456..5be129fd42 100755
--- a/src/main/java/ui/tmlcompd/TMLCRecordComponent.java
+++ b/src/main/java/ui/tmlcompd/TMLCRecordComponent.java
@@ -290,7 +290,8 @@ public class TMLCRecordComponent extends TGCScalableWithInternalComponent implem
}
// And so -> attributes!
- JDialogAttribute jda = new JDialogAttribute(myAttributes, null, frame, "Setting fields of " + value, "Field", null);
+ JDialogAttribute jda = new JDialogAttribute(myAttributes, null, frame,
+ "Setting fields of " + value, "Field", null, false);
setJDialogOptions(jda);
// jda.setSize(650, 375);
GraphicLib.centerOnParent(jda, 650, 375);
diff --git a/src/main/java/ui/window/JDialogAttribute.java b/src/main/java/ui/window/JDialogAttribute.java
index c9cd1567d6..d89e9540cf 100644
--- a/src/main/java/ui/window/JDialogAttribute.java
+++ b/src/main/java/ui/window/JDialogAttribute.java
@@ -71,6 +71,10 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
protected String attrib; // "Attributes", "Gates", etc.
+ // Daemon task?
+ protected boolean isDaemon;
+ protected JCheckBox daemonBox;
+
// Operation type
protected String operation;
protected JPanel panelOperation;
@@ -87,10 +91,11 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
protected JButton upButton;
protected JButton downButton;
protected JButton removeButton;
+
/* Creates new form */
public JDialogAttribute(java.util.List<TAttribute> _attributes, java.util.List<TAttribute>_forbidden, Frame f,
- String title, String attrib, String _operation) {
+ String title, String attrib, String _operation, boolean _isDaemon) {
super(f, title, true);
frame = f;
attributesPar = _attributes;
@@ -98,6 +103,7 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
initValues = new LinkedList<Boolean> ();
this.attrib = attrib;
this.operation = _operation;
+ this.isDaemon = _isDaemon;
attributes = new LinkedList<TAttribute> ();
@@ -251,13 +257,31 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
//panelOperation.setPreferredSize(new Dimension(500, 70));
cOp.weighty = 1.0;
- cOp.weightx = 1.0;
- cOp.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cOp.weightx = 2.0;
+ cOp.gridwidth = 4;
cOp.fill = GridBagConstraints.BOTH;
cOp.gridheight = 3;
operationField = new JTextField(operation);
panelOperation.add(operationField, cOp);
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.fill = GridBagConstraints.BOTH;
+ c0.gridwidth = 4;
+ c.add(panelOperation, c0);
+
+
+ gbOp = new GridBagLayout();
+ cOp = new GridBagConstraints();
+ panelOperation = new JPanel();
+ panelOperation.setLayout(gbOp);
+ panelOperation.setBorder(new javax.swing.border.TitledBorder("System termination"));
+ cOp.weightx = 1.0;
+ cOp.gridwidth = GridBagConstraints.REMAINDER; //end row
+ daemonBox = new JCheckBox("Daemon task?");
+ daemonBox.setSelected(isDaemon);
+ panelOperation.add(daemonBox, cOp);
+
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.fill = GridBagConstraints.BOTH;
@@ -507,6 +531,10 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
}
}
+ public boolean isDaemon() {
+ return daemonBox.isSelected();
+ }
+
public String getOperation() {
if (operationField != null) {
return operationField.getText().trim();
--
GitLab